Merge remote-tracking branch 'ParadiseSS13/master' into depot

This commit is contained in:
Kyep
2018-01-05 03:25:18 -08:00
89 changed files with 537 additions and 450 deletions
+1 -1
View File
@@ -250,7 +250,7 @@
var/mob/living/carbon/human/H = ass
to_chat(H, "<span class='notice'>Something smells toasty...</span>")
var/obj/item/organ/external/G = H.get_organ("groin")
G.take_damage(0, 30)
G.receive_damage(0, 30)
spawn(20)
H.emote("scream")
emag_cooldown = world.time + EMAG_DELAY