From d0d6e8d6f758bb0c3310339db78f18020ac13ac5 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Thu, 23 Jun 2016 08:52:11 -0400 Subject: [PATCH 1/2] Flashes now once again stun borgs --- code/modules/assembly/flash.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 7f08bfb2bca..a4ee663d342 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -94,7 +94,7 @@ M << "[user] blinds you with the flash!" if(M.weakeyes) M.Stun(2) - M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!") + M.visible_message("[M] gasps and shields their eyes!", "You gasp and shield your eyes!") else visible_message("[user] fails to blind [M] with the flash!") user << "You fail to blind [M] with the flash!" @@ -115,6 +115,7 @@ var/mob/living/silicon/robot/R = M add_logs(user, R, "flashed", src) update_icon(1) + M.Weaken(3) R.confused += 5 R.uneq_active() R.flash_eyes(affect_silicon = 1) From 91a7632d9df10b2d48fca3a73679d0a8e7ba7a5f Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Thu, 23 Jun 2016 20:00:58 -0400 Subject: [PATCH 2/2] no module unequip --- code/modules/assembly/flash.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index a4ee663d342..fef67d6d497 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -117,7 +117,6 @@ update_icon(1) M.Weaken(3) R.confused += 5 - R.uneq_active() R.flash_eyes(affect_silicon = 1) user.visible_message("[user] overloads [R]'s sensors with the flash!", "You overload [R]'s sensors with the flash!") return 1