April sync (#360)

* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
2017-04-13 23:37:00 -05:00
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
@@ -11,15 +11,13 @@
 	dna = null
 	faction = list("alien")
 	ventcrawler = VENTCRAWLER_ALWAYS
-	languages_spoken = ALIEN
-	languages_understood = ALIEN
 	sight = SEE_MOBS
 	see_in_dark = 4
 	verb_say = "hisses"
+	initial_languages = list(/datum/language/xenocommon)
 	bubble_icon = "alien"
 	type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
 	var/nightvision = 1
-	devourable = 1

 	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
 	var/has_fine_manipulation = 0
@@ -111,7 +109,7 @@ Des: Gives the client of the alien an image on each infected mob.
 ----------------------------------------*/
 /mob/living/carbon/alien/proc/AddInfectionImages()
 	if (client)
-		for (var/mob/living/C in mob_list)
+		for (var/mob/living/C in GLOB.mob_list)
 			if(C.status_flags & XENO_HOST)
 				var/obj/item/organ/body_egg/alien_embryo/A = C.getorgan(/obj/item/organ/body_egg/alien_embryo)
 				if(A)
@@ -74,7 +74,8 @@ In all, this is a lot like the monkey code. /N


 /mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
-	if(..())
+	. = ..()
+	if(.)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		switch(M.melee_damage_type)
 			if(BRUTE)
@@ -89,7 +90,6 @@ In all, this is a lot like the monkey code. /N
 				adjustCloneLoss(damage)
 			if(STAMINA)
 				adjustStaminaLoss(damage)
-		updatehealth()

 /mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M)
 	if(..()) //successful slime attack
@@ -1,30 +0,0 @@
-/datum/emote/living/alien
-	mob_type_allowed_typecache = list(/mob/living/carbon/alien)
-
-/datum/emote/living/alien/gnarl
-	key = "gnarl"
-	key_third_person = "gnarls"
-	message = "gnarls and shows its teeth..."
-
-/datum/emote/living/alien/hiss
-	key = "hiss"
-	key_third_person = "hisses"
-	message_alien = "hisses."
-	message_larva = "hisses softly."
-
-/datum/emote/living/alien/hiss/run_emote(mob/user, params)
-	. = ..()
-	if(. && isalienadult(user))
-		playsound(user.loc, "hiss", 40, 1, 1)
-
-/datum/emote/living/alien/roar
-	key = "roar"
-	key_third_person = "roars"
-	message_alien = "roars"
-	message_larva = "softly roars"
-	emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/alien/roar/run_emote(mob/user, params)
-	. = ..()
-	if(. && isalienadult(user))
-		playsound(user.loc, 'sound/voice/hiss5.ogg', 40, 1, 1)
@@ -87,7 +87,7 @@ Doesn't work on other aliens/AI.*/
 		log_say("AlienWhisper: [key_name(user)]->[M.key] : [msg]")
 		to_chat(M, "<span class='noticealien'>You hear a strange, alien voice in your head...</span>[msg]")
 		to_chat(user, "<span class='noticealien'>You said: \"[msg]\" to [M]</span>")
-		for(var/ded in dead_mob_list)
+		for(var/ded in GLOB.dead_mob_list)
 			if(!isobserver(ded))
 				continue
 			var/follow_link_user = FOLLOW_LINK(ded, user)
@@ -13,7 +13,7 @@
 	if(stat == DEAD)
 		return

-	for(var/mob/living/carbon/C in living_mob_list)
+	for(var/mob/living/carbon/C in GLOB.living_mob_list)
 		if(C == src) //Make sure not to proc it on ourselves.
 			continue
 		var/obj/item/organ/alien/hivenode/node = C.getorgan(/obj/item/organ/alien/hivenode)
@@ -108,7 +108,7 @@

 //For alien evolution/promotion/queen finder procs. Checks for an active alien of that type
 /proc/get_alien_type(var/alienpath)
-	for(var/mob/living/carbon/alien/humanoid/A in living_mob_list)
+	for(var/mob/living/carbon/alien/humanoid/A in GLOB.living_mob_list)
 		if(!istype(A, alienpath))
 			continue
 		if(!A.key || A.stat == DEAD) //Only living aliens with a ckey are valid.
@@ -46,7 +46,7 @@

 /mob/living/carbon/alien/humanoid/royal/queen/Initialize()
 	//there should only be one queen
-	for(var/mob/living/carbon/alien/humanoid/royal/queen/Q in living_mob_list)
+	for(var/mob/living/carbon/alien/humanoid/royal/queen/Q in GLOB.living_mob_list)
 		if(Q == src)
 			continue
 		if(Q.stat == DEAD)
@@ -5,10 +5,10 @@

 	var/message_a = say_quote(message, get_spans())
 	var/rendered = "<i><span class='alien'>Hivemind, <span class='name'>[shown_name]</span> <span class='message'>[message_a]</span></span></i>"
-	for(var/mob/S in player_list)
+	for(var/mob/S in GLOB.player_list)
 		if(!S.stat && S.hivecheck())
 			to_chat(S, rendered)
-		if(S in dead_mob_list)
+		if(S in GLOB.dead_mob_list)
 			var/link = FOLLOW_LINK(S, src)
 			to_chat(S, "[link] [rendered]")

@@ -117,7 +117,7 @@ Proc: AddInfectionImages(C)
 Des: Adds the infection image to all aliens for this embryo
 ----------------------------------------*/
 /obj/item/organ/body_egg/alien_embryo/AddInfectionImages()
-	for(var/mob/living/carbon/alien/alien in player_list)
+	for(var/mob/living/carbon/alien/alien in GLOB.player_list)
 		if(alien.client)
 			var/I = image('icons/mob/alien.dmi', loc = owner, icon_state = "infected[stage]")
 			alien.client.images += I
@@ -127,7 +127,7 @@ Proc: RemoveInfectionImage(C)
 Des: Removes all images from the mob infected by this embryo
 ----------------------------------------*/
 /obj/item/organ/body_egg/alien_embryo/RemoveInfectionImages()
-	for(var/mob/living/carbon/alien/alien in player_list)
+	for(var/mob/living/carbon/alien/alien in GLOB.player_list)
 		if(alien.client)
 			for(var/image/I in alien.client.images)
 				if(dd_hasprefix_case(I.icon_state, "infected") && I.loc == owner)
@@ -2,11 +2,11 @@

 //TODO: Make these simple_animals

-var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
-var/const/MAX_IMPREGNATION_TIME = 150
+#define MIN_IMPREGNATION_TIME 100 //time it takes to impregnate someone
+#define MAX_IMPREGNATION_TIME 150

-var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle
-var/const/MAX_ACTIVE_TIME = 400
+#define MIN_ACTIVE_TIME 200 //time between being dropped and going idle
+#define MAX_ACTIVE_TIME 400

 /obj/item/clothing/mask/facehugger
 	name = "alien"
@@ -152,14 +152,6 @@ var/const/MAX_ACTIVE_TIME = 400
 	// probiscis-blocker handling
 	if(iscarbon(M))
 		var/mob/living/carbon/target = M
-		if(target.wear_mask)
-			var/obj/item/clothing/W = target.wear_mask
-			if(W.flags & NODROP)
-				return FALSE
-			if(!istype(W,/obj/item/clothing/mask/facehugger))
-				target.dropItemToGround(W)
-				target.visible_message("<span class='danger'>[src] tears [W] off of [target]'s face!</span>", \
-									"<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")

 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
@@ -168,6 +160,12 @@ var/const/MAX_ACTIVE_TIME = 400
 									"<span class='userdanger'>[src] smashes against [H]'s [H.head]!</span>")
 				Die()
 				return FALSE
+
+		if(target.wear_mask)
+			var/obj/item/clothing/W = target.wear_mask
+			if(!istype(W,/obj/item/clothing/mask/facehugger) && target.dropItemToGround(W))
+				target.visible_message("<span class='danger'>[src] tears [W] off of [target]'s face!</span>", \
+									"<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")
 		forceMove(target)
 		target.equip_to_slot_if_possible(src, slot_wear_mask, 0, 1, 1)
 	// early returns and validity checks done: attach.
@@ -522,6 +522,7 @@
 		return

 	sight = initial(sight)
+	lighting_alpha = initial(lighting_alpha)
 	var/obj/item/organ/eyes/E = getorganslot("eye_sight")
 	if(!E)
 		update_tint()
@@ -529,6 +530,8 @@
 		see_invisible = E.see_invisible
 		see_in_dark = E.see_in_dark
 		sight |= E.sight_flags
+		if(!isnull(E.lighting_alpha))
+			lighting_alpha = E.lighting_alpha

 	if(client.eye != src)
 		var/atom/A = client.eye
@@ -543,6 +546,8 @@
 			see_invisible = G.invis_override
 		else
 			see_invisible = min(G.invis_view, see_invisible)
+		if(!isnull(G.lighting_alpha))
+			lighting_alpha = min(lighting_alpha, G.lighting_alpha)
 	if(dna)
 		for(var/X in dna.mutations)
 			var/datum/mutation/M = X
@@ -552,11 +557,12 @@

 	if(see_override)
 		see_invisible = see_override
