From 1ebdf19cdba24942436df976fc4d75a863af96a4 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Tue, 18 Jul 2017 09:59:09 -0500
Subject: [PATCH 1/7] Refactor Lung Handling

---
 code/__DEFINES/atmospherics.dm                |   4 +-
 code/__DEFINES/combat.dm.rej                  |   9 +
 code/_onclick/hud/alert.dm                    |  24 ++-
 code/modules/flufftext/Hallucination.dm       |  10 +-
 .../mob/living/carbon/damage_procs.dm.rej     |  10 +
 code/modules/mob/living/carbon/human/life.dm  |   4 +-
 .../mob/living/carbon/human/species.dm        |   2 +
 code/modules/mob/living/carbon/life.dm        |  13 +-
 code/modules/mob/living/damage_procs.dm.rej   |  41 +++++
 code/modules/mob/living/living.dm             |   2 +-
 code/modules/surgery/organs/lungs.dm          | 174 ++++++++++++------
 11 files changed, 211 insertions(+), 82 deletions(-)
 create mode 100644 code/__DEFINES/combat.dm.rej
 create mode 100644 code/modules/mob/living/carbon/damage_procs.dm.rej
 create mode 100644 code/modules/mob/living/damage_procs.dm.rej

diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 5ce803fa3c..a79850b04f 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -67,8 +67,8 @@
 #define PLASMA_MINIMUM_OXYGEN_NEEDED		2
 #define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO	30
 #define PLASMA_OXYGEN_FULLBURN				10
-#define MIN_PLASMA_DAMAGE					1
-#define MAX_PLASMA_DAMAGE					10
+#define MIN_TOXIC_GAS_DAMAGE				1
+#define MAX_TOXIC_GAS_DAMAGE				10
 #define MOLES_PLASMA_VISIBLE				0.5		//Moles in a standard cell after which plasma is visible
 	//Plasma fusion properties
 #define PLASMA_BINDING_ENERGY				3000000
diff --git a/code/__DEFINES/combat.dm.rej b/code/__DEFINES/combat.dm.rej
new file mode 100644
index 0000000000..b765917e85
--- /dev/null
+++ b/code/__DEFINES/combat.dm.rej
@@ -0,0 +1,9 @@
+diff a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm	(rejected hunks)
+@@ -9,6 +9,7 @@
+ #define OXY			"oxy"
+ #define CLONE		"clone"
+ #define STAMINA 	"stamina"
++#define BRAIN		"brain"
+ 
+ //bitflag damage defines used for suicide_act
+ #define BRUTELOSS 1
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index b792f4399e..b944f32754 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -109,17 +109,26 @@
 
 
 //Gas alerts
-/obj/screen/alert/oxy
+/obj/screen/alert/not_enough_oxy
 	name = "Choking (No O2)"
-	desc = "You're not getting enough oxygen. Find some good air before you pass out! \
-The box in your backpack has an oxygen tank and breath mask in it."
-	icon_state = "oxy"
+	desc = "You're not getting enough oxygen. Find some good air before you pass out! The box in your backpack has an oxygen tank and breath mask in it."
+	icon_state = "not_enough_oxy"
 
 /obj/screen/alert/too_much_oxy
 	name = "Choking (O2)"
 	desc = "There's too much oxygen in the air, and you're breathing it in! Find some good air before you pass out!"
 	icon_state = "too_much_oxy"
 
+/obj/screen/alert/not_enough_nitro
+	name = "Choking (No N2)"
+	desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
+	icon_state = "not_enough_nitro"
+
+/obj/screen/alert/too_much_nitro
+	name = "Choking (N2)"
+	desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!"
+	icon_state = "too_much_nitro"
+
 /obj/screen/alert/not_enough_co2
 	name = "Choking (No CO2)"
 	desc = "You're not getting enough carbon dioxide. Find some good air before you pass out!"
@@ -135,11 +144,10 @@ The box in your backpack has an oxygen tank and breath mask in it."
 	desc = "You're not getting enough plasma. Find some good air before you pass out!"
 	icon_state = "not_enough_tox"
 
-/obj/screen/alert/tox_in_air
+/obj/screen/alert/too_much_tox
 	name = "Choking (Plasma)"
-	desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. \
-The box in your backpack has an oxygen tank and gas mask in it."
-	icon_state = "tox_in_air"
+	desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. The box in your backpack has an oxygen tank and gas mask in it."
+	icon_state = "too_much_tox"
 //End gas alerts
 
 
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 0b1187e9bc..32e3d1b2f5 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -874,12 +874,12 @@ Gunshots/explosions/opening doors/less rare audio (done)
 			hal_screwyhud = 0
 
 		if("fake_alert")
-			var/alert_type = pick("oxy","not_enough_tox","not_enough_co2","too_much_oxy","too_much_co2","tox_in_air","newlaw","nutrition","charge","weightless","fire","locked","hacked","temp","pressure")
+			var/alert_type = pick("not_enough_oxy","not_enough_tox","not_enough_co2","too_much_oxy","too_much_co2","too_much_tox","newlaw","nutrition","charge","weightless","fire","locked","hacked","temp","pressure")
 			if(specific)
 				alert_type = specific
 			switch(alert_type)
-				if("oxy")
-					throw_alert("oxy", /obj/screen/alert/oxy, override = TRUE)
+				if("not_enough_oxy")
+					throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy, override = TRUE)
 				if("not_enough_tox")
 					throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox, override = TRUE)
 				if("not_enough_co2")
@@ -888,8 +888,8 @@ Gunshots/explosions/opening doors/less rare audio (done)
 					throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy, override = TRUE)
 				if("too_much_co2")
 					throw_alert("too_much_co2", /obj/screen/alert/too_much_co2, override = TRUE)
-				if("tox_in_air")
-					throw_alert("tox_in_air", /obj/screen/alert/tox_in_air, override = TRUE)
+				if("too_much_tox")
+					throw_alert("too_much_tox", /obj/screen/alert/too_much_tox, override = TRUE)
 				if("nutrition")
 					if(prob(50))
 						throw_alert("nutrition", /obj/screen/alert/fat, override = TRUE)
diff --git a/code/modules/mob/living/carbon/damage_procs.dm.rej b/code/modules/mob/living/carbon/damage_procs.dm.rej
new file mode 100644
index 0000000000..9819e18e18
--- /dev/null
+++ b/code/modules/mob/living/carbon/damage_procs.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm	(rejected hunks)
+@@ -36,6 +36,8 @@
+ 			adjustCloneLoss(damage * hit_percent)
+ 		if(STAMINA)
+ 			adjustStaminaLoss(damage * hit_percent)
++		if(BRAIN)
++			adjustBrainLoss(damage * hit_percent)
+ 	return 1
+ 
+ 
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index cefb77e248..b8e5a06d59 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -103,11 +103,13 @@
 			var/datum/species/S = dna.species
 
 			if(S.breathid == "o2")
-				throw_alert("oxy", /obj/screen/alert/oxy)
+				throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 			else if(S.breathid == "tox")
 				throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
 			else if(S.breathid == "co2")
 				throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+			else if(S.breathid == "n2")
