shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

July 5th TG sync (#1883)

Browse Source 
July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/traps.dm
+4 -4
View File
@@ -81,7 +81,7 @@
/obj/structure/trap/stun/trap_effect(mob/living/L)
L.electrocute_act(30, src, safety=1) // electrocute act does a message.
L.Weaken(5)
L.Knockdown(100)
/obj/structure/trap/fire
name = "flame trap"
@@ -90,7 +90,7 @@
/obj/structure/trap/fire/trap_effect(mob/living/L)
to_chat(L, "<span class='danger'><B>Spontaneous combustion!</B></span>")
L.Weaken(1)
L.Knockdown(20)
/obj/structure/trap/fire/flare()
..()
@@ -104,7 +104,7 @@
/obj/structure/trap/chill/trap_effect(mob/living/L)
to_chat(L, "<span class='danger'><B>You're frozen solid!</B></span>")
L.Weaken(1)
L.Knockdown(20)
L.bodytemperature -= 300
L.apply_status_effect(/datum/status_effect/freon)
@@ -117,7 +117,7 @@
/obj/structure/trap/damage/trap_effect(mob/living/L)
to_chat(L, "<span class='danger'><B>The ground quakes beneath your feet!</B></span>")
L.Weaken(5)
L.Knockdown(100)
L.adjustBruteLoss(35)
/obj/structure/trap/damage/flare()