Merge pull request #4246 from FlattestGuitar/lightbulbs

Lightbulbs no longer burn you, lighters do a bit less.
This commit is contained in:
TheDZD
2016-04-29 19:44:01 -04:00
2 changed files with 72 additions and 39 deletions
+7 -1
View File
@@ -46,7 +46,13 @@
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src].</span>")
else
to_chat(user, "<span class='warning'>You burn yourself while lighting the lighter.</span>")
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, 5 )) //INFERNO
H.UpdateDamageIcon()
H.updatehealth()
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], they however burn their finger in the process.</span>")
set_light(2)