From 36ae2782bb2f405565b07ec506d3a34123381353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Wed, 20 Apr 2016 22:52:48 +0200 Subject: [PATCH] Lighters burn only your hand and lightbulbs don't burn at all --- code/game/objects/items/weapons/lighters.dm | 7 ++++++- code/modules/power/lighting.dm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index 3f19d6a494b..0444324af96 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -46,7 +46,12 @@ user.visible_message("After a few attempts, [user] manages to light the [src].") else to_chat(user, "You burn yourself while lighting the lighter.") - user.adjustFireLoss(5) + var/mob/living/M = user + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") + if(affecting.take_damage( 0, 1 )) //INFERNO + H.UpdateDamageIcon() user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.") set_light(2) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 574502df928..9b2d3bfb81e 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -455,7 +455,7 @@ else if(TK in user.mutations) to_chat(user, "You telekinetically remove the light [fitting].") else - to_chat(user, "You try to remove the light [fitting], but it's too hot! You should get some better gloves.") + to_chat(user, "You try to remove the light [fitting], but it's too hot!") //no light burning return // if burned, don't remove the light else