+				throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
 
 		return 0
 	else
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 4844a4e804..36611b5e13 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1502,6 +1502,8 @@
 			H.adjustCloneLoss(damage * hit_percent)
 		if(STAMINA)
 			H.adjustStaminaLoss(damage * hit_percent)
+		if(BRAIN)
+			H.adjustBrainLoss(damage * hit_percent)
 	return 1
 
 /datum/species/proc/on_hit(obj/item/projectile/P, mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 1d60ae4982..8c20c12b80 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -113,7 +113,7 @@
 			return
 		adjustOxyLoss(1)
 		failed_last_breath = 1
-		throw_alert("oxy", /obj/screen/alert/oxy)
+		throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 		return 0
 
 	var/safe_oxy_min = 16
@@ -144,14 +144,14 @@
 		else
 			adjustOxyLoss(3)
 			failed_last_breath = 1
-		throw_alert("oxy", /obj/screen/alert/oxy)
+		throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 
 	else //Enough oxygen
 		failed_last_breath = 0
 		if(oxyloss)
 			adjustOxyLoss(-5)
 		oxygen_used = breath_gases["o2"][MOLES]
-		clear_alert("oxy")
+		clear_alert("not_enough_oxy")
 
 	breath_gases["o2"][MOLES] -= oxygen_used
 	breath_gases["co2"][MOLES] += oxygen_used
@@ -174,11 +174,10 @@
 	//TOXINS/PLASMA
 	if(Toxins_partialpressure > safe_tox_max)
 		var/ratio = (breath_gases["plasma"][MOLES]/safe_tox_max) * 10
-		if(reagents)
-			reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
-		throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
+		adjustToxLoss(Clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
+		throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
 	else
-		clear_alert("tox_in_air")
+		clear_alert("too_much_tox")
 
 	//NITROUS OXIDE
 	if(breath_gases["n2o"])
diff --git a/code/modules/mob/living/damage_procs.dm.rej b/code/modules/mob/living/damage_procs.dm.rej
new file mode 100644
index 0000000000..375db36138
--- /dev/null
+++ b/code/modules/mob/living/damage_procs.dm.rej
@@ -0,0 +1,41 @@
+diff a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm	(rejected hunks)
+@@ -25,6 +25,8 @@
+ 			adjustCloneLoss(damage * hit_percent)
+ 		if(STAMINA)
+ 			adjustStaminaLoss(damage * hit_percent)
++		if(BRAIN)
++			adjustBrainLoss(damage * hit_percent)
+ 	return 1
+ 
+ /mob/living/proc/apply_damage_type(damage = 0, damagetype = BRUTE) //like apply damage except it always uses the damage procs
+@@ -41,6 +43,8 @@
+ 			return adjustCloneLoss(damage)
+ 		if(STAMINA)
+ 			return adjustStaminaLoss(damage)
++		if(BRAIN)
++			return adjustBrainLoss(damage)
+ 
+ /mob/living/proc/get_damage_amount(damagetype = BRUTE)
+ 	switch(damagetype)
+@@ -56,9 +60,11 @@
+ 			return getCloneLoss()
+ 		if(STAMINA)
+ 			return getStaminaLoss()
++		if(BRAIN)
++			return getBrainLoss()
+ 
+ 
+-/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0)
++/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
+ 	if(blocked >= 100)
+ 		return 0
+ 	if(brute)
+@@ -73,6 +79,8 @@
+ 		apply_damage(clone, CLONE, def_zone, blocked)
+ 	if(stamina)
+ 		apply_damage(stamina, STAMINA, def_zone, blocked)
++	if(brain)
++		apply_damage(brain, BRAIN, def_zone, blocked)
+ 	return 1
+ 
+ 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 829b031d21..6510b46bf3 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -357,7 +357,7 @@
 		updatehealth() //then we check if the mob should wake up.
 		update_canmove()
 		update_sight()
-		clear_alert("oxy")
+		clear_alert("not_enough_oxy")
 		reload_fullscreen()
 		. = 1
 		if(mind)
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 4a529409c9..f95e2cd996 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -15,13 +15,13 @@
 	slot = "lungs"
 	gender = PLURAL
 	w_class = WEIGHT_CLASS_NORMAL
-	var/list/breathlevels = list("safe_oxygen_min" = 16,"safe_oxygen_max" = 0,"safe_co2_min" = 0,"safe_co2_max" = 10,
-	"safe_toxins_min" = 0,"safe_toxins_max" = 0.05,"SA_para_min" = 1,"SA_sleep_min" = 5,"BZ_trip_balls_min" = 1)
 
 	//Breath damage
 
 	var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
 	var/safe_oxygen_max = 0
+	var/safe_nitro_min = 0
+	var/safe_nitro_max = 0
 	var/safe_co2_min = 0
 	var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
 	var/safe_toxins_min = 0
@@ -30,16 +30,41 @@
 	var/SA_sleep_min = 5 //Sleeping agent
 	var/BZ_trip_balls_min = 1 //BZ gas.
 
-	var/oxy_breath_dam_min = 1
-	var/oxy_breath_dam_max = 10
-	var/co2_breath_dam_min = 1
-	var/co2_breath_dam_max = 10
-	var/tox_breath_dam_min = MIN_PLASMA_DAMAGE
-	var/tox_breath_dam_max = MAX_PLASMA_DAMAGE
+	var/oxy_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+	var/oxy_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+	var/oxy_damage_type = OXY
+	var/nitro_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+	var/nitro_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+	var/nitro_damage_type = OXY
+	var/co2_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+	var/co2_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+	var/co2_damage_type = OXY
+	var/tox_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+	var/tox_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+	var/tox_damage_type = TOX
+
+	var/cold_message = "your face freezing and an icicle forming"
+	var/cold_level_1_threshold = 260
+	var/cold_level_2_threshold = 200
+	var/cold_level_3_threshold = 120
+	var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead.
+	var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2
+	var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3
+	var/cold_damage_type = BURN
+
+	var/hot_message = "your face burning and a searing heat"
+	var/heat_level_1_threshold = 360
+	var/heat_level_2_threshold = 400
+	var/heat_level_3_threshold = 1000
+	var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
+	var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
+	var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
+	var/heat_damage_type = BURN
+
+	var/crit_stabilizing_reagent = "epinephrine"
 
 
-
-/obj/item/organ/lungs/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H)
+/obj/item/organ/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
 	if((H.status_flags & GODMODE))
 		return
 
@@ -48,30 +73,33 @@
 		species_traits = H.dna.species.species_traits
 
 	if(!breath || (breath.total_moles() == 0))
-		if(H.reagents.has_reagent("epinephrine"))
+		if(H.reagents.has_reagent(crit_stabilizing_reagent))
 			return
 		if(H.health >= HEALTH_THRESHOLD_CRIT)
 			H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
 		else if(!(NOCRITDAMAGE in species_traits))
 			H.adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
 
-		H.failed_last_breath = 1
+		H.failed_last_breath = TRUE
 		if(safe_oxygen_min)
-			H.throw_alert("oxy", /obj/screen/alert/oxy)
+			H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 		else if(safe_toxins_min)
 			H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
 		else if(safe_co2_min)
 			H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