+	. = ..()


 //to recalculate and update the mob's total tint from tinted equipment it's wearing.
 /mob/living/carbon/proc/update_tint()
-	if(!tinted_weldhelh)
+	if(!GLOB.tinted_weldhelh)
 		return
 	tinttotal = get_total_tint()
 	if(tinttotal >= TINT_BLIND)
@@ -44,4 +44,7 @@
 					 /obj/item/bodypart/r_arm, /obj/item/bodypart/r_leg, /obj/item/bodypart/l_leg)
 	//Gets filled up in create_bodyparts()

-	var/list/hand_bodyparts = list() //a collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems)
+	var/list/hand_bodyparts = list() //a collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems)
+	
+	var/icon_render_key = ""
+	var/static/list/limb_icon_cache = list()
@@ -19,12 +19,6 @@
 		if(legcuffed)
 			. += legcuffed.slowdown

-
-var/const/NO_SLIP_WHEN_WALKING = 1
-var/const/SLIDE = 2
-var/const/GALOSHES_DONT_HELP = 4
-var/const/SLIDE_ICE = 8
-
 /mob/living/carbon/slip(s_amount, w_amount, obj/O, lube)
 	if(movement_type & FLYING)
 		return 0
@@ -147,8 +147,8 @@
 		parts -= picked
 	if(updating_health)
 		updatehealth()
-		if(update)
-			update_damage_overlays()
+	if(update)
+		update_damage_overlays()

 // damage MANY bodyparts, in random order
 /mob/living/carbon/take_overall_damage(brute, burn, updating_health = 1)
@@ -9,8 +9,8 @@
 		emote("deathgasp")

 	. = ..()
-	if(ticker && ticker.mode)
-		ticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
+	if(SSticker && SSticker.mode)
+		SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now

 /mob/living/carbon/gib(no_brain, no_organs, no_bodyparts)
 	for(var/mob/M in src)
@@ -35,7 +35,7 @@
 				if(org_zone == "chest")
 					O.Remove(src)
 					O.forceMove(get_turf(src))
-					O.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
+					O.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
 	else
 		for(var/X in internal_organs)
 			var/obj/item/organ/I = X
@@ -44,11 +44,11 @@
 				continue
 			I.Remove(src)
 			I.forceMove(get_turf(src))
-			I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
+			I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)


 /mob/living/carbon/spread_bodyparts()
 	for(var/X in bodyparts)
 		var/obj/item/bodypart/BP = X
 		BP.drop_limb()
-		BP.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
+		BP.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
@@ -10,8 +10,11 @@
 	else
 		new /obj/effect/gibspawner/humanbodypartless(loc, viruses, dna)

-/mob/living/carbon/human/spawn_dust()
-	new /obj/effect/decal/remains/human(loc)
+/mob/living/carbon/human/spawn_dust(just_ash = FALSE)
+	if(just_ash)
+		new /obj/effect/decal/cleanable/ash(loc)
+	else
+		new /obj/effect/decal/remains/human(loc)

 /mob/living/carbon/human/death(gibbed)
 	if(stat == DEAD)
@@ -29,7 +32,7 @@

 	dna.species.spec_death(gibbed, src)

-	if(ticker && ticker.mode)
+	if(SSticker && SSticker.mode)
 		sql_report_death(src)
 	if(mind && mind.devilinfo)
 		INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)
@@ -142,7 +142,7 @@
 			if(!key)
 				var/foundghost = 0
 				if(mind)
-					for(var/mob/dead/observer/G in player_list)
+					for(var/mob/dead/observer/G in GLOB.player_list)
 						if(G.mind == mind)
 							foundghost = 1
 							if (G.can_reenter_corpse == 0)
@@ -257,9 +257,6 @@
 				msg += "[t_He] looks like a drunken mess.\n"
 			if(91.01 to INFINITY)
 				msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n"
-	for (var/I in src.vore_organs)
-		var/datum/belly/B = vore_organs[I]
-		msg += B.get_examine_msg()

 	msg += "</span>"

@@ -292,7 +289,7 @@
 		if(istype(H.glasses, /obj/item/clothing/glasses/hud) || CIH)
 			var/perpname = get_face_name(get_id_name(""))
 			if(perpname)
-				var/datum/data/record/R = find_record("name", perpname, data_core.general)
+				var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.general)
 				if(R)
 					msg += "<span class='deptradio'>Rank:</span> [R.fields["rank"]]<br>"
 					msg += "<a href='?src=\ref[src];hud=1;photo_front=1'>\[Front photo\]</a> "
@@ -310,7 +307,7 @@
 						msg += "<a href='?src=\ref[src];hud=m;p_stat=1'>\[[health_r]\]</a>"
 						health_r = R.fields["m_stat"]
 						msg += "<a href='?src=\ref[src];hud=m;m_stat=1'>\[[health_r]\]</a><br>"
-					R = find_record("name", perpname, data_core.medical)
+					R = find_record("name", perpname, GLOB.data_core.medical)
 					if(R)
 						msg += "<a href='?src=\ref[src];hud=m;evaluation=1'>\[Medical evaluation\]</a><br>"

@@ -320,7 +317,7 @@
 					//|| !user.canmove || user.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at.
 						var/criminal = "None"

-						R = find_record("name", perpname, data_core.security)
+						R = find_record("name", perpname, GLOB.data_core.security)
 						if(R)
 							criminal = R.fields["criminal"]

@@ -1,54 +0,0 @@
-/mob/living/carbon/human/proc/examine_nutrition()
-	var/message = ""
-	var/nutrition_examine = round(nutrition)
-	var/t_He 	= "It" //capitalised for use at the start of each line.
-	var/t_His 	= "Its"
-	var/t_his 	= "its"
-	var/t_is 	= "is"
-	var/t_has 	= "has"
-	switch(gender)
-		if(MALE)
-			t_He 	= "He"
-			t_his 	= "his"
-			t_His 	= "His"
-		if(FEMALE)
-			t_He 	= "She"
-			t_his 	= "her"
-			t_His 	= "Her"
-		if(PLURAL)
-			t_He  	= "They"
-			t_his 	= "their"
-			t_His 	= "Their"
-			t_is	= "are"
-			t_has 	= "have"
-		if(NEUTER)
-			t_He 	= "It"
-			t_his 	= "its"
-			t_His	= "Its"
-	switch(nutrition_examine)
-		if(0 to 49)
-			message = "<span class='warning'>[t_He] [t_is] starving! You can hear [t_his] stomach snarling from across the room!</span>\n"
-		if(50 to 99)
-			message = "<span class='warning'>[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach.</span>\n"
-		if(100 to 499)
-			return message //Well that's pretty normal, really.
-		if(500 to 864) // Fat.
-			message = "[t_He] [t_has] a stuffed belly, bloated fat and round from eating too much.\n"
-		if(1200 to 1934) // One person fully digested.
-			message = "<span class='warning'>[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.</span>\n"
-		if(1935 to 3004) // Two people.
-			message = "<span class='warning'>[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft.</span>\n"
-		if(3005 to 4074) // Three people.
-			message = "<span class='warning'>[t_His] stomach is firmly packed with digesting slop. [t_He] must have eaten at least a few times worth their body weight! It looks hard for them to stand, and [t_his] gut jiggles when they move.</span>\n"
-		if(4075 to 10000) // Four or more people.
-			message = "<span class='warning'>[t_He] [t_is] so absolutely stuffed that you aren't sure how it's possible to move. [t_He] can't seem to swell any bigger. The surface of [t_his] belly looks sorely strained!</span>\n"
-	return message
-
-/mob/living/carbon/human/proc/examine_bellies()
-	var/message = ""
-
-	for (var/I in src.vore_organs)
-		var/datum/belly/B = vore_organs[I]
-		message += B.get_examine_msg()
-
-	return message
@@ -17,6 +17,9 @@
 		args[1] = FALSE
 		Initialize(arglist(args))

+/mob/living/carbon/human/dummy/Life()
+	return
+
 /mob/living/carbon/human/Initialize()
 	verbs += /mob/living/proc/mob_sleep
 	verbs += /mob/living/proc/lay_down
@@ -39,6 +42,8 @@

 	handcrafting = new()

+	grant_language(/datum/language/common) // ME TARZAN, YOU JANEBOT
+
 	..()

 /mob/living/carbon/human/create_internal_organs()
@@ -298,7 +303,7 @@
 			var/mob/living/carbon/human/H = usr
 			var/perpname = get_face_name(get_id_name(""))
 			if(istype(H.glasses, /obj/item/clothing/glasses/hud) || istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud))
-				var/datum/data/record/R = find_record("name", perpname, data_core.general)
+				var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.general)
 				if(href_list["photo_front"] || href_list["photo_side"])
 					if(R)
 						if(!H.canUseHUD())
@@ -388,7 +393,7 @@
 						if (!G.emagged)
 							if(H.wear_id)
 								var/list/access = H.wear_id.GetAccess()
-								if(access_sec_doors in access)
+								if(GLOB.access_sec_doors in access)
 									allowed_access = H.get_authentification_name()
 						else
 							allowed_access = "@%&ERROR_%$*"
@@ -399,7 +404,7 @@
 							return

 						if(perpname)
