Goosemed

code/ATMOSPHERICS/pipes/he_pipes.dm

@@ -114,7 +114,7 @@
 
 				var/heat_limit = 1000
 
-				var/mob/living/carbon/human/H = L
+				var/mob/living/human/H = L
 				if(istype(H) && H.species)
 					heat_limit = H.species.heat_level_3
 

code/ZAS/Airflow.dm

@@ -22,7 +22,7 @@ Contains helper procs for airflow, handled in /connection_group.
 /mob/living/silicon/airflow_stun()
 	return
 
-/mob/living/carbon/human/airflow_stun()
+/mob/living/human/airflow_stun()
 	if(shoes && (shoes.item_flags & NOSLIP))
 		to_chat(src, "<span class='notice'>Air suddenly rushes past you!</span>")
 		return 0
@@ -112,7 +112,7 @@ Contains helper procs for airflow, handled in /connection_group.
 	airflow_speed = 0
 	airflow_dest = null
 
-/mob/living/carbon/human/airflow_hit(atom/A)
+/mob/living/human/airflow_hit(atom/A)
 //	for(var/mob/M in hearers(src))
 //		M.show_message("<span class='danger'>[src] slams into [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
 	playsound(src, "punch", 25, 1, -1)

code/ZAS/Fire.dm

@@ -393,7 +393,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
 	apply_damage(2.5*mx, BURN)
 
 
-/mob/living/carbon/human/FireBurn(var/firelevel, var/last_temperature, var/pressure)
+/mob/living/human/FireBurn(var/firelevel, var/last_temperature, var/pressure)
 	//Burns mobs due to fire. Respects heat transfer coefficients on various body parts.
 	//Due to TG reworking how fireprotection works, this is kinda less meaningful.
 

code/ZAS/Phoron.dm

@@ -65,7 +65,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 
 /mob/proc/contaminate()
 
-/mob/living/carbon/human/contaminate()
+/mob/living/human/contaminate()
 	//See if anything can be contaminated.
 
 	if(!pl_suit_protected())
@@ -81,7 +81,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 
 /mob/proc/pl_effects()
 
-/mob/living/carbon/human/pl_effects()
+/mob/living/human/pl_effects()
 	//Handles all the bad things phoron can do.
 
 	//Contamination
@@ -127,7 +127,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 			to_chat(src, "<span class='danger'>High levels of toxins cause you to spontaneously mutate!</span>")
 			domutcheck(src,null)
 
-/mob/living/carbon/human/proc/burn_eyes()
+/mob/living/human/proc/burn_eyes()
 	var/obj/item/organ/internal/eyes/E = internal_organs_by_name[O_EYES]
 	if(E)
 		if(prob(20))
@@ -138,7 +138,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 			to_chat(src, "<span class='danger'>You are blinded!</span>")
 			Blind(20)
 
-/mob/living/carbon/human/proc/pl_head_protected()
+/mob/living/human/proc/pl_head_protected()
 	//Checks if the head is adequately sealed.	//This is just odd. TODO: Make this respect the body_parts_covered stuff like thermal gear does.
 	if(head)
 		if(vsc.plc.PHORONGUARD_ONLY)
@@ -148,7 +148,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 			return 1
 	return 0
 
-/mob/living/carbon/human/proc/pl_suit_protected()
+/mob/living/human/proc/pl_suit_protected()
 	//Checks if the suit is adequately sealed.	//This is just odd. TODO: Make this respect the body_parts_covered stuff like thermal gear does.
 	var/coverage = 0
 	for(var/obj/item/protection in list(wear_suit, gloves, shoes))	//This is why it's odd. If I'm in a full suit, but my shoes and gloves aren't phoron proof, damage.
@@ -163,7 +163,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 
 	return BIT_TEST_ALL(coverage, UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS)
 
-/mob/living/carbon/human/proc/suit_contamination()
+/mob/living/human/proc/suit_contamination()
 	//Runs over the things that can be contaminated and does so.
 	if(w_uniform)
 		w_uniform.contaminate()

code/ZAS/Variable Settings.dm

@@ -43,7 +43,7 @@ var/global/vs_control/vsc = new
 	var/airflow_stun_pressure_DESC = "Percent of 1 Atm. at which mobs will be stunned by airflow."
 
 	var/airflow_stun_cooldown = 60
-	var/airflow_stun_cooldown_NAME = "Aiflow Stunning - Cooldown"
+	var/airflow_stun_cooldown_NAME = "Airflow Stunning - Cooldown"
 	var/airflow_stun_cooldown_DESC = "How long, in tenths of a second, to wait before stunning them again."
 
 	var/airflow_stun = 1

code/__defines/chemistry.dm