-		return 0
+		else if(safe_nitro_min)
+			H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+		return FALSE
 
 	var/gas_breathed = 0
 
 	var/list/breath_gases = breath.gases
 
-	breath.assert_gases("o2", "plasma", "co2", "n2o", "bz")
+	breath.assert_gases("o2", "n2", "plasma", "co2", "n2o", "bz")
 
 	//Partial pressures in our breath
 	var/O2_pp = breath.get_breath_partial_pressure(breath_gases["o2"][MOLES])
+	var/N2_pp = breath.get_breath_partial_pressure(breath_gases["n2"][MOLES])
 	var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases["plasma"][MOLES])
 	var/CO2_pp = breath.get_breath_partial_pressure(breath_gases["co2"][MOLES])
 
@@ -82,7 +110,7 @@
 	if(safe_oxygen_max)
 		if(O2_pp > safe_oxygen_max)
 			var/ratio = (breath_gases["o2"][MOLES]/safe_oxygen_max) * 10
-			H.adjustOxyLoss(Clamp(ratio,oxy_breath_dam_min,oxy_breath_dam_max))
+			H.apply_damage_type(Clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
 			H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
 		else
 			H.clear_alert("too_much_oxy")
@@ -90,20 +118,45 @@
 	//Too little oxygen!
 	if(safe_oxygen_min)
 		if(O2_pp < safe_oxygen_min)
-			gas_breathed = handle_too_little_breath(H,O2_pp,safe_oxygen_min,breath_gases["o2"][MOLES])
-			H.throw_alert("oxy", /obj/screen/alert/oxy)
+			gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath_gases["o2"][MOLES])
+			H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 		else
-			H.failed_last_breath = 0
-			if(H.getOxyLoss())
-				H.adjustOxyLoss(-5)
+			H.failed_last_breath = FALSE
+			H.adjustOxyLoss(-5)
 			gas_breathed = breath_gases["o2"][MOLES]
-			H.clear_alert("oxy")
+			H.clear_alert("not_enough_oxy")
 
 	//Exhale
 	breath_gases["o2"][MOLES] -= gas_breathed
 	breath_gases["co2"][MOLES] += gas_breathed
 	gas_breathed = 0
 
+	//-- Nitrogen --//
+
+	//Too much nitrogen!
+	if(safe_nitro_max)
+		if(N2_pp > safe_nitro_max)
+			var/ratio = (breath_gases["n2"][MOLES]/safe_nitro_max) * 10
+			H.apply_damage_type(Clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
+			H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
+		else
+			H.clear_alert("too_much_nitro")
+
+	//Too little nitrogen!
+	if(safe_nitro_min)
+		if(N2_pp < safe_nitro_min)
+			gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath_gases["n2"][MOLES])
+			H.throw_alert("nitro", /obj/screen/alert/not_enough_nitro)
+		else
+			H.failed_last_breath = FALSE
+			H.adjustOxyLoss(-5)
+			gas_breathed = breath_gases["n2"][MOLES]
+			H.clear_alert("nitro")
+
+	//Exhale
+	breath_gases["n2"][MOLES] -= gas_breathed
+	breath_gases["co2"][MOLES] += gas_breathed
+	gas_breathed = 0
 
 	//-- CO2 --//
 
@@ -114,9 +167,9 @@
 				H.co2overloadtime = world.time
 			else if(world.time - H.co2overloadtime > 120)
 				H.Unconscious(60)
-				H.adjustOxyLoss(3) // Lets hurt em a little, let them know we mean business
+				H.apply_damage_type(3, co2_damage_type) // Lets hurt em a little, let them know we mean business
 				if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
-					H.adjustOxyLoss(8)
+					H.apply_damage_type(8, co2_damage_type)
 				H.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2)
 			if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
 				H.emote("cough")
@@ -126,12 +179,12 @@
 			H.clear_alert("too_much_co2")
 
 	//Too little CO2!
-	if(breathlevels["safe_co2_min"])
+	if(safe_co2_min)
 		if(CO2_pp < safe_co2_min)
-			gas_breathed = handle_too_little_breath(H,CO2_pp, safe_co2_min,breath_gases["co2"][MOLES])
+			gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath_gases["co2"][MOLES])
 			H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
 		else
-			H.failed_last_breath = 0
+			H.failed_last_breath = FALSE
 			H.adjustOxyLoss(-5)
 			gas_breathed = breath_gases["co2"][MOLES]
 			H.clear_alert("not_enough_co2")
@@ -148,20 +201,19 @@
 	if(safe_toxins_max)
 		if(Toxins_pp > safe_toxins_max)
 			var/ratio = (breath_gases["plasma"][MOLES]/safe_toxins_max) * 10
-			if(H.reagents)
-				H.reagents.add_reagent("plasma", Clamp(ratio, tox_breath_dam_min, tox_breath_dam_max))
-			H.throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
+			H.apply_damage_type(Clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
+			H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
 		else
-			H.clear_alert("tox_in_air")
+			H.clear_alert("too_much_tox")
 
 
 	//Too little toxins!
 	if(safe_toxins_min)
 		if(Toxins_pp < safe_toxins_min)
-			gas_breathed = handle_too_little_breath(H,Toxins_pp, safe_toxins_min, breath_gases["plasma"][MOLES])
+			gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath_gases["plasma"][MOLES])
 			H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
 		else
-			H.failed_last_breath = 0
+			H.failed_last_breath = FALSE
 			H.adjustOxyLoss(-5)
 			gas_breathed = breath_gases["plasma"][MOLES]
 			H.clear_alert("not_enough_tox")
@@ -199,50 +251,56 @@
 		handle_breath_temperature(breath, H)
 		breath.garbage_collect()
 
-	return 1
+	return TRUE
 
 
-/obj/item/organ/lungs/proc/handle_too_little_breath(mob/living/carbon/human/H = null,breath_pp = 0, safe_breath_min = 0, true_pp = 0)
+/obj/item/organ/lungs/proc/handle_too_little_breath(mob/living/carbon/human/H = null, breath_pp = 0, safe_breath_min = 0, true_pp = 0)
 	. = 0
 	if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled.
-		return 0
+		return FALSE
 
 	if(prob(20))
 		H.emote("gasp")
 	if(breath_pp > 0)
 		var/ratio = safe_breath_min/breath_pp
 		H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!
-		H.failed_last_breath = 1
+		H.failed_last_breath = TRUE
 		. = true_pp*ratio/6
 	else
 		H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
-		H.failed_last_breath = 1
+		H.failed_last_breath = TRUE
 
 
 /obj/item/organ/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures
-	if(abs(310.15 - breath.temperature) > 50)
+	var/breath_temperature = breath.temperature
 
-		var/species_traits = list()
-		if(H && H.dna && H.dna.species && H.dna.species.species_traits)
-			species_traits = H.dna.species.species_traits
+	var/species_traits = list()
+	if(H && H.dna && H.dna.species && H.dna.species.species_traits)
+		species_traits = H.dna.species.species_traits
 