-							R = find_record("name", perpname, data_core.security)
+							R = find_record("name", perpname, GLOB.data_core.security)
 							if(R)
 								if(href_list["status"])
 									var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Discharged", "Cancel")
@@ -447,8 +452,8 @@
 														return
 													else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
 														return
-													var/crime = data_core.createCrimeEntry(t1, t2, allowed_access, worldtime2text())
-													data_core.addMinorCrime(R.fields["id"], crime)
+													var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, worldtime2text())
+													GLOB.data_core.addMinorCrime(R.fields["id"], crime)
 													to_chat(usr, "<span class='notice'>Successfully added a minor crime.</span>")
 													return
 										if("Major Crime")
@@ -462,8 +467,8 @@
 														return
 													else if (!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
 														return
-													var/crime = data_core.createCrimeEntry(t1, t2, allowed_access, worldtime2text())
-													data_core.addMajorCrime(R.fields["id"], crime)
+													var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, worldtime2text())
+													GLOB.data_core.addMajorCrime(R.fields["id"], crime)
 													to_chat(usr, "<span class='notice'>Successfully added a major crime.</span>")
 									return

@@ -494,7 +499,7 @@
 											var/counter = 1
 											while(R.fields[text("com_[]", counter)])
 												counter++
-											R.fields[text("com_[]", counter)] = text("Made by [] on [] [], []<BR>[]", allowed_access, worldtime2text(), time2text(world.realtime, "MMM DD"), year_integer+540, t1)
+											R.fields[text("com_[]", counter)] = text("Made by [] on [] [], []<BR>[]", allowed_access, worldtime2text(), time2text(world.realtime, "MMM DD"), GLOB.year_integer+540, t1)
 											to_chat(usr, "<span class='notice'>Successfully added comment.</span>")
 											return
 							to_chat(usr, "<span class='warning'>Unable to locate a data core entry for this person.</span>")
@@ -581,7 +586,7 @@

 	//Check for weapons
 	if(judgebot.weaponscheck)
-		if(!idcard || !(access_weapons in idcard.access))
+		if(!idcard || !(GLOB.access_weapons in idcard.access))
 			for(var/obj/item/I in held_items)
 				if(judgebot.check_for_weapons(I))
 					threatcount += 4
@@ -591,7 +596,7 @@
 	//Check for arrest warrant
 	if(judgebot.check_records)
 		var/perpname = get_face_name(get_id_name())
-		var/datum/data/record/R = find_record("name", perpname, data_core.security)
+		var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security)
 		if(R && R.fields["criminal"])
 			switch(R.fields["criminal"])
 				if("*Arrest*")
@@ -765,7 +770,7 @@
 		..()

 /mob/living/carbon/human/replace_records_name(oldname,newname) // Only humans have records right now, move this up if changed.
-	for(var/list/L in list(data_core.general,data_core.medical,data_core.security,data_core.locked))
+	for(var/list/L in list(GLOB.data_core.general,GLOB.data_core.medical,GLOB.data_core.security,GLOB.data_core.locked))
 		var/datum/data/record/R = find_record("name", oldname, L)
 		if(R)
 			R.fields["name"] = newname
@@ -855,7 +860,7 @@
 		if(7) // Pride
 			log_game("[src] was influenced by the sin of pride.")
 			O = new /datum/objective/sintouched/pride
-	ticker.mode.sintouched += src.mind
+	SSticker.mode.sintouched += src.mind
 	src.mind.objectives += O
 	src.mind.announce_objectives()

@@ -920,12 +925,15 @@
 		return
 	if(buckled)	//NO INFINITE STACKING!!
 		return
-	if(M.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE))
-		M.visible_message("<span class='boldwarning'>[M] can't hang onto [src]!</span>")
-		return
-	if(iscarbon(M) && (!riding_datum.equip_buckle_inhands(M, 2)))	//MAKE SURE THIS IS LAST!!
-		M.visible_message("<span class='boldwarning'>[M] can't climb onto [src] because [M.p_their()] hands are full!</span>")
+	if(M.stat != CONSCIOUS)
 		return
+	if(iscarbon(M))
+		if(M.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE))
+			M.visible_message("<span class='boldwarning'>[M] can't hang onto [src]!</span>")
+			return
+		if(!riding_datum.equip_buckle_inhands(M, 2))	//MAKE SURE THIS IS LAST!!
+			M.visible_message("<span class='boldwarning'>[M] can't climb onto [src] because [M.p_their()] hands are full!</span>")
+			return
 	. = ..(M, force, check_loc)
 	stop_pulling()

@@ -160,8 +160,8 @@
 	return ..()

 /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
-		vore_attack(user, pulling)
+	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (disabilities & FAT) && ismonkey(pulling))
+		devour_mob(pulling)
 	else
 		..()

@@ -302,13 +302,14 @@


 /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
-	if(..())
+	. = ..()
+	if(.)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		if(check_shields(damage, "the [M.name]", null, MELEE_ATTACK, M.armour_penetration))
-			return 0
+			return FALSE
 		var/dam_zone = dismembering_strike(M, pick("chest", "l_hand", "r_hand", "l_leg", "r_leg"))
 		if(!dam_zone) //Dismemberment successful
-			return 1
+			return TRUE
 		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
 		if(!affecting)
 			affecting = get_bodypart("chest")
@@ -1,7 +1,5 @@
-var/global/default_martial_art = new/datum/martial_art
 /mob/living/carbon/human
-	languages_spoken = HUMAN
-	languages_understood = HUMAN
+	initial_languages = list(/datum/language/common)
 	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD)
 	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
 	pressure_resistance = 25
@@ -43,6 +41,7 @@ var/global/default_martial_art = new/datum/martial_art
 	var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding

 	var/datum/martial_art/martial_art = null
+	var/static/default_martial_art = new/datum/martial_art

 	var/name_override //For temporary visible name changes

@@ -50,4 +49,4 @@ var/global/default_martial_art = new/datum/martial_art
 	var/datum/personal_crafting/handcrafting
 	can_buckle = TRUE
 	buckle_lying = FALSE
-	can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime)
+	can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot)
@@ -102,7 +102,7 @@
 				update_tint()
 			if(G.vision_correction)
 				clear_fullscreen("nearsighted")
-			if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view)
+			if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
 				update_sight()
 			update_inv_glasses()
 		if(slot_gloves)
@@ -141,13 +141,13 @@

 	return not_handled //For future deeper overrides

-/mob/living/carbon/human/doUnEquip(obj/item/I, force)
+/mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop)
 	. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
 	if(!. || !I)
 		return

 	if(I == wear_suit)
-		if(s_store)
+		if(s_store && invdrop)
 			dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit.
 		if(wear_suit.breakouttime) //when unequipping a straightjacket
 			update_action_buttons_icon() //certain action buttons may be usable again.
@@ -156,17 +156,18 @@
 			update_inv_w_uniform()
 		update_inv_wear_suit()
 	else if(I == w_uniform)
-		if(r_store)
-			dropItemToGround(r_store, TRUE) //Again, makes sense for pockets to drop.
-		if(l_store)
-			dropItemToGround(l_store, TRUE)
-		if(wear_id)
-			dropItemToGround(wear_id)
-		if(belt)
-			dropItemToGround(belt)
+		if(invdrop)
+			if(r_store)
+				dropItemToGround(r_store, TRUE) //Again, makes sense for pockets to drop.
+			if(l_store)
+				dropItemToGround(l_store, TRUE)
+			if(wear_id)
+				dropItemToGround(wear_id)
+			if(belt)
+				dropItemToGround(belt)
 		w_uniform = null
 		update_suit_sensors()
-		update_inv_w_uniform()
+		update_inv_w_uniform(invdrop)
 	else if(I == gloves)
 		gloves = null
 		update_inv_gloves()
@@ -180,7 +181,7 @@
 		if(G.vision_correction)
 			if(disabilities & NEARSIGHT)
 				overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
-		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view)
+		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
 			update_sight()
 		update_inv_glasses()
 	else if(I == ears)
@@ -57,8 +57,6 @@
 /mob/living/carbon/human/calculate_affecting_pressure(pressure)
 	if((wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE)) && (head && (head.flags & STOPSPRESSUREDMAGE)))
 		return ONE_ATMOSPHERE
-	if(ismob(loc))
-		return ONE_ATMOSPHERE //hopefully won't murderficate people in your guts by going for a spacewalk
 	else
 		return pressure

@@ -98,7 +96,7 @@
 	if(!dna.species.breathe(src))
 		..()
 #define HUMAN_MAX_OXYLOSS 3
-#define HUMAN_CRIT_MAX_OXYLOSS (SSmob.wait/30)
+#define HUMAN_CRIT_MAX_OXYLOSS (SSmobs.wait/30)
 /mob/living/carbon/human/check_breath(datum/gas_mixture/breath)

 	var/L = getorganslot("lungs")
@@ -141,8 +139,6 @@

 /mob/living/carbon/human/proc/get_thermal_protection()
 	var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
-	if(ismob(loc))
-		thermal_protection = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //because lazy and insulated by being inside someone
 	if(wear_suit)
 		if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT)
 			thermal_protection += (wear_suit.max_heat_protection_temperature*0.7)
