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

Odds and ends

code/modules/mob/living/living.dm

@@ -322,15 +322,16 @@
 	on_fire = 0
 	suiciding = 0
 	buckled = initial(src.buckled)
-	
+
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 		C.handcuffed = initial(C.handcuffed)
 
-		// restore all of the human's blood
+		// restore all of the human's blood and reset their shock stage
 		if(ishuman(src))
 			var/mob/living/carbon/human/human_mob = src
 			human_mob.restore_blood()
+			human_mob.shock_stage = 0
 
 	restore_all_organs()
 	if(stat == 2)
@@ -757,6 +758,6 @@
 	else if(!on && floating)
 		animate(src, pixel_y = initial(pixel_y), time = 10)
 		floating = 0
-		
+
 /mob/living/proc/can_use_vents()
 	return "You can't fit into that vent."

code/modules/power/lighting.dm

@@ -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]."