-		if(!(GLOB.mutations_list[COLDRES] in H.dna.mutations) && !(RESISTCOLD in species_traits)) // COLD DAMAGE
-			switch(breath.temperature)
-				if(-INFINITY to 120)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head")
-				if(120 to 200)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head")
-				if(200 to 260)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head")
+	if(!(GLOB.mutations_list[COLDRES] in H.dna.mutations) && !(RESISTCOLD in species_traits)) // COLD DAMAGE
+		var/cold_modifier = H.dna.species.coldmod
+		if(breath_temperature < cold_level_3_threshold)
+			H.apply_damage_type(cold_level_3_damage*cold_modifier, cold_damage_type)
+		if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
+			H.apply_damage_type(cold_level_2_damage*cold_modifier, cold_damage_type)
+		if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
+			H.apply_damage_type(cold_level_1_damage*cold_modifier, cold_damage_type)
+		if(breath_temperature < cold_level_1_threshold)
+			if(prob(20))
+				to_chat(H, "<span class='warning'>You feel [cold_message] in your [name]!</span>")
 
-		if(!(RESISTHOT in species_traits)) // HEAT DAMAGE
-			switch(breath.temperature)
-				if(360 to 400)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head")
-				if(400 to 1000)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head")
-				if(1000 to INFINITY)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head")
+	if(!(RESISTHOT in species_traits)) // HEAT DAMAGE
+		var/heat_modifier = H.dna.species.heatmod
+		if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
+			H.apply_damage_type(heat_level_1_damage*heat_modifier, heat_damage_type)
+		if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
+			H.apply_damage_type(heat_level_2_damage*heat_modifier, heat_damage_type)
+		if(breath_temperature > heat_level_3_threshold)
+			H.apply_damage_type(heat_level_3_damage*heat_modifier, heat_damage_type)
+		if(breath_temperature > heat_level_1_threshold)
+			if(prob(20))
+				to_chat(H, "<span class='warning'>You feel [hot_message] in your [name]!</span>")
 
 /obj/item/organ/lungs/prepare_eat()
 	var/obj/S = ..()

From 96179eded8629c06ac8129bcf75ad25fe7812fd4 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 19 Jul 2017 13:32:38 -0500
Subject: [PATCH 2/7] Update combat.dm