@@ -252,9 +248,6 @@
 	if(dna.check_mutation(COLDRES))
 		return 1 //Fully protected from the cold.

-	if(ismob(loc))
-		return 1 //because lazy and being inside somemone insulates you from space
-
 	if(dna && (RESISTCOLD in dna.species.species_traits))
 		return 1

@@ -1,12 +1,10 @@
-/mob/living/carbon/human/say_quote(input, spans)
-	if(!input)
-		return "says, \"...\""	//not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
+/mob/living/carbon/human/say_quote(input, spans, message_mode)
 	verb_say = dna.species.say_mod
+	. = ..()
 	if(src.slurring)
 		input = attach_spans(input, spans)
 		return "slurs, \"[input]\""

-	return ..()

 /mob/living/carbon/human/treat_message(message)
 	message = dna.species.handle_speech(message,src)
@@ -75,7 +73,7 @@
 		if(!istype(dongle)) return 0
 		if(dongle.translate_binary) return 1

-/mob/living/carbon/human/radio(message, message_mode, list/spans)
+/mob/living/carbon/human/radio(message, message_mode, list/spans, language)
 	. = ..()
 	if(. != 0)
 		return .
@@ -83,17 +81,17 @@
 	switch(message_mode)
 		if(MODE_HEADSET)
 			if (ears)
-				ears.talk_into(src, message, , spans)
+				ears.talk_into(src, message, , spans, language)
 			return ITALICS | REDUCE_RANGE

 		if(MODE_DEPARTMENT)
 			if (ears)
-				ears.talk_into(src, message, message_mode, spans)
+				ears.talk_into(src, message, message_mode, spans, language)
 			return ITALICS | REDUCE_RANGE

-	if(message_mode in radiochannels)
+	if(message_mode in GLOB.radiochannels)
 		if(ears)
-			ears.talk_into(src, message, message_mode, spans)
+			ears.talk_into(src, message, message_mode, spans, language)
 			return ITALICS | REDUCE_RANGE

 	return 0
@@ -17,6 +17,10 @@
 	var/default_color = "#FFF"	// if alien colors are disabled, this is the color that will be used by that race

 	var/sexes = 1		// whether or not the race has sexual characteristics. at the moment this is only 0 for skeletons and shadows
+
+	var/face_y_offset = 0
+	var/hair_y_offset = 0
+
 	var/hair_color = null	// this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
 	var/hair_alpha = 255	// the alpha used by the hair. 255 is completely solid, 0 is transparent.
 	var/use_skintones = 0	// does it use skintones or not? (spoiler alert this is only used by humans)
@@ -69,8 +73,6 @@
 	var/fixed_mut_color3 = ""
 	var/whitelisted = 0 		//Is this species restricted to certain players?
 	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
-	var/lang_spoken = HUMAN
-	var/lang_understood = HUMAN

 	///////////
 	// PROCS //
@@ -90,21 +92,21 @@

 	var/randname
 	if(gender == MALE)
-		randname = pick(first_names_male)
+		randname = pick(GLOB.first_names_male)
 	else
-		randname = pick(first_names_female)
+		randname = pick(GLOB.first_names_female)

 	if(lastname)
 		randname += " [lastname]"
 	else
-		randname += " [pick(last_names)]"
+		randname += " [pick(GLOB.last_names)]"

 	return randname


 //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
 /datum/species/proc/qualifies_for_rank(rank, list/features)
-	if(rank in command_positions)
+	if(rank in GLOB.command_positions)
 		return 0
 	return 1

@@ -205,7 +207,7 @@
 			facialhair_hidden = TRUE

 	if(H.facial_hair_style && (FACEHAIR in species_traits) && (!facialhair_hidden || dynamic_fhair_suffix))
-		S = facial_hair_styles_list[H.facial_hair_style]
+		S = GLOB.facial_hair_styles_list[H.facial_hair_style]
 		if(S)

 			//List of all valid dynamic_fhair_suffixes
@@ -262,7 +264,7 @@
 				standing += image("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained", "layer" = -HAIR_LAYER)

 		else if(H.hair_style && (HAIR in species_traits))
-			S = hair_styles_list[H.hair_style]
+			S = GLOB.hair_styles_list[H.hair_style]
 			if(S)

 				//List of all valid dynamic_hair_suffixes
@@ -295,6 +297,7 @@
 					img_hair.color = forced_colour
 				img_hair.alpha = hair_alpha

+				img_hair.pixel_y += hair_y_offset
 				standing += img_hair

 	if(standing.len)
@@ -311,33 +314,36 @@


 	// eyes
-	var/has_eyes = (H.getorgan(/obj/item/organ/eyes) && HD)
+	var/has_eyes = TRUE

-	if(!has_eyes)
+	if(!H.getorgan(/obj/item/organ/eyes) && HD)
 		standing += image("icon"='icons/mob/human_face.dmi', "icon_state" = "eyes_missing", "layer" = -BODY_LAYER)
+		has_eyes = FALSE

-	if(!HUSK)
+	if(!(H.disabilities & HUSK))
 		// lipstick
 		if(H.lip_style && (LIPS in species_traits) && HD)
 			var/image/lips = image("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[H.lip_style]", "layer" = -BODY_LAYER)
 			lips.color = H.lip_color
+			lips.pixel_y += face_y_offset
 			standing	+= lips

 		// eyes
 		if((EYECOLOR in species_traits) && HD && has_eyes)
 			var/image/img_eyes = image("icon" = 'icons/mob/human_face.dmi', "icon_state" = "eyes", "layer" = -BODY_LAYER)
 			img_eyes.color = "#" + H.eye_color
+			img_eyes.pixel_y += face_y_offset
 			standing	+= img_eyes

 	//Underwear, Undershirts & Socks
 	/*This will be refactored at a later date
 	if(H.underwear)
-		var/datum/sprite_accessory/underwear/underwear = underwear_list[H.underwear]
+		var/datum/sprite_accessory/underwear/underwear = GLOB.underwear_list[H.underwear]
 		if(underwear)
 			standing	+= image("icon"=underwear.icon, "icon_state"="[underwear.icon_state]", "layer"=-BODY_LAYER)

 	if(H.undershirt)
-		var/datum/sprite_accessory/undershirt/undershirt = undershirt_list[H.undershirt]
+		var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[H.undershirt]
 		if(undershirt)
 			if(H.dna.species.sexes && H.gender == FEMALE)
 				standing	+=	wear_female_version("[undershirt.icon_state]", undershirt.icon, BODY_LAYER)
@@ -345,7 +351,7 @@
 				standing	+= image("icon"=undershirt.icon, "icon_state"="[undershirt.icon_state]", "layer"=-BODY_LAYER)

 	if(H.socks && H.get_num_legs() >= 2 && !(DIGITIGRADE in species_traits))
-		var/datum/sprite_accessory/socks/socks = socks_list[H.socks]
+		var/datum/sprite_accessory/socks/socks = GLOB.socks_list[H.socks]
 		if(socks)
 			standing	+= image("icon"=socks.icon, "icon_state"="[socks.icon_state]", "layer"=-BODY_LAYER)
 	*/
@@ -495,53 +501,53 @@
 			var/datum/sprite_accessory/S
 			switch(bodypart)
 				if("tail_lizard")
-					S = tails_list_lizard[H.dna.features["tail_lizard"]]
+					S = GLOB.tails_list_lizard[H.dna.features["tail_lizard"]]
 				if("waggingtail_lizard")
-					S.= animated_tails_list_lizard[H.dna.features["tail_lizard"]]
+					S.= GLOB.animated_tails_list_lizard[H.dna.features["tail_lizard"]]
 				if("tail_human")
-					S = tails_list_human[H.dna.features["tail_human"]]
+					S = GLOB.tails_list_human[H.dna.features["tail_human"]]
 				if("waggingtail_human")
-					S.= animated_tails_list_human[H.dna.features["tail_human"]]
+					S.= GLOB.animated_tails_list_human[H.dna.features["tail_human"]]
 				if("spines")
-					S = spines_list[H.dna.features["spines"]]
+					S = GLOB.spines_list[H.dna.features["spines"]]
 				if("waggingspines")
-					S.= animated_spines_list[H.dna.features["spines"]]
+					S.= GLOB.animated_spines_list[H.dna.features["spines"]]
 				if("snout")
-					S = snouts_list[H.dna.features["snout"]]
+					S = GLOB.snouts_list[H.dna.features["snout"]]
 				if("frills")
-					S = frills_list[H.dna.features["frills"]]
+					S = GLOB.frills_list[H.dna.features["frills"]]
 				if("horns")
-					S = horns_list[H.dna.features["horns"]]
+					S = GLOB.horns_list[H.dna.features["horns"]]
 				if("ears")
-					S = ears_list[H.dna.features["ears"]]
+					S = GLOB.ears_list[H.dna.features["ears"]]
 				if("body_markings")
-					S = body_markings_list[H.dna.features["body_markings"]]
+					S = GLOB.body_markings_list[H.dna.features["body_markings"]]
 				if("wings")
-					S = wings_list[H.dna.features["wings"]]
+					S = GLOB.wings_list[H.dna.features["wings"]]
 				if("wingsopen")
