Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm

code/modules/mob/living/carbon/human/human.dm

@@ -944,9 +944,30 @@
 		return NEUTER
 	return gender
 
-
 /mob/living/carbon/human/proc/increase_germ_level(n)
     if(gloves)
         gloves.germ_level += n
     else
         germ_level += n
+        
+/mob/living/carbon/human/revive()
+	for (var/datum/organ/external/O in organs)
+		O.status &= ~ORGAN_BROKEN
+		O.status &= ~ORGAN_BLEEDING
+		O.status &= ~ORGAN_SPLINTED
+		O.status &= ~ORGAN_ATTACHABLE
+		if (!O.amputated)
+			O.status &= ~ORGAN_DESTROYED
+		O.wounds.Cut()
+
+	vessel.add_reagent("blood",560-vessel.total_volume)
+	fixblood()
+	for (var/obj/item/weapon/organ/head/H in world)
+		if(H.brainmob)
+			if(H.brainmob.real_name == src.real_name)
+				if(H.brainmob.mind)
+					H.brainmob.mind.transfer_to(src)
+					del(H)
+
+
+	..()

code/modules/mob/living/carbon/human/inventory.dm

@@ -587,7 +587,7 @@ It can still be worn/put on as normal.
 						target.internal = target.belt
 					if (target.internal)
 						for(var/mob/M in viewers(target, 1))
-							M.show_message("[source] is now running on internals.", 1)
+							M.show_message("[target] is now running on internals.", 1)
 						target.internal.add_fingerprint(source)
 						if (target.internals)
 							target.internals.icon_state = "internal1"

code/modules/mob/living/carbon/human/life.dm

@@ -670,6 +670,7 @@
 				else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
 					if(prob(20))
 						spawn(0) emote(pick("giggle", "laugh"))
+				SA.moles = 0
 
 		if( (abs(310.15 - breath.temperature) > 50) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(breath.temperature < 260.15)
@@ -1116,8 +1117,9 @@
 			else if(sleeping)
 				handle_dreams()
 				adjustHalLoss(-5)
-				if(mind.active || immune_to_ssd)
-					sleeping = max(sleeping-1, 0)
+				if (mind)
+					if(mind.active || immune_to_ssd)
+						sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS
 				if( prob(10) && health && !hal_crit )