Merge branch 'master' into upstream-merge-31737

code/modules/surgery/organs/heart.dm

@@ -63,10 +63,9 @@
 			H.stop_sound_channel(CHANNEL_HEARTBEAT)
 			beat = BEAT_NONE
 
-		if(H.jitteriness)
-			if(!beat || beat == BEAT_SLOW)
-				H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
-				beat = BEAT_FAST
+		if(H.jitteriness && H.health > HEALTH_THRESHOLD_FULLCRIT && (!beat || beat == BEAT_SLOW))
+			H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
+			beat = BEAT_FAST
 
 /obj/item/organ/heart/cursed
 	name = "cursed heart"

code/modules/surgery/organs/lungs.dm

@@ -95,10 +95,10 @@
 
 	var/list/breath_gases = breath.gases
 
-	breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen)
+	breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen, /datum/gas/tritium, /datum/gas/brown_gas, /datum/gas/pluoxium, /datum/gas/stimulum)
 
 	//Partial pressures in our breath
-	var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])
+	var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES]))
 	var/N2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
 	var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
 	var/CO2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
@@ -252,9 +252,40 @@
 				H.adjustBrainLoss(3)
 		else if(bz_pp > 0.01)
 			H.hallucination += 5//Removed at 2 per tick so this will slowly build up
+
+
+	// Tritium
+		var/trit_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/tritium][MOLES])
+		if (trit_pp > 50)
+			H.radiation += trit_pp/2 //If you're breathing in half an atmosphere of radioactive gas, you fucked up.
+		else
+			H.radiation += trit_pp/10
+
+	//Brown Gas
+		var/brown_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/brown_gas][MOLES])
+		if (prob(brown_pp))
+			to_chat(H, "<span class='alert'>Your mouth feels like it's burning!</span>")
+		if (brown_pp >40)
+			H.emote("gasp")
+			H.adjustFireLoss(10)
+			if (prob(brown_pp/2))
+				to_chat(H, "<span class='alert'>Your throat closes up!</span>")
+				H.silent = max(H.silent, 3)
+		else
+			H.adjustFireLoss(brown_pp/4)
+		gas_breathed = breath_gases[/datum/gas/brown_gas][MOLES]
+		if (gas_breathed > GAS_STIM_MINIMUM)
+			H.reagents.add_reagent("brown_gas",1)
+
+		breath_gases[/datum/gas/brown_gas][MOLES]-=gas_breathed
+		gas_breathed = 0
+	//Stimulum
+		gas_breathed = breath_gases[/datum/gas/stimulum][MOLES]
+		if (gas_breathed > GAS_STIM_MINIMUM)
+			H.reagents.add_reagent("stimulum",1)
+		breath_gases[/datum/gas/stimulum][MOLES]-=gas_breathed
 		handle_breath_temperature(breath, H)
 		breath.garbage_collect()
-
 	return TRUE
 
 

code/modules/surgery/organs/organ_internal.dm

@@ -22,7 +22,7 @@
 	if(replaced)
 		replaced.Remove(M, special = 1)
 		if(drop_if_replaced)
-			replaced.forceMove(get_turf(src))
+			replaced.forceMove(get_turf(M))
 		else
 			qdel(replaced)
 

code/modules/surgery/organs/tongue.dm

@@ -8,10 +8,7 @@
 	var/list/languages_possible
 	var/say_mod = null
 	var/taste_sensitivity = 15 // lower is more sensitive.
-
-/obj/item/organ/tongue/Initialize(mapload)
-	. = ..()
-	languages_possible = typecacheof(list(
+	var/static/list/languages_possible_base = typecacheof(list(
 		/datum/language/common,
 		/datum/language/draconic,
 		/datum/language/codespeak,
@@ -21,6 +18,10 @@
 		/datum/language/ratvar
 	))
 
+/obj/item/organ/tongue/Initialize(mapload)
+	. = ..()
+	languages_possible = languages_possible_base
+
 /obj/item/organ/tongue/get_spans()
 	return list()
 
@@ -124,16 +125,17 @@
 	icon_state = "tonguexeno"
 	say_mod = "hisses"
 	taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
-
-/obj/item/organ/tongue/alien/Initialize(mapload)
-	. = ..()
-	languages_possible = typecacheof(list(
+	var/static/list/languages_possible_alien = typecacheof(list(
 		/datum/language/xenocommon,
 		/datum/language/common,
 		/datum/language/draconic,
 		/datum/language/ratvar,
 		/datum/language/monkey))
 
+/obj/item/organ/tongue/alien/Initialize(mapload)
+	. = ..()
+	languages_possible = languages_possible_alien
+
 /obj/item/organ/tongue/alien/TongueSpeech(var/message)
 	playsound(owner, "hiss", 25, 1, 1)
 	return message