-					S = wings_open_list[H.dna.features["wings"]]
+					S = GLOB.wings_open_list[H.dna.features["wings"]]
 				if("legs")
-					S = legs_list[H.dna.features["legs"]]
+					S = GLOB.legs_list[H.dna.features["legs"]]

 				//Mammal Bodyparts (Canid/Felid, others maybe in the future)
 				if("mam_tail")
-					S = mam_tails_list[H.dna.features["mam_tail"]]
+					S = GLOB.mam_tails_list[H.dna.features["mam_tail"]]
 				if("mam_waggingtail")
-					S.= mam_tails_animated_list[H.dna.features["mam_tail"]]
+					S.= GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]]
 				if("mam_body_markings")
-					S = mam_body_markings_list[H.dna.features["mam_body_markings"]]
+					S = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
 				if("mam_ears")
-					S = mam_ears_list[H.dna.features["mam_ears"]]
+					S = GLOB.mam_ears_list[H.dna.features["mam_ears"]]
 				if("taur")
-					S = taur_list[H.dna.features["taur"]]
+					S = GLOB.taur_list[H.dna.features["taur"]]

 				//Xeno Bodyparts
 				if("xenodorsal")
-					S = xeno_dorsal_list[H.dna.features["xenodorsal"]]
+					S = GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]]
 				if("xenohead")
-					S = xeno_head_list[H.dna.features["xenohead"]]
+					S = GLOB.xeno_head_list[H.dna.features["xenohead"]]
 				if("xenotail")