---
 code/__DEFINES/combat.dm | 285 +++++++++++++++++++--------------------
 1 file changed, 141 insertions(+), 144 deletions(-)

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 6ca2d80974..a307a0819d 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -1,147 +1,144 @@
-/*ALL DEFINES RELATED TO COMBAT GO HERE*/
-
-//Damage and status effect defines
-
-//Damage defines //TODO: merge these down to reduce on defines
-#define BRUTE		"brute"
-#define BURN		"fire"
-#define TOX			"tox"
-#define OXY			"oxy"
-#define CLONE		"clone"
-#define STAMINA 	"stamina"
-//citadel code
-#define AROUSAL		"arousal"
-
-//bitflag damage defines used for suicide_act
-#define BRUTELOSS 1
-#define FIRELOSS 2
-#define TOXLOSS 4
-#define OXYLOSS 8
-#define SHAME 16
-//citadel code
-#define AROUSAL	32
-
-#define STUN		"stun"
-#define KNOCKDOWN		"knockdown"
-#define UNCONSCIOUS	"unconscious"
-#define IRRADIATE	"irradiate"
-#define STUTTER		"stutter"
-#define SLUR 		"slur"
-#define EYE_BLUR	"eye_blur"
-#define DROWSY		"drowsy"
-#define JITTER		"jitter"
-
-//Bitflags defining which status effects could be or are inflicted on a mob
-#define CANSTUN		1
-#define CANKNOCKDOWN	2
-#define CANUNCONSCIOUS	4
-#define CANPUSH		8
-#define IGNORESLOWDOWN	16
-#define GOTTAGOFAST	32
-#define GOTTAGOREALLYFAST	64
-#define GODMODE		4096
-#define FAKEDEATH	8192	//Replaces stuff like changeling.changeling_fakedeath
-#define DISFIGURED	16384	//I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system
-#define XENO_HOST	32768	//Tracks whether we're gonna be a baby alien's mummy.
-
-//Health Defines
-#define HEALTH_THRESHOLD_CRIT 0
-#define HEALTH_THRESHOLD_DEAD -100
-
-//Actual combat defines
-
-//click cooldowns, in tenths of a second, used for various combat actions
-#define CLICK_CD_MELEE 8
-#define CLICK_CD_RANGE 4
-#define CLICK_CD_RAPID 2
-#define CLICK_CD_CLICK_ABILITY 6
-#define CLICK_CD_BREAKOUT 100
-#define CLICK_CD_HANDCUFFED 10
-#define CLICK_CD_RESIST 20
-#define CLICK_CD_GRABBING 10
-
-//Cuff resist speeds
-#define FAST_CUFFBREAK 1
-#define INSTANT_CUFFBREAK 2
-
-//Grab levels
-#define GRAB_PASSIVE				0
-#define GRAB_AGGRESSIVE				1
-#define GRAB_NECK					2
-#define GRAB_KILL					3
-
-//Attack types for checking shields/hit reactions
-#define MELEE_ATTACK 1
-#define UNARMED_ATTACK 2
-#define PROJECTILE_ATTACK 3
-#define THROWN_PROJECTILE_ATTACK 4
-#define LEAP_ATTACK 5
-
-//attack visual effects
-#define ATTACK_EFFECT_PUNCH		"punch"
-#define ATTACK_EFFECT_KICK		"kick"
-#define ATTACK_EFFECT_SMASH		"smash"
-#define ATTACK_EFFECT_CLAW		"claw"
-#define ATTACK_EFFECT_DISARM	"disarm"
-#define ATTACK_EFFECT_BITE		"bite"
-#define ATTACK_EFFECT_MECHFIRE	"mech_fire"
-#define ATTACK_EFFECT_MECHTOXIN	"mech_toxin"
-#define ATTACK_EFFECT_BOOP		"boop" //Honk
-
-//intent defines
-#define INTENT_HELP   "help"
-#define INTENT_GRAB   "grab"
-#define INTENT_DISARM "disarm"
-#define INTENT_HARM   "harm"
-//NOTE: INTENT_HOTKEY_* defines are not actual intents!
-//they are here to support hotkeys
-#define INTENT_HOTKEY_LEFT  "left"
-#define INTENT_HOTKEY_RIGHT "right"
-
-//the define for visible message range in combat
-#define COMBAT_MESSAGE_RANGE 3
-
-//Combat object defines
-
-//Embedded objects
-#define EMBEDDED_PAIN_CHANCE 					15	//Chance for embedded objects to cause pain (damage user)
-#define EMBEDDED_ITEM_FALLOUT 					5	//Chance for embedded object to fall out (causing pain but removing the object)
-#define EMBED_CHANCE							45	//Chance for an object to embed into somebody when thrown (if it's sharp)
-#define EMBEDDED_PAIN_MULTIPLIER				2	//Coefficient of multiplication for the damage the item does while embedded (this*item.w_class)
-#define EMBEDDED_FALL_PAIN_MULTIPLIER			5	//Coefficient of multiplication for the damage the item does when it falls out (this*item.w_class)
-#define EMBEDDED_IMPACT_PAIN_MULTIPLIER			4	//Coefficient of multiplication for the damage the item does when it first embeds (this*item.w_class)
-#define EMBED_THROWSPEED_THRESHOLD				4	//The minimum value of an item's throw_speed for it to embed (Unless it has embedded_ignore_throwspeed_threshold set to 1)
-#define EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER 8	//Coefficient of multiplication for the damage the item does when removed without a surgery (this*item.w_class)
-#define EMBEDDED_UNSAFE_REMOVAL_TIME			30	//A Time in ticks, total removal time = (this*item.w_class)
-
-//Gun Stuff
-#define SAWN_INTACT  0
-#define SAWN_OFF     1
-//Gun weapon weight
-#define WEAPON_DUAL_WIELD 0
-#define WEAPON_LIGHT 1
-#define WEAPON_MEDIUM 2
-#define WEAPON_HEAVY 3
-//Gun trigger guards
-#define TRIGGER_GUARD_ALLOW_ALL -1
-#define TRIGGER_GUARD_NONE 0
-#define TRIGGER_GUARD_NORMAL 1
-
-//Object/Item sharpness
-#define IS_BLUNT			0
-#define IS_SHARP			1
-#define IS_SHARP_ACCURATE	2
-
-//His Grace.
-#define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep.
-#define HIS_GRACE_PECKISH 20 //Slightly hungry.
-#define HIS_GRACE_HUNGRY 60 //Getting closer. Increases damage up to a minimum of 20.
-#define HIS_GRACE_FAMISHED 100 //Dangerous. Increases damage up to a minimum of 25 and cannot be dropped.
-#define HIS_GRACE_STARVING 120 //Incredibly close to breaking loose. Increases damage up to a minimum of 30.
-#define HIS_GRACE_CONSUME_OWNER 140 //His Grace consumes His owner at this point and becomes aggressive.
-#define HIS_GRACE_FALL_ASLEEP 160 //If it reaches this point, He falls asleep and resets.
-
-#define HIS_GRACE_FORCE_BONUS 4 //How much force is gained per kill.
+/*ALL DEFINES RELATED TO COMBAT GO HERE*/
+
+//Damage and status effect defines
+
+//Damage defines //TODO: merge these down to reduce on defines
+#define BRUTE		"brute"
+#define BURN		"fire"
+#define TOX			"tox"
+#define OXY			"oxy"
+#define CLONE		"clone"
+#define STAMINA 	"stamina"
+#define BRAIN		"brain"
+
+//bitflag damage defines used for suicide_act
+#define BRUTELOSS 1
+#define FIRELOSS 2
+#define TOXLOSS 4
+#define OXYLOSS 8
+#define SHAME 16
+
+#define STUN		"stun"
+#define KNOCKDOWN		"knockdown"
+#define UNCONSCIOUS	"unconscious"
+#define IRRADIATE	"irradiate"
+#define STUTTER		"stutter"
+#define SLUR 		"slur"
+#define EYE_BLUR	"eye_blur"
+#define DROWSY		"drowsy"
+#define JITTER		"jitter"
+
+//Bitflags defining which status effects could be or are inflicted on a mob
+#define CANSTUN		1
+#define CANKNOCKDOWN	2
+#define CANUNCONSCIOUS	4
+#define CANPUSH		8
+#define IGNORESLOWDOWN	16
+#define GOTTAGOFAST	32
+#define GOTTAGOREALLYFAST	64
+#define GODMODE		4096
+#define FAKEDEATH	8192	//Replaces stuff like changeling.changeling_fakedeath
+#define DISFIGURED	16384	//I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system
+#define XENO_HOST	32768	//Tracks whether we're gonna be a baby alien's mummy.
+
+//Health Defines
+#define HEALTH_THRESHOLD_CRIT 0
+#define HEALTH_THRESHOLD_DEAD -100
+
+//Actual combat defines
+
+//click cooldowns, in tenths of a second, used for various combat actions
+#define CLICK_CD_MELEE 8
+#define CLICK_CD_RANGE 4
+#define CLICK_CD_RAPID 2
+#define CLICK_CD_CLICK_ABILITY 6
+#define CLICK_CD_BREAKOUT 100
+#define CLICK_CD_HANDCUFFED 10
+#define CLICK_CD_RESIST 20
+#define CLICK_CD_GRABBING 10
+
+//Cuff resist speeds
+#define FAST_CUFFBREAK 1
+#define INSTANT_CUFFBREAK 2
+
+//Grab levels
+#define GRAB_PASSIVE				0
+#define GRAB_AGGRESSIVE				1
+#define GRAB_NECK					2
+#define GRAB_KILL					3
+
+//Attack types for checking shields/hit reactions
+#define MELEE_ATTACK 1
+#define UNARMED_ATTACK 2
+#define PROJECTILE_ATTACK 3
+#define THROWN_PROJECTILE_ATTACK 4
+#define LEAP_ATTACK 5
+
+//attack visual effects
+#define ATTACK_EFFECT_PUNCH		"punch"
+#define ATTACK_EFFECT_KICK		"kick"
+#define ATTACK_EFFECT_SMASH		"smash"
+#define ATTACK_EFFECT_CLAW		"claw"
+#define ATTACK_EFFECT_DISARM	"disarm"
+#define ATTACK_EFFECT_BITE		"bite"
+#define ATTACK_EFFECT_MECHFIRE	"mech_fire"
+#define ATTACK_EFFECT_MECHTOXIN	"mech_toxin"
+#define ATTACK_EFFECT_BOOP		"boop" //Honk
+
+//intent defines
+#define INTENT_HELP   "help"
+#define INTENT_GRAB   "grab"
+#define INTENT_DISARM "disarm"
+#define INTENT_HARM   "harm"
+//NOTE: INTENT_HOTKEY_* defines are not actual intents!
+//they are here to support hotkeys
+#define INTENT_HOTKEY_LEFT  "left"
+#define INTENT_HOTKEY_RIGHT "right"
+
+//the define for visible message range in combat
+#define COMBAT_MESSAGE_RANGE 3
+
+//Combat object defines
+
+//Embedded objects
+#define EMBEDDED_PAIN_CHANCE 					15	//Chance for embedded objects to cause pain (damage user)
+#define EMBEDDED_ITEM_FALLOUT 					5	//Chance for embedded object to fall out (causing pain but removing the object)
+#define EMBED_CHANCE							45	//Chance for an object to embed into somebody when thrown (if it's sharp)
+#define EMBEDDED_PAIN_MULTIPLIER				2	//Coefficient of multiplication for the damage the item does while embedded (this*item.w_class)
+#define EMBEDDED_FALL_PAIN_MULTIPLIER			5	//Coefficient of multiplication for the damage the item does when it falls out (this*item.w_class)
+#define EMBEDDED_IMPACT_PAIN_MULTIPLIER			4	//Coefficient of multiplication for the damage the item does when it first embeds (this*item.w_class)
+#define EMBED_THROWSPEED_THRESHOLD				4	//The minimum value of an item's throw_speed for it to embed (Unless it has embedded_ignore_throwspeed_threshold set to 1)
+#define EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER 8	//Coefficient of multiplication for the damage the item does when removed without a surgery (this*item.w_class)
+#define EMBEDDED_UNSAFE_REMOVAL_TIME			30	//A Time in ticks, total removal time = (this*item.w_class)
+
+//Gun Stuff
+#define SAWN_INTACT  0
+#define SAWN_OFF     1
+//Gun weapon weight
+#define WEAPON_DUAL_WIELD 0
+#define WEAPON_LIGHT 1
+#define WEAPON_MEDIUM 2
+#define WEAPON_HEAVY 3
+//Gun trigger guards
+#define TRIGGER_GUARD_ALLOW_ALL -1
+#define TRIGGER_GUARD_NONE 0
+#define TRIGGER_GUARD_NORMAL 1
+
+//Object/Item sharpness
+#define IS_BLUNT			0
+#define IS_SHARP			1
+#define IS_SHARP_ACCURATE	2
+
+//His Grace.
+#define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep.
+#define HIS_GRACE_PECKISH 20 //Slightly hungry.
+#define HIS_GRACE_HUNGRY 60 //Getting closer. Increases damage up to a minimum of 20.
+#define HIS_GRACE_FAMISHED 100 //Dangerous. Increases damage up to a minimum of 25 and cannot be dropped.
+#define HIS_GRACE_STARVING 120 //Incredibly close to breaking loose. Increases damage up to a minimum of 30.
+#define HIS_GRACE_CONSUME_OWNER 140 //His Grace consumes His owner at this point and becomes aggressive.
+#define HIS_GRACE_FALL_ASLEEP 160 //If it reaches this point, He falls asleep and resets.
+
+#define HIS_GRACE_FORCE_BONUS 4 //How much force is gained per kill.
 
 #define EXPLODE_NONE 0				//Don't even ask me why we need this.
 #define EXPLODE_DEVASTATE 1

