Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not

code/datums/atmosphere/_atmosphere.dm

@@ -16,6 +16,9 @@
 /datum/atmosphere/New()
 	generate_gas_string()
 
+/datum/atmosphere/proc/check_for_sanity(datum/gas_mixture/mix)
+	return
+
 /datum/atmosphere/proc/generate_gas_string()
 	var/list/spicy_gas = restricted_gases.Copy()
 	var/target_pressure = rand(minimum_pressure, maximum_pressure)
@@ -52,6 +55,8 @@
 		gasmix.adjust_moles(gastype, -moles_to_remove)
 	gasmix.set_moles(gastype, FLOOR(gasmix.get_moles(gastype), 0.1))
 
+	check_for_sanity(gasmix)
+
 	// Now finally lets make that string
 	var/list/gas_string_builder = list()
 	for(var/id in gasmix.get_gases())

code/datums/atmosphere/planetary.dm

@@ -23,6 +23,12 @@
 	minimum_temp = 270
 	maximum_temp = 320
 
+/datum/atmosphere/lavaland/check_for_sanity(datum/gas_mixture/mix)
+	var/datum/breathing_class/o2_class = GLOB.gas_data.breathing_classes[BREATH_OXY]
+	while(o2_class.get_effective_pp(mix) < 10)
+		mix.adjust_moles(GAS_CO2, -0.5)
+		mix.adjust_moles(GAS_O2, 0.5)
+
 /datum/atmosphere/icemoon
 	id = ICEMOON_DEFAULT_ATMOS
 

code/datums/brain_damage/phobia.dm

@@ -83,13 +83,19 @@
 		return
 	if(HAS_TRAIT(owner, TRAIT_FEARLESS))
 		return
+
+	var/matches = FALSE
+	var/mainsource
 	for(var/word in trigger_words)
-		var/regex/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i")
+		var/regex/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "ig")
 
 		if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
-			addtimer(CALLBACK(src, .proc/freak_out, null, word), 10) //to react AFTER the chat message
-			hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "<span class='phobia'>$1</span>")
-			break
+			hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "<span class='phobia'>$0</span>")
+			matches = TRUE
+			mainsource = word
+
+	if(matches)
+		addtimer(CALLBACK(src, .proc/freak_out, null, mainsource), 10) //to react AFTER the chat message
 
 /datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
 	if(HAS_TRAIT(owner, TRAIT_FEARLESS))

code/datums/mind.dm

@@ -71,6 +71,8 @@
 	///What character we spawned in as- either at roundstart or latejoin, so we know for persistent scars if we ended as the same person or not
 	var/mob/original_character
 
+	/// A lazy list of statuses to add next to this mind in the traitor panel
+	var/list/special_statuses
 
 /datum/mind/New(var/key)
 	skill_holder = new(src)

code/datums/mocking/client.dm

@@ -0,0 +1,7 @@
+/// This should match the interface of /client wherever necessary.
+/datum/client_interface
+	/// Player preferences datum for the client
+	var/datum/preferences/prefs
+
+	/// The view of the client, similar to /client/var/view.
+	var/view = "15x15"

code/datums/status_effects/debuffs.dm

@@ -194,6 +194,9 @@
 			C.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
 	last_tick = world.time
 
+/datum/status_effect/electrode/no_damage
+	stamdmg_per_ds = 0
+
 /datum/status_effect/electrode/no_combat_mode
 	id = "tased_strong"
 	movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode

code/datums/weather/weather_types/radiation_storm.dm

@@ -18,7 +18,7 @@
 
 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle)
+	/area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle, /area/ruin/lavaland)
 	target_trait = ZTRAIT_STATION
 
 	immunity_type = "rad"