-					S = xeno_tail_list[H.dna.features["xenotail"]]
+					S = GLOB.xeno_tail_list[H.dna.features["xenotail"]]

 				//Slimecoon Bodyparts
 			/*	if("slimecoontail")
@@ -1035,6 +1041,8 @@
 	return 1

 /datum/species/proc/go_bald(mob/living/carbon/human/H)
+	if(QDELETED(H))	//may be called from a timer
+		return
 	H.facial_hair_style = "Shaved"
 	H.hair_style = "Bald"
 	H.update_hair()
@@ -1198,9 +1206,9 @@
 			target.visible_message("<span class='danger'>[user] has weakened [target]!</span>", \
 							"<span class='userdanger'>[user] has weakened [target]!</span>")
 			target.apply_effect(4, WEAKEN, armor_block)
-			target.forcesay(hit_appends)
+			target.forcesay(GLOB.hit_appends)
 		else if(target.lying)
-			target.forcesay(hit_appends)
+			target.forcesay(GLOB.hit_appends)



@@ -1223,7 +1231,6 @@
 		return 1
 	else
 		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
-		add_logs(user, target, "disarmed")

 		if(target.w_uniform)
 			target.w_uniform.add_fingerprint(user)
@@ -1234,24 +1241,26 @@
 			target.visible_message("<span class='danger'>[user] has pushed [target]!</span>",
 				"<span class='userdanger'>[user] has pushed [target]!</span>", null, COMBAT_MESSAGE_RANGE)
 			target.apply_effect(2, WEAKEN, target.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!"))
-			target.forcesay(hit_appends)
+			target.forcesay(GLOB.hit_appends)
+			add_logs(user, target, "disarmed", " pushing them to the ground")
+
 			return

-		var/talked = 0	// BubbleWrap
-
 		if(randn <= 60)
-			//BubbleWrap: Disarming breaks a pull
+			var/obj/item/I = null
 			if(target.pulling)
 				to_chat(target, "<span class='warning'>[user] has broken [target]'s grip on [target.pulling]!</span>")
-				talked = 1
 				target.stop_pulling()
-			//End BubbleWrap

-			if(!talked)	//BubbleWrap
+			else
+				I = target.get_active_held_item()
 				if(target.drop_item())
 					target.visible_message("<span class='danger'>[user] has disarmed [target]!</span>", \
 						"<span class='userdanger'>[user] has disarmed [target]!</span>", null, COMBAT_MESSAGE_RANGE)
+				else
+					I = null
 			playsound(target, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+			add_logs(user, target, "disarmed", "[I ? " removing \the [I]" : ""]")
 			return


@@ -1347,7 +1356,7 @@
 						H.adjust_blurriness(10)

 					if(prob(I.force + ((100 - H.health)/2)) && H != user)
-						ticker.mode.remove_revolutionary(H.mind)
+						SSticker.mode.remove_revolutionary(H.mind)

 				if(bloody)	//Apply blood
 					if(H.wear_mask)
@@ -1376,7 +1385,7 @@
 						H.update_inv_w_uniform()

 		if(Iforce > 10 || Iforce >= 5 && prob(33))
-			H.forcesay(hit_appends)	//forcesay checks stat already.
+			H.forcesay(GLOB.hit_appends)	//forcesay checks stat already.
 	return TRUE

 /datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H)
@@ -1480,7 +1489,7 @@
 					H.apply_damage(HEAT_DAMAGE_LEVEL_3*heatmod, BURN)
 				else
 					H.apply_damage(HEAT_DAMAGE_LEVEL_2*heatmod, BURN)
-	else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !(mutations_list[COLDRES] in H.dna.mutations))
+	else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !(GLOB.mutations_list[COLDRES] in H.dna.mutations))
 		switch(H.bodytemperature)
 			if(200 to 260)
 				H.throw_alert("temp", /obj/screen/alert/cold, 1)
@@ -14,6 +14,8 @@ datum/species/mammal
 	if(H)
 		H.endTailWag()

+/datum/species/mammal/qualifies_for_rank(rank, list/features)
+	return TRUE

 //AVIAN//
 /datum/species/avian
@@ -32,6 +34,9 @@ datum/species/mammal
 	if(H)
 		H.endTailWag()

+/datum/species/avian/qualifies_for_rank(rank, list/features)
+	return TRUE
+
 //AQUATIC//
 /datum/species/aquatic
 	name = "Aquatic"
@@ -48,6 +53,10 @@ datum/species/mammal
 /datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
 		H.endTailWag()
+
+/datum/species/aquatic/qualifies_for_rank(rank, list/features)
+	return TRUE
+
 //INSECT//
 /datum/species/insect
 	name = "Insect"
@@ -65,6 +74,8 @@ datum/species/mammal
 	if(H)
 		H.endTailWag()

+/datum/species/insect/qualifies_for_rank(rank, list/features)
+	return TRUE
 //HERBIVOROUS//

 //EXOTIC//
@@ -1,7 +1,7 @@
 /datum/species/golem
 	// Animated beings of stone. They have increased defenses, and do not need to breathe. They're also slow as fuuuck.
 	name = "Golem"
-	id = "iron"
+	id = "iron golem"
 	species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOFIRE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER,MUTCOLORS)
 	speedmod = 2
 	armor = 55
@@ -12,6 +12,7 @@
 	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
 	nojumpsuit = 1
 	sexes = 1
+	damage_overlay_type = ""
 	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
 	// To prevent golem subtypes from overwhelming the odds when random species
 	// changes, only the Random Golem type can be chosen
@@ -21,6 +22,21 @@
 	fixed_mut_color = "aaa"
 	var/info_text = "As an <span class='danger'>Iron Golem</span>, you don't have any special traits."

+	var/prefix = "Iron"
+	var/list/special_names
+
+/datum/species/golem/random_name(gender,unique,lastname)
+	var/golem_surname = pick(GLOB.golem_names)
+	// 3% chance that our golem has a human surname, because
+	// cultural contamination
+	if(prob(3))
+		golem_surname = pick(GLOB.last_names)
+	else if(special_names && prob(5))
+		golem_surname = pick(special_names)
+
+	var/golem_name = "[prefix] [golem_surname]"
+	return golem_name
+
 /datum/species/golem/random
 	name = "Random Golem"
 	blacklisted = FALSE
@@ -36,21 +52,24 @@

 /datum/species/golem/adamantine
 	name = "Adamantine Golem"
-	id = "adamantine"
+	id = "adamantine golem"
 	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
 	fixed_mut_color = "4ed"
 	info_text = "As an <span class='danger'>Adamantine Golem</span>, you don't have any special traits."
+	prefix = "Adamantine"

 //Explodes on death
 /datum/species/golem/plasma
 	name = "Plasma Golem"
-	id = "plasma"
+	id = "plasma golem"
 	fixed_mut_color = "a3d"
 	meat = /obj/item/weapon/ore/plasma
 	//Can burn and takes damage from heat
 	species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER,MUTCOLORS)
 	info_text = "As a <span class='danger'>Plasma Golem</span>, you explode on death!"
 	burnmod = 1.5
+	prefix = "Plasma"
+	special_names = list("Flood","Fire","Bar","Man")

 /datum/species/golem/plasma/spec_death(gibbed, mob/living/carbon/human/H)
 	explosion(get_turf(H),0,1,2,flame_range = 5)
@@ -60,35 +79,40 @@
 //Harder to hurt
 /datum/species/golem/diamond
 	name = "Diamond Golem"
-	id = "diamond"
+	id = "diamond golem"
 	fixed_mut_color = "0ff"
 	armor = 70 //up from 55
 	meat = /obj/item/weapon/ore/diamond
 	info_text = "As a <span class='danger'>Diamond Golem</span>, you are more resistant than the average golem."
+	prefix = "Diamond"
+	special_names = list("Back")

 //Faster but softer and less armoured
 /datum/species/golem/gold
 	name = "Gold Golem"
-	id = "gold"
+	id = "gold golem"
 	fixed_mut_color = "cc0"
 	speedmod = 1
 	armor = 25 //down from 55
 	meat = /obj/item/weapon/ore/gold
 	info_text = "As a <span class='danger'>Gold Golem</span>, you are faster but less resistant than the average golem."
+	prefix = "Golden"

 //Heavier, thus higher chance of stunning when punching
 /datum/species/golem/silver
 	name = "Silver Golem"
-	id = "silver"
+	id = "silver golem"
 	fixed_mut_color = "ddd"
 	punchstunthreshold = 9 //60% chance, from 40%
 	meat = /obj/item/weapon/ore/silver
 	info_text = "As a <span class='danger'>Silver Golem</span>, your attacks are heavier and have a higher chance of stunning."
+	prefix = "Silver"
+	special_names = list("Surfer", "Chariot", "Lining")

 //Harder to stun, deals more damage, but it's even slower
 /datum/species/golem/plasteel
 	name = "Plasteel Golem"
-	id = "plasteel"
+	id = "plasteel golem"
 	fixed_mut_color = "bbb"
 	stunmod = 0.40
 	punchdamagelow = 12
@@ -99,15 +123,17 @@
 	info_text = "As a <span class='danger'>Plasteel Golem</span>, you are slower, but harder to stun, and hit very hard when punching."
 	attack_verb = "smash"
 	attack_sound = 'sound/effects/meteorimpact.ogg' //hits pretty hard
+	prefix = "Plasteel"

 //Immune to ash storms
 /datum/species/golem/titanium
 	name = "Titanium Golem"
-	id = "titanium"
+	id = "titanium golem"
 	fixed_mut_color = "fff"
 	meat = /obj/item/weapon/ore/titanium
 	info_text = "As a <span class='danger'>Titanium Golem</span>, you are immune to ash storms, and slightly more resistant to burn damage."
 	burnmod = 0.9
+	prefix = "Titanium"

 /datum/species/golem/titanium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -120,11 +146,12 @@
 //Immune to ash storms and lava
 /datum/species/golem/plastitanium
 	name = "Plastitanium Golem"
-	id = "plastitanium"
+	id = "plastitanium golem"
 	fixed_mut_color = "888"
 	meat = /obj/item/weapon/ore/titanium
 	info_text = "As a <span class='danger'>Plastitanium Golem</span>, you are immune to both ash storms and lava, and slightly more resistant to burn damage."
 	burnmod = 0.8
+	prefix = "Plastitanium"

 /datum/species/golem/plastitanium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -139,12 +166,14 @@
 //Fast and regenerates... but can only speak like an abductor
 /datum/species/golem/alloy
 	name = "Alien Alloy Golem"
-	id = "alloy"
+	id = "alloy golem"
 	fixed_mut_color = "333"
 	meat = /obj/item/stack/sheet/mineral/abductor
 	mutant_organs = list(/obj/item/organ/tongue/abductor) //abductor tongue
 	speedmod = 1 //faster
 	info_text = "As an <span class='danger'>Alloy Golem</span>, you are made of advanced alien materials: you are faster and regenerate over time. You are, however, only able to be heard by other alloy golems."
+	prefix = "Alien"
+	special_names = list("Outsider", "Technology", "Watcher", "Stranger") //ominous and unknown

 //Regenerates because self-repairing super-advanced alien tech
 /datum/species/golem/alloy/spec_life(mob/living/carbon/human/H)
@@ -157,7 +186,7 @@
 //Since this will usually be created from a collaboration between podpeople and free golems, wood golems are a mix between the two races
 /datum/species/golem/wood
 	name = "Wood Golem"
-	id = "wood"
+	id = "wood golem"
 	fixed_mut_color = "49311c"
 	meat = /obj/item/stack/sheet/mineral/wood
 	//Can burn and take damage from heat
@@ -166,6 +195,13 @@
 	burnmod = 1.25
 	heatmod = 1.5
 	info_text = "As a <span class='danger'>Wooden Golem</span>, you have plant-like traits: you take damage from extreme temperatures, can be set on fire, and have lower armor than a normal golem. You regenerate when in the light and wither in the darkness."
+	prefix = "Wooden"
+
+/datum/species/golem/wood/random_name(gender,unique,lastname)
+	var/plant_name = pick("Tomato", "Potato", "Broccoli", "Carrot", "Ambrosia", "Pumpkin", "Ivy", "Kudzu", "Banana", "Moss", "Flower", "Bloom", "Root", "Bark", "Glowshroom", "Petal", "Leaf", \
+	"Venus", "Sprout","Cocoa", "Strawberry", "Citrus", "Oak", "Cactus", "Pepper", "Juniper")
+	var/golem_name = "[prefix] [plant_name]"
+	return golem_name

 /datum/species/golem/wood/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -204,13 +240,14 @@
 //Radioactive
 /datum/species/golem/uranium
 	name = "Uranium Golem"
-	id = "uranium"
+	id = "uranium golem"
 	fixed_mut_color = "7f0"
 	meat = /obj/item/weapon/ore/uranium
 	info_text = "As an <span class='danger'>Uranium Golem</span>, you emit radiation pulses every once in a while. It won't harm fellow golems, but organic lifeforms will be affected."

 	var/last_event = 0
 	var/active = null
+	prefix = "Uranium"

 /datum/species/golem/uranium/spec_life(mob/living/carbon/human/H)
 	if(!active)
@@ -224,7 +261,7 @@
 //Immune to physical bullets and resistant to brute, but very vulnerable to burn damage. Dusts on death.
 /datum/species/golem/sand
 	name = "Sand Golem"
-	id = "sand"
+	id = "sand golem"
 	fixed_mut_color = "ffdc8f"
 	meat = /obj/item/weapon/ore/glass //this is sand
 	armor = 0
@@ -232,6 +269,7 @@
 	brutemod = 0.25
 	info_text = "As a <span class='danger'>Sand Golem</span>, you are immune to physical bullets and take very little brute damage, but are extremely vulnerable to burn damage. You will also turn to sand when dying, preventing any form of recovery."
 	attack_sound = 'sound/effects/shovel_dig.ogg'
+	prefix = "Sand"

 /datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H)
 	H.visible_message("<span class='danger'>[H] turns into a pile of sand!</span>")
@@ -253,7 +291,7 @@
 //Reflects lasers and resistant to burn damage, but very vulnerable to brute damage. Shatters on death.
 /datum/species/golem/glass
 	name = "Glass Golem"
-	id = "glass"
+	id = "glass golem"
 	fixed_mut_color = "5a96b4aa" //transparent body
 	meat = /obj/item/weapon/shard
 	armor = 0
@@ -261,6 +299,7 @@
 	burnmod = 0.25
 	info_text = "As a <span class='danger'>Glass Golem</span>, you reflect lasers and energy weapons, and are very resistant to burn damage, but you are extremely vulnerable to brute damage. On death, you'll shatter beyond any hope of recovery."
 	attack_sound = 'sound/effects/Glassbr2.ogg'
+	prefix = "Glass"

 /datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H)
 	playsound(H, "shatter", 70, 1)
@@ -295,12 +334,14 @@
 //Teleports when hit or when it wants to
 /datum/species/golem/bluespace
 	name = "Bluespace Golem"
-	id = "bluespace"
+	id = "bluespace golem"
 	fixed_mut_color = "33f"
 	meat = /obj/item/weapon/ore/bluespace_crystal
 	info_text = "As a <span class='danger'>Bluespace Golem</span>, are spatially unstable: you will teleport when hit, and you can teleport manually at a long distance."
 	attack_verb = "bluespace punch"
 	attack_sound = 'sound/effects/phasein.ogg'
+	prefix = "Bluespace"
+	special_names = list("Crystal", "Polycrystal")

 	var/datum/action/innate/unstable_teleport/unstable_teleport
 	var/teleport_cooldown = 100
@@ -384,7 +425,7 @@
 //honk
 /datum/species/golem/bananium
 	name = "Bananium Golem"
-	id = "bananium"
+	id = "bananium golem"
 	fixed_mut_color = "ff0"
 	say_mod = "honks"
 	punchdamagelow = 0
@@ -394,6 +435,7 @@
 	info_text = "As a <span class='danger'>Bananium Golem</span>, you are made for pranking. Your body emits natural honks, and you cannot hurt people when punching them. Your skin also emits bananas when damaged."
 	attack_verb = "honk"
 	attack_sound = 'sound/items/AirHorn2.ogg'
+	prefix = "Bananium"

 	var/last_honk = 0
 	var/honkooldown = 0
@@ -401,6 +443,11 @@
 	var/banana_cooldown = 100
 	var/active = null

+/datum/species/golem/bananium/random_name(gender,unique,lastname)
+	var/clown_name = pick(GLOB.clown_names)
+	var/golem_name = "[uppertext(clown_name)]"
+	return golem_name
+
 /datum/species/golem/bananium/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style = M.martial_art)
 	..()
 	if(world.time > last_banana + banana_cooldown && M != H &&  M.a_intent != INTENT_HELP)
@@ -449,7 +496,7 @@

 /datum/species/golem/runic
 	name = "Runic Golem"
-	id = "runic"
+	id = "runic golem"
 	limbs_id = "cultgolem"
 	sexes = FALSE
 	info_text = "As a <span class='danger'>Runic Golem</span>, you possess eldritch powers granted by the Elder God Nar'Sie."
@@ -459,6 +506,12 @@
 	var/obj/effect/proc_holder/spell/targeted/abyssal_gaze/abyssal_gaze
 	var/obj/effect/proc_holder/spell/targeted/dominate/dominate

+/datum/species/golem/runic/random_name(gender,unique,lastname)
+	var/edgy_first_name = pick("Razor","Blood","Dark","Evil","Cold","Pale","Black","Silent","Chaos","Deadly")
+	var/edgy_last_name = pick("Edge","Night","Death","Razor","Blade","Steel","Calamity","Twilight","Shadow","Nightmare") //dammit Razor Razor
+	var/golem_name = "[edgy_first_name] [edgy_last_name]"
+	return golem_name
+
 /datum/species/golem/runic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
 	C.faction |= "cult"
@@ -489,3 +542,100 @@
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)

+/datum/species/golem/cloth
+	name = "Cloth Golem"
+	id = "cloth golem"
+	limbs_id = "clothgolem"
+	sexes = FALSE
+	info_text = "As a <span class='danger'>Cloth Golem</span>, you are able to reform yourself after death, provided your remains aren't burned or destroyed. You are, of course, very flammable."
+	species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER) //no mutcolors, and can burn
+	armor = 15 //feels no pain, but not too resistant
+	burnmod = 2 // don't get burned
+	speedmod = 1 // not as heavy as stone
+	punchdamagelow = 4
+	punchstunthreshold = 7
+	punchdamagehigh = 8 // not as heavy as stone
+	prefix = "Cloth"
+
+/datum/species/golem/cloth/random_name(gender,unique,lastname)
+	var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \
+	"Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh
+	var/golem_name = "[pharaoh_name] \Roman[rand(1,99)]"
+	return golem_name
+
+/datum/species/golem/cloth/spec_life(mob/living/carbon/human/H)
+	if(H.fire_stacks < 1)
+		H.adjust_fire_stacks(1) //always prone to burning
+	..()
+
+/datum/species/golem/cloth/spec_death(gibbed, mob/living/carbon/human/H)
+	if(gibbed)
+		return
+	if(H.on_fire)
+		H.visible_message("<span class='danger'>[H] burns into ash!</span>")
+		H.dust(just_ash = TRUE)
+		return
+
+	H.visible_message("<span class='danger'>[H] falls apart into a pile of bandages!</span>")
+	new /obj/structure/cloth_pile(get_turf(H), H)
+	..()
+
+/obj/structure/cloth_pile
+	name = "pile of bandages"
+	desc = "It emits a strange aura, as if there was still life within it..."
+	obj_integrity = 50
+	max_integrity = 50
+	armor = list(melee = 90, bullet = 90, laser = 25, energy = 80, bomb = 50, bio = 100, fire = -50, acid = -50)
+	icon = 'icons/obj/items.dmi'
+	icon_state = "pile_bandages"
+	resistance_flags = FLAMMABLE
+
+	var/revive_time = 900
+	var/mob/living/carbon/human/cloth_golem
+
+/obj/structure/cloth_pile/Initialize(mapload, mob/living/carbon/human/H)
+	if(!QDELETED(H) && is_species(H, /datum/species/golem/cloth))
+		H.unequip_everything()
+		H.forceMove(src)
+		cloth_golem = H
+		to_chat(cloth_golem, "<span class='notice'>You start gathering your life energy, preparing to rise again...</span>")
+		addtimer(CALLBACK(src, .proc/revive), revive_time)
+	else
+		qdel(src)
+
+/obj/structure/cloth_pile/Destroy()
+	if(cloth_golem)
+		QDEL_NULL(cloth_golem)
+	return ..()
+
+/obj/structure/cloth_pile/burn()
+	visible_message("<span class='danger'>[src] burns into ash!</span>")
+	new /obj/effect/decal/cleanable/ash(get_turf(src))
+	..()
+
+/obj/structure/cloth_pile/proc/revive()
+	if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime
+		return
+	if(cloth_golem.suiciding || cloth_golem.disabilities & NOCLONE)
+		QDEL_NULL(cloth_golem)
+		return
+
+	invisibility = INVISIBILITY_MAXIMUM //disappear before the animation
+	new /obj/effect/overlay/temp/mummy_animation(get_turf(src))
+	if(cloth_golem.revive(full_heal = TRUE, admin_revive = TRUE))
+		cloth_golem.grab_ghost() //won't pull if it's a suicide
+	sleep(20)
+	cloth_golem.forceMove(get_turf(src))
+	cloth_golem.visible_message("<span class='danger'>[src] rises and reforms into [cloth_golem]!</span>","<span class='userdanger'>You reform into yourself!</span>")
+	cloth_golem = null
+	qdel(src)
+
+/obj/structure/cloth_pile/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params)
+	. = ..()
+
+	if(resistance_flags & ON_FIRE)
+		return
+
+	if(P.is_hot())
+		visible_message("<span class='danger'>[src] bursts into flames!</span>")
+		fire_act()
@@ -10,9 +10,7 @@


 /datum/species/human/qualifies_for_rank(rank, list/features)
-	if((!features["tail_human"] || features["tail_human"] == "None") && (!features["ears"] || features["ears"] == "None"))
-		return TRUE	//Pure humans are always allowed in all roles.
-	return ..()
+	return TRUE

 //Curiosity killed the cat's wagging tail.
 /datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
@@ -7,6 +7,7 @@
 	species_traits = list(MUTCOLORS,EYECOLOR,NOBLOOD,VIRUSIMMUNE,TOXINLOVER)
 	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	exotic_blood = "slimejelly"
+	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs

 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
@@ -226,7 +227,7 @@
 	else
 		ui_interact(owner)

-/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = conscious_state)
+/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.conscious_state)

 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
@@ -7,6 +7,8 @@
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR)
 	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur")
 	mutant_organs = list(/obj/item/organ/tongue/lizard)
+	coldmod = 1.5
+	heatmod = 0.67
 	default_features = list("mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "taur" = "None")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
@@ -26,6 +28,9 @@

 	return randname

+/datum/species/lizard/qualifies_for_rank(rank, list/features)
+	return TRUE
+
 //I wag in death
 /datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
@@ -38,4 +43,4 @@
 	name = "Ash Walker"
 	id = "ashlizard"
 	limbs_id = "lizard"
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,NOBREATH,NOGUNS,DIGITIGRADE)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,NOBREATH,NOGUNS,DIGITIGRADE)
@@ -1,5 +1,3 @@
-var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_state"="plasmaman")
-
 /datum/species/plasmaman
 	name = "Plasmaman"
 	id = "plasmaman"
@@ -52,7 +50,7 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
 	return 0

 /datum/species/plasmaman/qualifies_for_rank(rank, list/features)
-	if(rank in security_positions)
+	if(rank in GLOB.security_positions)
 		return 0
 	if(rank == "Clown" || rank == "Mime")//No funny bussiness
 		return 0
@@ -99,7 +99,7 @@ There are several things that need to be remembered:
 /* --------------------------------------- */
 //vvvvvv UPDATE_INV PROCS vvvvvv