From cd0845bcd82f2b46e0f699d4d1c4a654232fa1d0 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 19 Jul 2017 13:34:20 -0500
Subject: [PATCH 3/7] Update damage_procs.dm

---
 code/modules/mob/living/carbon/damage_procs.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm
index f980ed149c..ebf1d6284d 100644
--- a/code/modules/mob/living/carbon/damage_procs.dm
+++ b/code/modules/mob/living/carbon/damage_procs.dm
@@ -36,6 +36,8 @@
 			adjustCloneLoss(damage * hit_percent)
 		if(STAMINA)
 			adjustStaminaLoss(damage * hit_percent)
+		if(BRAIN)
+			adjustBrainLoss(damage * hit_percent)
 		//citadel code
 		if(AROUSAL)
 			adjustArousalLoss(damage * hit_percent)

From c38fe60fc4ef860a6dd33233a1c0c79299e7a0c0 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 19 Jul 2017 13:36:43 -0500
Subject: [PATCH 4/7] Update damage_procs.dm

---
 code/modules/mob/living/damage_procs.dm | 574 ++++++++++++------------
 1 file changed, 291 insertions(+), 283 deletions(-)

diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 922febe423..4edcd3be21 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -1,286 +1,294 @@
-
-/*
-	apply_damage(a,b,c)
-	args
-	a:damage - How much damage to take
-	b:damage_type - What type of damage to take, brute, burn
-	c:def_zone - Where to take the damage if its brute or burn
-	Returns
-	standard 0 if fail
-*/
+
+/*
+	apply_damage(a,b,c)
+	args
+	a:damage - How much damage to take
+	b:damage_type - What type of damage to take, brute, burn
+	c:def_zone - Where to take the damage if its brute or burn
+	Returns
+	standard 0 if fail
+*/
 /mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE)
-	var/hit_percent = (100-blocked)/100
-	if(!damage || (hit_percent <= 0))
-		return 0
-	switch(damagetype)
-		if(BRUTE)
-			adjustBruteLoss(damage * hit_percent)
-		if(BURN)
-			adjustFireLoss(damage * hit_percent)
-		if(TOX)
-			adjustToxLoss(damage * hit_percent)
-		if(OXY)
-			adjustOxyLoss(damage * hit_percent)
-		if(CLONE)
-			adjustCloneLoss(damage * hit_percent)
-		if(STAMINA)
-			adjustStaminaLoss(damage * hit_percent)
-		//citadel code
-		if(AROUSAL)
-			adjustArousalLoss(damage * hit_percent)
-	return 1
-
-/mob/living/proc/apply_damage_type(damage = 0, damagetype = BRUTE) //like apply damage except it always uses the damage procs
-	switch(damagetype)
-		if(BRUTE)
-			return adjustBruteLoss(damage)
-		if(BURN)
-			return adjustFireLoss(damage)
-		if(TOX)
-			return adjustToxLoss(damage)
-		if(OXY)
-			return adjustOxyLoss(damage)
-		if(CLONE)
-			return adjustCloneLoss(damage)
-		if(STAMINA)
-			return adjustStaminaLoss(damage)
-		//citadel code
-		if(AROUSAL)
-			return adjustArousalLoss(damage)
-
-/mob/living/proc/get_damage_amount(damagetype = BRUTE)
-	switch(damagetype)
-		if(BRUTE)
-			return getBruteLoss()
-		if(BURN)
-			return getFireLoss()
-		if(TOX)
-			return getToxLoss()
-		if(OXY)
-			return getOxyLoss()
-		if(CLONE)
-			return getCloneLoss()
-		if(STAMINA)
-			return getStaminaLoss()
-		//citadel code
-		if(AROUSAL)
-			return getArousalLoss()
-
-
-/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = 0, stamina = 0, arousal = 0)
-	if(blocked >= 100)
-		return 0
-	if(brute)
-		apply_damage(brute, BRUTE, def_zone, blocked)
-	if(burn)
-		apply_damage(burn, BURN, def_zone, blocked)
-	if(tox)
-		apply_damage(tox, TOX, def_zone, blocked)
-	if(oxy)
-		apply_damage(oxy, OXY, def_zone, blocked)
-	if(clone)
-		apply_damage(clone, CLONE, def_zone, blocked)
-	if(stamina)
-		apply_damage(stamina, STAMINA, def_zone, blocked)
-	//citadel code
-	if(arousal)
-		apply_damage(arousal, AROUSAL, def_zone, blocked)
-	return 1
-
-
-
+	var/hit_percent = (100-blocked)/100
+	if(!damage || (hit_percent <= 0))
+		return 0
+	switch(damagetype)
+		if(BRUTE)
+			adjustBruteLoss(damage * hit_percent)
+		if(BURN)
+			adjustFireLoss(damage * hit_percent)
+		if(TOX)
+			adjustToxLoss(damage * hit_percent)
+		if(OXY)
+			adjustOxyLoss(damage * hit_percent)
+		if(CLONE)
+			adjustCloneLoss(damage * hit_percent)
+		if(STAMINA)
+			adjustStaminaLoss(damage * hit_percent)
+		if(BRAIN)
+			adjustBrainLoss(damage * hit_percent)
+		//citadel code
+		if(AROUSAL)
+			adjustArousalLoss(damage * hit_percent)
+	return 1
+
+/mob/living/proc/apply_damage_type(damage = 0, damagetype = BRUTE) //like apply damage except it always uses the damage procs
+	switch(damagetype)
+		if(BRUTE)
+			return adjustBruteLoss(damage)
+		if(BURN)
+			return adjustFireLoss(damage)
+		if(TOX)
+			return adjustToxLoss(damage)
+		if(OXY)
+			return adjustOxyLoss(damage)
+		if(CLONE)
+			return adjustCloneLoss(damage)
+		if(STAMINA)
+			return adjustStaminaLoss(damage)
+		if(BRAIN)
+			return adjustBrainLoss(damage)
+		//citadel code
+		if(AROUSAL)
+			return adjustArousalLoss(damage)
+
+/mob/living/proc/get_damage_amount(damagetype = BRUTE)
+	switch(damagetype)
+		if(BRUTE)
+			return getBruteLoss()
+		if(BURN)
+			return getFireLoss()
+		if(TOX)
+			return getToxLoss()
+		if(OXY)
+			return getOxyLoss()
+		if(CLONE)
+			return getCloneLoss()
+		if(STAMINA)
+			return getStaminaLoss()
+		if(BRAIN)
+			return getBrainLoss()
+		//citadel code
+		if(AROUSAL)
+			return getArousalLoss()
+
+
+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
+	if(blocked >= 100)
+		return 0
+	if(brute)
+		apply_damage(brute, BRUTE, def_zone, blocked)
+	if(burn)
+		apply_damage(burn, BURN, def_zone, blocked)
+	if(tox)
+		apply_damage(tox, TOX, def_zone, blocked)
+	if(oxy)
+		apply_damage(oxy, OXY, def_zone, blocked)
+	if(clone)
+		apply_damage(clone, CLONE, def_zone, blocked)
+	if(stamina)
+		apply_damage(stamina, STAMINA, def_zone, blocked)
+	if(brain)
+		apply_damage(brain, BRAIN, def_zone, blocked)
+	//citadel code
+	if(arousal)
+		apply_damage(arousal, AROUSAL, def_zone, blocked)
+	return 1
+
+
+
 /mob/living/proc/apply_effect(effect = 0,effecttype = STUN, blocked = FALSE)