@@ -1,4 +1,4 @@
-#define DEFAULT_HUNGER_FACTOR 0.05 // Factor of how fast mob nutrition decreases
+#define DEFAULT_HUNGER_FACTOR -0.005 // Factor of how fast mob nutrition decreases
 
 #define REM 0.2 // Means 'Reagent Effect Multiplier'. This is how many units of reagent are consumed per tick
 

code/__defines/dcs/signals.dm

@@ -57,7 +57,7 @@
 #define COMSIG_PARENT_ATTACKBY "atom_attackby"
 ///Return this in response if you don't want later item attack procs to be called.
 	#define COMPONENT_CANCEL_ATTACK_CHAIN (1<<0)
-///from base of atom/attack_hulk(): (/mob/living/carbon/human)
+///from base of atom/attack_hulk(): (/mob/living/human)
 #define COMSIG_ATOM_HULK_ATTACK "hulk_attack"
 ///from base of atom/animal_attack(): (/mob/user)
 #define COMSIG_ATOM_ATTACK_ANIMAL "attack_animal"
@@ -381,21 +381,21 @@
 #define COMSIG_LIVING_CAN_TRACK "mob_cantrack"
 	#define COMPONENT_CANT_TRACK (1<<0)
 
-// /mob/living/carbon signals
+// /mob/living/human signals
 
-///from base of mob/living/carbon/soundbang_act(): (list(intensity))
+///from base of mob/living/human/soundbang_act(): (list(intensity))
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"
 ///from /item/organ/proc/Insert() (/obj/item/organ/)
 #define COMSIG_CARBON_GAIN_ORGAN "carbon_gain_organ"
 ///from /item/organ/proc/Remove() (/obj/item/organ/)
 #define COMSIG_CARBON_LOSE_ORGAN "carbon_lose_organ"
-///from /mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)
+///from /mob/living/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)
 #define COMSIG_CARBON_EQUIP_HAT "carbon_equip_hat"
-///from /mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)
+///from /mob/living/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)
 #define COMSIG_CARBON_UNEQUIP_HAT "carbon_unequip_hat"
-///defined twice, in carbon and human's topics, fired when interacting with a valid embedded_object to pull it out (mob/living/carbon/target, /obj/item, /obj/item/bodypart/L)
+///defined twice, in carbon and human's topics, fired when interacting with a valid embedded_object to pull it out (mob/living/human/target, /obj/item, /obj/item/bodypart/L)
 #define COMSIG_CARBON_EMBED_RIP "item_embed_start_rip"
-///called when removing a given item from a mob, from mob/living/carbon/remove_embedded_object(mob/living/carbon/target, /obj/item)
+///called when removing a given item from a mob, from mob/living/human/remove_embedded_object(mob/living/human/target, /obj/item)
 #define COMSIG_CARBON_EMBED_REMOVAL "item_embed_remove_safe"
 
 // /mob/living/simple_animal/hostile signals
@@ -447,7 +447,7 @@
 #define COMSIG_ITEM_DROPPED "item_drop"
 ///from base of obj/item/pickup(): (/mob/taker)
 #define COMSIG_ITEM_PICKUP "item_pickup"
-///from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone)
+///from base of mob/living/human/attacked_by(): (mob/living/human/target, mob/living/user, hit_zone)
 #define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone"
 ///return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user)
 #define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul"
@@ -525,7 +525,7 @@
 
 // /obj/item/pen signals
 
-///called after rotation in /obj/item/pen/attack_self(): (rotation, mob/living/carbon/user)
+///called after rotation in /obj/item/pen/attack_self(): (rotation, mob/living/human/user)
 #define COMSIG_PEN_ROTATED "pen_rotated"
 
 // /obj/item/gun signals
@@ -565,15 +565,15 @@
 ///sent from mecha action buttons to the mecha they're linked to
 #define COMSIG_MECHA_ACTION_ACTIVATE "mecha_action_activate"
 
-// /mob/living/carbon/human signals
+// /mob/living/human signals
 
-///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity)
+///from mob/living/human/UnarmedAttack(): (atom/target, proximity)
 #define COMSIG_HUMAN_EARLY_UNARMED_ATTACK "human_early_unarmed_attack"
-///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity)
+///from mob/living/human/UnarmedAttack(): (atom/target, proximity)
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack"
-///from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
+///from mob/living/human/UnarmedAttack(): (mob/living/human/attacker)
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby"
-///Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted)
+///Hit by successful disarm attack (mob/living/human/attacker,zone_targeted)
 #define COMSIG_HUMAN_DISARM_HIT	"human_disarm_hit"
 ///Whenever EquipRanked is called, called after job is set
 #define COMSIG_JOB_RECEIVED "job_received"
@@ -705,10 +705,10 @@
 
 // /datum/component/two_handed signals
 
-///from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user)
+///from base of datum/component/two_handed/proc/wield(mob/living/human/user): (/mob/user)
 #define COMSIG_TWOHANDED_WIELD "twohanded_wield"
 	#define COMPONENT_TWOHANDED_BLOCK_WIELD (1<<0)