-/mob/living/carbon/human/update_inv_w_uniform()
+/mob/living/carbon/human/update_inv_w_uniform(invdrop = TRUE)
 	remove_overlay(UNIFORM_LAYER)

 	if(client && hud_used)
@@ -138,7 +138,7 @@ There are several things that need to be remembered:

 		overlays_standing[UNIFORM_LAYER]	= standing

-	else if(!(dna && dna.species.nojumpsuit))
+	else if(!(dna && dna.species.nojumpsuit) && invdrop)
 		// Automatically drop anything in store / id / belt if you're not wearing a uniform.	//CHECK IF NECESARRY
 		for(var/obj/item/thing in list(r_store, l_store, wear_id, belt))						//
 			dropItemToGround(thing)
@@ -274,7 +274,7 @@ There are several things that need to be remembered:
 				client.screen += shoes					//add it to client's screen
 		update_observer_view(shoes,1)
 		var/image/standing = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/feet.dmi')
-		overlays_standing[SHOES_LAYER] = standing
+		overlays_standing[SHOES_LAYER]	= standing

 	apply_overlay(SHOES_LAYER)

@@ -392,10 +392,10 @@ There are several things that need to be remembered:

 /proc/wear_female_version(t_color, icon, layer, type)
 	var/index = t_color
-	var/icon/female_clothing_icon = female_clothing_icons[index]
+	var/icon/female_clothing_icon = GLOB.female_clothing_icons[index]
 	if(!female_clothing_icon) 	//Create standing/laying icons if they don't exist
 		generate_female_clothing(index,t_color,icon,type)
-	var/standing	= image("icon"=female_clothing_icons["[t_color]"], "layer"=-layer)
+	var/standing	= image("icon"=GLOB.female_clothing_icons["[t_color]"], "layer"=-layer)
 	return(standing)

 /mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers)
