Merge pull request #209 from Fox-McCloud/Odds-and-Ends

Odds and ends
This commit is contained in:
Fox-McCloud
2015-01-23 22:19:57 -05:00
16 changed files with 161 additions and 71 deletions
+6 -1
View File
@@ -516,7 +516,12 @@
else if(M_TK in user.mutations)
user << "You telekinetically remove the light [fitting]."
else
user << "You try to remove the light [fitting], but it's too hot and you don't want to burn your hand."
user << "You try to remove the light [fitting], but you burn your hand on it!"
var/datum/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
if(affecting.take_damage( 0, 5 )) // 5 burn damage
H.UpdateDamageIcon()
H.updatehealth()
return // if burned, don't remove the light
else
user << "You remove the light [fitting]."