-///from base of datum/component/two_handed/proc/unwield(mob/living/carbon/user): (/mob/user)
+///from base of datum/component/two_handed/proc/unwield(mob/living/human/user): (/mob/user)
 #define COMSIG_TWOHANDED_UNWIELD "twohanded_unwield"
 
 // /datum/action signals

code/__defines/is_helpers.dm

@@ -39,10 +39,8 @@
 #define isslime(A)		istype(A, /mob/living/simple_mob/slime)
 #define isxeno(A)		istype(A, /mob/living/simple_mob/animal/space/alien)
 
-#define iscarbon(A)		istype(A, /mob/living/carbon)
-#define isalien(A)		istype(A, /mob/living/carbon/alien)
-#define isbrain(A)		istype(A, /mob/living/carbon/brain)
-#define ishuman(A)		istype(A, /mob/living/carbon/human)
+#define isbrain(A)		istype(A, /mob/living/brain)
+#define ishuman(A)		istype(A, /mob/living/human)
 
 #define issilicon(A)	istype(A, /mob/living/silicon)
 #define isAI(A)			istype(A, /mob/living/silicon/ai)

code/__defines/mobs.dm

@@ -264,7 +264,7 @@
 #define COLORMUT 	1
 #define SPECIESMUT	2
 
-//carbon taste sensitivity defines, used in mob/living/carbon/proc/ingest
+//carbon taste sensitivity defines, used in mob/living/human/proc/ingest
 #define TASTE_HYPERSENSITIVE 3 //anything below 5%
 #define TASTE_SENSITIVE 2 //anything below 7%
 #define TASTE_NORMAL 1 //anything below 15%
@@ -453,3 +453,37 @@
 
 /// Used by human/get_visible_gender(user, force) to return the mob's biological gender
 #define VISIBLE_GENDER_FORCE_BIOLOGICAL 3
+
+//NOTE: Breathing happens once per FOUR TICKS, unless the last breath fails. In which case it happens once per ONE TICK! So oxyloss healing is done once per 4 ticks while oxyloss damage is applied once per tick!
+#define HUMAN_MAX_OXYLOSS 1 //Defines how much oxyloss humans can get per tick. A tile with no air at all (such as space) applies this value, otherwise it's a percentage of it.
+#define HUMAN_CRIT_MAX_OXYLOSS ( 2.0 / 6) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 50HP to get through, so (1/6)*last_tick_duration per second. Breaths however only happen every 4 ticks. last_tick_duration = ~2.0 on average
+
+#define HEAT_DAMAGE_LEVEL_1 5 //Amount of damage applied when your body temperature just passes the 360.15k safety point
+#define HEAT_DAMAGE_LEVEL_2 10 //Amount of damage applied when your body temperature passes the 400K point
+#define HEAT_DAMAGE_LEVEL_3 20 //Amount of damage applied when your body temperature passes the 1000K point
+
+#define COLD_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when your body temperature just passes the 260.15k safety point
+#define COLD_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when your body temperature passes the 200K point
+#define COLD_DAMAGE_LEVEL_3 3 //Amount of damage applied when your body temperature passes the 120K point
+
+//Note that gas heat damage is only applied once every FOUR ticks.
+#define HEAT_GAS_DAMAGE_LEVEL_1 2 //Amount of damage applied when the current breath's temperature just passes the 360.15k safety point
+#define HEAT_GAS_DAMAGE_LEVEL_2 4 //Amount of damage applied when the current breath's temperature passes the 400K point
+#define HEAT_GAS_DAMAGE_LEVEL_3 8 //Amount of damage applied when the current breath's temperature passes the 1000K point
+
+#define COLD_GAS_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when the current breath's temperature just passes the 260.15k safety point
+#define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point
+#define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point
+
+#define COLD_ALERT_SEVERITY_LOW         1 // Constants passed to the cold and heat alerts.
+#define COLD_ALERT_SEVERITY_MODERATE    2
+#define COLD_ALERT_SEVERITY_MAX         3
+#define ENVIRONMENT_COMFORT_MARKER_COLD 1
+
+#define HOT_ALERT_SEVERITY_LOW          1
+#define HOT_ALERT_SEVERITY_MODERATE     2
+#define HOT_ALERT_SEVERITY_MAX          3
+#define ENVIRONMENT_COMFORT_MARKER_HOT  2
+
+#define RADIATION_SPEED_COEFFICIENT 0.1
+#define HUMAN_COMBUSTION_TEMP 524 //524k is the sustained combustion temperature of human fat

code/_helpers/events.dm

@@ -17,7 +17,7 @@
 /** Checks if any living humans are in a given area! */
 /proc/is_area_occupied(var/area/myarea)
 	// Testing suggests looping over human_mob_list is quicker than looping over area contents