@@ -1,10 +1,15 @@
-/mob/living/carbon/human/whisper(message as text)
+/mob/living/carbon/human/whisper_verb(message as text)
+	whisper(message)
+
+/mob/living/carbon/human/whisper(message, datum/language/language=null)
 	if(!IsVocal())
 		return
 	if(!message)
 		return
+	if(!language)
+		language = get_default_language()

-	if(say_disabled)	//This is here to try to identify lag problems
+	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return

@@ -44,9 +49,11 @@
 		message = Ellipsis(message, 10, 1)

 	message = treat_message(message)
+	if(!message)
+		return

 	var/list/listening_dead = list()
-	for(var/mob/M in player_list)
+	for(var/mob/M in GLOB.player_list)
 		if(M.stat == DEAD && M.client && ((M.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) || (get_dist(M, src) <= 7)))
 			listening_dead |= M

@@ -71,14 +78,14 @@
 	for(var/atom/movable/AM in listening)
 		if(istype(AM,/obj/item/device/radio))
 			continue
-		AM.Hear(rendered, src, languages_spoken, message, , spans)
+		AM.Hear(rendered, src, language, message, , spans)

 	message = stars(message)
 	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[attach_spans(message, spans)]\"</span></span>"
 	for(var/atom/movable/AM in eavesdropping)
 		if(istype(AM,/obj/item/device/radio))
 			continue
-		AM.Hear(rendered, src, languages_spoken, message, , spans)
+		AM.Hear(rendered, src, language, message, , spans)

 	if(critical) //Dying words.
 		succumb(1)
@@ -29,7 +29,7 @@

 //Start of a breath chain, calls breathe()
 /mob/living/carbon/handle_breathing()
-	if(SSmob.times_fired%4==2 || failed_last_breath)
+	if(SSmobs.times_fired%4==2 || failed_last_breath)
 		breathe() //Breathe per 4 ticks, unless suffocating
 	else
 		if(istype(loc, /obj/))
@@ -47,8 +47,6 @@
 	if(loc)
 		environment = loc.return_air()

-	if(ismob(loc))	return
-
 	var/datum/gas_mixture/breath

 	if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube")))
@@ -132,7 +130,7 @@
 		if(prob(20))
 			emote("gasp")
 		if(O2_partialpressure > 0)
-			var/ratio = safe_oxy_min/O2_partialpressure
+			var/ratio = 1 - O2_partialpressure/safe_oxy_min
 			adjustOxyLoss(min(5*ratio, 3))
 			failed_last_breath = 1
 			oxygen_used = breath_gases["o2"][MOLES]*ratio
@@ -255,7 +253,7 @@
 						dna.previous.Remove("blood_type")
 					dna.temporary_mutations.Remove(mut)
 					continue
-				HM = mutations_list[mut]
+				HM = GLOB.mutations_list[mut]
 				HM.force_lose(src)
 				dna.temporary_mutations.Remove(mut)

@@ -294,7 +292,7 @@
 				stomach_contents.Remove(M)
 				qdel(M)
 				continue
-			if(SSmob.times_fired%3==1)
+			if(SSmobs.times_fired%3==1)
 				if(!(M.status_flags & GODMODE))
 					M.adjustBruteLoss(5)
 				nutrition += 10
@@ -16,6 +16,8 @@
 	var/pickpocketing = FALSE
 	var/disposing_body = FALSE
 	var/obj/machinery/disposal/bodyDisposal = null
+	var/next_battle_screech = 0
+	var/battle_screech_cooldown = 50

 /mob/living/carbon/monkey/proc/IsStandingStill()
 	return resisting || pickpocketing || disposing_body
@@ -59,6 +61,12 @@
 		return 1
 	return 0

+/mob/living/carbon/monkey/proc/battle_screech()
+	if(next_battle_screech < world.time)
+		emote(pick("roar","screech"))
+		for(var/mob/living/carbon/monkey/M in view(7,src))
+			M.next_battle_screech = world.time + battle_screech_cooldown
+
 /mob/living/carbon/monkey/proc/equip_item(var/obj/item/I)

 	if(I.loc == src)
@@ -197,7 +205,7 @@
 			for(var/mob/living/L in around)
 				if( should_target(L) )
 					if(L.stat == CONSCIOUS)
-						emote(pick("roar","screech"))
+						battle_screech()
 						retaliate(L)
 						return TRUE
 					else if(bodyDisposal)
@@ -241,7 +249,7 @@
 			var/list/around = view(src, MONKEY_ENEMY_VISION)
 			for(var/mob/living/carbon/monkey/M in around)
 				if(M.mode == MONKEY_IDLE && prob(MONKEY_RECRUIT_PROB))
-					M.emote(pick("roar","screech"))
+					M.battle_screech()
 					M.target = target
 					M.mode = MONKEY_HUNT

@@ -406,7 +414,7 @@
 	enemies[L] += MONKEY_HATRED_AMOUNT

 	if(a_intent != INTENT_HARM)
-		emote(pick("roar","screech"))
+		battle_screech()
 		a_intent = INTENT_HARM

 /mob/living/carbon/monkey/attack_hand(mob/living/L)
@@ -16,7 +16,7 @@
 			if(stat == CONSCIOUS)
 				if(!handle_combat())
 					if(prob(33) && canmove && isturf(loc) && !pulledby)
-						step(src, pick(cardinal))
+						step(src, pick(GLOB.cardinal))
 					if(prob(1))
 						emote(pick("scratch","jump","roll","tail"))
 			else
@@ -2,18 +2,16 @@
 	name = "monkey"
 	voice_name = "monkey"
 	verb_say = "chimpers"
+	initial_languages = list(/datum/language/monkey)
 	icon = 'icons/mob/monkey.dmi'
 	icon_state = ""
 	gender = NEUTER
 	pass_flags = PASSTABLE
-	languages_spoken = MONKEY
-	languages_understood = MONKEY
 	ventcrawler = VENTCRAWLER_NUDE
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
 	type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
 	gib_type = /obj/effect/decal/cleanable/blood/gibs
 	unique_name = 1
-	devourable = 1
 	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
 					 /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)

@@ -160,4 +158,4 @@
 	if(prob(10))
 		var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
 		equip_to_slot_or_del(helmet,slot_head)
-		helmet.attack_self(src) // todo encapsulate toggle
+		helmet.attack_self(src) // todo encapsulate toggle
@@ -117,26 +117,33 @@
 				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
 						"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+
 		if (M.a_intent == INTENT_DISARM)
+			var/obj/item/I = null
 			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 			if(prob(95))
 				Weaken(10)
 				visible_message("<span class='danger'>[M] has tackled down [name]!</span>", \
 						"<span class='userdanger'>[M] has tackled down [name]!</span>", null, COMBAT_MESSAGE_RANGE)
 			else
+				I = get_active_held_item()
 				if(drop_item())
 					visible_message("<span class='danger'>[M] has disarmed [name]!</span>", \
 							"<span class='userdanger'>[M] has disarmed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
-			add_logs(M, src, "disarmed")
+				else
+					I = null//did not manage to actually disarm the item, gross but no time to refactor
+
+			add_logs(M, src, "disarmed", "[I ? " removing \the [I]" : ""]")
 			updatehealth()


 /mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
-	if(..())
+	. = ..()
+	if(.)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		var/dam_zone = dismembering_strike(M, pick("chest", "l_hand", "r_hand", "l_leg", "r_leg"))
 		if(!dam_zone) //Dismemberment successful
-			return 1
+			return TRUE
 		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
 		if(!affecting)
 			affecting = get_bodypart("chest")
@@ -32,7 +32,7 @@
 		equip_to_slot_or_del(new relic_mask, slot_wear_mask)

 /mob/living/carbon/monkey/punpun/Life()
-	if(ticker.current_state == GAME_STATE_FINISHED && !memory_saved)
+	if(SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
 		Write_Memory(0)
 	..()

@@ -68,7 +68,7 @@
 //update whether our neck item appears on our hud.
 /mob/living/carbon/monkey/update_hud_neck(obj/item/I)
 	if(client && hud_used && hud_used.hud_shown)
-		I.screen_loc = ui_monkey_mask
+		I.screen_loc = ui_monkey_neck
 		client.screen += I

 //update whether our back item appears on our hud.
@@ -28,3 +28,15 @@
 	var/obj/item/I = get_active_held_item()
 	if(I)
 		. |= I.get_held_item_speechspans(src)
+
+/mob/living/carbon/can_speak_in_language(datum/language/dt)
+	if(HAS_SECONDARY_FLAG(src, OMNITONGUE))
+		. = has_language(dt)
+	else if(has_language(dt))
+		var/obj/item/organ/tongue/T = getorganslot("tongue")
+		if(T)
+			. = T.can_speak_in_language(dt)
+		else
+			. = initial(dt.flags) & TONGUELESS_SPEECH
+	else
+		. = FALSE
@@ -276,12 +276,6 @@
 	See RemieRichards on irc.rizon.net #coderbus
 */

-var/global/list/limb_icon_cache = list()
-
-/mob/living/carbon
-	var/icon_render_key = ""
-
-
 //produces a key based on the mob's limbs

 /mob/living/carbon/proc/generate_icon_render_key()