From a0f361efa53193cd256ca72ad9f3dab2521b475e Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 10 Jul 2017 02:32:00 +0100 Subject: [PATCH 1/2] feelin hot hot hot --- code/modules/power/lighting.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 323d403d1cb..3a7e3c63571 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -454,6 +454,7 @@ to_chat(user, "You telekinetically remove the light [fitting].") else if(user.a_intent == INTENT_DISARM || user.a_intent == INTENT_GRAB) + user.changeNext_move(CLICK_CD_MELEE) to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!") var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") From 18dd833e629927eeca3ad53d5c53fd49ba234a32 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 17 Aug 2017 07:13:40 +0100 Subject: [PATCH 2/2] Update lighting.dm --- code/modules/power/lighting.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 3a7e3c63571..061cd62bc44 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -428,7 +428,7 @@ // if hands aren't protected and the light is on, burn the player /obj/machinery/light/attack_hand(mob/user) - + user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) if(status == LIGHT_EMPTY) @@ -454,7 +454,6 @@ to_chat(user, "You telekinetically remove the light [fitting].") else if(user.a_intent == INTENT_DISARM || user.a_intent == INTENT_GRAB) - user.changeNext_move(CLICK_CD_MELEE) to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!") var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")