Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876

code/modules/mob/living/blood.dm

@@ -35,22 +35,21 @@
 			blood_volume += 0.1 // regenerate blood VERY slowly
 
 		//Effects of bloodloss
+		var/word = pick("dizzy","woozy","faint")
 		switch(blood_volume)
 			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 				if(prob(5))
-					to_chat(src, "<span class='warning'>You feel [pick("dizzy","woozy","faint")].</span>")
+					to_chat(src, "<span class='warning'>You feel [word].</span>")
 				adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.01, 1))
 			if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
 				adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
 				if(prob(5))
 					blur_eyes(6)
-					var/word = pick("dizzy","woozy","faint")
 					to_chat(src, "<span class='warning'>You feel very [word].</span>")
 			if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
 				adjustOxyLoss(5)
 				if(prob(15))
 					Paralyse(rand(1,3))
-					var/word = pick("dizzy","woozy","faint")
 					to_chat(src, "<span class='warning'>You feel extremely [word].</span>")
 			if(0 to BLOOD_VOLUME_SURVIVE)
 				death()
@@ -70,7 +69,7 @@
 
 		bleed_rate = max(bleed_rate - 0.5, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases
 
-		if(bleed_rate && !bleedsuppress)
+		if(bleed_rate && !bleedsuppress && !(status_flags & FAKEDEATH))
 			bleed(bleed_rate)
 
 //Makes a blood drop, leaking amt units of blood from the mob

code/modules/mob/living/carbon/alien/say.dm

@@ -1,4 +1,4 @@
-/mob/living/proc/alien_talk(message, shown_name = name)
+/mob/living/proc/alien_talk(message, shown_name = real_name)
 	log_say("[key_name(src)] : [message]")
 	message = trim(message)
 	if(!message) return

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

@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm	(rejected hunks)
-@@ -32,7 +32,7 @@
- 
- 	dna.species.spec_death(gibbed, src)
- 
--	if(SSticker && SSticker.mode)
-+	if(SSticker.HasRoundStarted())
- 		SSblackbox.ReportDeath(src)
- 	if(mind && mind.devilinfo)
- 		INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -28,7 +28,7 @@
 		//Holopad
 		if(istype(ai.current, /obj/machinery/holopad))
 			var/obj/machinery/holopad/H = ai.current
-			H.move_hologram(ai)
+			H.move_hologram(ai, T)
 
 /mob/camera/aiEye/Move()
 	return 0