Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	html/changelogs/.all_changelog.yml

code/modules/materials/material_sheets.dm

@@ -65,9 +65,10 @@
 	var/obj/item/stack/material/M = S
 	if(!istype(M) || material.name != M.material.name)
 		return 0
-	..(S,tamount,1)
+	var/transfer = ..(S,tamount,1)
 	if(src) update_strings()
 	if(M) M.update_strings()
+	return transfer
 
 /obj/item/stack/material/attack_self(var/mob/user)
 	if(!material.build_windows(user, src))
@@ -207,4 +208,4 @@
 	desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
 	singular_name = "reinforced borosilicate glass sheet"
 	icon_state = "sheet-phoronrglass"
-	default_type = "reinforced borosilicate glass"
+	default_type = "reinforced borosilicate glass"

code/modules/materials/materials.dm

@@ -127,8 +127,6 @@ var/list/name_to_material
 	var/obj/item/stack/S = new rod_product(get_turf(user))
 	S.add_fingerprint(user)
 	S.add_to_stacks(user)
-	if(!(user.l_hand && user.r_hand))
-		user.put_in_hands(S)
 
 /material/proc/build_wired_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
 	if(!wire_product)

code/modules/mob/dead/observer/observer.dm

@@ -152,7 +152,7 @@ Works together with spawning an observer, noted above.
 	if(key)
 		var/mob/dead/observer/ghost = new(src)	//Transfer safety to observer spawning proc.
 		ghost.can_reenter_corpse = can_reenter_corpse
-		ghost.timeofdeath = src.timeofdeath //BS12 EDIT
+		ghost.timeofdeath = src.stat == DEAD ? src.timeofdeath : world.time
 		ghost.key = key
 		if(ghost.client && !ghost.client.holder && !config.antag_hud_allowed)		// For new ghosts we remove the verb from even showing up if it's not allowed.
 			ghost.verbs -= /mob/dead/observer/verb/toggle_antagHUD	// Poor guys, don't know what they are missing!

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

@@ -1282,11 +1282,10 @@
 		if(C.body_parts_covered & FEET)
 			feet_exposed = 0
 
-	flavor_text = flavor_texts["general"]
-	flavor_text += "\n\n"
+	flavor_text = ""
 	for (var/T in flavor_texts)
 		if(flavor_texts[T] && flavor_texts[T] != "")
-			if((T == "head" && head_exposed) || (T == "face" && face_exposed) || (T == "eyes" && eyes_exposed) || (T == "torso" && torso_exposed) || (T == "arms" && arms_exposed) || (T == "hands" && hands_exposed) || (T == "legs" && legs_exposed) || (T == "feet" && feet_exposed))
+			if((T == "general") || (T == "head" && head_exposed) || (T == "face" && face_exposed) || (T == "eyes" && eyes_exposed) || (T == "torso" && torso_exposed) || (T == "arms" && arms_exposed) || (T == "hands" && hands_exposed) || (T == "legs" && legs_exposed) || (T == "feet" && feet_exposed))
 				flavor_text += flavor_texts[T]
 				flavor_text += "\n\n"
 	if(!shrink)

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

@@ -347,26 +347,16 @@
 	if(status_flags & GODMODE)
 		return
 
-		if(status_flags & GODMODE)
-			return
-
-		//exposure to extreme pressures can rupture lungs
-		if(breath && (breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5))
-			if(!is_lung_ruptured() && prob(5))
-				rupture_lung()
-
-		//check if we actually need to process breath
-		if(!breath || (breath.total_moles == 0) || suiciding)
-			failed_last_breath = 1
-			if(suiciding)
-				adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
-				oxygen_alert = max(oxygen_alert, 1)
-				return 0
-			if(health > config.health_threshold_crit)
-				adjustOxyLoss(HUMAN_MAX_OXYLOSS)
-			else
-				adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
+	//exposure to extreme pressures can rupture lungs
+	if(breath && (breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5))
+		if(!is_lung_ruptured() && prob(5))
+			rupture_lung()
 
+	//check if we actually need to process breath
+	if(!breath || (breath.total_moles == 0) || suiciding)
+		failed_last_breath = 1
+		if(suiciding)
+			adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
 			oxygen_alert = max(oxygen_alert, 1)
 			return 0
 		if(health > config.health_threshold_crit)
@@ -375,7 +365,6 @@
 			adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
 
 		oxygen_alert = max(oxygen_alert, 1)
-
 		return 0
 
 	var/safe_pressure_min = 16 // Minimum safe partial pressure of breathable gas in kPa