-	var/hit_percent = (100-blocked)/100
-	if(!effect || (hit_percent <= 0))
-		return 0
-	switch(effecttype)
-		if(STUN)
-			Stun(effect * hit_percent)
-		if(KNOCKDOWN)
-			Knockdown(effect * hit_percent)
-		if(UNCONSCIOUS)
-			Unconscious(effect * hit_percent)
-		if(IRRADIATE)
-			radiation += max(effect * hit_percent, 0)
-		if(SLUR)
-			slurring = max(slurring,(effect * hit_percent))
-		if(STUTTER)
-			if(status_flags & CANSTUN) // stun is usually associated with stutter
-				stuttering = max(stuttering,(effect * hit_percent))
-		if(EYE_BLUR)
-			blur_eyes(effect * hit_percent)
-		if(DROWSY)
-			drowsyness = max(drowsyness,(effect * hit_percent))
-		if(JITTER)
-			if(status_flags & CANSTUN)
-				jitteriness = max(jitteriness,(effect * hit_percent))
-	return 1
-
-
+	var/hit_percent = (100-blocked)/100
+	if(!effect || (hit_percent <= 0))
+		return 0
+	switch(effecttype)
+		if(STUN)
+			Stun(effect * hit_percent)
+		if(KNOCKDOWN)
+			Knockdown(effect * hit_percent)
+		if(UNCONSCIOUS)
+			Unconscious(effect * hit_percent)
+		if(IRRADIATE)
+			radiation += max(effect * hit_percent, 0)
+		if(SLUR)
+			slurring = max(slurring,(effect * hit_percent))
+		if(STUTTER)
+			if(status_flags & CANSTUN) // stun is usually associated with stutter
+				stuttering = max(stuttering,(effect * hit_percent))
+		if(EYE_BLUR)
+			blur_eyes(effect * hit_percent)
+		if(DROWSY)
+			drowsyness = max(drowsyness,(effect * hit_percent))
+		if(JITTER)
+			if(status_flags & CANSTUN)
+				jitteriness = max(jitteriness,(effect * hit_percent))
+	return 1
+
+
 /mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0)