-	for(var/mob/living/carbon/human/H in human_mob_list)
+	for(var/mob/living/human/H in human_mob_list)
 		if(H.stat >= DEAD) //Conditions for exclusion here, like if disconnected people start blocking it.
 			continue
 		var/area/A = get_area(H)

code/_helpers/game.dm

@@ -48,7 +48,7 @@
 /** Checks if any living humans are in a given area. */
 /proc/area_is_occupied(var/area/myarea)
 	// Testing suggests looping over human_mob_list is quicker than looping over area contents
-	for(var/mob/living/carbon/human/H in human_mob_list)
+	for(var/mob/living/human/H in human_mob_list)
 		if(H.stat >= DEAD) //Conditions for exclusion here, like if disconnected people start blocking it.
 			continue
 		var/area/A = get_area(H)

code/_helpers/global_lists.dm

@@ -109,7 +109,7 @@ var/global/list/string_slot_flags = list(
 		mannequins_ = new()
  	. = mannequins_[ckey]
 	if(!.)
-		. = new/mob/living/carbon/human/dummy/mannequin()
+		. = new/mob/living/human/dummy/mannequin()
 		mannequins_[ckey] = .
 
 //////////////////////////

code/_helpers/mobs.dm

@@ -264,7 +264,7 @@ Proc for attack log creation, because really why not
 /atom/proc/human_mobs(var/range = world.view)
 	var/list/viewers = oviewers(src,range)
 	var/list/humans = list()
-	for(var/mob/living/carbon/human/H in viewers)
+	for(var/mob/living/human/H in viewers)
 		humans += H
 
 	return humans

code/_helpers/unsorted.dm

@@ -446,11 +446,9 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		moblist.Add(M)
 	for(var/mob/living/silicon/robot/M in sortmob)
 		moblist.Add(M)
-	for(var/mob/living/carbon/human/M in sortmob)
+	for(var/mob/living/human/M in sortmob)
 		moblist.Add(M)
-	for(var/mob/living/carbon/brain/M in sortmob)
-		moblist.Add(M)
-	for(var/mob/living/carbon/alien/M in sortmob)
+	for(var/mob/living/brain/M in sortmob)
 		moblist.Add(M)
 	for(var/mob/observer/dead/M in sortmob)
 		moblist.Add(M)
@@ -1148,7 +1146,7 @@ var/global/list/common_tools = list(
 
 // check if mob is lying down on something we can operate him on.
 // The RNG with table/rollerbeds comes into play in do_surgery() so that fail_step() can be used instead.
-/proc/can_operate(mob/living/carbon/M, mob/living/user)
+/proc/can_operate(mob/living/human/M, mob/living/user)
 	// You can, technically, always operate on yourself after standing still. Inadvised, but you can.
 	return M.lying || \
 		(
@@ -1527,7 +1525,7 @@ var/mob/dview/dview_mob = new
 			/turf/unsimulated/floor = "US-FLOOR",
 			/turf/unsimulated = "UNSIMULATED",
 			/turf = "T",
-			/mob/living/carbon = "CARBON",
+			/mob/living/human = "CARBON",
 			/mob/living/simple_mob = "SIMPLE",
 			/mob/living = "LIVING",
 			/mob = "M"

code/_onclick/click.dm

@@ -311,7 +311,7 @@
 	LE.preparePixelProjectile(A, src, params)
 	LE.fire()
 
-/mob/living/carbon/human/LaserEyes(atom/A, params)
+/mob/living/human/LaserEyes(atom/A, params)
 	if(nutrition>0)
 		..()
 		nutrition = max(nutrition - rand(1,5),0)
@@ -347,8 +347,8 @@
 
 /obj/screen/click_catcher/Click(location, control, params)
 	var/list/modifiers = params2list(params)
-	if(modifiers["middle"] && istype(usr, /mob/living/carbon))
-		var/mob/living/carbon/C = usr
+	if(modifiers["middle"] && istype(usr, /mob/living/human))
+		var/mob/living/human/C = usr
 		C.swap_hand()
 	else
 		var/list/P = params2list(params)

code/_onclick/hud/action.dm

@@ -170,10 +170,7 @@
 
 
 /obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user)
-	if(isalien(user))
-		icon_state = "bg_alien"
-	else
-		icon_state = "bg_default"
+	icon_state = "bg_default"
 	UpdateIcon()
 	return
 

code/_onclick/hud/alert.dm

@@ -267,7 +267,7 @@ If you're feeling frisky, right click on yourself and select \"Remove embedded o
 
 /obj/screen/alert/embeddedobject/Click()
 	if(isliving(usr))
-		var/mob/living/carbon/human/M = usr
+		var/mob/living/human/M = usr
 		return M.help_shake_act(M)
 
 /obj/screen/alert/asleep