Merge branch 'master' into upstream-merge-32183

code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -240,6 +240,10 @@
 	name = "Devil Lock"
 	icon_state = "hair_devilock"
 
+/datum/sprite_accessory/hair/drillhairextended
+	name = "Extended Drill Hair"
+	icon_state = "hair_drillhairextended"
+
 /datum/sprite_accessory/hair/dreadlocks
 	name = "Dreadlocks"
 	icon_state = "hair_dreads"

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

@@ -44,24 +44,30 @@
 	msg += "<span class='warning'>"
 	var/temp = getBruteLoss()
 	if(temp)
-		if (temp < 30)
+		if (temp < 25)
 			msg += "[t_He] [t_has] minor bruising.\n"
+		else if (temp < 50)
+			msg += "[t_He] [t_has] <b>moderate</b> bruising!\n"
 		else
 			msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
 
 	temp = getFireLoss()
 	if(temp)
-		if (temp < 30)
+		if (temp < 25)
 			msg += "[t_He] [t_has] minor burns.\n"
+		else if (temp < 50)
+			msg += "[t_He] [t_has] <b>moderate</b> burns!\n"
 		else
 			msg += "<B>[t_He] [t_has] severe burns!</B>\n"
 
 	temp = getCloneLoss()
 	if(temp)
-		if(getCloneLoss() < 30)
+		if(temp < 25)
 			msg += "[t_He] [t_is] slightly deformed.\n"
+		else if (temp < 50)
+			msg += "[t_He] [t_is] <b>moderately</b> deformed!\n"
 		else
-			msg += "<b>[t_He] [t_is] severely deformed.</b>\n"
+			msg += "<b>[t_He] [t_is] severely deformed!</b>\n"
 
 	if(getBrainLoss() > 60)
 		msg += "[t_He] seem[p_s()] to be clumsy and unable to think.\n"

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

@@ -341,6 +341,9 @@
 						msg += "<a href='?src=[REF(src)];hud=s;add_crime=1'>\[Add crime\]</a> "
 						msg += "<a href='?src=[REF(src)];hud=s;view_comment=1'>\[View comment log\]</a> "
 						msg += "<a href='?src=[REF(src)];hud=s;add_comment=1'>\[Add comment\]</a>\n"
+	if(print_flavor_text() && get_visible_name() != "Unknown")//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
+		msg += "[print_flavor_text()]\n"
+		
 	msg += "*---------*</span>"
 
 	to_chat(user, msg)

code/modules/mob/living/silicon/robot/robot.dm

@@ -167,7 +167,7 @@
 	if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
 		var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
 		if(T)
-			mmi.loc = T
+			mmi.forceMove(T)
 		if(mmi.brainmob)
 			if(mmi.brainmob.stat == DEAD)
 				mmi.brainmob.stat = CONSCIOUS
@@ -770,24 +770,24 @@
 /mob/living/silicon/robot/proc/deconstruct()
 	var/turf/T = get_turf(src)
 	if (robot_suit)
-		robot_suit.loc = T
-		robot_suit.l_leg.loc = T
+		robot_suit.forceMove(T)
+		robot_suit.l_leg.forceMove(T)
 		robot_suit.l_leg = null
-		robot_suit.r_leg.loc = T
+		robot_suit.r_leg.forceMove(T)
 		robot_suit.r_leg = null
 		new /obj/item/stack/cable_coil(T, robot_suit.chest.wired)
-		robot_suit.chest.loc = T
+		robot_suit.chest.forceMove(T)
 		robot_suit.chest.wired = 0
 		robot_suit.chest = null
-		robot_suit.l_arm.loc = T
+		robot_suit.l_arm.forceMove(T)
 		robot_suit.l_arm = null
-		robot_suit.r_arm.loc = T
+		robot_suit.r_arm.forceMove(T)
 		robot_suit.r_arm = null
-		robot_suit.head.loc = T
-		robot_suit.head.flash1.loc = T
+		robot_suit.head.forceMove(T)
+		robot_suit.head.flash1.forceMove(T)
 		robot_suit.head.flash1.burn_out()
 		robot_suit.head.flash1 = null
-		robot_suit.head.flash2.loc = T
+		robot_suit.head.flash2.forceMove(T)
 		robot_suit.head.flash2.burn_out()
 		robot_suit.head.flash2 = null
 		robot_suit.head = null
@@ -806,7 +806,7 @@
 			var/obj/item/device/assembly/flash/handheld/F = new /obj/item/device/assembly/flash/handheld(T)
 			F.burn_out()
 	if (cell) //Sanity check.
-		cell.loc = T
+		cell.forceMove(T)
 		cell = null
 	qdel(src)
 

code/modules/mob/mob_helpers.dm

@@ -387,8 +387,8 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 /mob/proc/reagent_check(datum/reagent/R) // utilized in the species code
 	return 1
 
-/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/mutable_appearance/alert_overlay = null, var/action = NOTIFY_JUMP, flashwindow = TRUE) //Easy notification of ghosts.
-	if(SSatoms.initialized != INITIALIZATION_INNEW_REGULAR)	//don't notify for objects created during a map load
+/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/mutable_appearance/alert_overlay = null, var/action = NOTIFY_JUMP, flashwindow = TRUE, ignore_mapload = TRUE) //Easy notification of ghosts.
+	if(ignore_mapload && SSatoms.initialized != INITIALIZATION_INNEW_REGULAR)	//don't notify for objects created during a map load
 		return
 	for(var/mob/dead/observer/O in GLOB.player_list)
 		if(O.client)