Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Spaghetti-bit committed Jul 2, 2024
1 parent 77253c5 commit 16a138f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions code/game/machinery/vendors/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -980,9 +980,15 @@
if(!HAS_TRAIT(attacker, TRAIT_PACIFISM))
add_attack_logs(attacker, target, "shoved into a vending machine ([src])")
tilt(target, from_combat = TRUE)
target.visible_message("<span class='warning'>[attacker] slams [target] into [src]!</span>", \
"<span class='userdanger'>You get slammed into [src] by [attacker]!</span>", \
"You hear a loud crunch.")
else if(HAS_TRAIT_FROM(attacker, TRAIT_PACIFISM, GHOST_ROLE)) // should only apply to the ghost bar
add_attack_logs(attacker, target, "shoved into a vending machine ([src]), but flattened themselves.")
tilt(attacker, crit = TRUE, from_anywhere = TRUE) // get fucked
target.visible_message("<span class='warning'>[attacker] tries to slam [target] into [src], but falls face first into [src]!</span>", \
"<span class='userdanger'>You get pushed into [src] by [attacker], but narrowly move out of the way as it tips over ontop of [attacker]!</span>", \
"You hear a loud crunch.")
else
attacker.visible_message("<span class='notice'>[attacker] lightly presses [target] against [src].</span>", "<span class='warning'>You lightly press [target] against [src], you don't want to hurt [target.p_them()]!</span>")
return TRUE
Expand Down

0 comments on commit 16a138f

Please sign in to comment.