From c7a3c92b1c4c9e0e578a9d478206eb29110ee64d Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 18:39:29 +0200 Subject: [PATCH] Stops 0 force item paps turning borgs into pyrotechnical sparklers. (#4261) * Stops 0 force item paps turning borgs into pyrotechnical sparklers. -That's just too much of a silly thing to happen without damage. * Adds verb for party sparks. * Update robot.dm --- code/modules/mob/living/silicon/robot/robot.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2deb4bc0b22..6c3cd7f1dbd 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -394,6 +394,11 @@ C.toggled = 1 src << "You enable [C.name]." +/mob/living/silicon/robot/verb/spark_plug() //So you can still sparkle on demand without violence. + set category = "Robot Commands" + set name = "Emit Sparks" + spark_system.start() + // this function displays jetpack pressure in the stat panel /mob/living/silicon/robot/proc/show_jetpack_pressure() // if you have a jetpack, show the internal tank pressure @@ -637,7 +642,8 @@ else if( !(istype(W, /obj/item/device/robotanalyzer) || istype(W, /obj/item/device/healthanalyzer)) ) - spark_system.start() + if(W.force > 0) + spark_system.start() return ..() /mob/living/silicon/robot/attack_hand(mob/user)