From f302506fbdffcd4a596f471da2eb4ec046ea282a Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Sat, 1 Aug 2015 05:30:39 -0400 Subject: [PATCH 1/2] Removes explosion immunity from chameleon projector Being disguised via chameleon projector will no longer cause the user to shrug off even the nastiest of explosions. The explosion will now break the illusion AND cause the appropriate strength ex_act on the user. --- code/game/objects/items/devices/chameleonproj.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 034fdb53ebc..a6d3052f9c8 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -115,9 +115,10 @@ M << "Your chameleon-projector deactivates." master.disrupt() -/obj/effect/dummy/chameleon/ex_act() //ok now THATS some serious protection against explosions right here +/obj/effect/dummy/chameleon/ex_act(var/severity) //no longer bomb-proof for(var/mob/M in src) M << "Your chameleon-projector deactivates." + M.ex_act(severity) master.disrupt() /obj/effect/dummy/chameleon/bullet_act() From 4b84d7ebd8045f2134e7d192353d5f37f84c24d2 Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Sat, 1 Aug 2015 15:48:29 -0400 Subject: [PATCH 2/2] spawn() added to ex_act --- code/game/objects/items/devices/chameleonproj.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index a6d3052f9c8..a5ec2b9ea25 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -118,7 +118,8 @@ /obj/effect/dummy/chameleon/ex_act(var/severity) //no longer bomb-proof for(var/mob/M in src) M << "Your chameleon-projector deactivates." - M.ex_act(severity) + spawn() + M.ex_act(severity) master.disrupt() /obj/effect/dummy/chameleon/bullet_act()