-	if(blocked >= 100)
-		return 0
-	if(stun)
-		apply_effect(stun, STUN, blocked)
-	if(knockdown)
-		apply_effect(knockdown, KNOCKDOWN, blocked)
-	if(unconscious)
-		apply_effect(unconscious, UNCONSCIOUS, blocked)
-	if(irradiate)
-		apply_effect(irradiate, IRRADIATE, blocked)
-	if(slur)
-		apply_effect(slur, SLUR, blocked)
-	if(stutter)
-		apply_effect(stutter, STUTTER, blocked)
-	if(eyeblur)
-		apply_effect(eyeblur, EYE_BLUR, blocked)
-	if(drowsy)
-		apply_effect(drowsy, DROWSY, blocked)
-	if(stamina)
-		apply_damage(stamina, STAMINA, null, blocked)
-	if(jitter)
-		apply_effect(jitter, JITTER, blocked)
-	return 1
-
-
-/mob/living/proc/getBruteLoss()
-	return bruteloss
-
-/mob/living/proc/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	bruteloss = Clamp((bruteloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/getOxyLoss()
-	return oxyloss
-
-/mob/living/proc/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	oxyloss = Clamp((oxyloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/setOxyLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(status_flags & GODMODE)
-		return 0
-	oxyloss = amount
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/getToxLoss()
-	return toxloss
-
-/mob/living/proc/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	toxloss = Clamp((toxloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/setToxLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	toxloss = amount
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/getFireLoss()
-	return fireloss
-
-/mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	fireloss = Clamp((fireloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/getCloneLoss()
-	return cloneloss
-
-/mob/living/proc/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	cloneloss = Clamp((cloneloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/setCloneLoss(amount, updating_health = TRUE, forced = FALSE)
-	if(!forced && (status_flags & GODMODE))
-		return FALSE
-	cloneloss = amount
-	if(updating_health)
-		updatehealth()
-	return amount
-
-/mob/living/proc/getBrainLoss()
-	return brainloss
-
-/mob/living/proc/adjustBrainLoss(amount)
-	if(status_flags & GODMODE)
-		return 0
-	brainloss = Clamp((brainloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
-
-/mob/living/proc/setBrainLoss(amount)
-	if(status_flags & GODMODE)
-		return 0
-	brainloss = amount
-
-/mob/living/proc/getStaminaLoss()
-	return staminaloss
-
-/mob/living/proc/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
-	return
-
-/mob/living/proc/setStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
-	return
-
-
-// heal ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/heal_bodypart_damage(brute, burn, updating_health = 1)
-	adjustBruteLoss(-brute, 0) //zero as argument for no instant health update
-	adjustFireLoss(-burn, 0)
-	if(updating_health)
-		updatehealth()
-
-// damage ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/take_bodypart_damage(brute, burn, updating_health = 1)
-	adjustBruteLoss(brute, 0) //zero as argument for no instant health update
-	adjustFireLoss(burn, 0)
-	if(updating_health)
-		updatehealth()
-
-// heal MANY bodyparts, in random order
-/mob/living/proc/heal_overall_damage(brute, burn, only_robotic = 0, only_organic = 1, updating_health = 1)
-	adjustBruteLoss(-brute, 0) //zero as argument for no instant health update
-	adjustFireLoss(-burn, 0)
-	if(updating_health)
-		updatehealth()
-
-// damage MANY bodyparts, in random order
-/mob/living/proc/take_overall_damage(brute, burn, updating_health = 1)
-	adjustBruteLoss(brute, 0) //zero as argument for no instant health update
-	adjustFireLoss(burn, 0)
-	if(updating_health)
-		updatehealth()
-
-//heal up to amount damage, in a given order
-/mob/living/proc/heal_ordered_damage(amount, list/damage_types)
-	. = amount //we'll return the amount of damage healed
-	for(var/i in damage_types)
-		var/amount_to_heal = min(amount, get_damage_amount(i)) //heal only up to the amount of damage we have
-		if(amount_to_heal)
-			apply_damage_type(-amount_to_heal, i)
-			amount -= amount_to_heal //remove what we healed from our current amount
-		if(!amount)
-			break
-	. -= amount //if there's leftover healing, remove it from what we return
+	if(blocked >= 100)
+		return 0
+	if(stun)
+		apply_effect(stun, STUN, blocked)
+	if(knockdown)
+		apply_effect(knockdown, KNOCKDOWN, blocked)
+	if(unconscious)
+		apply_effect(unconscious, UNCONSCIOUS, blocked)
+	if(irradiate)
+		apply_effect(irradiate, IRRADIATE, blocked)
+	if(slur)
+		apply_effect(slur, SLUR, blocked)
+	if(stutter)
+		apply_effect(stutter, STUTTER, blocked)
+	if(eyeblur)
+		apply_effect(eyeblur, EYE_BLUR, blocked)
+	if(drowsy)
+		apply_effect(drowsy, DROWSY, blocked)
+	if(stamina)
+		apply_damage(stamina, STAMINA, null, blocked)
+	if(jitter)
+		apply_effect(jitter, JITTER, blocked)
+	return 1
+
+
+/mob/living/proc/getBruteLoss()
+	return bruteloss
+
+/mob/living/proc/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	bruteloss = Clamp((bruteloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/getOxyLoss()
+	return oxyloss
+
+/mob/living/proc/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	oxyloss = Clamp((oxyloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/setOxyLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(status_flags & GODMODE)
+		return 0
+	oxyloss = amount
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/getToxLoss()
+	return toxloss
+
+/mob/living/proc/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	toxloss = Clamp((toxloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/setToxLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	toxloss = amount
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/getFireLoss()
+	return fireloss
+
+/mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	fireloss = Clamp((fireloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/getCloneLoss()
+	return cloneloss
+
+/mob/living/proc/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	cloneloss = Clamp((cloneloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/setCloneLoss(amount, updating_health = TRUE, forced = FALSE)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	cloneloss = amount
+	if(updating_health)
+		updatehealth()
+	return amount
+
+/mob/living/proc/getBrainLoss()
+	return brainloss
+
+/mob/living/proc/adjustBrainLoss(amount)
+	if(status_flags & GODMODE)
+		return 0
+	brainloss = Clamp((brainloss + (amount * config.damage_multiplier)), 0, maxHealth*2)
+
+/mob/living/proc/setBrainLoss(amount)
+	if(status_flags & GODMODE)
+		return 0
+	brainloss = amount
+
+/mob/living/proc/getStaminaLoss()
+	return staminaloss
+
+/mob/living/proc/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
+	return
+
+/mob/living/proc/setStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
+	return
+
+
+// heal ONE external organ, organ gets randomly selected from damaged ones.
+/mob/living/proc/heal_bodypart_damage(brute, burn, updating_health = 1)
+	adjustBruteLoss(-brute, 0) //zero as argument for no instant health update
+	adjustFireLoss(-burn, 0)
+	if(updating_health)
+		updatehealth()
+
+// damage ONE external organ, organ gets randomly selected from damaged ones.
+/mob/living/proc/take_bodypart_damage(brute, burn, updating_health = 1)
+	adjustBruteLoss(brute, 0) //zero as argument for no instant health update
+	adjustFireLoss(burn, 0)
+	if(updating_health)
+		updatehealth()
+
+// heal MANY bodyparts, in random order
+/mob/living/proc/heal_overall_damage(brute, burn, only_robotic = 0, only_organic = 1, updating_health = 1)
+	adjustBruteLoss(-brute, 0) //zero as argument for no instant health update
+	adjustFireLoss(-burn, 0)
+	if(updating_health)
+		updatehealth()
+
+// damage MANY bodyparts, in random order
+/mob/living/proc/take_overall_damage(brute, burn, updating_health = 1)
+	adjustBruteLoss(brute, 0) //zero as argument for no instant health update
+	adjustFireLoss(burn, 0)
+	if(updating_health)
+		updatehealth()
+
+//heal up to amount damage, in a given order
+/mob/living/proc/heal_ordered_damage(amount, list/damage_types)
+	. = amount //we'll return the amount of damage healed
+	for(var/i in damage_types)
+		var/amount_to_heal = min(amount, get_damage_amount(i)) //heal only up to the amount of damage we have
+		if(amount_to_heal)
+			apply_damage_type(-amount_to_heal, i)
+			amount -= amount_to_heal //remove what we healed from our current amount
+		if(!amount)
+			break
+	. -= amount //if there's leftover healing, remove it from what we return

From ac9c24dfe51329467891f45b5b27d5111cd12a38 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 31 Jul 2017 05:53:58 -0500
Subject: [PATCH 5/7] Update combat.dm

---
 code/__DEFINES/combat.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index a307a0819d..caf7f7964b 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -11,6 +11,9 @@
 #define STAMINA 	"stamina"
 #define BRAIN		"brain"
 
+//Citadel code
+#define AROUSAL		"arousal"
+
 //bitflag damage defines used for suicide_act
 #define BRUTELOSS 1
 #define FIRELOSS 2

From dc9c53ae0a74cfaafe2db1675e40df560c069399 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 31 Jul 2017 06:13:00 -0500
Subject: [PATCH 6/7] Update combat.dm

---
 code/__DEFINES/combat.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index caf7f7964b..c088e81c4a 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -21,6 +21,9 @@
 #define OXYLOSS 8
 #define SHAME 16
 
+//Citadel code
+#define AROUSAL	32
+
 #define STUN		"stun"
 #define KNOCKDOWN		"knockdown"
 #define UNCONSCIOUS	"unconscious"

From 8a174f8a767da2192cf70b2ea8b90b206568fc2c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 31 Jul 2017 06:24:52 -0500
Subject: [PATCH 7/7] Update damage_procs.dm

---
 code/modules/mob/living/damage_procs.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 4edcd3be21..fccb3ab8dd 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -73,7 +73,7 @@
 			return getArousalLoss()
 
 
-/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, arousal = 0, brain = 0)
 	if(blocked >= 100)
 		return 0
 	if(brute)