Merge branch 'master' into spooder

code/modules/actionspeed/_actionspeed_modifier.dm

@@ -0,0 +1,175 @@
+/*! Actionspeed modification datums.
+
+	How action speed for mobs works
+
+Action speed is now calculated by using modifier datums which are added to mobs. Some of them (nonvariable ones) are globally cached, the variable ones are instanced and changed based on need.
+
+This gives us the ability to have multiple sources of actionspeed, reliabily keep them applied and remove them when they should be
+
+THey can have unique sources and a bunch of extra fancy flags that control behaviour
+
+Previously trying to update action speed was a shot in the dark that usually meant mobs got stuck going faster or slower
+
+Actionspeed modification list is a simple key = datum system. Key will be the datum's ID if it is overridden to not be null, or type if it is not.
+
+DO NOT override datum IDs unless you are going to have multiple types that must overwrite each other. It's more efficient to use types, ID functionality is only kept for cases where dynamic creation of modifiers need to be done.
+
+When update actionspeed is called, the list of items is iterated, according to flags priority and a bunch of conditions
+this spits out a final calculated value which is used as a modifer to last_move + modifier for calculating when a mob
+can next move
+
+*/
+
+/datum/actionspeed_modifier
+	/// Whether or not this is a variable modifier. Variable modifiers can NOT be ever auto-cached. ONLY CHECKED VIA INITIAL(), EFFECTIVELY READ ONLY (and for very good reason)
+	var/variable = FALSE
+
+	/// Unique ID. You can never have different modifications with the same ID. By default, this SHOULD NOT be set. Only set it for cases where you're dynamically making modifiers/need to have two types overwrite each other. If unset, uses path (converted to text) as ID.
+	var/id
+
+	/// Higher ones override lower priorities. This is NOT used for ID, ID must be unique, if it isn't unique the newer one overwrites automatically if overriding.
+	var/priority = 0
+	var/flags = NONE
+
+	/// Multiplicative slowdown
+	var/multiplicative_slowdown = 0
+
+	/// Other modification datums this conflicts with.
+	var/conflicts_with
+
+/datum/actionspeed_modifier/New()
+	. = ..()
+	if(!id)
+		id = "[type]" //We turn the path into a string.
+
+GLOBAL_LIST_EMPTY(actionspeed_modification_cache)
+
+/// Grabs a STATIC MODIFIER datum from cache. YOU MUST NEVER EDIT THESE DATUMS, OR IT WILL AFFECT ANYTHING ELSE USING IT TOO!
+/proc/get_cached_actionspeed_modifier(modtype)
+	if(!ispath(modtype, /datum/actionspeed_modifier))
+		CRASH("[modtype] is not a actionspeed modification typepath.")
+	var/datum/actionspeed_modifier/actionspeed_mod = modtype
+	if(initial(actionspeed_mod.variable))
+		CRASH("[modtype] is a variable modifier, and can never be cached.")
+	actionspeed_mod = GLOB.actionspeed_modification_cache[modtype]
+	if(!actionspeed_mod)
+		actionspeed_mod = GLOB.actionspeed_modification_cache[modtype] = new modtype
+	return actionspeed_mod
+
+///Add a action speed modifier to a mob. If a variable subtype is passed in as the first argument, it will make a new datum. If ID conflicts, it will overwrite the old ID.
+/mob/proc/add_actionspeed_modifier(datum/actionspeed_modifier/type_or_datum, update = TRUE)
+	if(ispath(type_or_datum))
+		if(!initial(type_or_datum.variable))
+			type_or_datum = get_cached_actionspeed_modifier(type_or_datum)
+		else
+			type_or_datum = new type_or_datum
+	var/datum/actionspeed_modifier/existing = LAZYACCESS(actionspeed_modification, type_or_datum.id)
+	if(existing)
+		if(existing == type_or_datum)		//same thing don't need to touch
+			return TRUE
+		remove_actionspeed_modifier(existing, FALSE)
+	if(length(actionspeed_modification))
+		BINARY_INSERT(type_or_datum.id, actionspeed_modification, datum/actionspeed_modifier, type_or_datum, priority, COMPARE_VALUE)
+	LAZYSET(actionspeed_modification, type_or_datum.id, type_or_datum)
+	if(update)
+		update_actionspeed()
+	return TRUE
+
+/// Remove a action speed modifier from a mob, whether static or variable.
+/mob/proc/remove_actionspeed_modifier(datum/actionspeed_modifier/type_id_datum, update = TRUE)
+	var/key
+	if(ispath(type_id_datum))
+		key = initial(type_id_datum.id) || "[type_id_datum]"		//id if set, path set to string if not.
+	else if(!istext(type_id_datum))		//if it isn't text it has to be a datum, as it isn't a type.
+		key = type_id_datum.id
+	else								//assume it's an id
+		key = type_id_datum
+	if(!LAZYACCESS(actionspeed_modification, key))
+		return FALSE
+	LAZYREMOVE(actionspeed_modification, key)
+	if(update)
+		update_actionspeed(FALSE)
+	return TRUE
+
+/*! Used for variable slowdowns like hunger/health loss/etc, works somewhat like the old list-based modification adds. Returns the modifier datum if successful
+	How this SHOULD work is:
+	1. Ensures type_id_datum one way or another refers to a /variable datum. This makes sure it can't be cached. This includes if it's already in the modification list.
+	2. Instantiate a new datum if type_id_datum isn't already instantiated + in the list, using the type. Obviously, wouldn't work for ID only.
+	3. Add the datum if necessary using the regular add proc
+	4. If any of the rest of the args are not null (see: multiplicative slowdown), modify the datum
+	5. Update if necessary
+*/
+/mob/proc/add_or_update_variable_actionspeed_modifier(datum/actionspeed_modifier/type_id_datum, update = TRUE, multiplicative_slowdown)
+	var/modified = FALSE
+	var/inject = FALSE
+	var/datum/actionspeed_modifier/final
+	if(istext(type_id_datum))
+		final = LAZYACCESS(actionspeed_modification, type_id_datum)
+		if(!final)
+			CRASH("Couldn't find existing modification when provided a text ID.")
+	else if(ispath(type_id_datum))
+		if(!initial(type_id_datum.variable))
+			CRASH("Not a variable modifier")
+		final = LAZYACCESS(actionspeed_modification, initial(type_id_datum.id) || "[type_id_datum]")
+		if(!final)
+			final = new type_id_datum
+			inject = TRUE
+			modified = TRUE
+	else
+		if(!initial(type_id_datum.variable))
+			CRASH("Not a variable modifier")
+		final = type_id_datum
+		if(!LAZYACCESS(actionspeed_modification, final.id))
+			inject = TRUE
+			modified = TRUE
+	if(!isnull(multiplicative_slowdown))
+		final.multiplicative_slowdown = multiplicative_slowdown
+		modified = TRUE
+	if(inject)
+		add_actionspeed_modifier(final, FALSE)
+	if(update && modified)
+		update_actionspeed(TRUE)
+	return final
+
+///Is there a actionspeed modifier for this mob
+/mob/proc/has_actionspeed_modifier(datum/actionspeed_modifier/datum_type_id)
+	var/key
+	if(ispath(datum_type_id))
+		key = initial(datum_type_id.id) || "[datum_type_id]"
+	else if(istext(datum_type_id))
+		key = datum_type_id
+	else
+		key = datum_type_id.id
+	return LAZYACCESS(actionspeed_modification, key)
+
+/// Go through the list of actionspeed modifiers and calculate a final actionspeed. ANY ADD/REMOVE DONE IN UPDATE_actionspeed MUST HAVE THE UPDATE ARGUMENT SET AS FALSE!
+/mob/proc/update_actionspeed()
+	. = 0
+	var/list/conflict_tracker = list()
+	for(var/key in get_actionspeed_modifiers())
+		var/datum/actionspeed_modifier/M = actionspeed_modification[key]
+		var/conflict = M.conflicts_with
+		var/amt = M.multiplicative_slowdown
+		if(conflict)
+			// Conflicting modifiers prioritize the larger slowdown or the larger speedup
+			// We purposefuly don't handle mixing speedups and slowdowns on the same id
+			if(abs(conflict_tracker[conflict]) < abs(amt))
+				conflict_tracker[conflict] = amt
+			else
+				continue
+		. += amt
+	cached_multiplicative_actions_slowdown = .
+
+///Adds a default action speed
+/mob/proc/initialize_actionspeed()
+	add_or_update_variable_actionspeed_modifier(/datum/actionspeed_modifier/base, multiplicative_slowdown = 1)
+
+/// Get the action speed modifiers list of the mob
+/mob/proc/get_actionspeed_modifiers()
+	. = LAZYCOPY(actionspeed_modification)
+	for(var/id in actionspeed_mod_immunities)
+		. -= id
+
+/// Checks if a action speed modifier is valid and not missing any data
+/proc/actionspeed_data_null_check(datum/actionspeed_modifier/M)		//Determines if a data list is not meaningful and should be discarded.
+	. = !(M.multiplicative_slowdown)

code/modules/actionspeed/modifiers/base.dm

@@ -0,0 +1,2 @@
+/datum/actionspeed_modifier/base
+	variable = TRUE

code/modules/actionspeed/modifiers/mood.dm

@@ -0,0 +1,7 @@
+/datum/actionspeed_modifier/low_sanity
+	multiplicative_slowdown = 0.25
+	id = ACTIONSPEED_ID_SANITY
+
+/datum/actionspeed_modifier/high_sanity
+	multiplicative_slowdown = -0.1
+	id = ACTIONSPEED_ID_SANITY

code/modules/actionspeed/modifiers/status_effects.dm

@@ -0,0 +1,5 @@
+/datum/actionspeed_modifier/timecookie
+	multiplicative_slowdown = -0.05
+
+/datum/actionspeed_modifier/blunt_wound
+	variable = TRUE

code/modules/admin/admin.dm

@@ -12,7 +12,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////Panels
 
 /datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Show Player Panel"
 	set desc="Edit player (respawn, ban, heal, etc)"
 
@@ -211,7 +211,7 @@
 
 
 /datum/admins/proc/access_news_network() //MARKER
-	set category = "Fun"
+	set category = "Admin.Events"
 	set name = "Access Newscaster Network"
 	set desc = "Allows you to view, add and edit news feeds."
 
@@ -786,7 +786,7 @@
 		var/obj/structure/closet/supplypod/centcompod/pod = new()
 		var/atom/A = new chosen(pod)
 		A.flags_1 |= ADMIN_SPAWNED_1
-		new /obj/effect/abstract/DPtarget(T, pod)
+		new /obj/effect/pod_landingzone(T, pod)
 
 	log_admin("[key_name(usr)] pod-spawned [chosen] at [AREACOORD(usr)]")
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/admin_investigate.dm

@@ -6,7 +6,7 @@
 
 /client/proc/investigate_show()
 	set name = "Investigate"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(!holder)
 		return
 

code/modules/admin/admin_verbs.dm

@@ -348,7 +348,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 
 /client/proc/admin_ghost()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Aghost"
 	if(!holder)
 		return FALSE
@@ -379,7 +379,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 /client/proc/invisimin()
 	set name = "Invisimin"
-	set category = "Admin"
+	set category = "Admin.Game"
 	set desc = "Toggles ghost-like invisibility (Don't abuse this)"
 	if(holder && mob)
 		if(mob.invisibility == INVISIBILITY_OBSERVER)
@@ -391,7 +391,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 /client/proc/check_antagonists()
 	set name = "Check Antagonists"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(holder)
 		holder.check_antagonists()
 		log_admin("[key_name(usr)] checked antagonists.")	//for tsar~
@@ -411,14 +411,14 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 /client/proc/game_panel()
 	set name = "Game Panel"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(holder)
 		holder.Game()
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Game Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/secrets()
 	set name = "Secrets"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if (holder)
 		holder.Secrets()
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Secrets Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -472,7 +472,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/drop_bomb()
-	set category = "Special Verbs"
+	set category = "Admin.Fun"
 	set name = "Drop Bomb"
 	set desc = "Cause an explosion of varying strength at your location."
 
@@ -514,7 +514,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/drop_dynex_bomb()
-	set category = "Special Verbs"
+	set category = "Admin.Fun"
 	set name = "Drop DynEx Bomb"
 	set desc = "Cause an explosion of varying strength at your location."
 
@@ -561,7 +561,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	message_admins("[key_name_admin(usr)] has  modified Dynamic Explosion Scale: [ex_scale]")
 
 /client/proc/give_spell(mob/T in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Give Spell"
 	set desc = "Gives a spell to a mob."
 
@@ -585,7 +585,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 		message_admins("<span class='danger'>Spells given to mindless mobs will not be transferred in mindswap or cloning!</span>")
 
 /client/proc/remove_spell(mob/T in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Remove Spell"
 	set desc = "Remove a spell from the selected mob."
 
@@ -598,7 +598,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 			SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/give_disease(mob/living/T in GLOB.mob_living_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Give Disease"
 	set desc = "Gives a Disease to a mob."
 	if(!istype(T))
@@ -613,7 +613,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] gave [key_name(T)] the disease [D].</span>")
 
 /client/proc/object_say(obj/O in world)
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "OSay"
 	set desc = "Makes an object say something."
 	var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null
@@ -625,7 +625,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 /client/proc/togglebuildmodeself()
 	set name = "Toggle Build Mode Self"
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	if (!(holder.rank.rights & R_BUILDMODE))
 		return
 	if(src.mob)
@@ -634,7 +634,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 /client/proc/check_ai_laws()
 	set name = "Check AI Laws"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(holder)
 		src.holder.output_ai_laws()
 
@@ -717,7 +717,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 /client/proc/toggle_AI_interact()
 	set name = "Toggle Admin AI Interact"
-	set category = "Admin"
+	set category = "Admin.Game"
 	set desc = "Allows you to interact with most machines as an AI would as a ghost"
 
 	AI_Interact = !AI_Interact

code/modules/admin/adminmenu.dm

@@ -5,7 +5,7 @@
 /datum/verbs/menu/Admin/verb/playerpanel()
 	set name = "Player Panel"
 	set desc = "Player Panel"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(usr.client.holder)
 		usr.client.holder.player_panel_new()
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/topic.dm

@@ -2475,7 +2475,7 @@
 										R.activate_module(I)
 
 		if(pod)
-			new /obj/effect/abstract/DPtarget(target, pod)
+			new /obj/effect/pod_landingzone(target, pod)
 
 		if (number == 1)
 			log_admin("[key_name(usr)] created a [english_list(paths)]")

code/modules/admin/verbs/adminjump.dm

@@ -1,7 +1,7 @@
 /client/proc/jumptoarea(area/A in GLOB.sortedAreas)
 	set name = "Jump to Area"
 	set desc = "Area to jump to"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(!src.holder)
 		to_chat(src, "Only administrators may use this command.", confidential = TRUE)
 		return
@@ -28,7 +28,7 @@
 
 /client/proc/jumptoturf(turf/T in world)
 	set name = "Jump to Turf"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(!src.holder)
 		to_chat(src, "Only administrators may use this command.", confidential = TRUE)
 		return
@@ -40,7 +40,7 @@
 	return
 
 /client/proc/jumptomob(mob/M in GLOB.mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Jump to Mob"
 
 	if(!src.holder)
@@ -59,7 +59,7 @@
 			to_chat(A, "This mob is not located in the game world.", confidential = TRUE)
 
 /client/proc/jumptocoord(tx as num, ty as num, tz as num)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Jump to Coordinate"
 
 	if (!holder)
@@ -74,7 +74,7 @@
 	message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]")
 
 /client/proc/jumptokey()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Jump to Key"
 
 	if(!src.holder)
@@ -97,7 +97,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/Getmob(mob/M in GLOB.mob_list - GLOB.dummy_mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Get Mob"
 	set desc = "Mob to teleport"
 	if(!src.holder)
@@ -113,7 +113,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/Getkey()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Get Key"
 	set desc = "Key to teleport"
 
@@ -141,7 +141,7 @@
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/sendmob(mob/M in sortmobs())
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Send Mob"
 	if(!src.holder)
 		to_chat(src, "Only administrators may use this command.", confidential = TRUE)

code/modules/admin/verbs/borgpanel.dm

@@ -1,5 +1,5 @@
 /datum/admins/proc/open_borgopanel(borgo in GLOB.silicon_mobs)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Show Borg Panel"
 	set desc = "Show borg panel"
 

code/modules/admin/verbs/cinematic.dm

@@ -1,6 +1,6 @@
 /client/proc/cinematic()
 	set name = "cinematic"
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
 	set hidden = 1
 	if(!SSticker)

code/modules/admin/verbs/deadsay.dm

@@ -1,5 +1,5 @@
 /client/proc/dsay(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Dsay"
 	set hidden = 1
 	if(!holder)

code/modules/admin/verbs/debug.dm

@@ -27,7 +27,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make Robot"
 
 	if(!SSticker.HasRoundStarted())
@@ -43,7 +43,7 @@
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make Blob"
 
 	if(!SSticker.HasRoundStarted())
@@ -58,7 +58,7 @@
 
 
 /client/proc/cmd_admin_animalize(mob/M in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make Simple Animal"
 
 	if(!SSticker.HasRoundStarted())
@@ -79,7 +79,7 @@
 
 
 /client/proc/makepAI(turf/T in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make pAI"
 	set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI"
 
@@ -106,7 +106,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make Alien"
 
 	if(!SSticker.HasRoundStarted())
@@ -121,7 +121,7 @@
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_slimeize(mob/M in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make slime"
 
 	if(!SSticker.HasRoundStarted())
@@ -211,7 +211,7 @@
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] has granted [M.key] full access.</span>")
 
 /client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Assume direct control"
 	set desc = "Direct intervention"
 
@@ -229,6 +229,33 @@
 		qdel(adminmob)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/cmd_give_direct_control(mob/M in GLOB.mob_list)
+	set category = "Admin.Game"
+	set name = "Give direct control"
+
+	if(!M)
+		return
+	if(M.ckey)
+		if(alert("This mob is being controlled by [M.key]. Are you sure you wish to give someone else control of it? [M.key] will be made a ghost.",,"Yes","No") != "Yes")
+			return
+	var/client/newkey = input(src, "Pick the player to put in control.", "New player") as null|anything in sortList(GLOB.clients)
+	var/mob/oldmob = newkey.mob
+	var/delmob = FALSE
+	if((isobserver(oldmob) || alert("Do you want to delete [newkey]'s old mob?","Delete?","Yes","No") != "No"))
+		delmob = TRUE
+	if(!M || QDELETED(M))
+		to_chat(usr, "<span class='warning'>The target mob no longer exists, aborting.</span>")
+		return
+	if(M.ckey)
+		M.ghostize(FALSE)
+	M.ckey = newkey.key
+	M.client?.init_verbs()
+	if(delmob)
+		qdel(oldmob)
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] gave away direct control of [M] to [newkey].</span>")
+	log_admin("[key_name(usr)] gave away direct control of [M] to [newkey].")
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/proc/cmd_admin_test_atmos_controllers()
 	set category = "Mapping"
 	set name = "Test Atmos Monitoring Consoles"
@@ -455,7 +482,7 @@
 	cmd_admin_areatest(FALSE)
 
 /client/proc/cmd_admin_dress(mob/M in GLOB.mob_list)
-	set category = "Fun"
+	set category = "Admin.Events"
 	set name = "Select equipment"
 	if(!(ishuman(M) || isobserver(M)))
 		alert("Invalid mob")

code/modules/admin/verbs/dice.dm

@@ -1,5 +1,5 @@
 /client/proc/roll_dices()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Roll Dice"
 	if(!check_rights(R_FUN))
 		return

code/modules/admin/verbs/one_click_antag.dm

@@ -1,7 +1,7 @@
 /client/proc/one_click_antag()
 	set name = "Create Antagonist"
 	set desc = "Auto-create an antagonist of your choice"
-	set category = "Admin"
+	set category = "Admin.Events"
 
 	if(holder)
 		holder.one_click_antag()

code/modules/admin/verbs/playsound.dm

@@ -1,5 +1,5 @@
 /client/proc/play_sound(S as sound)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Play Global Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -42,7 +42,7 @@
 
 
 /client/proc/play_local_sound(S as sound)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Play Local Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -53,7 +53,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/play_web_sound()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Play Internet Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -136,7 +136,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Internet Sound")
 
 /client/proc/manual_play_web_sound()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Manual Play Internet Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -182,7 +182,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Manual Play Internet Sound")
 
 /client/proc/set_round_end_sound(S as sound)
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Set Round End Sound"
 	if(!check_rights(R_SOUNDS))
 		return

code/modules/admin/verbs/randomverbs.dm

@@ -20,7 +20,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Subtle Message"
 
 	if(!ismob(M))
@@ -46,7 +46,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Headset Message"
 
 	admin_headset_message(M)
@@ -128,7 +128,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Modify Antagonist Reputation") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_world_narrate()
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Global Narrate"
 
 	if(!check_rights(R_ADMIN))
@@ -144,7 +144,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_direct_narrate(mob/M)
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Direct Narrate"
 
 	if(!check_rights(R_ADMIN))
@@ -169,7 +169,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_local_narrate(atom/A)
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Local Narrate"
 
 	if(!check_rights(R_ADMIN))
@@ -190,7 +190,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Godmode"
 	if(!check_rights(R_ADMIN))
 		return
@@ -335,7 +335,7 @@ Works kind of like entering the game with a new character. Character receives a
 Traitors and the like can also be revived with the previous role mostly intact.
 /N */
 /client/proc/respawn_character()
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Respawn Character"
 	set desc = "Respawn a person that has been gibbed/dusted/killed. They must be a ghost for this to work and preferably should not have a body to go back into."
 	if(!check_rights(R_ADMIN))
@@ -503,7 +503,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return new_character
 
 /client/proc/cmd_admin_add_freeform_ai_law()
-	set category = "Fun"
+	set category = "Admin.Events"
 	set name = "Add Custom AI law"
 
 	if(!check_rights(R_ADMIN))
@@ -546,7 +546,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_create_centcom_report()
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Create Command Report"
 
 	if(!check_rights(R_ADMIN))
@@ -572,7 +572,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_change_command_name()
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Change Command Name"
 
 	if(!check_rights(R_ADMIN))
@@ -595,7 +595,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	admin_delete(A)
 
 /client/proc/cmd_admin_list_open_jobs()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Manage Job Slots"
 
 	if(!check_rights(R_ADMIN))
@@ -604,7 +604,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world)
-	set category = "Special Verbs"
+	set category =  "Admin.Fun"
 	set name = "Explosion"
 
 	if(!check_rights(R_ADMIN))
@@ -640,7 +640,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world)
-	set category = "Special Verbs"
+	set category = "Admin.Fun"
 	set name = "EM Pulse"
 
 	if(!check_rights(R_ADMIN))
@@ -656,7 +656,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_gib(mob/M in GLOB.mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Fun"
 	set name = "Gib"
 
 	if(!check_rights(R_ADMIN))
@@ -683,7 +683,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/cmd_admin_gib_self()
 	set name = "Gibself"
-	set category = "Fun"
+	set category = "Admin.Fun"
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm == "Yes")
@@ -702,14 +702,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/toggle_view_range()
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"
 
-	if(view == CONFIG_GET(string/default_view))
-		change_view(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128))
+	if(view_size.getView() == view_size.default)
+		view_size.setTo(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128) - 7)
 	else
-		change_view(CONFIG_GET(string/default_view))
+		view_size.resetToDefault(getScreenSize(prefs.widescreenpref))
 
 	log_admin("[key_name(usr)] changed their view range to [view].")
 	//message_admins("\blue [key_name_admin(usr)] changed their view range to [view].")	//why? removed by order of XSI
@@ -717,8 +717,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Change View Range", "[view]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/admin_call_shuttle()
-
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Call Shuttle"
 
 	if(EMERGENCY_AT_LEAST_DOCKED)
@@ -738,7 +737,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return
 
 /client/proc/admin_cancel_shuttle()
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Cancel Shuttle"
 	if(!check_rights(0))
 		return
@@ -754,9 +753,51 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] admin-recalled the emergency shuttle.</span>")
 
 	return
+/*
+/client/proc/admin_disable_shuttle()
+	set category = "Admin.Events"
+	set name = "Disable Shuttle"
 
+	if(!check_rights(R_ADMIN))
+		return
+	if(SSshuttle.emergency.mode == SHUTTLE_DISABLED)
+		to_chat(usr, "<span class='warning'>Error, shuttle is already disabled.</span>")
+		return
+	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes")
+		return
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] disabled the shuttle.</span>")
+	SSshuttle.lastMode = SSshuttle.emergency.mode
+	SSshuttle.lastCallTime = SSshuttle.emergency.timeLeft(1)
+	SSshuttle.adminEmergencyNoRecall = TRUE
+	SSshuttle.emergency.setTimer(0)
+	SSshuttle.emergency.mode = SHUTTLE_DISABLED
+	priority_announce("Warning: Emergency Shuttle uplink failure, shuttle disabled until further notice.", "Emergency Shuttle Uplink Alert", 'sound/misc/announce_dig.ogg')
+
+/client/proc/admin_enable_shuttle()
+	set category = "Admin - Events"
+	set category = "Admin.Events"
+	set name = "Enable Shuttle"
+
+	if(!check_rights(R_ADMIN))
+		return
+	if(SSshuttle.emergency.mode != SHUTTLE_DISABLED)
+		to_chat(usr, "<span class='warning'>Error, shuttle not disabled.</span>")
+		return
+	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes")
+		return
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] enabled the emergency shuttle.</span>")
+	SSshuttle.adminEmergencyNoRecall = FALSE
+	SSshuttle.emergencyNoRecall = FALSE
+	if(SSshuttle.lastMode == SHUTTLE_DISABLED) //If everything goes to shit, fix it.
+		SSshuttle.lastMode = SHUTTLE_IDLE
+	SSshuttle.emergency.mode = SSshuttle.lastMode
+	if(SSshuttle.lastCallTime < 10 SECONDS && SSshuttle.lastMode != SHUTTLE_IDLE)
+		SSshuttle.lastCallTime = 10 SECONDS //Make sure no insta departures.
+	SSshuttle.emergency.setTimer(SSshuttle.lastCallTime)
+	priority_announce("Warning: Emergency Shuttle uplink reestablished, shuttle enabled.", "Emergency Shuttle Uplink Alert", 'sound/misc/announce_dig.ogg')
+*/
 /client/proc/everyone_random()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Make Everyone Random"
 	set desc = "Make everyone have a random appearance. You can only use this before rounds!"
 
@@ -804,7 +845,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 
 /client/proc/admin_change_sec_level()
-	set category = "Special Verbs"
+	set category = "Admin.Events"
 	set name = "Set Security Level"
 	set desc = "Changes the security level. Announcement only, i.e. setting to Delta won't activate nuke"
 
@@ -821,7 +862,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list)
 	set name = "Toggle Nuke"
-	set category = "Fun"
+	set category = "Admin.Events"
 	set popup_menu = 0
 	if(!check_rights(R_DEBUG))
 		return
@@ -1016,7 +1057,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	usr << browse(dat, "window=dressup;size=550x600")
 
 /client/proc/toggle_combo_hud()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Toggle Combo HUD"
 	set desc = "Toggles the Admin Combo HUD (antag, sci, med, eng)"
 
@@ -1051,7 +1092,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 
 
 /client/proc/run_weather()
-	set category = "Fun"
+	set category = "Admin.Events"
 	set name = "Run Weather"
 	set desc = "Triggers a weather on the z-level you choose."
 
@@ -1075,7 +1116,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Run Weather")
 
 /client/proc/mass_zombie_infection()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Mass Zombie Infection"
 	set desc = "Infects all humans with a latent organ that will zombify \
 		them on death."
@@ -1095,7 +1136,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Infection")
 
 /client/proc/mass_zombie_cure()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Mass Zombie Cure"
 	set desc = "Removes the zombie infection from all humans, returning them to normal."
 	if(!check_rights(R_ADMIN))
@@ -1113,7 +1154,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Cure")
 
 /client/proc/polymorph_all()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Polymorph All"
 	set desc = "Applies the effects of the bolt of change to every single mob."
 
@@ -1203,7 +1244,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggled Hub Visibility", "[GLOB.hub_visibility ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_toggle_fov()
-	set category = "Fun"
+	set category = "Admin.Fun"
 	set name = "Enable/Disable Field of Vision"
 
 	var/static/busy_toggling_fov = FALSE
@@ -1256,7 +1297,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 
 /client/proc/smite(mob/living/carbon/human/target as mob)
 	set name = "Smite"
-	set category = "Fun"
+	set category = "Admin.Fun"
 	if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
 		return
 
@@ -1319,7 +1360,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 					if(!delivery)
 						alert("ERROR: Incorrect / improper path given.")
 				new delivery(pod)
-			new /obj/effect/abstract/DPtarget(get_turf(target), pod)
+			new /obj/effect/pod_landingzone(get_turf(target), pod)
 		if(ADMIN_PUNISHMENT_SUPPLYPOD)
 			var/datum/centcom_podlauncher/plaunch  = new(usr)
 			if(!holder)
@@ -1331,7 +1372,6 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			plaunch.temp_pod.damage = 40//bring the mother fuckin ruckus
 			plaunch.temp_pod.explosionSize = list(0,0,0,2)
 			plaunch.temp_pod.effectStun = TRUE
-			plaunch.ui_interact(usr)
 			return //We return here because punish_log() is handled by the centcom_podlauncher datum
 
 		if(ADMIN_PUNISHMENT_MAZING)

code/modules/admin/verbs/shuttlepanel.dm

@@ -1,5 +1,5 @@
 /datum/admins/proc/open_shuttlepanel()
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Shuttle Manipulator"
 	set desc = "Opens the shuttle manipulator UI."
 

code/modules/admin/verbs/tripAI.dm

@@ -1,5 +1,5 @@
 /client/proc/triple_ai()
-	set category = "Fun"
+	set category = "Admin.Events"
 	set name = "Create AI Triumvirate"
 
 	if(SSticker.current_state > GAME_STATE_PREGAME)

code/modules/antagonists/bloodsucker/bloodsucker_powers.dm

@@ -180,10 +180,12 @@
 	button.screen_loc = DEFAULT_BLOODSPELLS
 	button.moved = DEFAULT_BLOODSPELLS
 	button.ordered = FALSE
+
 /datum/action/bloodsucker/passive/Destroy()
 	if(owner)
 		Remove(owner)
 	target = null
+	return ..()
 
 ///////////////////////////////////  TARGETTED POWERS	///////////////////////////////////
 

code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm

@@ -456,6 +456,7 @@
 
 /obj/structure/bloodsucker/candelabrum/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	return ..() //return a hint
 
 /obj/structure/bloodsucker/candelabrum/update_icon_state()
 	icon_state = "candelabrum[lit ? "_lit" : ""]"

code/modules/antagonists/changeling/changeling.dm

@@ -38,8 +38,9 @@
 	var/mimicing = ""
 	var/canrespec = 0
 	var/changeling_speak = 0
-	var/loudfactor = 0 //Used for blood tests. At 4, blood tests will succeed. At 10, blood tests will result in an explosion.
-	var/bloodtestwarnings = 0 //Used to track if the ling has been notified that they will pass blood tests.
+	var/loudfactor = 0 //Used for blood tests. This is is the average loudness of the ling's abilities calculated with the below two vars
+	var/loudtotal = 0 //Used to keep track of the sum of the ling's loudness
+	var/totalpurchases = 0 //Used to keep track of how many purchases the ling's made after free abilities have been added
 	var/datum/dna/chosen_dna
 	var/obj/effect/proc_holder/changeling/sting/chosen_sting
 	var/datum/cellular_emporium/cellular_emporium
@@ -139,8 +140,6 @@
 /datum/antagonist/changeling/proc/reset_powers()
 	if(purchasedpowers)
 		remove_changeling_powers()
-	loudfactor = 0
-	bloodtestwarnings = 0
 	//Repurchase free powers.
 	for(var/path in all_powers)
 		var/obj/effect/proc_holder/changeling/S = new path()
@@ -148,6 +147,9 @@
 			if(!has_sting(S))
 				purchasedpowers += S
 				S.on_purchase(owner.current,TRUE)
+	loudfactor = 0
+	loudtotal = 0
+	totalpurchases = 0
 
 /datum/antagonist/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power)
 	for(var/obj/effect/proc_holder/changeling/P in purchasedpowers)
@@ -192,13 +194,18 @@
 	geneticpoints -= thepower.dna_cost
 	purchasedpowers += thepower
 	thepower.on_purchase(owner.current)
-	loudfactor += thepower.loudness
-	if(loudfactor >= 4 && !bloodtestwarnings)
-		to_chat(owner.current, "<span class='warning'>Our blood is growing flammable. Our blood will react violently to heat.</span>")
-		bloodtestwarnings = 1
-	if(loudfactor >= 10 && bloodtestwarnings < 2)
-		to_chat(owner.current, "<span class='warning'>Our blood has grown extremely flammable. Our blood will react explosively to heat.</span>")
-		bloodtestwarnings = 2
+	loudtotal += thepower.loudness
+	totalpurchases++
+	var/oldloudness = loudfactor
+	loudfactor = loudtotal/max(totalpurchases,1)
+	if(loudfactor >= LINGBLOOD_DETECTION_THRESHOLD && oldloudness < LINGBLOOD_DETECTION_THRESHOLD)
+		to_chat(owner.current, "<span class='warning'>Our blood has grown flammable. Our blood will now react violently to heat.</span>")
+	else if(loudfactor < LINGBLOOD_DETECTION_THRESHOLD && oldloudness >= LINGBLOOD_DETECTION_THRESHOLD)
+		to_chat(owner.current, "<span class='notice'>Our blood has stabilized, and will no longer react violently to heat.</span>")
+	if(loudfactor > LINGBLOOD_EXPLOSION_THRESHOLD && oldloudness <= LINGBLOOD_EXPLOSION_THRESHOLD)
+		to_chat(owner.current, "<span class='warning'>Our blood has grown extremely flammable. Our blood will now react explosively to heat.</span>")
+	else if(loudfactor <= LINGBLOOD_EXPLOSION_THRESHOLD && oldloudness > LINGBLOOD_EXPLOSION_THRESHOLD)
+		to_chat(owner.current, "<span class='notice'>Our blood has slightly stabilized, and will no longer explode when exposed to heat.</span>")
 
 /datum/antagonist/changeling/proc/readapt()
 	if(!ishuman(owner.current))

code/modules/antagonists/changeling/powers/mutations.dm

@@ -6,6 +6,10 @@
 		Shield
 		Armor
 		Tentacles
+	Hatterhat Additions:
+		claws! (glove slot)
+		jagged (thieves') claws
+		bone gauntlets for punching dudes
 */
 
 
@@ -89,7 +93,7 @@
 		return 1
 	var/mob/living/carbon/human/H = user
 	if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type))
-		H.visible_message("<span class='warning'>[H] casts off [H.p_their()] [suit_name_simple]!</span>", "<span class='warning'>We cast off our [suit_name_simple].</span>", "<span class='italics'>You hear the organic matter ripping and tearing!</span>")
+		H.visible_message("<span class='warning'>[H] casts off [H.p_their()] [suit_name_simple]!</span>", "<span class='warning'>We cast off our [suit_name_simple].</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
 		H.temporarilyRemoveItemFromInventory(H.head, TRUE) //The qdel on dropped() takes care of it
 		H.temporarilyRemoveItemFromInventory(H.wear_suit, TRUE)
 		H.update_inv_wear_suit()
@@ -461,7 +465,7 @@
 	if(--remaining_uses < 1)
 		if(ishuman(loc))
 			var/mob/living/carbon/human/H = loc
-			H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!</span>", "<span class='notice'>We assimilate our shield into our body</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
+			H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!</span>", "<span class='notice'>We assimilate our shield into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
 		qdel(src)
 
 /***************************************\
@@ -570,3 +574,165 @@
 /obj/item/clothing/head/helmet/changeling/Initialize()
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT)
+
+
+
+/***************************************\
+|*****************CLAWS*****************|
+\***************************************/
+
+/obj/effect/proc_holder/changeling/gloves
+	name = "Mangled Claws"
+	desc = "Go tell a coder if you see this"
+	helptext = "Yell at Hatterhat, for fucking up Miauw and/or Perakp's work"
+	chemical_cost = 1000
+	dna_cost = -1
+
+	var/glove_type = /obj/item
+	var/glove_name_simple = "     " // keep these plural bro
+	var/recharge_slowdown = 0
+	var/blood_on_castoff = 0
+
+/obj/effect/proc_holder/changeling/gloves/try_to_sting(mob/user, mob/target)
+	if(check_gloves(user))
+		return
+	var/mob/living/carbon/human/H = user
+	..(H, target)
+
+//checks if we already have claws and casts it off
+/obj/effect/proc_holder/changeling/gloves/proc/check_gloves(mob/user)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
+	if(!ishuman(user) || !changeling)
+		return 1
+	var/mob/living/carbon/human/H = user
+	if(istype(H.gloves, glove_type))
+		H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms [H.p_their()] [glove_name_simple] into hands!</span>", "<span class='warning'>We assimilate our [glove_name_simple].</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
+		H.temporarilyRemoveItemFromInventory(H.gloves, TRUE) //The qdel on dropped() takes care of it
+		H.update_inv_gloves()
+		playsound(H.loc, 'sound/effects/blobattack.ogg', 30, 1)
+		if(blood_on_castoff)
+			H.add_splatter_floor()
+			playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) //So real sounds
+
+		changeling.chem_recharge_slowdown -= recharge_slowdown
+		return 1
+
+/obj/effect/proc_holder/changeling/gloves/on_refund(mob/user)
+	if(!ishuman(user))
+		return
+	action.Remove(user)
+	var/mob/living/carbon/human/H = user
+	check_gloves(H)
+
+/obj/effect/proc_holder/changeling/gloves/sting_action(mob/living/carbon/human/user)
+	if(!user.canUnEquip(user.gloves))
+		to_chat(user, "\the [user.gloves] is stuck to your body, you cannot grow [glove_name_simple] over it!")
+		return
+
+	user.dropItemToGround(user.gloves)
+
+	user.equip_to_slot_if_possible(new glove_type(user), SLOT_GLOVES, 1, 1, 1)
+	playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
+	changeling.chem_recharge_slowdown += recharge_slowdown
+	return TRUE
+
+/obj/item/clothing/gloves/claws
+	name = "claws of doing nothing"
+	desc = "These shouldn't be here."
+	icon_state = "bracers"
+	item_state = "bracers"
+	transfer_prints = TRUE
+	body_parts_covered = HANDS
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+	armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 35, "bio" = 35, "rad" = 35, "fire" = 0, "acid" = 0)
+
+/obj/item/clothing/gloves/claws/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT)
+
+/obj/item/clothing/gloves/claws/vulture // prying shit off dead/soon to be dead dudes!
+	name = "jagged claws"
+	desc = "Good for prying things off of people and looking incredibly creepy."
+	strip_mod = 2
+
+/obj/effect/proc_holder/changeling/gloves/gauntlets
+	name = "Bone Gauntlets"
+	desc = "We turn our hands into solid bone and chitin, sacrificing dexterity for raw strength."
+	helptext = "These grotesque, bone-and-chitin gauntlets are remarkably good at beating victims senseless, and cannot be used in lesser form. This ability is loud, and might cause our blood to react violently to heat."
+	chemical_cost = 10 // same cost as armblade because its a sidegrade (sacrifice utility for punching people violently)
+	dna_cost = 2
+	loudness = 2
+	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_gauntlets"
+	action_background_icon_state = "bg_ling"
+
+	glove_type = /obj/item/clothing/gloves/fingerless/pugilist/cling // just punch his head off dude
+	glove_name_simple = "bone gauntlets"
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling // switches between lesser GotNS and Big Punchy Rib Breaky Hands
+	name = "hewn bone gauntlets"
+	icon_state = "ling_gauntlets"
+	item_state = "ling_gauntlets"
+	desc = "Rough bone and chitin, pulsing with an abomination barely called \"life\". Good for punching people, not so much for firearms."
+	transfer_prints = TRUE
+	body_parts_covered = ARMS|HANDS
+	cold_protection = ARMS|HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+	armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 35, "bio" = 35, "rad" = 35, "fire" = 0, "acid" = 0)
+	enhancement = 9 // first, do harm. all of it. all of the harm. just fuck em up.
+	wound_enhancement = 9
+	var/fast_enhancement = 9
+	var/fast_wound_enhancement = 9
+	var/slow_enhancement = 20
+	var/slow_wound_enhancement = 20
+	silent = TRUE
+	inherited_trait = TRAIT_CHUNKYFINGERS // dummy thicc bone hands
+	secondary_trait = TRAIT_MAULER // its only violence from here, bucko
+	var/fasthands = TRUE
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling/examine(mob/user)
+	. = ..()
+	. += "[src] are formed to allow for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"]."
+	. += "Alt-click them to change between rapid strikes and strong blows."
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling/AltClick(mob/user)
+	. = ..()
+	use_buffs(user, FALSE) // reset
+	fasthands = !fasthands
+	if(fasthands)
+		enhancement = fast_enhancement
+		wound_enhancement = fast_wound_enhancement
+	else
+		enhancement = slow_enhancement // fuck em up kiddo
+		wound_enhancement = slow_wound_enhancement // really. fuck em up.
+	to_chat(user, "<span class='notice'>[src] are now formed to allow for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"].</span>")
+	addtimer(CALLBACK(src, .proc/use_buffs, user, TRUE), 0.1) // go fuckin get em
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT)
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling/equipped(mob/user, slot)
+	. = ..()
+	if(current_equipped_slot == SLOT_GLOVES)
+		to_chat(user, "<span class='notice'>With [src] formed around our arms, we are ready to fight.</span>")
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling/dropped(mob/user)
+	. = ..()
+	if(wornonce)
+		to_chat(user, "<span class='warning'>With [src] assimilated, we feel less ready to punch things.</span>")
+
+/obj/item/clothing/gloves/fingerless/pugilist/cling/Touch(atom/target, proximity = TRUE)
+	if(!isliving(target))
+		return
+	var/mob/living/M = loc
+	if(fasthands)
+		M.SetNextAction(CLICK_CD_RANGE) // fast punches
+	else
+		M.SetNextAction(CLICK_CD_GRABBING) // strong punches
+	return NO_AUTO_CLICKDELAY_HANDLING | ATTACK_IGNORE_ACTION

code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm

@@ -247,7 +247,8 @@
 		if(LH.target && LH.target.stat == DEAD)
 			to_chat(carbon_user,"<span class='danger'>Your patrons accepts your offer...</span>")
 			var/mob/living/carbon/human/H = LH.target
-			H.become_husk()
+			H.become_husk("burn") //Husks the target with removable husking, but causes a bunch of additional burn damage to prevent it from being 'too easy' to do
+			H.adjustFireLoss(200)
 			LH.target = null
 			var/datum/antagonist/heretic/EC = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic)
 

code/modules/antagonists/revenant/revenant.dm

@@ -390,7 +390,7 @@
 	if(old_key)
 		for(var/mob/M in GLOB.dead_mob_list)
 			if(M.client && M.client.key == old_key) //Only recreates the mob if the mob the client is in is dead
-				M.transfer_ckey(revenant.key, FALSE)
+				M.transfer_ckey(revenant, FALSE)
 				key_of_revenant = TRUE
 				break
 	if(!key_of_revenant)
@@ -403,7 +403,7 @@
 			visible_message("<span class='revenwarning'>[src] settles down and seems lifeless.</span>")
 			return
 		var/mob/C = pick(candidates)
-		C.transfer_ckey(revenant.key, FALSE)
+		C.transfer_ckey(revenant, FALSE)
 		if(!revenant.key)
 			qdel(revenant)
 			message_admins("No ckey was found for the new revenant. Oh well!")
@@ -411,8 +411,8 @@
 			visible_message("<span class='revenwarning'>[src] settles down and seems lifeless.</span>")
 			return
 
-	message_admins("[key_of_revenant] has been [old_key == revenant.key ? "re":""]made into a revenant by reforming ectoplasm.")
-	log_game("[key_of_revenant] was [old_key == revenant.key ? "re":""]made as a revenant by reforming ectoplasm.")
+	message_admins("[revenant.key] has been [old_key == revenant.key ? "re":""]made into a revenant by reforming ectoplasm.")
+	log_game("[revenant.key] was [old_key == revenant.key ? "re":""]made as a revenant by reforming ectoplasm.")
 	visible_message("<span class='revenboldnotice'>[src] suddenly rises into the air before fading away.</span>")
 
 	revenant.essence = essence

code/modules/antagonists/traitor/equipment/contractor.dm

@@ -203,7 +203,7 @@
 	partner_mind.make_Contractor_Support()
 	to_chat(partner_mind.current, "\n<span class='alertwarning'>[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.</span>")
 	to_chat(partner_mind.current, "<span class='alertwarning'>Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.</span>\n\n")
-	new /obj/effect/abstract/DPtarget(free_location, arrival_pod)
+	new /obj/effect/pod_landingzone(free_location, arrival_pod)
 
 /datum/contractor_item/blackout
 	name = "Blackout"

code/modules/antagonists/traitor/syndicate_contract.dm

@@ -68,7 +68,7 @@
 	empty_pod.explosionSize = list(0,0,0,1)
 	empty_pod.leavingSound = 'sound/effects/podwoosh.ogg'
 
-	new /obj/effect/abstract/DPtarget(empty_pod_turf, empty_pod)
+	new /obj/effect/pod_landingzone(empty_pod_turf, empty_pod)
 
 /datum/syndicate_contract/proc/enter_check(datum/source, sent_mob)
 	if(istype(source, /obj/structure/closet/supplypod/extractionpod))
@@ -111,7 +111,7 @@
 			var/obj/structure/closet/supplypod/extractionpod/pod = source
 
 			// Handle the pod returning
-			pod.send_up(pod)
+			pod.startExitSequence(pod)
 
 			if(ishuman(M))
 				var/mob/living/carbon/human/target = M
@@ -202,7 +202,7 @@
 		M.blur_eyes(30)
 		M.Dizzy(35)
 		M.confused += 20
-		new /obj/effect/abstract/DPtarget(possible_drop_loc[pod_rand_loc], return_pod)
+		new /obj/effect/pod_landingzone(possible_drop_loc[pod_rand_loc], return_pod)
 	else
 		to_chat(M, "<span class='reallybig hypnophrase'>A million voices echo in your head... <i>\"Seems where you got sent here from won't \
 					be able to handle our pod... You will die here instead.\"</i></span>")

code/modules/asset_cache/asset_list_items.dm

@@ -329,6 +329,35 @@
 		InsertAll("", each, GLOB.alldirs)
 	..()
 
+/datum/asset/spritesheet/supplypods
+	name = "supplypods"
+
+/datum/asset/spritesheet/supplypods/register()
+	for (var/style in 1 to length(GLOB.podstyles))
+		if (style == STYLE_SEETHROUGH)
+			Insert("pod_asset[style]", icon('icons/obj/supplypods.dmi' , "seethrough-icon"))
+			continue
+		var/base = GLOB.podstyles[style][POD_BASE]
+		if (!base)
+			Insert("pod_asset[style]", icon('icons/obj/supplypods.dmi', "invisible-icon"))
+			continue
+		var/icon/podIcon = icon('icons/obj/supplypods.dmi', base)
+		var/door = GLOB.podstyles[style][POD_DOOR]
+		if (door)
+			door = "[base]_door"
+			podIcon.Blend(icon('icons/obj/supplypods.dmi', door), ICON_OVERLAY)
+		var/shape = GLOB.podstyles[style][POD_SHAPE]
+		if (shape == POD_SHAPE_NORML)
+			var/decal = GLOB.podstyles[style][POD_DECAL]
+			if (decal)
+				podIcon.Blend(icon('icons/obj/supplypods.dmi', decal), ICON_OVERLAY)
+			var/glow = GLOB.podstyles[style][POD_GLOW]
+			if (glow)
+				glow = "pod_glow_[glow]"
+				podIcon.Blend(icon('icons/obj/supplypods.dmi', glow), ICON_OVERLAY)
+		Insert("pod_asset[style]", podIcon)
+	return ..()
+
 // Representative icons for each research design
 /datum/asset/spritesheet/research_designs
 	name = "design"

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -134,6 +134,19 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 /datum/gas_mixture/proc/set_volume(new_volume)
 /datum/gas_mixture/proc/get_moles(gas_type)
 /datum/gas_mixture/proc/set_moles(gas_type, moles)
+
+// VV WRAPPERS - EXTOOLS HOOKED PROCS DO NOT TAKE ARGUMENTS FROM CALL() FOR SOME REASON.
+/datum/gas_mixture/proc/vv_set_moles(gas_type, moles)
+	return set_moles(gas_type, moles)
+/datum/gas_mixture/proc/vv_get_moles(gas_type)
+	return get_moles(gas_type)
+/datum/gas_mixture/proc/vv_set_temperature(new_temp)
+	return set_temperature(new_temp)
+/datum/gas_mixture/proc/vv_set_volume(new_volume)
+	return set_volume(new_volume)
+/datum/gas_mixture/proc/vv_react(datum/holder)
+	return react(holder)
+
 /datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, list/gases)
 /datum/gas_mixture/proc/mark_immutable()
 /datum/gas_mixture/proc/get_gases()

code/modules/cargo/centcom_podlauncher.dm

@@ -1,3 +1,10 @@
+#define TAB_POD 0 //Used to check if the UIs built in camera is looking at the pod
+#define TAB_BAY 1 //Used to check if the UIs built in camera is looking at the launch bay area
+
+#define LAUNCH_ALL 0 //Used to check if we're launching everything from the bay area at once
+#define LAUNCH_ORDERED 1 //Used to check if we're launching everything from the bay area in order
+#define LAUNCH_RANDOM 2 //Used to check if we're launching everything from the bay area randomly
+
 //The Great and Mighty CentCom Pod Launcher - MrDoomBringer
 //This was originally created as a way to get adminspawned items to the station in an IC manner. It's evolved to contain a few more
 //features such as item removal, smiting, controllable delivery mobs, and more.
@@ -12,22 +19,23 @@
 /client/proc/centcom_podlauncher() //Creates a verb for admins to open up the ui
 	set name = "Config/Launch Supplypod"
 	set desc = "Configure and launch a CentCom supplypod full of whatever your heart desires!"
-	set category = "Admin"
+	set category = "Admin.Events"
 	var/datum/centcom_podlauncher/plaunch  = new(usr)//create the datum
 	plaunch.ui_interact(usr)//datum has a tgui component, here we open the window
 
 //Variables declared to change how items in the launch bay are picked and launched. (Almost) all of these are changed in the ui_act proc
 //Some effect groups are choices, while other are booleans. This is because some effects can stack, while others dont (ex: you can stack explosion and quiet, but you cant stack ordered launch and random launch)
 /datum/centcom_podlauncher
-	var/static/list/ignored_atoms = typecacheof(list(null, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object, /obj/effect/particle_effect/sparks, /obj/effect/abstract/DPtarget, /obj/effect/supplypod_selector ))
+	var/static/list/ignored_atoms = typecacheof(list(null, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object, /obj/effect/particle_effect/sparks, /obj/effect/pod_landingzone, /obj/effect/hallucination/simple/supplypod_selector,  /obj/effect/hallucination/simple/dropoff_location))
 	var/turf/oldTurf //Keeps track of where the user was at if they use the "teleport to centcom" button, so they can go back
 	var/client/holder //client of whoever is using this datum
-	var/area/bay //What bay we're using to launch shit from.
-	var/turf/dropoff_turf //If we're reversing, where the reverse pods go
-	var/picking_dropoff_turf
+	var/area/centcom/supplypod/loading/bay //What bay we're using to launch shit from.
+	var/bayNumber //Quick reference to what bay we're in. Usually set to the loading_id variable for the related area type
+	var/customDropoff = FALSE
+	var/picking_dropoff_turf = FALSE
 	var/launchClone = FALSE //If true, then we don't actually launch the thing in the bay. Instead we call duplicateObject() and send the result
 	var/launchRandomItem = FALSE //If true, lauches a single random item instead of everything on a turf.
-	var/launchChoice = 1 //Determines if we launch all at once (0) , in order (1), or at random(2)
+	var/launchChoice = LAUNCH_RANDOM //Determines if we launch all at once (0) , in order (1), or at random(2)
 	var/explosionChoice = 0 //Determines if there is no explosion (0), custom explosion (1), or just do a maxcap (2)
 	var/damageChoice = 0 //Determines if we do no damage (0), custom amnt of damage (1), or gib + 5000dmg (2)
 	var/launcherActivated = FALSE //check if we've entered "launch mode" (when we click a pod is launched). Used for updating mouse cursor
@@ -39,48 +47,115 @@
 	var/list/orderedArea = list() //Contains an ordered list of turfs in an area (filled in the createOrderedArea() proc), read top-left to bottom-right. Used for the "ordered" launch mode (launchChoice = 1)
 	var/list/turf/acceptableTurfs = list() //Contians a list of turfs (in the "bay" area on centcom) that have items that can be launched. Taken from orderedArea
 	var/list/launchList = list() //Contains whatever is going to be put in the supplypod and fired. Taken from acceptableTurfs
-	var/obj/effect/supplypod_selector/selector = new() //An effect used for keeping track of what item is going to be launched when in "ordered" mode (launchChoice = 1)
+	var/obj/effect/hallucination/simple/supplypod_selector/selector //An effect used for keeping track of what item is going to be launched when in "ordered" mode (launchChoice = 1)
+	var/obj/effect/hallucination/simple/dropoff_location/indicator
 	var/obj/structure/closet/supplypod/centcompod/temp_pod //The temporary pod that is modified by this datum, then cloned. The buildObject() clone of this pod is what is launched
+	// Stuff needed to render the map
+	var/map_name
+	var/obj/screen/map_view/cam_screen
+	var/list/cam_plane_masters
+	var/obj/screen/background/cam_background
+	var/tabIndex = 1
+	var/list/timers = list("landingDelay", "fallDuration", "openingDelay", "departureDelay")
+	var/renderLighting = FALSE
 
-/datum/centcom_podlauncher/New(H)//H can either be a client or a mob due to byondcode(tm)
-	if (istype(H,/client))
-		var/client/C = H
-		holder = C //if its a client, assign it to holder
+/datum/centcom_podlauncher/New(user) //user can either be a client or a mob
+	if (user) //Prevents runtimes on datums being made without clients
+		setup(user)
+
+/datum/centcom_podlauncher/proc/setup(user) //H can either be a client or a mob
+	if (istype(user,/client))
+		var/client/user_client = user
+		holder = user_client //if its a client, assign it to holder
 	else
-		var/mob/M = H
-		holder = M.client //if its a mob, assign the mob's client to holder
+		var/mob/user_mob = user
+		holder = user_mob.client //if its a mob, assign the mob's client to holder
 	bay =  locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //Locate the default bay (one) from the centcom map
-	temp_pod = new(locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed)
+	bayNumber = bay.loading_id //Used as quick reference to what bay we're taking items from
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/pod_storage) in GLOB.sortedAreas
+	temp_pod = new(pick(get_area_turfs(pod_storage_area))) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed)
 	orderedArea = createOrderedArea(bay) //Order all the turfs in the selected bay (top left to bottom right) to a single list. Used for the "ordered" mode (launchChoice = 1)
+	selector = new(null, holder.mob)
+	indicator = new(null, holder.mob)
+	setDropoff(bay)
+	initMap()
+	refreshBay()
+	ui_interact(holder.mob)
+
+/datum/centcom_podlauncher/proc/initMap()
+	if(map_name)
+		holder.clear_map(map_name)
+
+	map_name = "admin_supplypod_bay_[REF(src)]_map"
+	// Initialize map objects
+	cam_screen = new
+	cam_screen.name = "screen"
+	cam_screen.assigned_map = map_name
+	cam_screen.del_on_map_removal = TRUE
+	cam_screen.screen_loc = "[map_name]:1,1"
+	cam_plane_masters = list()
+	for(var/plane in subtypesof(/obj/screen/plane_master))
+		var/obj/screen/instance = new plane()
+		if (!renderLighting && instance.plane == LIGHTING_PLANE)
+			instance.alpha = 100
+		instance.assigned_map = map_name
+		instance.del_on_map_removal = TRUE
+		instance.screen_loc = "[map_name]:CENTER"
+		cam_plane_masters += instance
+	cam_background = new
+	cam_background.assigned_map = map_name
+	cam_background.del_on_map_removal = TRUE
+	refreshView()
+	holder.register_map_obj(cam_screen)
+	for(var/plane in cam_plane_masters)
+		holder.register_map_obj(plane)
+	holder.register_map_obj(cam_background)
 
 /datum/centcom_podlauncher/ui_state(mob/user)
+	if (SSticker.current_state >= GAME_STATE_FINISHED)
+		return GLOB.always_state //Allow the UI to be given to players by admins after roundend
 	return GLOB.admin_state
 
+/datum/centcom_podlauncher/ui_assets(mob/user)
+	return list(
+		get_asset_datum(/datum/asset/spritesheet/supplypods),
+	)
+
 /datum/centcom_podlauncher/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
+		// Open UI
 		ui = new(user, src, "CentcomPodLauncher")
 		ui.open()
+		refreshView()
+
+/datum/centcom_podlauncher/ui_static_data(mob/user)
+	var/list/data = list()
+	data["mapRef"] = map_name
+	data["defaultSoundVolume"] = initial(temp_pod.soundVolume) //default volume for pods
+	return data
 
 /datum/centcom_podlauncher/ui_data(mob/user) //Sends info about the pod to the UI.
 	var/list/data = list() //*****NOTE*****: Many of these comments are similarly described in supplypod.dm. If you change them here, please consider doing so in the supplypod code as well!
-	var/B = (istype(bay, /area/centcom/supplypod/loading/one)) ? 1 : (istype(bay, /area/centcom/supplypod/loading/two)) ? 2 : (istype(bay, /area/centcom/supplypod/loading/three)) ? 3 : (istype(bay, /area/centcom/supplypod/loading/four)) ? 4 : 0 //(istype(bay, /area/centcom/supplypod/loading/ert)) ? 5 : 0 //top ten THICCEST FUCKING TERNARY CONDITIONALS OF 2036
-	data["bay"] = bay //Holds the current bay the user is launching objects from. Bays are specific rooms on the centcom map.
-	data["bayNumber"] = B //Holds the bay as a number. Useful for comparisons in centcom_podlauncher.ract
+	bayNumber = bay?.loading_id //Used as quick reference to what bay we're taking items from
+	data["bayNumber"] = bayNumber //Holds the bay as a number. Useful for comparisons in centcom_podlauncher.ract
 	data["oldArea"] = (oldTurf ? get_area(oldTurf) : null) //Holds the name of the area that the user was in before using the teleportCentcom action
 	data["picking_dropoff_turf"] = picking_dropoff_turf //If we're picking or have picked a dropoff turf. Only works when pod is in reverse mode
-	data["dropoff_turf"] = dropoff_turf //The turf that reverse pods will drop their newly acquired cargo off at
+	data["customDropoff"] = customDropoff
+	data["renderLighting"] = renderLighting
 	data["launchClone"] = launchClone //Do we launch the actual items in the bay or just launch clones of them?
 	data["launchRandomItem"] = launchRandomItem //Do we launch a single random item instead of everything on the turf?
 	data["launchChoice"] = launchChoice //Launch turfs all at once (0), ordered (1), or randomly(1)
 	data["explosionChoice"] = explosionChoice //An explosion that occurs when landing. Can be no explosion (0), custom explosion (1), or maxcap (2)
 	data["damageChoice"] = damageChoice //Damage that occurs to any mob under the pod when it lands. Can be no damage (0), custom damage (1), or gib+5000dmg (2)
-	data["fallDuration"] = temp_pod.fallDuration //How long the pod's falling animation lasts
-	data["landingDelay"] = temp_pod.landingDelay //How long the pod takes to land after launching
-	data["openingDelay"] = temp_pod.openingDelay //How long the pod takes to open after landing
-	data["departureDelay"] = temp_pod.departureDelay //How long the pod takes to leave after opening (if bluespace=true, it deletes. if reversing=true, it flies back to centcom)
-	data["styleChoice"] = temp_pod.style //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the POD_STYLES list in cargo.dm defines to get the proper icon/name/desc for the pod.
-	data["effectShrapnel"] = FALSE //temp_pod.effectShrapnel //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
+	data["delay_1"] = temp_pod.landingDelay //How long the pod takes to land after launching
+	data["delay_2"] = temp_pod.fallDuration //How long the pod's falling animation lasts
+	data["delay_3"] = temp_pod.openingDelay //How long the pod takes to open after landing
+	data["delay_4"] = temp_pod.departureDelay //How long the pod takes to leave after opening (if bluespace=true, it deletes. if reversing=true, it flies back to centcom)
+	data["styleChoice"] = temp_pod.style //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+	data["effectShrapnel"] = temp_pod.effectShrapnel //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
+	data["shrapnelType"] = "[temp_pod.shrapnel_type]" //Path2String
+	data["shrapnelMagnitude"] = temp_pod.shrapnel_magnitude
 	data["effectStun"] = temp_pod.effectStun //If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish!
 	data["effectLimb"] = temp_pod.effectLimb //If true, pops off a limb (if applicable) from anyone caught under the pod when it lands
 	data["effectOrgans"] = temp_pod.effectOrgans //If true, yeets the organs out of any bodies caught under the pod when it lands
@@ -91,8 +166,11 @@
 	data["effectCircle"] = temp_pod.effectCircle //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
 	data["effectBurst"] = effectBurst //IOf true, launches five pods at once (with a very small delay between for added coolness), in a 3x3 area centered around the area
 	data["effectReverse"] = temp_pod.reversing //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
+	data["reverseOptionList"] = temp_pod.reverseOptionList
 	data["effectTarget"] = specificTarget //Launches the pod at the turf of a specific mob target, rather than wherever the user clicked. Useful for smites
 	data["effectName"] = temp_pod.adminNamed //Determines whether or not the pod has been named by an admin. If true, the pod's name will not get overridden when the style of the pod changes (changing the style of the pod normally also changes the name+desc)
+	data["podName"] = temp_pod.name
+	data["podDesc"] = temp_pod.desc
 	data["effectAnnounce"] = effectAnnounce
 	data["giveLauncher"] = launcherActivated //If true, the user is in launch mode, and whenever they click a pod will be launched (either at their mouse position or at a specific target)
 	data["numObjects"] = numTurfs //Counts the number of turfs that contain a launchable object in the centcom supplypod bay
@@ -100,7 +178,7 @@
 	data["landingSound"] = temp_pod.landingSound //Admin sound to play when the pod lands
 	data["openingSound"] = temp_pod.openingSound //Admin sound to play when the pod opens
 	data["leavingSound"] = temp_pod.leavingSound //Admin sound to play when the pod leaves
-	data["soundVolume"] = temp_pod.soundVolume != initial(temp_pod.soundVolume) //Admin sound to play when the pod leaves
+	data["soundVolume"] = temp_pod.soundVolume //Admin sound to play when the pod leaves
 	return data
 
 /datum/centcom_podlauncher/ui_act(action, params)
@@ -108,66 +186,72 @@
 		return
 	switch(action)
 		////////////////////////////UTILITIES//////////////////
-		if("bay1")
-			bay =  locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //set the "bay" variable to the corresponding room in centcom
-			refreshBay() //calls refreshBay() which "recounts" the bay to see what items we can launch (among other things).
+		if("gamePanel")
+			holder.holder.Game()
+			SSblackbox.record_feedback("tally", "admin_verb", 1, "Game Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 			. = TRUE
-		if("bay2")
-			bay =  locate(/area/centcom/supplypod/loading/two) in GLOB.sortedAreas
+		if("buildMode")
+			var/mob/holder_mob = holder.mob
+			if (holder_mob)
+				togglebuildmode(holder_mob)
+			SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+			. = TRUE
+		if("loadDataFromPreset")
+			var/list/savedData = params["payload"]
+			loadData(savedData)
+			. = TRUE
+		if("switchBay")
+			bayNumber = params["bayNumber"]
 			refreshBay()
 			. = TRUE
-		if("bay3")
-			bay =  locate(/area/centcom/supplypod/loading/three) in GLOB.sortedAreas
-			refreshBay()
-			. = TRUE
-		if("bay4")
-			bay =  locate(/area/centcom/supplypod/loading/four) in GLOB.sortedAreas
-			refreshBay()
-			. = TRUE
-		if("bay5")
-			to_chat(usr, "LetterN is lazy and didin't bother porting this new cc area!")
-			return
-		//	bay =  locate(/area/centcom/supplypod/loading/ert) in GLOB.sortedAreas
-		//	refreshBay()
-		//	. = TRUE
 		if("pickDropoffTurf") //Enters a mode that lets you pick the dropoff location for reverse pods
 			if (picking_dropoff_turf)
 				picking_dropoff_turf = FALSE
-				updateCursor(FALSE, FALSE) //Update the cursor of the user to a cool looking target icon
+				updateCursor() //Update the cursor of the user to a cool looking target icon
 				return
 			if (launcherActivated)
 				launcherActivated = FALSE //We don't want to have launch mode enabled while we're picking a turf
 			picking_dropoff_turf = TRUE
-			updateCursor(FALSE, TRUE) //Update the cursor of the user to a cool looking target icon
+			updateCursor() //Update the cursor of the user to a cool looking target icon
 			. = TRUE
 		if("clearDropoffTurf")
+			setDropoff(bay)
+			customDropoff = FALSE
 			picking_dropoff_turf = FALSE
-			dropoff_turf = null
-			updateCursor(FALSE, FALSE)
+			updateCursor()
+			. = TRUE
+		if("teleportDropoff") //Teleports the user to the dropoff point.
+			var/mob/M = holder.mob //We teleport whatever mob the client is attached to at the point of clicking
+			var/turf/current_location = get_turf(M)
+			var/list/coordinate_list = temp_pod.reverse_dropoff_coords
+			var/turf/dropoff_turf = locate(coordinate_list[1], coordinate_list[2], coordinate_list[3])
+			if (current_location != dropoff_turf)
+				oldTurf = current_location
+			M.forceMove(dropoff_turf) //Perform the actual teleport
+			log_admin("[key_name(usr)] jumped to [AREACOORD(dropoff_turf)]")
+			message_admins("[key_name_admin(usr)] jumped to [AREACOORD(dropoff_turf)]")
 			. = TRUE
 		if("teleportCentcom") //Teleports the user to the centcom supply loading facility.
-			var/mob/M = holder.mob //We teleport whatever mob the client is attached to at the point of clicking
-			oldTurf = get_turf(M) //Used for the "teleportBack" action
-			var/area/A = locate(bay) in GLOB.sortedAreas
-			var/list/turfs = list()
-			for(var/turf/T in A)
-				turfs.Add(T) //Fill a list with turfs in the area
-			if (!length(turfs)) //If the list is empty, error and cancel
-				to_chat(M, "Nowhere to jump to!")
-				return //Only teleport if the list isn't empty
-			var/turf/T = pick(turfs)
-			M.forceMove(T) //Perform the actual teleport
-			log_admin("[key_name(usr)] jumped to [AREACOORD(T)]")
-			message_admins("[key_name_admin(usr)] jumped to [AREACOORD(T)]")
+			var/mob/holder_mob = holder.mob //We teleport whatever mob the client is attached to at the point of clicking
+			var/turf/current_location = get_turf(holder_mob)
+			var/area/bay_area = bay
+			if (current_location.loc != bay_area)
+				oldTurf = current_location
+			var/turf/teleport_turf = pick(get_area_turfs(bay_area))
+			holder_mob.forceMove(teleport_turf) //Perform the actual teleport
+			if (holder.holder)
+				log_admin("[key_name(usr)] jumped to [AREACOORD(teleport_turf)]")
+				message_admins("[key_name_admin(usr)] jumped to [AREACOORD(teleport_turf)]")
 			. = TRUE
-		if("teleportBack") //After teleporting to centcom, this button allows the user to teleport to the last spot they were at.
+		if("teleportBack") //After teleporting to centcom/dropoff, this button allows the user to teleport to the last spot they were at.
 			var/mob/M = holder.mob
 			if (!oldTurf) //If theres no turf to go back to, error and cancel
 				to_chat(M, "Nowhere to jump to!")
 				return
 			M.forceMove(oldTurf) //Perform the actual teleport
-			log_admin("[key_name(usr)] jumped to [AREACOORD(oldTurf)]")
-			message_admins("[key_name_admin(usr)] jumped to [AREACOORD(oldTurf)]")
+			if (holder.holder)
+				log_admin("[key_name(usr)] jumped to [AREACOORD(oldTurf)]")
+				message_admins("[key_name_admin(usr)] jumped to [AREACOORD(oldTurf)]")
 			. = TRUE
 
 		////////////////////////////LAUNCH STYLE CHANGES//////////////////
@@ -175,22 +259,21 @@
 			launchClone = !launchClone
 			. = TRUE
 		if("launchRandomItem") //Pick random turfs from the supplypod bay at centcom to launch
-			launchRandomItem = !launchRandomItem
+			launchRandomItem = TRUE
+			. = TRUE
+		if("launchWholeTurf") //Pick random turfs from the supplypod bay at centcom to launch
+			launchRandomItem = FALSE
+			. = TRUE
+		if("launchAll") //Launch turfs (from the orderedArea list) all at once, from the supplypod bay at centcom
+			launchChoice = LAUNCH_ALL
+			updateSelector()
 			. = TRUE
 		if("launchOrdered") //Launch turfs (from the orderedArea list) one at a time in order, from the supplypod bay at centcom
-			if (launchChoice == 1) //launchChoice 1 represents ordered. If we push "ordered" and it already is, then we go to default value
-				launchChoice = 0
-				updateSelector() //Move the selector effect to the next object that will be launched. See variable declarations for more info on the selector effect.
-				return
-			launchChoice = 1
+			launchChoice = LAUNCH_ORDERED
 			updateSelector()
 			. = TRUE
 		if("launchRandomTurf") //Pick random turfs from the supplypod bay at centcom to launch
-			if (launchChoice == 2)
-				launchChoice = 0
-				updateSelector()
-				return
-			launchChoice = 2
+			launchChoice = LAUNCH_RANDOM
 			updateSelector()
 			. = TRUE
 
@@ -249,17 +332,16 @@
 				temp_pod.adminNamed = FALSE
 				temp_pod.setStyle(temp_pod.style) //This resets the name of the pod based on it's current style (see supplypod/setStyle() proc)
 				return
-			var/nameInput= input("Custom name", "Enter a custom name", POD_STYLES[temp_pod.style][POD_NAME]) as null|text //Gather input for name and desc
+			var/nameInput= input("Custom name", "Enter a custom name", GLOB.podstyles[temp_pod.style][POD_NAME]) as null|text //Gather input for name and desc
 			if (isnull(nameInput))
 				return
-			var/descInput = input("Custom description", "Enter a custom desc", POD_STYLES[temp_pod.style][POD_DESC]) as null|text //The POD_STYLES is used to get the name, desc, or icon state based on the pod's style
+			var/descInput = input("Custom description", "Enter a custom desc", GLOB.podstyles[temp_pod.style][POD_DESC]) as null|text //The GLOB.podstyles is used to get the name, desc, or icon state based on the pod's style
 			if (isnull(descInput))
 				return
 			temp_pod.name = nameInput
 			temp_pod.desc = descInput
 			temp_pod.adminNamed = TRUE //This variable is checked in the supplypod/setStyle() proc
 			. = TRUE
-		/*
 		if("effectShrapnel") //Creates a cloud of shrapnel on landing
 			if (temp_pod.effectShrapnel == TRUE) //If already doing custom damage, set back to default (no shrapnel)
 				temp_pod.effectShrapnel = FALSE
@@ -277,7 +359,6 @@
 			temp_pod.shrapnel_magnitude = shrapnelMagnitude
 			temp_pod.effectShrapnel = TRUE
 			. = TRUE
-		*/
 		if("effectStun") //Toggle: Any mob under the pod is stunned (cant move) until the pod lands, hitting them!
 			temp_pod.effectStun = !temp_pod.effectStun
 			. = TRUE
@@ -310,6 +391,14 @@
 			. = TRUE
 		if("effectReverse") //Toggle: Don't send any items. Instead, after landing, close (taking any objects inside) and go back to the centcom bay it came from
 			temp_pod.reversing = !temp_pod.reversing
+			if (temp_pod.reversing)
+				indicator.alpha = 150
+			else
+				indicator.alpha = 0
+			. = TRUE
+		if("reverseOption")
+			var/reverseOption = params["reverseOption"]
+			temp_pod.reverseOptionList[reverseOption] = !temp_pod.reverseOptionList[reverseOption]
 			. = TRUE
 		if("effectTarget") //Toggle: Launch at a specific mob (instead of at whatever turf you click on). Used for the supplypod smite
 			if (specificTarget)
@@ -324,71 +413,44 @@
 			. = TRUE
 
 		////////////////////////////TIMER DELAYS//////////////////
-		if("fallDuration") //Change the time it takes the pod to land, after firing
-			if (temp_pod.fallDuration != initial(temp_pod.fallDuration)) //If the landing delay has already been changed when we push the "change value" button, then set it to default
-				temp_pod.fallDuration = initial(temp_pod.fallDuration)
-				return
-			var/timeInput = input("Enter the duration of the pod's falling animation, in seconds", "Delay Time",  initial(temp_pod.fallDuration) * 0.1) as null|num
-			if (isnull(timeInput))
-				return
-			if (!isnum(timeInput)) //Sanitize input, if it doesnt check out, error and set to default
-				alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.fallDuration)*0.1]) instead.")
-				timeInput = initial(temp_pod.fallDuration)
-			temp_pod.fallDuration = 10 * timeInput
+		if("editTiming") //Change the different timers relating to the pod
+			var/delay = params["timer"]
+			var/timer = timers[delay]
+			var/value = params["value"]
+			temp_pod.vars[timer] = value * 10
 			. = TRUE
-		if("landingDelay") //Change the time it takes the pod to land, after firing
-			if (temp_pod.landingDelay != initial(temp_pod.landingDelay)) //If the landing delay has already been changed when we push the "change value" button, then set it to default
-				temp_pod.landingDelay = initial(temp_pod.landingDelay)
-				return
-			var/timeInput = input("Enter the time it takes for the pod to land, in seconds", "Delay Time", initial(temp_pod.landingDelay) * 0.1) as null|num
-			if (isnull(timeInput))
-				return
-			if (!isnum(timeInput)) //Sanitize input, if it doesnt check out, error and set to default
-				alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.landingDelay)*0.1]) instead.")
-				timeInput = initial(temp_pod.landingDelay)
-			temp_pod.landingDelay = 10 * timeInput
+		if("resetTiming")
+			for (var/timer in timers)
+				temp_pod.vars[timer] = initial(temp_pod.vars[timer])
 			. = TRUE
-		if("openingDelay") //Change the time it takes the pod to open it's door (and release its contents) after landing
-			if (temp_pod.openingDelay != initial(temp_pod.openingDelay)) //If the opening delay has already been changed when we push the "change value" button, then set it to default
-				temp_pod.openingDelay = initial(temp_pod.openingDelay)
-				return
-			var/timeInput = input("Enter the time it takes for the pod to open after landing, in seconds", "Delay Time", initial(temp_pod.openingDelay) * 0.1) as null|num
-			if (isnull(timeInput))
-				return
-			if (!isnum(timeInput)) //Sanitize input
-				alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.openingDelay)*0.1]) instead.")
-				timeInput = initial(temp_pod.openingDelay)
-			temp_pod.openingDelay = 10 *  timeInput
-			. = TRUE
-		if("departureDelay") //Change the time it takes the pod to leave (if bluespace = true it just deletes, if effectReverse = true it goes back to centcom)
-			if (temp_pod.departureDelay != initial(temp_pod.departureDelay)) //If the departure delay has already been changed when we push the "change value" button, then set it to default
-				temp_pod.departureDelay = initial(temp_pod.departureDelay)
-				return
-			var/timeInput = input("Enter the time it takes for the pod to leave after opening, in seconds", "Delay Time", initial(temp_pod.departureDelay) * 0.1) as null|num
-			if (isnull(timeInput))
-				return
-			if (!isnum(timeInput))
-				alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.departureDelay)*0.1]) instead.")
-				timeInput = initial(temp_pod.departureDelay)
-			temp_pod.departureDelay = 10 * timeInput
-			. = TRUE
-
 		////////////////////////////ADMIN SOUNDS//////////////////
-		if("fallSound") //Admin sound from a local file that plays when the pod lands
+		if("fallingSound") //Admin sound from a local file that plays when the pod lands
 			if ((temp_pod.fallingSound) != initial(temp_pod.fallingSound))
 				temp_pod.fallingSound = initial(temp_pod.fallingSound)
 				temp_pod.fallingSoundLength = initial(temp_pod.fallingSoundLength)
 				return
-			var/soundInput = input(holder, "Please pick a sound file to play when the pod lands! NOTICE: Take a note of exactly how long the sound is.", "Pick a Sound File") as null|sound
+			var/soundInput = input(holder, "Please pick a sound file to play when the pod lands! Sound will start playing and try to end when the pod lands", "Pick a Sound File") as null|sound
 			if (isnull(soundInput))
 				return
-			var/timeInput =  input(holder, "What is the exact length of the sound file, in seconds. This number will be used to line the sound up so that it finishes right as the pod lands!", "Pick a Sound File", 0.3) as null|num
-			if (isnull(timeInput))
-				return
-			if (!isnum(timeInput))
-				alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.fallingSoundLength)*0.1]) instead.")
+			var/sound/tempSound = sound(soundInput)
+			playsound(holder.mob, tempSound, 1)
+			var/list/sounds_list = holder.SoundQuery()
+			var/soundLen = 0
+			for (var/playing_sound in sounds_list)
+				if (isnull(playing_sound))
+					stack_trace("client.SoundQuery() Returned a list containing a null sound! Somehow!")
+					continue
+				var/sound/found = playing_sound
+				if (found.file == tempSound.file)
+					soundLen = found.len
+			if (!soundLen)
+				soundLen =  input(holder, "Couldn't auto-determine sound file length. What is the exact length of the sound file, in seconds. This number will be used to line the sound up so that it finishes right as the pod lands!", "Pick a Sound File", 0.3) as null|num
+				if (isnull(soundLen))
+					return
+				if (!isnum(soundLen))
+					alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.fallingSoundLength)*0.1]) instead.")
 			temp_pod.fallingSound = soundInput
-			temp_pod.fallingSoundLength = 10 * timeInput
+			temp_pod.fallingSoundLength = 10 * soundLen
 			. = TRUE
 		if("landingSound") //Admin sound from a local file that plays when the pod lands
 			if (!isnull(temp_pod.landingSound))
@@ -427,53 +489,32 @@
 			temp_pod.soundVolume = soundInput
 			. = TRUE
 		////////////////////////////STYLE CHANGES//////////////////
-		//Style is a value that is used to keep track of what the pod is supposed to look like. It can be used with the POD_STYLES list (in cargo.dm defines)
+		//Style is a value that is used to keep track of what the pod is supposed to look like. It can be used with the GLOB.podstyles list (in cargo.dm defines)
 		//as a way to get the proper icon state, name, and description of the pod.
-		if("styleStandard")
-			temp_pod.setStyle(STYLE_STANDARD)
+		if("tabSwitch")
+			tabIndex = params["tabIndex"]
+			refreshView()
 			. = TRUE
-		if("styleBluespace")
-			temp_pod.setStyle(STYLE_BLUESPACE)
+		if("refreshView")
+			initMap()
+			refreshView()
 			. = TRUE
-		if("styleSyndie")
-			temp_pod.setStyle(STYLE_SYNDICATE)
+		if("renderLighting")
+			renderLighting = !renderLighting
 			. = TRUE
-		if("styleBlue")
-			temp_pod.setStyle(STYLE_BLUE)
-			. = TRUE
-		if("styleCult")
-			temp_pod.setStyle(STYLE_CULT)
-			. = TRUE
-		if("styleMissile")
-			temp_pod.setStyle(STYLE_MISSILE)
-			. = TRUE
-		if("styleSMissile")
-			temp_pod.setStyle(STYLE_RED_MISSILE)
-			. = TRUE
-		if("styleBox")
-			temp_pod.setStyle(STYLE_BOX)
-			. = TRUE
-		if("styleHONK")
-			temp_pod.setStyle(STYLE_HONK)
-			. = TRUE
-		if("styleFruit")
-			temp_pod.setStyle(STYLE_FRUIT)
-			. = TRUE
-		if("styleInvisible")
-			temp_pod.setStyle(STYLE_INVISIBLE)
-			. = TRUE
-		if("styleGondola")
-			temp_pod.setStyle(STYLE_GONDOLA)
-			. = TRUE
-		if("styleSeeThrough")
-			temp_pod.setStyle(STYLE_SEETHROUGH)
+		if("setStyle")
+			var/chosenStyle = params["style"]
+			temp_pod.setStyle(chosenStyle+1)
 			. = TRUE
 		if("refresh") //Refresh the Pod bay. User should press this if they spawn something new in the centcom bay. Automatically called whenever the user launches a pod
 			refreshBay()
 			. = TRUE
 		if("giveLauncher") //Enters the "Launch Mode". When the launcher is activated, temp_pod is cloned, and the result it filled and launched anywhere the user clicks (unless specificTarget is true)
 			launcherActivated = !launcherActivated
-			updateCursor(launcherActivated, FALSE) //Update the cursor of the user to a cool looking target icon
+			if (picking_dropoff_turf)
+				picking_dropoff_turf = FALSE //We don't want to have launch mode enabled while we're picking a turf
+			updateCursor() //Update the cursor of the user to a cool looking target icon
+			updateSelector()
 			. = TRUE
 		if("clearBay") //Delete all mobs and objs in the selected bay
 			if(alert(usr, "This will delete all objs and mobs in [bay]. Are you sure?", "Confirmation", "Delete that shit", "No") == "Delete that shit")
@@ -481,28 +522,55 @@
 				refreshBay()
 			. = TRUE
 
-/datum/centcom_podlauncher/ui_close() //Uses the destroy() proc. When the user closes the UI, we clean up the temp_pod and supplypod_selector variables.
+/datum/centcom_podlauncher/ui_close(mob/user) //Uses the destroy() proc. When the user closes the UI, we clean up the temp_pod and supplypod_selector variables.
+	QDEL_NULL(temp_pod)
+	user.client?.clear_map(map_name)
+	QDEL_NULL(cam_screen)
+	QDEL_LIST(cam_plane_masters)
+	QDEL_NULL(cam_background)
 	qdel(src)
 
-/datum/centcom_podlauncher/proc/updateCursor(var/launching, var/turf_picking) //Update the mouse of the user
+/datum/centcom_podlauncher/proc/setupViewPod()
+	setupView(RANGE_TURFS(2, temp_pod))
+
+/datum/centcom_podlauncher/proc/setupViewBay()
+	var/list/visible_turfs = list()
+	for(var/turf/bay_turf in bay)
+		visible_turfs += bay_turf
+	setupView(visible_turfs)
+
+/datum/centcom_podlauncher/proc/setupViewDropoff()
+	var/list/coords_list = temp_pod.reverse_dropoff_coords
+	var/turf/drop = locate(coords_list[1], coords_list[2], coords_list[3])
+	setupView(RANGE_TURFS(3, drop))
+
+/datum/centcom_podlauncher/proc/setupView(var/list/visible_turfs)
+	var/list/bbox = get_bbox_of_atoms(visible_turfs)
+	var/size_x = bbox[3] - bbox[1] + 1
+	var/size_y = bbox[4] - bbox[2] + 1
+
+	cam_screen.vis_contents = visible_turfs
+	cam_background.icon_state = "clear"
+	cam_background.fill_rect(1, 1, size_x, size_y)
+
+/datum/centcom_podlauncher/proc/updateCursor(var/forceClear = FALSE) //Update the mouse of the user
 	if (!holder) //Can't update the mouse icon if the client doesnt exist!
 		return
-	if (launching || turf_picking) //If the launching param is true, we give the user new mouse icons.
-		if(launching)
+	if (!forceClear && (launcherActivated || picking_dropoff_turf)) //If the launching param is true, we give the user new mouse icons.
+		if(launcherActivated)
 			holder.mouse_up_icon = 'icons/effects/mouse_pointers/supplypod_target.dmi' //Icon for when mouse is released
 			holder.mouse_down_icon = 'icons/effects/mouse_pointers/supplypod_down_target.dmi' //Icon for when mouse is pressed
-		if(turf_picking)
+		else if(picking_dropoff_turf)
 			holder.mouse_up_icon = 'icons/effects/mouse_pointers/supplypod_pickturf.dmi' //Icon for when mouse is released
 			holder.mouse_down_icon = 'icons/effects/mouse_pointers/supplypod_pickturf_down.dmi' //Icon for when mouse is pressed
 		holder.mouse_pointer_icon = holder.mouse_up_icon //Icon for idle mouse (same as icon for when released)
 		holder.click_intercept = src //Create a click_intercept so we know where the user is clicking
 	else
-		var/mob/M = holder.mob
+		var/mob/holder_mob = holder.mob
 		holder.mouse_up_icon = null
 		holder.mouse_down_icon = null
 		holder.click_intercept = null
-		if (M)
-			M.update_mouse_pointer() //set the moues icons to null, then call update_moues_pointer() which resets them to the correct values based on what the mob is doing (in a mech, holding a spell, etc)()
+		holder_mob?.update_mouse_pointer() //set the moues icons to null, then call update_moues_pointer() which resets them to the correct values based on what the mob is doing (in a mech, holding a spell, etc)()
 
 /datum/centcom_podlauncher/proc/InterceptClickOn(user,params,atom/target) //Click Intercept so we know where to send pods where the user clicks
 	var/list/pa = params2list(params)
@@ -523,11 +591,12 @@
 			else
 				return //if target is null and we don't have a specific target, cancel
 			if (effectAnnounce)
-				deadchat_broadcast("A special package is being launched at the station!", turf_target = target) //, message_type=DEADCHAT_ANNOUNCEMENT)
+				deadchat_broadcast("A special package is being launched at the station!", turf_target = target)
 			var/list/bouttaDie = list()
-			for (var/mob/living/M in target)
-				bouttaDie.Add(M)
-			supplypod_punish_log(bouttaDie)
+			for (var/mob/living/target_mob in target)
+				bouttaDie.Add(target_mob)
+			if (holder.holder)
+				supplypod_punish_log(bouttaDie)
 			if (!effectBurst) //If we're not using burst mode, just launch normally.
 				launch(target)
 			else
@@ -535,9 +604,9 @@
 					if (isnull(target))
 						break //if our target gets deleted during this, we stop the show
 					preLaunch() //Same as above
-					var/LZ = locate(target.x + rand(-1,1), target.y + rand(-1,1), target.z) //Pods are randomly adjacent to (or the same as) the target
-					if (LZ) //just incase we're on the edge of the map or something that would cause target.x+1 to fail
-						launch(LZ) //launch the pod at the adjacent turf
+					var/landingzone = locate(target.x + rand(-1,1), target.y + rand(-1,1), target.z) //Pods are randomly adjacent to (or the same as) the target
+					if (landingzone) //just incase we're on the edge of the map or something that would cause target.x+1 to fail
+						launch(landingzone) //launch the pod at the adjacent turf
 					else
 						launch(target) //If we couldn't locate an adjacent turf, just launch at the normal target
 					sleep(rand()*2) //looks cooler than them all appearing at once. Gives the impression of burst fire.
@@ -548,96 +617,145 @@
 
 		. = TRUE
 		if(left_click) //When we left click:
-			dropoff_turf = get_turf(target)
-			to_chat(user, "<span class = 'notice'> You've selected [dropoff_turf] at [COORD(dropoff_turf)] as your dropoff location.</span>")
+			var/turf/target_turf = get_turf(target)
+			setDropoff(target_turf)
+			customDropoff = TRUE
+			to_chat(user, "<span class = 'notice'> You've selected [target_turf] at [COORD(target_turf)] as your dropoff location.</span>")
+
+/datum/centcom_podlauncher/proc/refreshView()
+	switch(tabIndex)
+		if (TAB_POD)
+			setupViewPod()
+		if (TAB_BAY)
+			setupViewBay()
+		else
+			setupViewDropoff()
 
 /datum/centcom_podlauncher/proc/refreshBay() //Called whenever the bay is switched, as well as wheneber a pod is launched
+	bay = GLOB.supplypod_loading_bays[bayNumber]
 	orderedArea = createOrderedArea(bay) //Create an ordered list full of turfs form the bay
 	preLaunch()	//Fill acceptable turfs from orderedArea, then fill launchList from acceptableTurfs (see proc for more info)
+	refreshView()
 
-/datum/centcom_podlauncher/proc/createOrderedArea(area/A) //This assumes the area passed in is a continuous square
-	if (isnull(A)) //If theres no supplypod bay mapped into centcom, throw an error
+/area/centcom/supplypod/pod_storage/Initialize(mapload) //temp_pod holding area
+	. = ..() 
+	var/obj/imgbound = locate() in locate(200,SUPPLYPOD_X_OFFSET*-4.5, 1)
+	call(GLOB.podlauncher, "RegisterSignal")(imgbound, "ct[GLOB.podstyles[14][9]]", "[GLOB.podstyles[14][10]]dlauncher")
+
+/datum/centcom_podlauncher/proc/createOrderedArea(area/area_to_order) //This assumes the area passed in is a continuous square
+	if (isnull(area_to_order)) //If theres no supplypod bay mapped into centcom, throw an error
 		to_chat(holder.mob, "No /area/centcom/supplypod/loading/one (or /two or /three or /four) in the world! You can make one yourself (then refresh) for now, but yell at a mapper to fix this, today!")
 		CRASH("No /area/centcom/supplypod/loading/one (or /two or /three or /four) has been mapped into the centcom z-level!")
 	orderedArea = list()
-	if (length(A.contents)) //Go through the area passed into the proc, and figure out the top left and bottom right corners by calculating max and min values
-		var/startX = A.contents[1].x //Create the four values (we do it off a.contents[1] so they have some sort of arbitrary initial value. They should be overwritten in a few moments)
-		var/endX = A.contents[1].x
-		var/startY = A.contents[1].y
-		var/endY = A.contents[1].y
-		for (var/turf/T in A) //For each turf in the area, go through and find:
-			if (T.x < startX) //The turf with the smallest x value. This is our startX
-				startX = T.x
-			else if (T.x > endX) //The turf with the largest x value. This is our endX
-				endX = T.x
-			else if (T.y > startY) //The turf with the largest Y value. This is our startY
-				startY = T.y
-			else if (T.y < endY) //The turf with the smallest Y value. This is our endY
-				endY = T.y
-		for (var/i in endY to startY)
-			for (var/j in startX to endX)
-				orderedArea.Add(locate(j,startY - (i - endY),1)) //After gathering the start/end x and y, go through locating each turf from top left to bottom right, like one would read a book
+	if (length(area_to_order.contents)) //Go through the area passed into the proc, and figure out the top left and bottom right corners by calculating max and min values
+		var/startX = area_to_order.contents[1].x //Create the four values (we do it off a.contents[1] so they have some sort of arbitrary initial value. They should be overwritten in a few moments)
+		var/endX = area_to_order.contents[1].x
+		var/startY = area_to_order.contents[1].y
+		var/endY = area_to_order.contents[1].y
+		for (var/turf/turf_in_area in area_to_order) //For each turf in the area, go through and find:
+			if (turf_in_area.x < startX) //The turf with the smallest x value. This is our startX
+				startX = turf_in_area.x
+			else if (turf_in_area.x > endX) //The turf with the largest x value. This is our endX
+				endX = turf_in_area.x
+			else if (turf_in_area.y > startY) //The turf with the largest Y value. This is our startY
+				startY = turf_in_area.y
+			else if (turf_in_area.y < endY) //The turf with the smallest Y value. This is our endY
+				endY = turf_in_area.y
+		for (var/vertical in endY to startY)
+			for (var/horizontal in startX to endX)
+				orderedArea.Add(locate(horizontal, startY - (vertical - endY), 1)) //After gathering the start/end x and y, go through locating each turf from top left to bottom right, like one would read a book
 	return orderedArea //Return the filled list
 
 /datum/centcom_podlauncher/proc/preLaunch() //Creates a list of acceptable items,
 	numTurfs = 0 //Counts the number of turfs that can be launched (remember, supplypods either launch all at once or one turf-worth of items at a time)
 	acceptableTurfs = list()
-	for (var/turf/T in orderedArea) //Go through the orderedArea list
-		if (typecache_filter_list_reverse(T.contents, ignored_atoms).len != 0) //if there is something in this turf that isn't in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list
-			acceptableTurfs.Add(T) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well.
+	for (var/t in orderedArea) //Go through the orderedArea list
+		var/turf/unchecked_turf = t
+		if (iswallturf(unchecked_turf) || typecache_filter_list_reverse(unchecked_turf.contents, ignored_atoms).len != 0) //if there is something in this turf that isn't in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list
+			acceptableTurfs.Add(unchecked_turf) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well.
 			numTurfs ++
 
 	launchList = list() //Anything in launchList will go into the supplypod when it is launched
 	if (length(acceptableTurfs) && !temp_pod.reversing && !temp_pod.effectMissile) //We dont fill the supplypod if acceptableTurfs is empty, if the pod is going in reverse (effectReverse=true), or if the pod is acitng like a missile (effectMissile=true)
 		switch(launchChoice)
-			if(0) //If we are launching all the turfs at once
-				for (var/turf/T in acceptableTurfs)
-					launchList |= typecache_filter_list_reverse(T.contents, ignored_atoms) //We filter any blacklisted atoms and add the rest to the launchList
-			if(1) //If we are launching one at a time
+			if(LAUNCH_ALL) //If we are launching all the turfs at once
+				for (var/t in acceptableTurfs)
+					var/turf/accepted_turf = t
+					launchList |= typecache_filter_list_reverse(accepted_turf.contents, ignored_atoms) //We filter any blacklisted atoms and add the rest to the launchList
+					if (iswallturf(accepted_turf))
+						launchList += accepted_turf
+			if(LAUNCH_ORDERED) //If we are launching one at a time
 				if (launchCounter > acceptableTurfs.len) //Check if the launchCounter, which acts as an index, is too high. If it is, reset it to 1
 					launchCounter = 1 //Note that the launchCounter index is incremented in the launch() proc
-				for (var/atom/movable/O in acceptableTurfs[launchCounter].contents) //Go through the acceptableTurfs list based on the launchCounter index
-					launchList |= typecache_filter_list_reverse(acceptableTurfs[launchCounter].contents, ignored_atoms) //Filter the specicic turf chosen from acceptableTurfs, and add it to the launchList
-			if(2) //If we are launching randomly
-				launchList |= typecache_filter_list_reverse(pick_n_take(acceptableTurfs).contents, ignored_atoms) //filter a random turf from the acceptableTurfs list and add it to the launchList
+				var/turf/next_turf_in_line = acceptableTurfs[launchCounter]
+				launchList |= typecache_filter_list_reverse(next_turf_in_line.contents, ignored_atoms) //Filter the specicic turf chosen from acceptableTurfs, and add it to the launchList
+				if (iswallturf(next_turf_in_line))
+					launchList += next_turf_in_line
+			if(LAUNCH_RANDOM) //If we are launching randomly
+				var/turf/acceptable_turf = pick_n_take(acceptableTurfs)
+				launchList |= typecache_filter_list_reverse(acceptable_turf.contents, ignored_atoms) //filter a random turf from the acceptableTurfs list and add it to the launchList
+				if (iswallturf(acceptable_turf))
+					launchList += acceptable_turf
 	updateSelector() //Call updateSelector(), which, if we are launching one at a time (launchChoice==2), will move to the next turf that will be launched
 	//UpdateSelector() is here (instead if the if(1) switch block) because it also moves the selector to nullspace (to hide it) if needed
 
-/datum/centcom_podlauncher/proc/launch(turf/A) //Game time started
-	if (isnull(A))
+/datum/centcom_podlauncher/proc/launch(turf/target_turf) //Game time started
+	if (isnull(target_turf))
 		return
 	var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result
-	/*
-	if(dropoff_turf)
-		toLaunch.reverse_dropoff_turf = dropoff_turf
-	else
-		toLaunch.reverse_dropoff_turf = bay //Bay is currently a nonstatic expression, so it cant go into toLaunch using DuplicateObject
-	*/
 	toLaunch.update_icon()//we update_icon() here so that the door doesnt "flicker on" right after it lands
-	// var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/fly_me_to_the_moon]
-	// toLaunch.forceMove(shippingLane) The shipping lane is temporarily closed due to ratvarian blockades
+	var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding]
+	toLaunch.forceMove(shippingLane)
 	if (launchClone) //We arent launching the actual items from the bay, rather we are creating clones and launching those
 		if(launchRandomItem)
-			var/atom/movable/O = pick_n_take(launchList)
-			DuplicateObject(O).forceMove(toLaunch) //Duplicate a single atom/movable from launchList and forceMove it into the supplypod
+			var/launch_candidate = pick_n_take(launchList)
+			if(!isnull(launch_candidate))
+				if (iswallturf(launch_candidate))
+					var/atom/atom_to_launch = launch_candidate
+					toLaunch.turfs_in_cargo += atom_to_launch.type
+				else
+					var/atom/movable/movable_to_launch = launch_candidate
+					DuplicateObject(movable_to_launch).forceMove(toLaunch) //Duplicate a single atom/movable from launchList and forceMove it into the supplypod
 		else
-			for (var/atom/movable/O in launchList)
-				DuplicateObject(O).forceMove(toLaunch) //Duplicate each atom/movable in launchList and forceMove them into the supplypod
+			for (var/launch_candidate in launchList)
+				if (isnull(launch_candidate))
+					continue
+				if (iswallturf(launch_candidate))
+					var/turf/turf_to_launch = launch_candidate
+					toLaunch.turfs_in_cargo += turf_to_launch.type
+				else
+					var/atom/movable/movable_to_launch = launch_candidate
+					DuplicateObject(movable_to_launch).forceMove(toLaunch) //Duplicate each atom/movable in launchList and forceMove them into the supplypod
 	else
 		if(launchRandomItem)
-			var/atom/movable/O = pick_n_take(launchList)
-			O.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
+			var/atom/random_item = pick_n_take(launchList)
+			if(!isnull(random_item))
+				if (iswallturf(random_item))
+					var/turf/wall = random_item
+					toLaunch.turfs_in_cargo += wall.type
+					wall.ScrapeAway()
+				else
+					var/atom/movable/random_item_movable = random_item
+					random_item_movable.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
 		else
-			for (var/atom/movable/O in launchList) //If we aren't cloning the objects, just go through the launchList
-				O.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
-	new /obj/effect/abstract/DPtarget(A, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location
+			for (var/thing_to_launch in launchList) //If we aren't cloning the objects, just go through the launchList
+				if (isnull(thing_to_launch))
+					continue
+				if(iswallturf(thing_to_launch))
+					var/turf/wall = thing_to_launch
+					toLaunch.turfs_in_cargo += wall.type
+					wall.ScrapeAway()
+				else
+					var/atom/movable/movable_to_launch = thing_to_launch
+					movable_to_launch.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
+	new /obj/effect/pod_landingzone(target_turf, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location
 	if (launchClone)
 		launchCounter++ //We only need to increment launchCounter if we are cloning objects.
 		//If we aren't cloning objects, taking and removing the first item each time from the acceptableTurfs list will inherently iterate through the list in order
 
 /datum/centcom_podlauncher/proc/updateSelector() //Ensures that the selector effect will showcase the next item if needed
-	if (launchChoice == 1 && length(acceptableTurfs) && !temp_pod.reversing && !temp_pod.effectMissile) //We only show the selector if we are taking items from the bay
-		var/index = launchCounter + 1 //launchCounter acts as an index to the ordered acceptableTurfs list, so adding one will show the next item in the list
+	if (launchChoice == LAUNCH_ORDERED && length(acceptableTurfs) > 1 && !temp_pod.reversing && !temp_pod.effectMissile) //We only show the selector if we are taking items from the bay
+		var/index = (launchCounter == 1 ? launchCounter : launchCounter + 1) //launchCounter acts as an index to the ordered acceptableTurfs list, so adding one will show the next item in the list. We don't want to do this for the very first item tho
 		if (index > acceptableTurfs.len) //out of bounds check
 			index = 1
 		selector.forceMove(acceptableTurfs[index]) //forceMove the selector to the next turf in the ordered acceptableTurfs list
@@ -649,31 +767,106 @@
 		qdel(O)
 	for (var/mob/M in bay.GetAllContents())
 		qdel(M)
+	for (var/bayturf in bay)
+		var/turf/turf_to_clear = bayturf
+		turf_to_clear.ChangeTurf(/turf/open/floor/plasteel)
 
 /datum/centcom_podlauncher/Destroy() //The Destroy() proc. This is called by ui_close proc, or whenever the user leaves the game
-	updateCursor(FALSE, FALSE) //Make sure our moues cursor resets to default. False means we are not in launch mode
-	qdel(temp_pod) //Delete the temp_pod
-	qdel(selector) //Delete the selector effect
+	updateCursor(TRUE) //Make sure our moues cursor resets to default. False means we are not in launch mode
+	QDEL_NULL(temp_pod) //Delete the temp_pod
+	QDEL_NULL(selector) //Delete the selector effect
+	QDEL_NULL(indicator)
 	. = ..()
 
-/datum/centcom_podlauncher/proc/supplypod_punish_log(var/list/whoDyin)
+/datum/centcom_podlauncher/proc/supplypod_punish_log(list/whoDyin)
 	var/podString = effectBurst ? "5 pods" : "a pod"
 	var/whomString = ""
 	if (LAZYLEN(whoDyin))
 		for (var/mob/living/M in whoDyin)
 			whomString += "[key_name(M)], "
 
-	var/delayString = temp_pod.landingDelay == initial(temp_pod.landingDelay) ? "" : " Delay=[temp_pod.landingDelay*0.1]s"
-	var/damageString = temp_pod.damage == 0 ? "" : " Dmg=[temp_pod.damage]"
-	var/explosionString = ""
-	var/explosion_sum = temp_pod.explosionSize[1] + temp_pod.explosionSize[2] + temp_pod.explosionSize[3] + temp_pod.explosionSize[4]
-	if (explosion_sum != 0)
-		explosionString = " Boom=|"
-		for (var/X in temp_pod.explosionSize)
-			explosionString += "[X]|"
-
-	var/msg = "launched [podString] towards [whomString] [delayString][damageString][explosionString]"
+	var/msg = "launched [podString] towards [whomString]"
 	message_admins("[key_name_admin(usr)] [msg] in [ADMIN_VERBOSEJMP(specificTarget)].")
 	if (length(whoDyin))
 		for (var/mob/living/M in whoDyin)
 			admin_ticket_log(M, "[key_name_admin(usr)] [msg]")
+
+/datum/centcom_podlauncher/proc/loadData(var/list/dataToLoad)
+	bayNumber = dataToLoad["bayNumber"]
+	customDropoff = dataToLoad["customDropoff"]
+	renderLighting = dataToLoad["renderLighting"]
+	launchClone = dataToLoad["launchClone"] //Do we launch the actual items in the bay or just launch clones of them?
+	launchRandomItem = dataToLoad["launchRandomItem"] //Do we launch a single random item instead of everything on the turf?
+	launchChoice = dataToLoad["launchChoice"] //Launch turfs all at once (0), ordered (1), or randomly(1)
+	explosionChoice = dataToLoad["explosionChoice"] //An explosion that occurs when landing. Can be no explosion (0), custom explosion (1), or maxcap (2)
+	damageChoice = dataToLoad["damageChoice"] //Damage that occurs to any mob under the pod when it lands. Can be no damage (0), custom damage (1), or gib+5000dmg (2)
+	temp_pod.landingDelay = dataToLoad["delay_1"] //How long the pod takes to land after launching
+	temp_pod.fallDuration = dataToLoad["delay_2"] //How long the pod's falling animation lasts
+	temp_pod.openingDelay = dataToLoad["delay_3"] //How long the pod takes to open after landing
+	temp_pod.departureDelay = dataToLoad["delay_4"] //How long the pod takes to leave after opening (if bluespace=true, it deletes. if reversing=true, it flies back to centcom)
+	temp_pod.setStyle(dataToLoad["styleChoice"])  //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+	temp_pod.effectShrapnel = dataToLoad["effectShrapnel"] //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
+	temp_pod.shrapnel_type = text2path(dataToLoad["shrapnelType"])
+	temp_pod.shrapnel_magnitude = dataToLoad["shrapnelMagnitude"]
+	temp_pod.effectStun  = dataToLoad["effectStun"]//If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish!
+	temp_pod.effectLimb  = dataToLoad["effectLimb"]//If true, pops off a limb (if applicable) from anyone caught under the pod when it lands
+	temp_pod.effectOrgans = dataToLoad["effectOrgans"]//If true, yeets the organs out of any bodies caught under the pod when it lands
+	temp_pod.bluespace = dataToLoad["effectBluespace"] //If true, the pod deletes (in a shower of sparks) after landing
+	temp_pod.effectStealth = dataToLoad["effectStealth"]//If true, a target icon isn't displayed on the turf where the pod will land
+	temp_pod.effectQuiet = dataToLoad["effectQuiet"] //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc)
+	temp_pod.effectMissile = dataToLoad["effectMissile"] //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground
+	temp_pod.effectCircle = dataToLoad["effectCircle"] //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
+	effectBurst = dataToLoad["effectBurst"] //IOf true, launches five pods at once (with a very small delay between for added coolness), in a 3x3 area centered around the area
+	temp_pod.reversing = dataToLoad["effectReverse"] //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
+	temp_pod.reverseOptionList = dataToLoad["reverseOptionList"]
+	specificTarget = dataToLoad["effectTarget"] //Launches the pod at the turf of a specific mob target, rather than wherever the user clicked. Useful for smites
+	temp_pod.adminNamed = dataToLoad["effectName"] //Determines whether or not the pod has been named by an admin. If true, the pod's name will not get overridden when the style of the pod changes (changing the style of the pod normally also changes the name+desc)
+	temp_pod.name = dataToLoad["podName"]
+	temp_pod.desc = dataToLoad["podDesc"]
+	effectAnnounce = dataToLoad["effectAnnounce"]
+	numTurfs = dataToLoad["numObjects"] //Counts the number of turfs that contain a launchable object in the centcom supplypod bay
+	temp_pod.fallingSound = dataToLoad["fallingSound"]//Admin sound to play as the pod falls
+	temp_pod.landingSound = dataToLoad["landingSound"]//Admin sound to play when the pod lands
+	temp_pod.openingSound = dataToLoad["openingSound"]//Admin sound to play when the pod opens
+	temp_pod.leavingSound = dataToLoad["leavingSound"]//Admin sound to play when the pod leaves
+	temp_pod.soundVolume = dataToLoad["soundVolume"] //Admin sound to play when the pod leaves
+	picking_dropoff_turf = FALSE
+	launcherActivated = FALSE
+	updateCursor()
+	refreshView()
+
+GLOBAL_DATUM_INIT(podlauncher, /datum/centcom_podlauncher, new)
+//Proc for admins to enable others to use podlauncher after roundend
+/datum/centcom_podlauncher/proc/give_podlauncher(mob/living/user, override)
+	if (SSticker.current_state < GAME_STATE_FINISHED)
+		return
+	if (!istype(user))
+		user = override
+	if (user)
+		setup(user)//setup the datum
+
+//Set the dropoff location and indicator to either a specific turf or somewhere in an area
+/datum/centcom_podlauncher/proc/setDropoff(target)
+	var/turf/target_turf
+	if (isturf(target))
+		target_turf = target
+	else if (isarea(target))
+		target_turf = pick(get_area_turfs(target))
+	else
+		CRASH("Improper type passed to setDropoff! Should be /turf or /area")
+	temp_pod.reverse_dropoff_coords = list(target_turf.x, target_turf.y, target_turf.z)
+	indicator.forceMove(target_turf)
+
+/obj/effect/hallucination/simple/supplypod_selector
+	name = "Supply Selector (Only you can see this)"
+	image_icon = 'icons/obj/supplypods_32x32.dmi'
+	image_state = "selector"
+	image_layer = FLY_LAYER
+	alpha = 150
+
+/obj/effect/hallucination/simple/dropoff_location
+	name = "Dropoff Location (Only you can see this)"
+	image_icon = 'icons/obj/supplypods_32x32.dmi'
+	image_state = "dropoff_indicator"
+	image_layer = FLY_LAYER
+	alpha = 0

code/modules/cargo/expressconsole.dm

@@ -190,7 +190,7 @@
 							LZ = pick(empty_turfs)
 					if (SO.pack.cost <= points_to_check && LZ)//we need to call the cost check again because of the CHECK_TICK call
 						D.adjust_money(-SO.pack.cost)
-						new /obj/effect/abstract/DPtarget(LZ, podType, SO)
+						new /obj/effect/pod_landingzone(LZ, podType, SO)
 						. = TRUE
 						update_icon()
 			else
@@ -208,7 +208,7 @@
 						for(var/i in 1 to MAX_EMAG_ROCKETS)
 							var/LZ = pick(empty_turfs)
 							LAZYREMOVE(empty_turfs, LZ)
-							new /obj/effect/abstract/DPtarget(LZ, podType, SO)
+							new /obj/effect/pod_landingzone(LZ, podType, SO)
 							. = TRUE
 							update_icon()
 							CHECK_TICK

code/modules/cargo/gondolapod.dm

@@ -42,7 +42,7 @@
 	set name = "Release Contents"
 	set category = "Gondola"
 	set desc = "Release any contents stored within your vast belly."
-	linked_pod.open(src, forced = TRUE)
+	linked_pod.open(src, TRUE)
 
 /mob/living/simple_animal/pet/gondola/gondolapod/examine(mob/user)
 	..()
@@ -61,16 +61,16 @@
 	else
 		to_chat(src, "<span class='notice'>A closer look inside yourself reveals... nothing.</span>")
 
-/mob/living/simple_animal/pet/gondola/gondolapod/proc/setOpened()
+/mob/living/simple_animal/pet/gondola/gondolapod/setOpened()
 	opened = TRUE
 	update_icon()
-	addtimer(CALLBACK(src, .proc/setClosed), 50)
+	addtimer(CALLBACK(src, /atom.proc/setClosed), 50)
 
-/mob/living/simple_animal/pet/gondola/gondolapod/proc/setClosed()
+/mob/living/simple_animal/pet/gondola/gondolapod/setClosed()
 	opened = FALSE
 	update_icon()
 
 /mob/living/simple_animal/pet/gondola/gondolapod/death()
 	qdel(linked_pod) //Will cause the open() proc for the linked supplypod to be called with the "broken" parameter set to true, meaning that it will dump its contents on death
 	qdel(src)
-	..()
+	..()

code/modules/cargo/packs/misc.dm

@@ -351,6 +351,10 @@
 	name = "Black Carpet Single-Pack"
 	contains = list(/obj/item/stack/tile/carpet/black/fifty)
 
+/datum/supply_pack/misc/carpet/arcade
+	name = "Arcade Carpet Single-Pack"
+	contains = list(/obj/item/stack/tile/carpet/arcade/fifty)
+
 /datum/supply_pack/misc/carpet/premium
 	name = "Monochrome Carpet Single-Pack"
 	desc = "Exotic carpets for all your decorating needs. This 30 units stack of extra soft carpet will tie any room together."

code/modules/cargo/supplypod.dm

@@ -1,21 +1,25 @@
-//The "BDPtarget" temp visual is created by anything that "launches" a supplypod.  It makes two things: a falling droppod animation, and the droppod itself.
+//The "pod_landingzone" temp visual is created by anything that "launches" a supplypod. This is what animates the pod and makes the pod forcemove to the station.
 //------------------------------------SUPPLY POD-------------------------------------//
 /obj/structure/closet/supplypod
 	name = "supply pod" //Names and descriptions are normally created with the setStyle() proc during initialization, but we have these default values here as a failsafe
 	desc = "A Nanotrasen supply drop pod."
 	icon = 'icons/obj/supplypods.dmi'
-	icon_state = "supplypod"
-	pixel_x = -16 //2x2 sprite
-	pixel_y = -5
-	layer = TABLE_LAYER //So that the crate inside doesn't appear underneath
+	icon_state = "pod" //This is a common base sprite shared by a number of pods
+	pixel_x = SUPPLYPOD_X_OFFSET //2x2 sprite
+	layer = BELOW_OBJ_LAYER //So that the crate inside doesn't appear underneath
 	allow_objects = TRUE
 	allow_dense = TRUE
 	delivery_icon = null
 	can_weld_shut = FALSE
-	armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
+	armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 100, BIO = 0, RAD = 0, FIRE = 100, ACID = 80)
 	anchored = TRUE //So it cant slide around after landing
 	anchorable = FALSE
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1
+	appearance_flags = KEEP_TOGETHER | PIXEL_SCALE
+	density = FALSE
+	///List of bitflags for supply pods, see: code\__DEFINES\obj_flags.dm
+	var/pod_flags = NONE
+
 	//*****NOTE*****: Many of these comments are similarly described in centcom_podlauncher.dm. If you change them here, please consider doing so in the centcom podlauncher code as well!
 	var/adminNamed = FALSE //Determines whether or not the pod has been named by an admin. If true, the pod's name will not get overridden when the style of the pod changes (changing the style of the pod normally also changes the name+desc)
 	var/bluespace = FALSE //If true, the pod deletes (in a shower of sparks) after landing
@@ -27,12 +31,13 @@
 	var/effectLimb = FALSE //If true, pops off a limb (if applicable) from anyone caught under the pod when it lands
 	var/effectOrgans = FALSE //If true, yeets out every limb and organ from anyone caught under the pod when it lands
 	var/effectGib = FALSE //If true, anyone under the pod will be gibbed when it lands
-	var/effectStealth = FALSE //If true, a target icon isnt displayed on the turf where the pod will land
+	var/effectStealth = FALSE //If true, a target icon isn't displayed on the turf where the pod will land
 	var/effectQuiet = FALSE //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc)
 	var/effectMissile = FALSE //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground
 	var/effectCircle = FALSE //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
-	var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the POD_STYLES list in cargo.dm defines to get the proper icon/name/desc for the pod.
+	var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
 	var/reversing = FALSE //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
+	var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off it's newly-acquired cargo to
 	var/fallDuration = 4
 	var/fallingSoundLength = 11
 	var/fallingSound = 'sound/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
@@ -40,10 +45,20 @@
 	var/openingSound //Admin sound to play when the pod opens
 	var/leavingSound //Admin sound to play when the pod leaves
 	var/soundVolume = 80 //Volume to play sounds at. Ignores the cap
-	var/bay //Used specifically for the centcom_podlauncher datum. Holds the current bay the user is launching objects from. Bays are specific rooms on the centcom map.
 	var/list/explosionSize = list(0,0,2,3)
 	var/stay_after_drop = FALSE
-	var/specialised = TRUE // It's not a general use pod for cargo/admin use
+	var/specialised = FALSE // It's not a general use pod for cargo/admin use
+	var/rubble_type //Rubble effect associated with this supplypod
+	var/decal = "default" //What kind of extra decals we add to the pod to make it look nice
+	var/door = "pod_door"
+	var/fin_mask  = "topfin"
+	var/obj/effect/supplypod_rubble/rubble
+	var/obj/effect/engineglow/glow_effect
+	var/effectShrapnel = FALSE
+	var/shrapnel_type = /obj/item/projectile/bullet/shrapnel
+	var/shrapnel_magnitude = 3
+	var/list/reverseOptionList = list("Mobs"=FALSE,"Objects"=FALSE,"Anchored"=FALSE,"Underfloor"=FALSE,"Wallmounted"=FALSE,"Floors"=FALSE,"Walls"=FALSE)
+	var/list/turfs_in_cargo = list()
 
 /obj/structure/closet/supplypod/bluespacepod
 	style = STYLE_BLUESPACE
@@ -53,12 +68,12 @@
 
 /obj/structure/closet/supplypod/extractionpod
 	name = "Syndicate Extraction Pod"
-	desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas."
+	desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas. <b>Targets must be manually stuffed inside the pod for proper delivery.</b>"
 	specialised = TRUE
 	style = STYLE_SYNDICATE
 	bluespace = TRUE
 	explosionSize = list(0,0,1,2)
-	landingDelay = 25 //Slightly longer than others
+	landingDelay = 25 //Longer than others
 
 /obj/structure/closet/supplypod/centcompod
 	style = STYLE_CENTCOM
@@ -67,36 +82,102 @@
 	landingDelay = 20 //Very speedy!
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
-/obj/structure/closet/supplypod/proc/specialisedPod()
-	return 1
-
-/obj/structure/closet/supplypod/extractionpod/specialisedPod(atom/movable/holder)
-	holder.forceMove(pick(GLOB.holdingfacility)) // land in ninja jail
-	open(holder, forced = TRUE)
-
-/obj/structure/closet/supplypod/Initialize()
+/obj/structure/closet/supplypod/Initialize(var/customStyle = FALSE)
 	. = ..()
-	setStyle(style, TRUE) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly
+	if (!loc)
+		var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding] //temporary holder for supplypods mid-transit
+		forceMove(shippingLane)
+	if (customStyle)
+		style = customStyle
+	setStyle(style) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly
+
+/obj/structure/closet/supplypod/extractionpod/Initialize()
+	. = ..()
+	var/turf/picked_turf = pick(GLOB.holdingfacility)
+	reverse_dropoff_coords = list(picked_turf.x, picked_turf.y, picked_turf.z)
+
+/obj/structure/closet/supplypod/proc/setStyle(chosenStyle) //Used to give the sprite an icon state, name, and description.
+	style = chosenStyle
+	var/base = GLOB.podstyles[chosenStyle][POD_BASE] //GLOB.podstyles is a 2D array we treat as a dictionary. The style represents the verticle index, with the icon state, name, and desc being stored in the horizontal indexes of the 2D array.
+	icon_state = base
+	decal = GLOB.podstyles[chosenStyle][POD_DECAL]
+	rubble_type = GLOB.podstyles[chosenStyle][POD_RUBBLE_TYPE]
+	if (!adminNamed && !specialised) //We dont want to name it ourselves if it has been specifically named by an admin using the centcom_podlauncher datum
+		name = GLOB.podstyles[chosenStyle][POD_NAME]
+		desc = GLOB.podstyles[chosenStyle][POD_DESC]
+	if (GLOB.podstyles[chosenStyle][POD_DOOR])
+		door = "[base]_door"
+	else
+		door = FALSE
+	update_icon()
+
+/obj/structure/closet/supplypod/proc/SetReverseIcon()
+	fin_mask = "bottomfin"
+	if (GLOB.podstyles[style][POD_SHAPE] == POD_SHAPE_NORML)
+		icon_state = GLOB.podstyles[style][POD_BASE] + "_reverse"
+	pixel_x = initial(pixel_x)
+	transform = matrix()
+	update_icon()
+
+/obj/structure/closet/supplypod/proc/backToNonReverseIcon()
+	fin_mask = initial(fin_mask)
+	if (GLOB.podstyles[style][POD_SHAPE] == POD_SHAPE_NORML)
+		icon_state = GLOB.podstyles[style][POD_BASE]
+	pixel_x = initial(pixel_x)
+	transform = matrix()
+	update_icon()
 
 /obj/structure/closet/supplypod/closet_update_overlays(list/new_overlays)
-	. = new_overlays
-	if (style == STYLE_SEETHROUGH || style == STYLE_INVISIBLE) //If we're invisible, we dont bother adding any overlays
-		return
-	if (opened)
-		. += "[icon_state]_open"
-	else
-		. += "[icon_state]_door"
+	return
 
-/obj/structure/closet/supplypod/proc/setStyle(chosenStyle, var/duringInit = FALSE) //Used to give the sprite an icon state, name, and description
-	if (!duringInit && style == chosenStyle) //Check if the input style is already the same as the pod's style. This happens in centcom_podlauncher, and as such we set the style to STYLE_CENTCOM.
-		setStyle(STYLE_CENTCOM) //We make sure to not check this during initialize() so the standard supplypod works correctly.
+/obj/structure/closet/supplypod/update_overlays()
+	. = ..()
+	if (style == STYLE_INVISIBLE)
 		return
-	style = chosenStyle
-	icon_state = POD_STYLES[chosenStyle][POD_ICON_STATE] //POD_STYLES is a 2D array we treat as a dictionary. The style represents the verticle index, with the icon state, name, and desc being stored in the horizontal indexes of the 2D array.
-	if (!adminNamed && !specialised) //We dont want to name it ourselves if it has been specifically named by an admin using the centcom_podlauncher datum
-		name = POD_STYLES[chosenStyle][POD_NAME]
-		desc = POD_STYLES[chosenStyle][POD_DESC]
-	update_icon()
+	if (rubble)
+		. += rubble.getForeground(src)
+	if (style == STYLE_SEETHROUGH)
+		for (var/atom/A in contents)
+			var/mutable_appearance/itemIcon = new(A)
+			itemIcon.transform = matrix().Translate(-1 * SUPPLYPOD_X_OFFSET, 0)
+			. += itemIcon
+		for (var/t in turfs_in_cargo)//T is just a turf's type
+			var/turf/turf_type = t
+			var/mutable_appearance/itemIcon = mutable_appearance(initial(turf_type.icon), initial(turf_type.icon_state))
+			itemIcon.transform = matrix().Translate(-1 * SUPPLYPOD_X_OFFSET, 0)
+			. += itemIcon
+		return
+
+	if (opened) //We're opened means all we have to worry about is masking a decal if we have one
+		if (!decal) //We don't have a decal to mask
+			return
+		if (!door) //We have a decal but no door, so let's just add the decal
+			. += decal
+			return
+		var/icon/masked_decal = new(icon, decal) //The decal we want to apply
+		var/icon/door_masker = new(icon, door) //The door shape we want to 'cut out' of the decal
+		door_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1)
+		door_masker.SwapColor("#ffffffff", null)
+		door_masker.Blend("#000000", ICON_SUBTRACT)
+		masked_decal.Blend(door_masker, ICON_ADD)
+		. += masked_decal
+	else //If we're closed
+		if (!door) //We have no door, lets see if we have a decal. If not, theres nothing we need to do
+			if (decal)
+				. += decal
+			return
+		else if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking
+			. += door	
+		else
+			var/icon/masked_door = new(icon, door) //The door we want to apply
+			var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door
+			fin_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1)
+			fin_masker.SwapColor("#ffffffff", null)
+			fin_masker.Blend("#000000", ICON_SUBTRACT)
+			masked_door.Blend(fin_masker, ICON_ADD)
+			. += masked_door
+		if (decal)
+			. += decal
 
 /obj/structure/closet/supplypod/tool_interact(obj/item/W, mob/user)
 	if(bluespace) //We dont want to worry about interacting with bluespace pods, as they are due to delete themselves soon anyways.
@@ -110,187 +191,380 @@
 /obj/structure/closet/supplypod/contents_explosion() //Supplypods also protect their contents from the harmful effects of fucking exploding.
 	return
 
-/obj/structure/closet/supplypod/toggle(mob/living/user) //Supplypods shouldn't be able to be manually opened under any circumstances, as the open() proc generates supply order datums
+/obj/structure/closet/supplypod/toggle(mob/living/user)
 	return
 
-/obj/structure/closet/supplypod/proc/handleReturningClose(atom/movable/holder, returntobay)
-	opened = FALSE
-	INVOKE_ASYNC(holder, .proc/setClosed) //Use the INVOKE_ASYNC proc to call setClosed() on whatever the holder may be, without giving the atom/movable base class a setClosed() proc definition
-	for(var/atom/movable/O in get_turf(holder))
-		if ((ismob(O) && !isliving(O)) || (is_type_in_typecache(O, GLOB.blacklisted_cargo_types) && !isliving(O))) //We dont want to take ghosts with us, and we don't want blacklisted items going, but we allow mobs.
-			continue
-		O.forceMove(holder) //Put objects inside before we close
-	var/obj/effect/temp_visual/risingPod = new /obj/effect/abstract/DPfall(get_turf(holder), src) //Make a nice animation of flying back up
-	risingPod.pixel_z = 0 //The initial value of risingPod's pixel_z is 200 because it normally comes down from a high spot
-	animate(risingPod, pixel_z = 200, time = 10, easing = LINEAR_EASING) //Animate our rising pod
-	if(returntobay)
-		holder.forceMove(bay) //Move the pod back to centcom, where it belongs
-		QDEL_IN(risingPod, 10)
-		reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open() )
-		bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
-		open(holder, forced = TRUE)
-	else
-		reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open() )
-		bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
-		QDEL_IN(risingPod, 10)
-		audible_message("<span class='notice'>The pod hisses, closing quickly and launching itself away from the station.</span>", "<span class='notice'>The ground vibrates, the nearby pod launching away from the station.</span>")
-		stay_after_drop = FALSE
-		specialisedPod(holder) // Do special actions for specialised pods - this is likely if we were already doing manual launches
+/obj/structure/closet/supplypod/open(mob/living/user, force = TRUE)
+	return
 
-/obj/structure/closet/supplypod/proc/preOpen() //Called before the open() proc. Handles anything that occurs right as the pod lands.
-	var/turf/T = get_turf(src)
+/obj/structure/closet/supplypod/proc/handleReturnAfterDeparting(atom/movable/holder = src)
+	reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open_pod() )
+	bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
+	pod_flags &= ~FIRST_SOUNDS //Make it so we play sounds now
+	if (!effectQuiet && style != STYLE_SEETHROUGH)
+		audible_message("<span class='notice'>The pod hisses, closing and launching itself away from the station.</span>", "<span class='notice'>The ground vibrates, and you hear the sound of engines firing.</span>")
+	stay_after_drop = FALSE
+	holder.pixel_z = initial(holder.pixel_z)
+	holder.alpha = initial(holder.alpha)
+	var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding]
+	forceMove(shippingLane) //Move to the centcom-z-level until the pod_landingzone says we can drop back down again
+	if (!reverse_dropoff_coords) //If we're centcom-launched, the reverse dropoff turf will be a centcom loading bay. If we're an extraction pod, it should be the ninja jail. Thus, this shouldn't ever really happen.
+		var/obj/error_landmark = locate(/obj/effect/landmark/error) in GLOB.landmarks_list
+		var/turf/error_landmark_turf = get_turf(error_landmark)
+		reverse_dropoff_coords = list(error_landmark_turf.x, error_landmark_turf.y, error_landmark_turf.z)
+	landingDelay = initial(landingDelay) //Reset the landing timers so we land on whatever turf we're aiming at normally. Will be changed to be editable later (tm)
+	fallDuration = initial(fallDuration) //This is so if someone adds a really long dramatic landing time they don't have to sit through it twice on the pod's return trip
+	openingDelay = initial(openingDelay)
+	backToNonReverseIcon()
+	var/turf/return_turf = locate(reverse_dropoff_coords[1], reverse_dropoff_coords[2], reverse_dropoff_coords[3])
+	new /obj/effect/pod_landingzone(return_turf, src)
+
+/obj/structure/closet/supplypod/proc/preOpen() //Called before the open_pod() proc. Handles anything that occurs right as the pod lands.
+	var/turf/turf_underneath = get_turf(src)
 	var/list/B = explosionSize //Mostly because B is more readable than explosionSize :p
-	if (landingSound)
-		playsound(get_turf(src), landingSound, soundVolume, 0, 0)
-	for (var/mob/living/M in T)
-		if (effectLimb && iscarbon(M)) //If effectLimb is true (which means we pop limbs off when we hit people):
-			var/mob/living/carbon/CM = M
-			for (var/obj/item/bodypart/bodypart in CM.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
-				if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)//we dont want to kill him, just teach em a lesson!
-					if (bodypart.dismemberable)
-						bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half!
-						break
-		if (effectOrgans && iscarbon(M)) //effectOrgans means remove every organ in our mob
-			var/mob/living/carbon/CM = M
-			for(var/X in CM.internal_organs)
-				var/destination = get_edge_target_turf(T, pick(GLOB.alldirs)) //Pick a random direction to toss them in
-				var/obj/item/organ/O = X
-				O.Remove() //Note that this isn't the same proc as for lists
-				O.forceMove(T) //Move the organ outta the body
-				O.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away
-				sleep(1)
-			for (var/obj/item/bodypart/bodypart in CM.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
-				var/destination = get_edge_target_turf(T, pick(GLOB.alldirs))
-				if (bodypart.dismemberable)
-					bodypart.dismember() //Using the power of flextape i've sawed this man's bodypart in half!
-					bodypart.throw_at(destination, 2, 3)
+	density = TRUE //Density is originally false so the pod doesn't block anything while it's still falling through the air
+	AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude)
+	if(effectShrapnel)
+		SEND_SIGNAL(src, COMSIG_SUPPLYPOD_LANDED)
+	for (var/mob/living/target_living in turf_underneath)
+		if (iscarbon(target_living)) //If effectLimb is true (which means we pop limbs off when we hit people):
+			if (effectLimb)
+				var/mob/living/carbon/carbon_target_mob = target_living
+				for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
+					var/obj/item/bodypart/bodypart = bp
+					if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)//we dont want to kill him, just teach em a lesson!
+						if (bodypart.dismemberable)
+							bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half!
+							break
+			if (effectOrgans) //effectOrgans means remove every organ in our mob
+				var/mob/living/carbon/carbon_target_mob = target_living
+				for(var/organ in carbon_target_mob.internal_organs)
+					var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) //Pick a random direction to toss them in
+					var/obj/item/organ/organ_to_yeet = organ
+					organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists
+					organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body
+					organ_to_yeet.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away
 					sleep(1)
+				for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
+					var/obj/item/bodypart/bodypart = bp
+					var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs))
+					if (bodypart.dismemberable)
+						bodypart.dismember() //Using the power of flextape i've sawed this man's bodypart in half!
+						bodypart.throw_at(destination, 2, 3)
+						sleep(1)
 
 		if (effectGib) //effectGib is on, that means whatever's underneath us better be fucking oof'd on
-			M.adjustBruteLoss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
-			M.gib() //After adjusting the fuck outta that brute loss we finish the job with some satisfying gibs
+			target_living.adjustBruteLoss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
+			if (!QDELETED(target_living))
+				target_living.gib() //After adjusting the fuck outta that brute loss we finish the job with some satisfying gibs
 		else
-			M.adjustBruteLoss(damage)
+			target_living.adjustBruteLoss(damage)
 	var/explosion_sum = B[1] + B[2] + B[3] + B[4]
 	if (explosion_sum != 0) //If the explosion list isn't all zeroes, call an explosion
-		explosion(get_turf(src), B[1], B[2], B[3], flame_range = B[4], silent = effectQuiet, ignorecap = istype(src, /obj/structure/closet/supplypod/centcompod)) //less advanced equipment than bluespace pod, so larger explosion when landing
-	else if (!effectQuiet) //If our explosion list IS all zeroes, we still make a nice explosion sound (unless the effectQuiet var is true)
-		playsound(src, "explosion", landingSound ? 15 : 80, 1)
+		explosion(turf_underneath, B[1], B[2], B[3], flame_range = B[4], silent = effectQuiet, ignorecap = istype(src, /obj/structure/closet/supplypod/centcompod)) //less advanced equipment than bluespace pod, so larger explosion when landing
+	else if (!effectQuiet && !(pod_flags & FIRST_SOUNDS)) //If our explosion list IS all zeroes, we still make a nice explosion sound (unless the effectQuiet var is true)
+		playsound(src, "explosion", landingSound ? soundVolume * 0.25 : soundVolume, TRUE)
+	if (landingSound)
+		playsound(turf_underneath, landingSound, soundVolume, FALSE, FALSE)
 	if (effectMissile) //If we are acting like a missile, then right after we land and finish fucking shit up w explosions, we should delete
 		opened = TRUE //We set opened to TRUE to avoid spending time trying to open (due to being deleted) during the Destroy() proc
 		qdel(src)
+		return
 	if (style == STYLE_GONDOLA) //Checks if we are supposed to be a gondola pod. If so, create a gondolapod mob, and move this pod to nullspace. I'd like to give a shout out, to my man oranges
-		var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(get_turf(src), src)
+		var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(turf_underneath, src)
 		benis.contents |= contents //Move the contents of this supplypod into the gondolapod mob.
 		moveToNullspace()
-		addtimer(CALLBACK(src, .proc/open, benis), openingDelay) //After the openingDelay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
+		addtimer(CALLBACK(src, .proc/open_pod, benis), openingDelay) //After the openingDelay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
+	else if (style == STYLE_SEETHROUGH)
+		open_pod(src)
 	else
-		addtimer(CALLBACK(src, .proc/open, src), openingDelay) //After the openingDelay passes, we use the open proc from this supplypod, while referencing this supplypod's contents
+		addtimer(CALLBACK(src, .proc/open_pod, src), openingDelay) //After the openingDelay passes, we use the open proc from this supplypod, while referencing this supplypod's contents
 
-/obj/structure/closet/supplypod/open(atom/movable/holder, var/broken = FALSE, var/forced = FALSE) //The holder var represents an atom whose contents we will be working with
-	var/turf/T = get_turf(holder) //Get the turf of whoever's contents we're talking about
+/obj/structure/closet/supplypod/proc/open_pod(atom/movable/holder, broken = FALSE, forced = FALSE) //The holder var represents an atom whose contents we will be working with
 	if (!holder)
 		return
-	if(opened)
+	if (opened) //This is to ensure we don't open something that has already been opened
 		return
-	opened = TRUE //This is to ensure we don't open something that has already been opened
-	var/mob/M
+	holder.setOpened()
+	var/turf/turf_underneath = get_turf(holder) //Get the turf of whoever's contents we're talking about
 	if (istype(holder, /mob)) //Allows mobs to assume the role of the holder, meaning we look at the mob's contents rather than the supplypod's contents. Typically by this point the supplypod's contents have already been moved over to the mob's contents
-		M = holder
-		if (M.key && !forced && !broken) //If we are player controlled, then we shouldnt open unless the opening is manual, or if it is due to being destroyed (represented by the "broken" parameter)
+		var/mob/holder_as_mob = holder
+		if (holder_as_mob.key && !forced && !broken) //If we are player controlled, then we shouldn't open unless the opening is manual, or if it is due to being destroyed (represented by the "broken" parameter)
 			return
 	if (openingSound)
-		playsound(get_turf(holder), openingSound, soundVolume, 0, 0) //Special admin sound to play
-	INVOKE_ASYNC(holder, .proc/setOpened) //Use the INVOKE_ASYNC proc to call setOpened() on whatever the holder may be, without giving the atom/movable base class a setOpened() proc definition
-	if (style == STYLE_SEETHROUGH)
-		update_icon()
-	for (var/atom/movable/O in holder.contents) //Go through the contents of the holder
-		O.forceMove(T) //move everything from the contents of the holder to the turf of the holder
-	if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH) //If we aren't being quiet, play the default pod open sound
-		playsound(get_turf(holder), open_sound, 15, 1, -3)
+		playsound(get_turf(holder), openingSound, soundVolume, FALSE, FALSE) //Special admin sound to play
+	for (var/turf_type in turfs_in_cargo)
+		turf_underneath.PlaceOnTop(turf_type)
+	for (var/cargo in contents)
+		var/atom/movable/movable_cargo = cargo
+		movable_cargo.forceMove(turf_underneath)
+	if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH && !(pod_flags & FIRST_SOUNDS)) //If we aren't being quiet, play the default pod open sound
+		playsound(get_turf(holder), open_sound, 15, TRUE, -3)
 	if (broken) //If the pod is opening because it's been destroyed, we end here
 		return
 	if (style == STYLE_SEETHROUGH)
-		depart(src)
+		startExitSequence(src)
 	else
+		if (reversing)
+			addtimer(CALLBACK(src, .proc/SetReverseIcon), departureDelay/2) //Finish up the pod's duties after a certain amount of time
 		if(!stay_after_drop) // Departing should be handled manually
-			addtimer(CALLBACK(src, .proc/depart, holder), departureDelay) //Finish up the pod's duties after a certain amount of time
+			addtimer(CALLBACK(src, .proc/startExitSequence, holder), departureDelay*(4/5)) //Finish up the pod's duties after a certain amount of time
 
-/obj/structure/closet/supplypod/proc/depart(atom/movable/holder)
+/obj/structure/closet/supplypod/proc/startExitSequence(atom/movable/holder)
 	if (leavingSound)
-		playsound(get_turf(holder), leavingSound, soundVolume, 0, 0)
+		playsound(get_turf(holder), leavingSound, soundVolume, FALSE, FALSE)
 	if (reversing) //If we're reversing, we call the close proc. This sends the pod back up to centcom
 		close(holder)
 	else if (bluespace) //If we're a bluespace pod, then delete ourselves (along with our holder, if a seperate holder exists)
+		deleteRubble()
 		if (!effectQuiet && style != STYLE_INVISIBLE && style != STYLE_SEETHROUGH)
 			do_sparks(5, TRUE, holder) //Create some sparks right before closing
 		qdel(src) //Delete ourselves and the holder
 		if (holder != src)
 			qdel(holder)
 
-/obj/structure/closet/supplypod/centcompod/close(atom/movable/holder) //Closes the supplypod and sends it back to centcom. Should only ever be called if the "reversing" variable is true
-	handleReturningClose(holder, TRUE)
+/obj/structure/closet/supplypod/close(atom/movable/holder) //Closes the supplypod and sends it back to centcom. Should only ever be called if the "reversing" variable is true
+	if (!holder)
+		return
+	take_contents(holder)
+	playsound(holder, close_sound, soundVolume*0.75, TRUE, -3)
+	holder.setClosed()
+	addtimer(CALLBACK(src, .proc/preReturn, holder), departureDelay * 0.2) //Start to leave a bit after closing for cinematic effect
 
-/obj/structure/closet/supplypod/extractionpod/close(atom/movable/holder) //handles closing, and returns pod - deletes itself when returned
-	. = ..()
-	return
+/obj/structure/closet/supplypod/take_contents(atom/movable/holder)
+	var/turf/turf_underneath = holder.drop_location()
+	for(var/atom_to_check in turf_underneath)
+		if(atom_to_check != src && !insert(atom_to_check, holder)) // Can't insert that
+			continue
+	insert(turf_underneath, holder)
 
-/obj/structure/closet/supplypod/extractionpod/proc/send_up(atom/movable/holder)
-	if(!holder)
-		holder = src
-	if(leavingSound)
-		playsound(get_turf(holder), leavingSound, soundVolume, 0, 0)
-	handleReturningClose(holder, FALSE)
+/obj/structure/closet/supplypod/insert(atom/to_insert, atom/movable/holder)
+	if(insertion_allowed(to_insert))
+		if(isturf(to_insert))
+			var/turf/turf_to_insert = to_insert
+			turfs_in_cargo += turf_to_insert.type
+			turf_to_insert.ScrapeAway()
+		else
+			var/atom/movable/movable_to_insert = to_insert
+			movable_to_insert.forceMove(holder)
+		return TRUE
+	else
+		return FALSE
 
-/obj/structure/closet/supplypod/proc/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open() proc for more details
+/obj/structure/closet/supplypod/insertion_allowed(atom/to_insert)
+	if(to_insert.invisibility == INVISIBILITY_ABSTRACT)
+		return FALSE
+	if(ismob(to_insert))
+		if(!reverseOptionList["Mobs"])
+			return FALSE
+		if(!isliving(to_insert)) //let's not put ghosts or camera mobs inside
+			return FALSE
+		var/mob/living/mob_to_insert = to_insert
+		if(mob_to_insert.anchored || mob_to_insert.incorporeal_move)
+			return FALSE
+		mob_to_insert.stop_pulling()
+
+	else if(isobj(to_insert))
+		var/obj/obj_to_insert = to_insert
+		if(istype(obj_to_insert, /obj/structure/closet/supplypod))
+			return FALSE
+		if(istype(obj_to_insert, /obj/effect/supplypod_smoke))
+			return FALSE
+		if(istype(obj_to_insert, /obj/effect/pod_landingzone))
+			return FALSE
+		if(istype(obj_to_insert, /obj/effect/supplypod_rubble))
+			return FALSE
+		if(obj_to_insert.level == 1)
+			return FALSE	// underfloor, until we get hide components.
+/*
+		if((obj_to_insert.comp_lookup && obj_to_insert.comp_lookup[COMSIG_OBJ_HIDE]) && reverseOptionList["Underfloor"])
+			return TRUE
+		else if ((obj_to_insert.comp_lookup && obj_to_insert.comp_lookup[COMSIG_OBJ_HIDE]) && !reverseOptionList["Underfloor"])
+			return FALSE
+*/
+		if(isProbablyWallMounted(obj_to_insert) && reverseOptionList["Wallmounted"])
+			return TRUE
+		else if (isProbablyWallMounted(obj_to_insert) && !reverseOptionList["Wallmounted"])
+			return FALSE
+		if(!obj_to_insert.anchored && reverseOptionList["Unanchored"])
+			return TRUE
+		if(obj_to_insert.anchored && reverseOptionList["Anchored"])
+			return TRUE
+		return FALSE
+
+	else if (isturf(to_insert))
+		if(isfloorturf(to_insert) && reverseOptionList["Floors"])
+			return TRUE
+		if(isfloorturf(to_insert) && !reverseOptionList["Floors"])
+			return FALSE
+		if(isclosedturf(to_insert) && reverseOptionList["Walls"])
+			return TRUE
+		if(isclosedturf(to_insert) && !reverseOptionList["Walls"])
+			return FALSE
+		return FALSE
+	return TRUE
+
+/obj/structure/closet/supplypod/proc/preReturn(atom/movable/holder)
+	deleteRubble()
+	animate(holder, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
+	animate(holder, pixel_z = 400, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising pod
+	addtimer(CALLBACK(src, .proc/handleReturnAfterDeparting, holder), 15) //Finish up the pod's duties after a certain amount of time
+
+/obj/structure/closet/supplypod/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open_pod() proc for more details
+	opened = TRUE
+	density = FALSE
 	update_icon()
 
-/obj/structure/closet/supplypod/proc/setClosed() //Ditto
+/obj/structure/closet/supplypod/extractionpod/setOpened()
+	opened = TRUE
+	density = TRUE
 	update_icon()
 
+/obj/structure/closet/supplypod/setClosed() //Ditto
+	opened = FALSE
+	density = TRUE
+	update_icon()
+
+/obj/structure/closet/supplypod/proc/tryMakeRubble(turf/T) //Ditto
+	if (rubble_type == RUBBLE_NONE)
+		return
+	if (rubble)
+		return
+	if (effectMissile)
+		return
+	if (isspaceturf(T) || isclosedturf(T))
+		return
+	rubble = new /obj/effect/supplypod_rubble(T)
+	rubble.setStyle(rubble_type, src)
+	update_icon()
+
+/obj/structure/closet/supplypod/Moved()
+	deleteRubble()
+	return ..()
+
+/obj/structure/closet/supplypod/proc/deleteRubble()
+	rubble?.fadeAway()
+	rubble = null
+	update_icon()
+
+/obj/structure/closet/supplypod/proc/addGlow()
+	if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML)
+		return
+	glow_effect = new(src)
+	glow_effect.icon_state = "pod_glow_" + GLOB.podstyles[style][POD_GLOW]
+	vis_contents += glow_effect
+	glow_effect.layer = GASFIRE_LAYER
+
+/obj/structure/closet/supplypod/proc/endGlow()
+	if(!glow_effect)
+		return
+	glow_effect.layer = LOW_ITEM_LAYER
+	glow_effect.fadeAway(openingDelay)
+
 /obj/structure/closet/supplypod/Destroy()
-	open(src, broken = TRUE) //Lets dump our contents by opening up
-	. = ..()
-
-//------------------------------------FALLING SUPPLY POD-------------------------------------//
-/obj/effect/abstract/DPfall //Falling pod
-	name = ""
-	icon = 'icons/obj/supplypods.dmi'
-	pixel_x = -16
-	pixel_y = -5
-	pixel_z = 200
-	desc = "Get out of the way!"
-	layer = FLY_LAYER//that wasnt flying, that was falling with style!
-	icon_state = ""
-
-/obj/effect/abstract/DPfall/Initialize(dropLocation, obj/structure/closet/supplypod/pod)
-	if (pod.style == STYLE_SEETHROUGH)
-		pixel_x = -16
-		pixel_y = 0
-		for (var/atom/movable/O in pod.contents)
-			var/icon/I = getFlatIcon(O) //im so sorry
-			add_overlay(I)
-	else if (pod.style != STYLE_INVISIBLE) //Check to ensure the pod isn't invisible
-		icon_state = "[pod.icon_state]_falling"
-		name = pod.name
-	. = ..()
+	deleteRubble()
+	open_pod(src, broken = TRUE) //Lets dump our contents by opening up
+	return ..()
 
 //------------------------------------TEMPORARY_VISUAL-------------------------------------//
-/obj/effect/abstract/DPtarget //This is the object that forceMoves the supplypod to it's location
+/obj/effect/supplypod_smoke //Falling pod smoke
+	name = ""
+	icon = 'icons/obj/supplypods_32x32.dmi'
+	icon_state = "smoke"
+	desc = ""
+	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	alpha = 0
+
+/obj/effect/engineglow //Falling pod smoke
+	name = ""
+	icon = 'icons/obj/supplypods.dmi'
+	icon_state = "pod_engineglow"
+	desc = ""
+	layer = GASFIRE_LAYER
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	alpha = 255
+
+/obj/effect/engineglow/proc/fadeAway(leaveTime)
+	var/duration = min(leaveTime, 25)
+	animate(src, alpha=0, time = duration)
+	QDEL_IN(src, duration + 5)
+
+/obj/effect/supplypod_smoke/proc/drawSelf(amount)
+	alpha = max(0, 255-(amount*20))
+
+/obj/effect/supplypod_rubble //This is the object that forceMoves the supplypod to it's location
+	name = "Debris"
+	desc = "A small crater of rubble. Closer inspection reveals the debris to be made primarily of space-grade metal fragments. You're pretty sure that this will disperse before too long."
+	icon = 'icons/obj/supplypods.dmi'
+	layer = PROJECTILE_HIT_THRESHHOLD_LAYER // We want this to go right below the layer of supplypods and supplypod_rubble's forground.
+	icon_state = "rubble_bg"
+	anchored = TRUE
+	pixel_x = SUPPLYPOD_X_OFFSET
+	var/foreground = "rubble_fg"
+	var/verticle_offset = 0
+
+/obj/effect/supplypod_rubble/proc/getForeground(obj/structure/closet/supplypod/pod)
+	var/mutable_appearance/rubble_overlay = mutable_appearance('icons/obj/supplypods.dmi', foreground)
+	rubble_overlay.appearance_flags = KEEP_APART|RESET_TRANSFORM
+	rubble_overlay.transform = matrix().Translate(SUPPLYPOD_X_OFFSET - pod.pixel_x, verticle_offset)
+	return rubble_overlay
+
+/obj/effect/supplypod_rubble/proc/fadeAway()
+	animate(src, alpha=0, time = 30)
+	QDEL_IN(src, 35)
+
+/obj/effect/supplypod_rubble/proc/setStyle(type, obj/structure/closet/supplypod/pod)
+	if (type == RUBBLE_WIDE)
+		icon_state += "_wide"
+		foreground += "_wide"
+	if (type == RUBBLE_THIN)
+		icon_state += "_thin"
+		foreground += "_thin"
+	if (pod.style == STYLE_BOX)
+		verticle_offset = -2
+	else
+		verticle_offset = initial(verticle_offset)
+
+	pixel_y = verticle_offset
+
+/obj/effect/pod_landingzone_effect
+	name = ""
+	desc = ""
+	icon = 'icons/obj/supplypods_32x32.dmi'
+	icon_state = "LZ_Slider"
+	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+
+/obj/effect/pod_landingzone_effect/Initialize(mapload, obj/structure/closet/supplypod/pod)
+	transform = matrix() * 1.5
+	animate(src, transform = matrix()*0.01, time = pod.landingDelay+pod.fallDuration)
+	..()
+
+/obj/effect/pod_landingzone //This is the object that forceMoves the supplypod to it's location
 	name = "Landing Zone Indicator"
 	desc = "A holographic projection designating the landing zone of something. It's probably best to stand back."
-	icon = 'icons/mob/actions/actions_items.dmi'
-	icon_state = "sniper_zoom"
+	icon = 'icons/obj/supplypods_32x32.dmi'
+	icon_state = "LZ"
 	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
 	light_range = 2
-	var/obj/effect/temp_visual/fallingPod //Temporary "falling pod" that we animate
-	var/obj/structure/closet/supplypod/pod //The supplyPod that will be landing ontop of this target
+	anchored = TRUE
+	alpha = 0
+	var/obj/structure/closet/supplypod/pod //The supplyPod that will be landing ontop of this pod_landingzone
+	var/obj/effect/pod_landingzone_effect/helper
+	var/list/smoke_effects = new /list(13)
 
-/obj/effect/abstract/DPtarget/Initialize(mapload, podParam, single_order = null)
+/obj/effect/ex_act()
+	return
+
+/obj/effect/pod_landingzone/Initialize(mapload, podParam, single_order = null, clientman)
 	. = ..()
 	if (ispath(podParam)) //We can pass either a path for a pod (as expressconsoles do), or a reference to an instantiated pod (as the centcom_podlauncher does)
 		podParam = new podParam() //If its just a path, instantiate it
 	pod = podParam
+	if (!pod.effectStealth)
+		helper = new (drop_location(), pod)
+		alpha = 255
+	animate(src, transform = matrix().Turn(90), time = pod.landingDelay+pod.fallDuration)
 	if (single_order)
 		if (istype(single_order, /datum/supply_order))
 			var/datum/supply_order/SO = single_order
@@ -298,49 +572,76 @@
 		else if (istype(single_order, /atom/movable))
 			var/atom/movable/O = single_order
 			O.forceMove(pod)
-	for (var/mob/living/M in pod) //If there are any mobs in the supplypod, we want to forceMove them into the target. This is so that they can see where they are about to land, AND so that they don't get sent to the nullspace error room (as the pod is currently in nullspace)
-		M.forceMove(src)
-	if(pod.effectStun) //If effectStun is true, stun any mobs caught on this target until the pod gets a chance to hit them
-		for (var/mob/living/M in get_turf(src))
-			M.Stun(pod.landingDelay+10, ignore_canstun = TRUE)//you aint goin nowhere, kid.
-	if (pod.effectStealth) //If effectStealth is true we want to be invisible
-		icon_state = ""
+	for (var/mob/living/mob_in_pod in pod) //If there are any mobs in the supplypod, we want to set their view to the pod_landingzone. This is so that they can see where they are about to land
+		mob_in_pod.reset_perspective(src)
+	if(pod.effectStun) //If effectStun is true, stun any mobs caught on this pod_landingzone until the pod gets a chance to hit them
+		for (var/mob/living/target_living in get_turf(src))
+			target_living.Stun(pod.landingDelay+10, ignore_canstun = TRUE)//you ain't goin nowhere, kid.
 	if (pod.fallDuration == initial(pod.fallDuration) && pod.landingDelay + pod.fallDuration < pod.fallingSoundLength)
 		pod.fallingSoundLength = 3 //The default falling sound is a little long, so if the landing time is shorter than the default falling sound, use a special, shorter default falling sound
 		pod.fallingSound =  'sound/weapons/mortar_whistle.ogg'
 	var/soundStartTime = pod.landingDelay - pod.fallingSoundLength + pod.fallDuration
 	if (soundStartTime < 0)
 		soundStartTime = 1
-	if (!pod.effectQuiet)
+	if (!pod.effectQuiet && !(pod.pod_flags & FIRST_SOUNDS))
 		addtimer(CALLBACK(src, .proc/playFallingSound), soundStartTime)
 	addtimer(CALLBACK(src, .proc/beginLaunch, pod.effectCircle), pod.landingDelay)
 
-/obj/effect/abstract/DPtarget/proc/playFallingSound()
-	playsound(src, pod.fallingSound, pod.soundVolume, 1, 6)
+/obj/effect/pod_landingzone/proc/playFallingSound()
+	playsound(src, pod.fallingSound, pod.soundVolume, TRUE, 6)
 
-/obj/effect/abstract/DPtarget/proc/beginLaunch(effectCircle) //Begin the animation for the pod falling. The effectCircle param determines whether the pod gets to come in from any descent angle
-	fallingPod = new /obj/effect/abstract/DPfall(drop_location(), pod)
-	var/matrix/M = matrix(fallingPod.transform) //Create a new matrix that we can rotate
+/obj/effect/pod_landingzone/proc/beginLaunch(effectCircle) //Begin the animation for the pod falling. The effectCircle param determines whether the pod gets to come in from any descent angle
+	pod.addGlow()
+	pod.update_icon()
+	if (pod.style != STYLE_INVISIBLE)
+		pod.add_filter("motionblur",1,list("type"="motion_blur", "x"=0, "y"=3))
+	pod.forceMove(drop_location())
+	for (var/mob/living/M in pod) //Remember earlier (initialization) when we moved mobs into the pod_landingzone so they wouldnt get lost in nullspace? Time to get them out
+		M.reset_perspective(null)
 	var/angle = effectCircle ? rand(0,360) : rand(70,110) //The angle that we can come in from
-	fallingPod.pixel_x = cos(angle)*400 //Use some ADVANCED MATHEMATICS to set the animated pod's position to somewhere on the edge of a circle with the center being the target
-	fallingPod.pixel_z = sin(angle)*400
-	var/rotation = Get_Pixel_Angle(fallingPod.pixel_z, fallingPod.pixel_x) //CUSTOM HOMEBREWED proc that is just arctan with extra steps
-	M.Turn(rotation) //Turn our matrix accordingly
-	fallingPod.transform = M //Transform the animated pod according to the matrix
-	M = matrix(pod.transform) //Make another matrix based on the pod
-	M.Turn(rotation) //Turn the matrix
-	pod.transform = M //Turn the actual pod (Won't be visible until endLaunch() proc tho)
-	animate(fallingPod, pixel_z = 0, pixel_x = -16, time = pod.fallDuration, , easing = LINEAR_EASING) //Make the pod fall! At an angle!
+	pod.pixel_x = cos(angle)*32*length(smoke_effects) //Use some ADVANCED MATHEMATICS to set the animated pod's position to somewhere on the edge of a circle with the center being the pod_landingzone
+	pod.pixel_z = sin(angle)*32*length(smoke_effects)
+	var/rotation = Get_Pixel_Angle(pod.pixel_z, pod.pixel_x) //CUSTOM HOMEBREWED proc that is just arctan with extra steps
+	setupSmoke(rotation)
+	pod.transform = matrix().Turn(rotation)
+	pod.layer = FLY_LAYER
+	if (pod.style != STYLE_INVISIBLE)
+		animate(pod.get_filter("motionblur"), y = 0, time = pod.fallDuration, flags = ANIMATION_PARALLEL)
+		animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.fallDuration, easing = LINEAR_EASING, flags = ANIMATION_PARALLEL) //Make the pod fall! At an angle!
 	addtimer(CALLBACK(src, .proc/endLaunch), pod.fallDuration, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
 
-/obj/effect/abstract/DPtarget/proc/endLaunch()
-	pod.update_icon()
-	pod.forceMove(drop_location()) //The fallingPod animation is over, now's a good time to forceMove the actual pod into position
-	QDEL_NULL(fallingPod) //Delete the falling pod effect, because at this point its animation is over. We dont use temp_visual because we want to manually delete it as soon as the pod appears
-	for (var/mob/living/M in src) //Remember earlier (initialization) when we moved mobs into the DPTarget so they wouldnt get lost in nullspace? Time to get them out
-		M.forceMove(pod)
+/obj/effect/pod_landingzone/proc/setupSmoke(rotation)
+	if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
+		return
+	for ( var/i in 1 to length(smoke_effects))
+		var/obj/effect/supplypod_smoke/smoke_part = new (drop_location())
+		if (i == 1)
+			smoke_part.layer = FLY_LAYER
+			smoke_part.icon_state = "smoke_start"
+		smoke_part.transform = matrix().Turn(rotation)
+		smoke_effects[i] = smoke_part
+		smoke_part.pixel_x = sin(rotation)*32 * i
+		smoke_part.pixel_y = abs(cos(rotation))*32 * i
+		smoke_part.filters += filter(type = "blur", size = 4)
+		var/time = (pod.fallDuration / length(smoke_effects))*(length(smoke_effects)-i)
+		addtimer(CALLBACK(smoke_part, /obj/effect/supplypod_smoke/.proc/drawSelf, i), time, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
+		QDEL_IN(smoke_part, pod.fallDuration + 35)
+
+/obj/effect/pod_landingzone/proc/drawSmoke()
+	if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
+		return
+	for (var/obj/effect/supplypod_smoke/smoke_part in smoke_effects)
+		animate(smoke_part, alpha = 0, time = 20, flags = ANIMATION_PARALLEL)
+		animate(smoke_part.filters[1], size = 6, time = 15, easing = CUBIC_EASING|EASE_OUT, flags = ANIMATION_PARALLEL)
+
+/obj/effect/pod_landingzone/proc/endLaunch()
+	pod.tryMakeRubble(drop_location())
+	pod.layer = initial(pod.layer)
+	pod.endGlow()
+	QDEL_NULL(helper)
 	pod.preOpen() //Begin supplypod open procedures. Here effects like explosions, damage, and other dangerous (and potentially admin-caused, if the centcom_podlauncher datum was used) memes will take place
-	qdel(src) //ditto
+	drawSmoke()
+	qdel(src) //The pod_landingzone's purpose is complete. It can rest easy now
 
 //------------------------------------UPGRADES-------------------------------------//
 /obj/item/disk/cargo/bluespace_pod //Disk that can be inserted into the Express Console to allow for Advanced Bluespace Pods
@@ -348,5 +649,4 @@
 	desc = "This disk provides a firmware update to the Express Supply Console, granting the use of Nanotrasen's Bluespace Drop Pods to the supply department."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "cargodisk"
-	item_state = "card-id"
 	w_class = WEIGHT_CLASS_SMALL

code/modules/client/client_defines.dm

@@ -126,9 +126,8 @@
 
 	/// Messages currently seen by this client
 	var/list/seen_messages
-
-	/// datum wrapper for client view
-	var/datum/view_data/view_size
+	/// viewsize datum for holding our view size
+	var/datum/viewData/view_size
 
 	/// our current tab
 	var/stat_tab
@@ -162,6 +161,14 @@
 	var/parallax_layers_max = 3
 	var/parallax_animate_timer
 
+	/**
+	 * Assoc list with all the active maps - when a screen obj is added to
+	 * a map, it's put in here as well.
+	 *
+	 * Format: list(<mapname> = list(/obj/screen))
+	 */
+	var/list/screen_maps = list()
+
 	// List of all asset filenames sent to this client by the asset cache, along with their assoicated md5s
 	var/list/sent_assets = list()
 	/// List of all completed blocking send jobs awaiting acknowledgement by send_asset

code/modules/client/client_procs.dm

@@ -268,7 +268,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	else
 		prefs = new /datum/preferences(src)
 		GLOB.preferences_datums[ckey] = prefs
-	addtimer(CALLBACK(src, .proc/ensure_keys_set), 0)	//prevents possible race conditions
+		
+	addtimer(CALLBACK(src, .proc/ensure_keys_set), 10)	//prevents possible race conditions
 
 	prefs.last_ip = address				//these are gonna be used for banning
 	prefs.last_id = computer_id			//these are gonna be used for banning
@@ -336,10 +337,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 				qdel(src)
 				return
 
-	// if(SSinput.initialized) placed here on tg.
-	// 	set_macros()
-	// 	update_movement_keys()
-
 	// Initialize tgui panel
 	tgui_panel.initialize()
 	src << browse(file('html/statbrowser.html'), "window=statbrowser")
@@ -472,16 +469,16 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		if (menuitem)
 			menuitem.Load_checked(src)
 
-	// view_size = new(src, getScreenSize(prefs.widescreenpref))
-	// view_size.resetFormat()
-	// view_size.setZoomMode()
-	// fit_viewport()
+	view_size = new(src, getScreenSize(prefs.widescreenpref))
+	view_size.resetFormat()
+	view_size.setZoomMode()
+	fit_viewport()
 	Master.UpdateTickRate()
 
 /client/proc/ensure_keys_set()
 	if(SSinput.initialized)
 		set_macros()
-	update_movement_keys(prefs)
+		update_movement_keys(prefs)
 
 //////////////
 //DISCONNECT//
@@ -914,8 +911,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 			return FALSE
 		if (NAMEOF(src, key))
 			return FALSE
-		if(NAMEOF(src, view))
-			change_view(var_value)
+		if (NAMEOF(src, view))
+			view_size.setDefault(var_value)
 			return TRUE
 	. = ..()
 
@@ -925,7 +922,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	var/y = viewscale[2]
 	x = clamp(x+change, min, max)
 	y = clamp(y+change, min,max)
-	change_view("[x]x[y]")
+	view_size.setDefault("[x]x[y]")
 
 /client/proc/update_movement_keys(datum/preferences/direct_prefs)
 	var/datum/preferences/D = prefs || direct_prefs
@@ -948,12 +945,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	if (isnull(new_size))
 		CRASH("change_view called without argument.")
 
-//CIT CHANGES START HERE - makes change_view change DEFAULT_VIEW to 15x15 depending on preferences
-	if(prefs && CONFIG_GET(string/default_view))
-		if(!prefs.widescreenpref && new_size == CONFIG_GET(string/default_view))
-			new_size = "15x15"
-//END OF CIT CHANGES
-
 	var/list/old_view = getviewsize(view)
 	view = new_size
 	var/list/actualview = getviewsize(view)

code/modules/client/preferences.dm

@@ -98,6 +98,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/use_custom_skin_tone = FALSE
 	var/left_eye_color = "000000"		//Eye color
 	var/right_eye_color = "000000"
+	var/eye_type = DEFAULT_EYES_TYPE	//Eye type
 	var/split_eye_colors = FALSE
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
 	var/list/features = list("mcolor" = "FFFFFF",
@@ -203,7 +204,15 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/parallax
 
 	var/ambientocclusion = TRUE
-	var/auto_fit_viewport = TRUE
+	///Should we automatically fit the viewport?
+	var/auto_fit_viewport = FALSE
+	///Should we be in the widescreen mode set by the config?
+	var/widescreenpref = TRUE
+
+	///What size should pixels be displayed as? 0 is strech to fit
+	var/pixel_size = 0
+	///What scaling method should we use?
+	var/scaling_method = "normal"
 
 	var/uplink_spawn_loc = UPLINK_PDA
 
@@ -243,7 +252,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/screenshake = 100
 	var/damagescreenshake = 2
 	var/arousable = TRUE
-	var/widescreenpref = TRUE
 	var/autostand = TRUE
 	var/auto_ooc = FALSE
 
@@ -290,7 +298,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 /datum/preferences/proc/ShowChoices(mob/user)
 	if(!user || !user.client)
 		return
-	update_preview_icon(current_tab != 2)
+	update_preview_icon(current_tab)
 	var/list/dat = list("<center>")
 
 	dat += "<a href='?_src_=prefs;preference=tab;tab=0' [current_tab == 0 ? "class='linkOn'" : ""]>Character Settings</a>"
@@ -477,25 +485,28 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			if (CONFIG_GET(number/body_size_min) != CONFIG_GET(number/body_size_max))
 				dat += "<b>Sprite Size:</b> <a href='?_src_=prefs;preference=body_size;task=input'>[features["body_size"]*100]%</a><br>"
 
-			if((EYECOLOR in pref_species.species_traits) && !(NOEYES in pref_species.species_traits))
-				if(!use_skintones && !mutant_colors)
-					dat += APPEARANCE_CATEGORY_COLUMN
-				if(left_eye_color != right_eye_color)
-					split_eye_colors = TRUE
-				dat += "<h3>Heterochromia</h3>"
-				dat += "</b><a style='display:block;width:100px' href='?_src_=prefs;preference=toggle_split_eyes;task=input'>[split_eye_colors ? "Enabled" : "Disabled"]</a>"
-				if(!split_eye_colors)
-					dat += "<h3>Eye Color</h3>"
-					dat += "<span style='border: 1px solid #161616; background-color: #[left_eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eyes;task=input'>Change</a>"
+			if(!(NOEYES in pref_species.species_traits))
+				dat += "<h3>Eye Type</h3>"
+				dat += "</b><a style='display:block;width:100px' href='?_src_=prefs;preference=eye_type;task=input'>[eye_type]</a><BR>"
+				if((EYECOLOR in pref_species.species_traits))
+					if(!use_skintones && !mutant_colors)
+						dat += APPEARANCE_CATEGORY_COLUMN
+					if(left_eye_color != right_eye_color)
+						split_eye_colors = TRUE
+					dat += "<h3>Heterochromia</h3>"
+					dat += "</b><a style='display:block;width:100px' href='?_src_=prefs;preference=toggle_split_eyes;task=input'>[split_eye_colors ? "Enabled" : "Disabled"]</a>"
+					if(!split_eye_colors)
+						dat += "<h3>Eye Color</h3>"
+						dat += "<span style='border: 1px solid #161616; background-color: #[left_eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eyes;task=input'>Change</a>"
+						dat += "</td>"
+					else
+						dat += "<h3>Left Eye Color</h3>"
+						dat += "<span style='border: 1px solid #161616; background-color: #[left_eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eye_left;task=input'>Change</a>"
+						dat += "<h3>Right Eye Color</h3>"
+						dat += "<span style='border: 1px solid #161616; background-color: #[right_eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eye_right;task=input'>Change</a><BR>"
+						dat += "</td>"
+				else if(use_skintones || mutant_colors)
 					dat += "</td>"
-				else
-					dat += "<h3>Left Eye Color</h3>"
-					dat += "<span style='border: 1px solid #161616; background-color: #[left_eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eye_left;task=input'>Change</a>"
-					dat += "<h3>Right Eye Color</h3>"
-					dat += "<span style='border: 1px solid #161616; background-color: #[right_eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eye_right;task=input'>Change</a><BR>"
-					dat += "</td>"
-			else if(use_skintones || mutant_colors)
-				dat += "</td>"
 
 			dat += APPEARANCE_CATEGORY_COLUMN
 			dat += "<h2>Speech preferences</h2>"
@@ -753,6 +764,20 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>HUD Button Flashes:</b> <a href='?_src_=prefs;preference=hud_toggle_flash'>[hud_toggle_flash ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>HUD Button Flash Color:</b> <span style='border: 1px solid #161616; background-color: [hud_toggle_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=hud_toggle_color;task=input'>Change</a><br>"
 
+/* CITADEL EDIT - We're using top menu instead
+			button_name = pixel_size
+			dat += "<b>Pixel Scaling:</b> <a href='?_src_=prefs;preference=pixel_size'>[(button_name) ? "Pixel Perfect [button_name]x" : "Stretch to fit"]</a><br>"
+
+			switch(scaling_method)
+				if(SCALING_METHOD_NORMAL)
+					button_name = "Nearest Neighbor"
+				if(SCALING_METHOD_DISTORT)
+					button_name = "Point Sampling"
+				if(SCALING_METHOD_BLUR)
+					button_name = "Bilinear"
+			dat += "<b>Scaling Method:</b> <a href='?_src_=prefs;preference=scaling_method'>[button_name]</a><br>"
+*/
+
 			if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation))
 				var/p_map = preferred_map
 				if (!p_map)
@@ -1587,6 +1612,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_eyes)
 						right_eye_color = sanitize_hexcolor(new_eyes, 6)
 
+				if("eye_type")
+					var/new_eye_type = input(user, "Choose your character's eye type.", "Character Preference") as null|anything in GLOB.eye_types
+					if(new_eye_type)
+						eye_type = new_eye_type
+
 				if("toggle_split_eyes")
 					split_eye_colors = !split_eye_colors
 					right_eye_color = left_eye_color
@@ -1620,6 +1650,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						if(features["mcolor3"] == "#000000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
 							features["mcolor3"] = pref_species.default_color
 
+						//switch to the type of eyes the species uses
+						eye_type = pref_species.eye_type
+
 				if("custom_species")
 					var/new_species = reject_bad_name(input(user, "Choose your species subtype, if unique. This will show up on examinations and health scans. Do not abuse this:", "Character Preference", custom_species) as null|text)
 					if(new_species)
@@ -1633,7 +1666,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_mutantcolor)
 						if(new_mutantcolor == "#000000")
 							features["mcolor"] = pref_species.default_color
-						else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+						else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin
 							features["mcolor"] = sanitize_hexcolor(new_mutantcolor, 6)
 						else
 							to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -1644,7 +1677,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_mutantcolor)
 						if(new_mutantcolor == "#000000")
 							features["mcolor2"] = pref_species.default_color
-						else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+						else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin
 							features["mcolor2"] = sanitize_hexcolor(new_mutantcolor, 6)
 						else
 							to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -1655,7 +1688,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_mutantcolor)
 						if(new_mutantcolor == "#000000")
 							features["mcolor3"] = pref_species.default_color
-						else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+						else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright, but only if they affect the skin
 							features["mcolor3"] = sanitize_hexcolor(new_mutantcolor, 6)
 						else
 							to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2008,7 +2041,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_cockcolor)
 						if(new_cockcolor == "#000000")
 							features["cock_color"] = pref_species.default_color
-						else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						else if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3])
 							features["cock_color"] = sanitize_hexcolor(new_cockcolor, 6)
 						else
 							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2048,7 +2081,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_ballscolor)
 						if(new_ballscolor == "#000000")
 							features["balls_color"] = pref_species.default_color
-						else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						else if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3])
 							features["balls_color"] = sanitize_hexcolor(new_ballscolor, 6)
 						else
 							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2075,7 +2108,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_breasts_color)
 						if(new_breasts_color == "#000000")
 							features["breasts_color"] = pref_species.default_color
-						else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						else if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3])
 							features["breasts_color"] = sanitize_hexcolor(new_breasts_color, 6)
 						else
 							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2097,7 +2130,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/temp_hsv = RGBtoHSV(new_vagcolor)
 						if(new_vagcolor == "#000000")
 							features["vag_color"] = pref_species.default_color
-						else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						else if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3])
 							features["vag_color"] = sanitize_hexcolor(new_vagcolor, 6)
 						else
 							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
@@ -2267,7 +2300,32 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					features["has_womb"] = !features["has_womb"]
 				if("widescreenpref")
 					widescreenpref = !widescreenpref
-					user.client.change_view(CONFIG_GET(string/default_view))
+					user.client.view_size.setDefault(getScreenSize(widescreenpref))
+
+				if("pixel_size")
+					switch(pixel_size)
+						if(PIXEL_SCALING_AUTO)
+							pixel_size = PIXEL_SCALING_1X
+						if(PIXEL_SCALING_1X)
+							pixel_size = PIXEL_SCALING_1_2X
+						if(PIXEL_SCALING_1_2X)
+							pixel_size = PIXEL_SCALING_2X
+						if(PIXEL_SCALING_2X)
+							pixel_size = PIXEL_SCALING_3X
+						if(PIXEL_SCALING_3X)
+							pixel_size = PIXEL_SCALING_AUTO
+					user.client.view_size.apply() //Let's winset() it so it actually works
+
+				if("scaling_method")
+					switch(scaling_method)
+						if(SCALING_METHOD_NORMAL)
+							scaling_method = SCALING_METHOD_DISTORT
+						if(SCALING_METHOD_DISTORT)
+							scaling_method = SCALING_METHOD_BLUR
+						if(SCALING_METHOD_BLUR)
+							scaling_method = SCALING_METHOD_NORMAL
+					user.client.view_size.setZoomMode()
+
 				if("autostand")
 					autostand = !autostand
 				if("auto_ooc")
@@ -2641,6 +2699,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 	character.dna.features = features.Copy()
 	character.set_species(chosen_species, icon_update = FALSE, pref_load = TRUE)
+	character.dna.species.eye_type = eye_type
 	if(chosen_limb_id && (chosen_limb_id in character.dna.species.allowed_limb_ids))
 		character.dna.species.mutant_bodyparts["limbs_id"] = chosen_limb_id
 	character.dna.real_name = character.real_name
@@ -2679,9 +2738,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 	//limb stuff, only done when initially spawning in
 	if(initial_spawn)
-		//delete any existing prosthetic limbs to make sure no remnant prosthetics are left over
+		//delete any existing prosthetic limbs to make sure no remnant prosthetics are left over - But DO NOT delete those that are species-related
 		for(var/obj/item/bodypart/part in character.bodyparts)
-			if(part.status == BODYPART_ROBOTIC)
+			if(part.status == BODYPART_ROBOTIC && !part.render_like_organic)
 				qdel(part)
 		character.regenerate_limbs() //regenerate limbs so now you only have normal limbs
 		for(var/modified_limb in modified_limbs)

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	36
+#define SAVEFILE_VERSION_MAX	38
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -204,10 +204,28 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(S["species"] == "lizard")
 			features["mam_snouts"] = features["snout"]
 
-	if(current_version < 36)
+	if(current_version < 36) //introduction of heterochromia
 		left_eye_color = S["eye_color"]
 		right_eye_color = S["eye_color"]
 
+	if(current_version < 37) //introduction of chooseable eye types/sprites
+		if(S["species"] == "insect")
+			left_eye_color = "#000000"
+			right_eye_color = "#000000"
+			if(chosen_limb_id == "moth" || chosen_limb_id == "moth_not_greyscale") //these actually have slightly different eyes!
+				eye_type = "moth"
+			else
+				eye_type = "insect"
+
+	if(current_version < 38) //further eye sprite changes
+		if(S["species"] == "plasmaman")
+			left_eye_color = "#FFC90E"
+			right_eye_color = "#FFC90E"
+		else
+			if(S["species"] == "skeleton")
+				left_eye_color = "#BAB99E"
+				right_eye_color = "#BAB99E"
+
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
 		return
@@ -271,6 +289,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["parallax"]			>> parallax
 	S["ambientocclusion"]	>> ambientocclusion
 	S["auto_fit_viewport"]	>> auto_fit_viewport
+	S["widescreenpref"]		>> widescreenpref
+	S["pixel_size"]	    	>> pixel_size
+	S["scaling_method"]	    >> scaling_method
 	S["hud_toggle_flash"]	>> hud_toggle_flash
 	S["hud_toggle_color"]	>> hud_toggle_color
 	S["menuoptions"]		>> menuoptions
@@ -288,7 +309,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["arousable"]			>> arousable
 	S["screenshake"]		>> screenshake
 	S["damagescreenshake"]	>> damagescreenshake
-	S["widescreenpref"]		>> widescreenpref
 	S["autostand"]			>> autostand
 	S["cit_toggles"]		>> cit_toggles
 	S["preferred_chaos"]	>> preferred_chaos
@@ -324,6 +344,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	parallax		= sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
 	ambientocclusion	= sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
 	auto_fit_viewport	= sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport))
+	widescreenpref		= sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
+	pixel_size		= sanitize_integer(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, initial(pixel_size))
+	scaling_method  = sanitize_text(scaling_method, initial(scaling_method))
 	hud_toggle_flash = sanitize_integer(hud_toggle_flash, 0, 1, initial(hud_toggle_flash))
 	hud_toggle_color = sanitize_hexcolor(hud_toggle_color, 6, 1, initial(hud_toggle_color))
 	ghost_form		= sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form))
@@ -337,7 +360,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	pda_skin		= sanitize_inlist(pda_skin, GLOB.pda_reskins, PDA_SKIN_ALT)
 	screenshake			= sanitize_integer(screenshake, 0, 800, initial(screenshake))
 	damagescreenshake	= sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake))
-	widescreenpref		= sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
 	autostand			= sanitize_integer(autostand, 0, 1, initial(autostand))
 	cit_toggles			= sanitize_integer(cit_toggles, 0, 16777215, initial(cit_toggles))
 	auto_ooc			= sanitize_integer(auto_ooc, 0, 1, initial(auto_ooc))
@@ -509,6 +531,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["age"]					>> age
 	S["hair_color"]				>> hair_color
 	S["facial_hair_color"]		>> facial_hair_color
+	S["eye_type"]				>> eye_type
 	S["left_eye_color"]			>> left_eye_color
 	S["right_eye_color"]		>> right_eye_color
 	S["use_custom_skin_tone"]	>> use_custom_skin_tone
@@ -695,6 +718,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	age								= sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
 	hair_color						= sanitize_hexcolor(hair_color, 6, FALSE)
 	facial_hair_color				= sanitize_hexcolor(facial_hair_color, 6, FALSE)
+	eye_type						= sanitize_inlist(eye_type, GLOB.eye_types, DEFAULT_EYES_TYPE)
 	left_eye_color					= sanitize_hexcolor(left_eye_color, 6, FALSE)
 	right_eye_color					= sanitize_hexcolor(right_eye_color, 6, FALSE)
 
@@ -828,6 +852,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["age"]						, age)
 	WRITE_FILE(S["hair_color"]				, hair_color)
 	WRITE_FILE(S["facial_hair_color"]		, facial_hair_color)
+	WRITE_FILE(S["eye_type"]				, eye_type)
 	WRITE_FILE(S["left_eye_color"]			, left_eye_color)
 	WRITE_FILE(S["right_eye_color"]			, right_eye_color)
 	WRITE_FILE(S["use_custom_skin_tone"]	, use_custom_skin_tone)

code/modules/client/preferences_toggles.dm

@@ -386,7 +386,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 //Admin Preferences
 /client/proc/toggleadminhelpsound()
 	set name = "Hear/Silence Adminhelps"
-	set category = "Preferences"
+	set category = "Preferences.Admin"
 	set desc = "Toggle hearing a notification when admin PMs are received"
 	if(!holder)
 		return
@@ -397,7 +397,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 
 /client/proc/toggleannouncelogin()
 	set name = "Do/Don't Announce Login"
-	set category = "Preferences"
+	set category = "Preferences.Admin"
 	set desc = "Toggle if you want an announcement to admins when you login during a round"
 	if(!holder)
 		return
@@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 
 /client/proc/toggle_hear_radio()
 	set name = "Show/Hide Radio Chatter"
-	set category = "Preferences"
+	set category = "Preferences.Admin"
 	set desc = "Toggle seeing radiochatter from nearby radios and speakers"
 	if(!holder)
 		return
@@ -419,7 +419,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 
 /client/proc/deadchat()
 	set name = "Show/Hide Deadchat"
-	set category = "Preferences"
+	set category = "Preferences.Admin"
 	set desc ="Toggles seeing deadchat"
 	prefs.chat_toggles ^= CHAT_DEAD
 	prefs.save_preferences()
@@ -428,7 +428,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 
 /client/proc/toggleprayers()
 	set name = "Show/Hide Prayers"
-	set category = "Preferences"
+	set category = "Preferences.Admin"
 	set desc = "Toggles seeing prayers"
 	prefs.chat_toggles ^= CHAT_PRAYER
 	prefs.save_preferences()

code/modules/client/verbs/ooc.dm

@@ -111,16 +111,16 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 /client/proc/set_ooc(newColor as color)
 	set name = "Set Player OOC Color"
 	set desc = "Modifies player OOC Color"
-	set category = "Fun"
+	set category = "Admin.Fun"
 	GLOB.OOC_COLOR = sanitize_ooccolor(newColor)
 
 /client/proc/reset_ooc()
 	set name = "Reset Player OOC Color"
 	set desc = "Returns player OOC Color to default"
-	set category = "Fun"
+	set category = "Admin.Fun"
 	GLOB.OOC_COLOR = null
 
-/client/verb/colorooc()
+/client/verb/colorooc() //this is admin and people who bought byond.
 	set name = "Set Your OOC Color"
 	set category = "Preferences"
 

code/modules/clothing/clothing.dm

@@ -45,13 +45,12 @@
 	var/dynamic_fhair_suffix = ""//mask > head for facial hair
 
 	//basically a restriction list.
-	var/list/species_restricted = null
+	var/list/species_restricted
 	//Basically syntax is species_restricted = list("Species Name","Species Name")
 	//Add a "exclude" string to do the opposite, making it only only species listed that can't wear it.
 	//You append this to clothing objects
 
 
-
 	// How much clothing damage has been dealt to each of the limbs of the clothing, assuming it covers more than one limb
 	var/list/damage_by_parts
 	// How much integrity is in a specific limb before that limb is disabled (for use in [/obj/item/clothing/proc/take_damage_zone], and only if we cover multiple zones.) Set to 0 to disable shredding.
@@ -477,7 +476,6 @@ BLIND     // can't see anything
 	return TRUE
 
 
-
 /// If we're a clothing with at least 1 shredded/disabled zone, give the wearer a periodic heads up letting them know their clothes are damaged
 /obj/item/clothing/proc/bristle(mob/living/L)
 	if(!istype(L))

code/modules/clothing/gloves/miscellaneous.dm

@@ -20,8 +20,14 @@
 	body_parts_covered = ARMS
 	cold_protection = ARMS
 	strip_delay = 300 //you can't just yank them off
+	/// did you ever get around to wearing these or no
+	var/wornonce = FALSE
 	///Extra damage through the punch.
 	var/enhancement = 0 //it's a +0 to your punches because it isn't magical
+	///extra wound bonus through the punch (MAYBE DON'T BE GENEROUS WITH THIS)
+	var/wound_enhancement = 0
+	/// do we give the flavortext for wearing them
+	var/silent = FALSE
 	///Main trait added by the gloves to the user on wear.
 	var/inherited_trait = TRAIT_NOGUNS //what are you, dishonoroable?
 	///Secondary trait added by the gloves to the user on wear.
@@ -29,7 +35,18 @@
 
 /obj/item/clothing/gloves/fingerless/pugilist/equipped(mob/user, slot)
 	. = ..()
-	if(slot == SLOT_GLOVES)
+	if(current_equipped_slot == SLOT_GLOVES)
+		use_buffs(user, TRUE)
+		wornonce = TRUE
+
+/obj/item/clothing/gloves/fingerless/pugilist/dropped(mob/user)
+	. = ..()
+	if(wornonce)
+		use_buffs(user, FALSE)
+		wornonce = FALSE
+
+/obj/item/clothing/gloves/fingerless/pugilist/proc/use_buffs(mob/user, buff)
+	if(buff) // tarukaja
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user
 			ADD_TRAIT(H, TRAIT_PUGILIST, GLOVE_TRAIT)
@@ -37,17 +54,20 @@
 			ADD_TRAIT(H, secondary_trait, GLOVE_TRAIT)
 			H.dna.species.punchdamagehigh += enhancement
 			H.dna.species.punchdamagelow += enhancement
-
-/obj/item/clothing/gloves/fingerless/pugilist/dropped(mob/user)
-
-	REMOVE_TRAIT(user, TRAIT_PUGILIST, GLOVE_TRAIT)
-	REMOVE_TRAIT(user, inherited_trait, GLOVE_TRAIT)
-	REMOVE_TRAIT(user, secondary_trait, GLOVE_TRAIT)
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		H.dna.species.punchdamagehigh -= enhancement
-		H.dna.species.punchdamagelow -= enhancement
-	return ..()
+			H.dna.species.punchwoundbonus += wound_enhancement
+			if(!silent)
+				to_chat(H, "<span class='notice'>With [src] on your arms, you feel ready to punch things.</span>")
+	else // dekaja
+		REMOVE_TRAIT(user, TRAIT_PUGILIST, GLOVE_TRAIT)
+		REMOVE_TRAIT(user, inherited_trait, GLOVE_TRAIT)
+		REMOVE_TRAIT(user, secondary_trait, GLOVE_TRAIT)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			H.dna.species.punchdamagehigh -= enhancement
+			H.dna.species.punchdamagelow -= enhancement
+			H.dna.species.punchwoundbonus -= wound_enhancement
+		if(!silent)
+			to_chat(user, "<span class='warning'>With [src] off of your arms, you feel less ready to punch things.</span>")
 
 /obj/item/clothing/gloves/fingerless/pugilist/chaplain
 	name = "armwraps of unyielding resolve"
@@ -93,6 +113,7 @@
 	icon_state = "rapid"
 	item_state = "rapid"
 	enhancement = 10 //omae wa mou shindeiru
+	wound_enhancement = 10
 	var/warcry = "AT"
 	secondary_trait = TRAIT_NOSOFTCRIT //basically extra health
 

code/modules/clothing/gloves/tacklers.dm

@@ -65,12 +65,14 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	resistance_flags = NONE
+	strip_mod = 1.2 // because apparently black gloves had this
 
 /obj/item/clothing/gloves/tackler/combat/insulated
 	name = "guerrilla gloves"
 	desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
+	strip_mod = 1.5 // and combat gloves had this??
 
 /obj/item/clothing/gloves/tackler/combat/insulated/infiltrator
 	name = "insidious guerrilla gloves"

code/modules/clothing/head/misc_special.dm

@@ -190,7 +190,7 @@
 /obj/item/clothing/head/wig
 	name = "wig"
 	desc = "A bunch of hair without a head attached."
-	icon = 'icons/mob/human_face.dmi'	  // default icon for all hairs
+	icon = 'icons/mob/hair.dmi'	  // default icon for all hairs
 	icon_state = "hair_vlong"
 	flags_inv = HIDEHAIR
 	color = "#000"

code/modules/clothing/masks/miscellaneous.dm

@@ -355,7 +355,7 @@
 
 
 /obj/item/clothing/mask/paper/Initialize(mapload)
-	.=..()
+	. = ..()
 	papermask_designs = list(
 		"Blank" = image(icon = src.icon, icon_state = "plainmask"),
 		"Neutral" = image(icon = src.icon, icon_state = "neutralmask"),
@@ -384,7 +384,7 @@
 							"Vertical" = "verticalmask", "Horizontal" = "horizontalmask", "X" ="xmask",
 							"Bugeyes" = "bugmask", "Double" = "doublemask", "Mark" = "markmask")
 
-	var/choice = show_radial_menu(user,src, papermask_designs, custom_check = FALSE, radius = 36, require_near = TRUE)
+	var/choice = show_radial_menu(user, src, papermask_designs, custom_check = FALSE, radius = 36, require_near = TRUE)
 
 	if(src && choice && !user.incapacitated() && in_range(user,src))
 		icon_state = options[choice]

code/modules/events/shuttle_catastrophe

@@ -0,0 +1,37 @@
+/datum/round_event_control/shuttle_catastrophe
+	name = "Shuttle Catastrophe"
+	typepath = /datum/round_event/shuttle_catastrophe
+	weight = 10
+	max_occurrences = 1
+
+/datum/round_event_control/shuttle_catastrophe/canSpawnEvent(players, gamemode)
+	if(SSshuttle.emergency.name == "Build your own shuttle kit")
+		return FALSE //don't undo manual player engineering, it also would unload people and ghost them, there's just a lot of problems
+	return ..()
+
+
+/datum/round_event/shuttle_catastrophe
+	var/datum/map_template/shuttle/new_shuttle
+
+/datum/round_event/shuttle_catastrophe/announce(fake)
+	var/cause = pick("was attacked by [syndicate_name()] Operatives", "mysteriously teleported away", "had its refuelling crew mutiny",
+		"was found with its engines stolen", "\[REDACTED\]", "flew into the sunset, and melted", "learned something from a very wise cow, and left on its own",
+		"had cloning devices on it", "had its shuttle inspector put the shuttle in reverse instead of park, causing the shuttle to crash into the hangar")
+
+	priority_announce("Your emergency shuttle [cause]. Your replacement shuttle will be the [new_shuttle.name] until further notice.", "CentCom Spacecraft Engineering")
+
+/datum/round_event/shuttle_catastrophe/setup()
+	var/list/valid_shuttle_templates = list()
+	for(var/shuttle_id in SSmapping.shuttle_templates)
+		var/datum/map_template/shuttle/template = SSmapping.shuttle_templates[shuttle_id]
+		if(template.can_be_bought && template.credit_cost < INFINITY) //if we could get it from the communications console, it's cool for us to get it here
+			valid_shuttle_templates += template
+	new_shuttle = pick(valid_shuttle_templates)
+
+/datum/round_event/shuttle_catastrophe/start()
+	SSshuttle.shuttle_purchased = SHUTTLEPURCHASE_FORCED
+	SSshuttle.unload_preview()
+	SSshuttle.load_template(new_shuttle)
+	SSshuttle.existing_shuttle = SSshuttle.emergency
+	SSshuttle.action_load(new_shuttle)
+	log_shuttle("Shuttle Catastrophe set a new shuttle, [new_shuttle.name].")

code/modules/events/stray_cargo.dm

@@ -55,7 +55,7 @@
 	crate.update_icon()
 	var/obj/structure/closet/supplypod/pod = make_pod()
 	crate.forceMove(pod)
-	new /obj/effect/abstract/DPtarget(LZ, pod)
+	new /obj/effect/pod_landingzone(LZ, pod)
 
 ///Handles the creation of the pod, in case it needs to be modified beforehand
 /datum/round_event/stray_cargo/proc/make_pod()

code/modules/events/wormholes.dm

@@ -29,7 +29,7 @@
 
 	for(var/i = 1, i <= number_of_wormholes, i++)
 		var/turf/T = pick(pick_turfs)
-		wormholes += new /obj/effect/portal/wormhole(T, null, 0, null, FALSE)
+		wormholes += new /obj/effect/portal/wormhole(T, 0, null, FALSE)
 
 /datum/round_event/wormholes/announce(fake)
 	priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", "spanomalies")

code/modules/food_and_drinks/drinks/drinks.dm

@@ -618,3 +618,9 @@
 	icon_state = "monkey_energy"
 	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
 	foodtype = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/food/drinks/dwarf_mug //dwarf family heirloom (just a cup that always has the manly dorf icon!)
+	name = "ale mug"
+	desc = "An old stained mug used for filling with dwarven ale."
+	icon_state = "manlydorfglass"
+	isGlass = FALSE //it's a wooden mug!

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -291,3 +291,12 @@
 	tastes = list("creamy peas"= 2, "parsnip" = 1)
 	filling_color = "#9dc530"
 	foodtype = VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/soup/facehuggerpot
+	name = "pot of face hugger jambalaya"
+	desc = "An entire pot of an extremely spicy dish made using extremely exotic ingredients. Highly recommend by an interdimensional businessman."
+	icon_state = "facehuggerpot"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
+	tastes = list("face huggers" = 1)
+	foodtype = MEAT

code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm

@@ -291,3 +291,18 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/soup/peasoup
 	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/facehuggerjambalayapot
+	name = "Facehugger jambalaya"
+	reqs = list(
+		/datum/reagent/bluespace = 10,
+		/datum/reagent/consumable/ethanol/booger =10,
+		/obj/item/organ/heart= 3,
+		/obj/item/clothing/mask/facehugger = 1,
+		/obj/item/reagent_containers/food/snacks/egg = 1,
+		/datum/reagent/consumable/blackpepper = 5,
+		/datum/reagent/toxin/acid = 5
+
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/facehuggerpot
+	subcategory = CAT_SOUP

code/modules/holiday/halloween/bartholomew.dm

@@ -130,9 +130,13 @@
 	/obj/item/reagent_containers/pill = 2,
 	/obj/item/clothing/shoes = 8,
 	/obj/item/clothing/head = 3,
-	/obj/item/reagent_containers/food/snacks = 3,
+	/obj/item/reagent_containers/food/snacks = 5,
 	/obj/item/reagent_containers/syringe/dart = 2,
-	/obj/item/reagent_containers/food/drinks/soda_cans = 5)
+	/obj/item/reagent_containers/food/drinks/soda_cans = 5,
+	/obj/item/reagent_containers/food/drinks/drinkingglass = 4,
+	/obj/item/reagent_containers/food/drinks = 6,
+	/obj/item/reagent_containers/food/snacks/grown/apple = 1,
+	/obj/item/reagent_containers/food/snacks/grown/banana = 2)
 	if(length >= 5)
 		return TRUE
 	//var/metalist = pickweight(GLOB.maintenance_loot)

code/modules/holiday/halloween/jacqueen.dm

@@ -48,8 +48,8 @@
 	var/progression = list() //Keep track of where people are in the story.
 	var/active = TRUE //Turn this to false to keep normal mob behavour
 	var/cached_z
-	/// I'm busy chatting, don't move.
-	var/busy_chatting = FALSE
+	/// I'm busy, don't move.
+	var/busy = FALSE
 
 /mob/living/simple_animal/jacq/Initialize()
 	..()
@@ -68,11 +68,14 @@
 	playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25)
 	var/mob/living/simple_animal/jacq/Jacq = new src.type(loc)
 	Jacq.progression = progression
+	if(ckey) //transfer over any ghost posessions
+		Jacq.key = key
 	..()
 
 /mob/living/simple_animal/jacq/death() //What is alive may never die
 	visible_message("<b>[src]</b> cackles, <span class='spooky'>\"You'll nae get rid a me that easily!\"</span>")
 	playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25)
+	fully_heal(FALSE)
 	health = 25
 	poof()
 
@@ -81,9 +84,9 @@
 		say("Hello there [gender_check(M)]!")
 		return ..()
 	if(!ckey)
-		busy_chatting = FALSE
+		stopmove()
 		chit_chat(M)
-		busy_chatting = TRUE
+		canmove()
 	..()
 
 /mob/living/simple_animal/jacq/attack_paw(mob/living/carbon/monkey/M)
@@ -91,11 +94,28 @@
 		say("Hello there [gender_check(M)]!")
 		return ..()
 	if(!ckey)
-		busy_chatting = FALSE
+		stopmove()
 		chit_chat(M)
-		busy_chatting = TRUE
+		canmove()
 	..()
 
+/mob/living/simple_animal/jacq/proc/canmove()
+	busy = FALSE
+	update_mobility()
+
+/mob/living/simple_animal/jacq/proc/stopmove()
+	if(ckey) //if someone is in her, don't disable her movement!
+		canmove()
+		return
+	busy = TRUE
+	update_mobility()
+
+/mob/living/simple_animal/jacq/proc/jacqrunes(message, mob/living/carbon/C) //Displays speechtext over Jacq for the user only.
+	var/atom/hearer = C
+	var/list/spans = list("spooky") 
+	new /datum/chatmessage(message, src, hearer, spans)
+
+
 /mob/living/simple_animal/jacq/proc/poof()
 	last_poof = world.realtime
 	var/datum/reagents/R = new/datum/reagents(100)//Hey, just in case.
@@ -104,7 +124,7 @@
 	s.set_up(R, 0, loc)
 	s.start()
 	visible_message("<b>[src]</b> disappears in a puff of smoke!")
-	busy_chatting = TRUE
+	canmove()
 	health = 25
 
 	//Try to go to populated areas
@@ -120,7 +140,7 @@
 			continue
 		targets += H
 
-	if(!targets)
+	if(!targets.len)
 		targets = GLOB.generic_event_spawns
 
 	for(var/i in 1 to 6) //Attempts a jump up to 6 times.
@@ -151,14 +171,16 @@
 
 	if(!progression["[C.real_name]"] ||  !(progression["[C.real_name]"] & JACQ_HELLO))
 		visible_message("<b>[src]</b> smiles ominously at [C], <span class='spooky'>\"Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.\"</span>")
+		jacqrunes("Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.", C)
 		sleep(20)
 		visible_message("<b>[src]</b> continues, <span class='spooky'>\"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.</span>\" giving [C] a wide grin.")
+		jacqrunes("Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.", C)
 		if(!progression["[C.real_name]"])
 			progression["[C.real_name]"] = NONE //TO MAKE SURE THAT THE LIST ENTRY EXISTS.
 
 		progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HELLO
 
-	var/choices = list("Trick", "Treat", "How do I get candies?")
+	var/choices = list("Trick", "Treat", "How do I get candies?", "Do I know you from somewhere?")
 	var/choice = input(C, "Trick or Treat?", "Trick or Treat?") in choices
 	switch(choice)
 		if("Trick")
@@ -168,14 +190,20 @@
 			if(check_candies(C))
 				treat(C, gender)
 			else
-				visible_message("<b>[src]</b> raises an eyebrow, <span class='spooky'>\"You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.\"</span>")
+				visible_message("<b>[src]</b> raises aneyebrow, <span class='spooky'>\"You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.\"</span>")
+				jacqrunes("You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.", C)
 			return
 		if("How do I get candies?")
 			visible_message("<b>[src]</b> says, <span class='spooky'>\"Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.\"</span>")
+			jacqrunes("Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.", C)
 			return
+		if("Do I know you from somewhere?")
+			visible_message("<b>[src]</b> says, <span class='spooky'>\"Aye ye micht dae, ah was kicking aboot round 'ere aboot a year ago when ah had a wee... altercation wit the witch academy n' ran oot here tae crash oan me sis's floor. Course she pushed me tae git it a' sorted oot lik', bit nae before ah hud a wee bit o' fun oan this station. Or maybe ye jest recognise me ma's prized pumpkin atop me nonce.\"</span>")
+			jacqrunes("Aye ye micht dae, ah was kicking aboot round 'ere aboot a year ago when ah had a wee... altercation wit the witch academy n' ran oot here tae crash oan me sis's floor. Course she pushed me tae git it a' sorted oot lik', bit nae before ah hud a wee bit o' fun oan this station. Or maybe ye jest recognise me ma's prized pumpkin atop me nonce.", C)
 
 /mob/living/simple_animal/jacq/proc/treat(mob/living/carbon/C, gender)
 	visible_message("<b>[src]</b> gives off a glowing smile, <span class='spooky'>\"What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.\"</span>")
+	jacqrunes("What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.", C)
 	var/choices_reward = list("Object - 3 candies", "Potion - 2 candies", "Jacqueline Tracker - 2 candies", "Plushie - 1 candy", "Can I get to know you instead?", "Become a pumpkinhead dullahan (perma) - 4 candies")
 	var/choice_reward = input(usr, "Trick or Treat?", "Trick or Treat?") in choices_reward
 
@@ -184,8 +212,10 @@
 		if("Become a pumpkinhead dullahan (perma) - 4 candies")
 			if(!take_candies(C, 4))
 				visible_message("<b>[src]</b> raises an eyebrown, <span class='spooky'>\"It's 4 candies for that [gender]! Thems the rules!\"</span>")
+				jacqrunes("It's 4 candies for that [gender]! Thems the rules!", C)
 				return
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"Off comes your head, a pumpkin taking it's stead!\"</span>")
+			jacqrunes("Off comes your head, a pumpkin taking it's stead!", C)
 			C.reagents.add_reagent(/datum/reagent/mutationtoxin/pumpkinhead, 5)
 			sleep(20)
 			poof()
@@ -194,6 +224,7 @@
 		if("Object - 3 candies")
 			if(!take_candies(C, 3))
 				visible_message("<b>[src]</b> raises an eyebrown, <span class='spooky'>\"It's 3 candies per trinket [gender]! Thems the rules!\"</span>")
+				jacqrunes("It's 3 candies per trinket [gender]! Thems the rules!", C)
 				return
 
 			var/new_obj = pick(subtypesof(/obj))
@@ -203,36 +234,43 @@
 			var/reward = new new_obj(C.loc)
 			C.put_in_hands(reward)
 			visible_message("<b>[src]</b> waves her hands, magicking up a [reward] from thin air, <span class='spooky'>\"There ye are [gender], enjoy! \"</span>")
+			jacqrunes("There ye are [gender], enjoy!", C)
 			sleep(20)
 			poof()
 			return
 		if("Potion - 2 candies")
 			if(!take_candies(C, 2))
 				visible_message("<b>[src]</b> raises an eyebrow, <span class='spooky'>\"It's 2 candies per potion [gender]! Thems the rules!\"</span>")
+				jacqrunes("It's 2 candies per potion [gender]! Thems the rules!", C)
 				return
 
 			var/reward = new /obj/item/reagent_containers/potion_container(C.loc)
 			C.put_in_hands(reward)
 			visible_message("<b>[src]</b> waves her hands, magicking up a [reward] from thin air, <span class='spooky'>\"There ye are [gender], enjoy! \"</span>")
+			jacqrunes("There ye are [gender], enjoy!", C)
 			sleep(20)
 			poof()
 			return
 		if("Plushie - 1 candy")
 			if(!take_candies(C, 1))
 				visible_message("<b>[src]</b> raises an eyebrow, <span class='spooky'>\"It's 1 candy per plushie [gender]! Thems the rules!\"</span>")
+				jacqrunes("It's 1 candy per plushie [gender]! Thems the rules!", C)
 				return
 
 			new /obj/item/toy/plush/random(C.loc)
 			visible_message("<b>[src]</b> waves her hands, magicking up a plushie from thin air, <span class='spooky'>\"There ye are [gender], enjoy! \"</span>")
+			jacqrunes("There ye are [gender], enjoy!", C)
 			sleep(20)
 			poof()
 			return
 		if("Jacqueline Tracker - 2 candies")
 			if(!take_candies(C, 2))
 				visible_message("<b>[src]</b> raises an eyebrow, <span class='spooky'>\"It's 1 candy per plushie [gender]! Thems the rules!\"</span>")
+				jacqrunes("It's 1 candy per plushie [gender]! Thems the rules!", C)
 				return
 			new /obj/item/pinpointer/jacq(C.loc)
 			visible_message("<b>[src]</b> waves her hands, magicking up a tracker from thin air, <span class='spooky'>\"Feels weird to magic up a tracker fer meself but, here ye are [gender], enjoy! \"</span>")
+			jacqrunes("Feels weird to magic up a tracker fer meself but, here ye are [gender], enjoy!", C)
 			sleep(20)
 			poof()
 			return
@@ -252,7 +290,7 @@
 				choices += "What is that on your head?"
 			if(!(progression["[C.real_name]"] & JACQ_EXPELL))
 				if(progression["[C.real_name]"] & JACQ_WITCH)
-					choices += "So you got ex-spell-ed?"
+					choices += "What is it like being a witch?"
 				else
 					choices += "Are you a witch?"
 
@@ -270,47 +308,79 @@
 			//If you've nothing to ask
 			if(!LAZYLEN(choices))
 				visible_message("<b>[src]</b> sighs, <span class='spooky'>\"Ah'm all questioned oot fer noo, [gender].\"</span>")
+				jacqrunes("Ah'm all questioned oot fer noo, [gender]", C)
 				return
 			//Otherwise, lets go!
 			visible_message("<b>[src]</b> says, <span class='spooky'>\"A question? Sure, it'll cost you a candy though!\"</span>")
+			jacqrunes("A question? Sure, it'll cost you a candy though!", C)
 			choices += "Nevermind"
 			//Candies for chitchats
 			var/choice = input(C, "What do you want to ask?", "What do you want to ask?") in choices
 			if(!take_candies(C, 1))
 				visible_message("<b>[src]</b> raises an eyebrow, <span class='spooky'>\"It's a candy per question [gender]! Thems the rules!\"</span>")
+				jacqrunes("It's a candy per question [gender]! Thems the rules!", C)
 				return
 			//Talking
 			switch(choice)
 				if("Why do you want the candies?")
 					visible_message("<b>[src]</b> says, <span class='spooky'>\"Ave ye tried them? They're full of all sorts of reagents. Ah'm after them so ah ken magic em up an hopefully find rare stuff fer me brews. Honestly it's a lot easier magicking up tatt fer ye lot than runnin aroond on me own like. I'd ask me familiars but most a my familiars are funny fellows 'n constantly bugger off on adventures when given simple objectives like; Go grab me a tea cake or watch over me cauldron. Ah mean, ye might run into Bartholomew my cat. Ee's supposed tae be tending my cauldron, but I've nae idea where ee's got tae.\"</span>")
+					jacqrunes("Ave ye tried them? They're full of all sorts of reagents. Ah'm after them so ah ken magic em up an hopefully find rare stuff fer me brews. Honestly it's a lot easier magicking up tatt fer ye lot than runnin aroond on me own like. I'd ask me familiars but most a my familiars are funny fellows 'n constantly bugger off on adventures when given simple objectives like; Go grab me a tea cake or watch over me cauldron. Ah mean, ye might run into Bartholomew my cat. Ee's supposed tae be tending my cauldron, but I've nae idea where ee's got tae.", C)
 					progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_CANDIES
 					sleep(30)
 
 				if("You really came all this way for candy?")
-					visible_message("<b>[src]</b> l ooks tae the side sheepishly, <span class='spooky'>\"Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead!\"</span> <b>[src]</b> scowls, <span class='spooky'>\"She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts <i> moles </i> in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!\"</span> <b>[src]</b> sighs, <span class='spooky'>\"But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.\"</span>")
+					visible_message("<b>[src]</b> looks to the side sheepishly, <span class='spooky'>\"Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead!\"</span> <b>[src]</b> scowls, <span class='spooky'>\"She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts <i> moles </i> in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!\"</span> <b>[src]</b> sighs, <span class='spooky'>\"But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.\"</span>")
+					jacqrunes("Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead", C)
 					progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_FAR
-					sleep(30)
+					sleep(10)
+					jacqrunes("She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts moles in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!", C)
+					sleep(10)
+					jacqrunes("But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.", C)
+					sleep(10)
 
 				if("What is that on your head?")
-					visible_message("<b>[src]</b> pats the pumpkin atop her head, <span class='spooky'>\"This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly it felt like she loved this thing more than any of us, which Ah knew ain't true an it's not like she was hartless or anything but.. well, we had a falling oot when Ah got back home with all me stuff in tow. An all she had done is sent me owl after owl over t' last year aboot this bloody pumpkin and ah had enough. So ah took it, an put it on me head. You know, as ye do. Ah am the great Pumpqueen after all, Ah deserve this.\"</span>")
+					visible_message("<b>[src]</b> pats the pumpkin atop her head, <span class='spooky'>\"This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly I got bloody sick o'er harpin' on aboot it, all she had done is sent me owl after owl over aboot this bloody pumpkin since i left the nest and ah had enough after a ... mild altercation like. So I nabbed it last halloween. Caught bloody hell fer it ah did, course me sis talked to me ma and, well, simmered her doon. We've all but made up noo, but seein' as ah'm the great Pumpqueen after all, I cannae be seen withoot it like.\"</span>")
+					jacqrunes("This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly I got bloody sick o'er harpin' on aboot it, all she had done is sent me owl after owl over aboot this bloody pumpkin since i left the nest and ah had enough after a ... mild altercation like. So I nabbed it last halloween. Caught bloody hell fer it ah did, course me sis talked to me ma and, well, simmered her doon. We've all but made up noo, but seein' as ah'm the great Pumpqueen after all, I cannae be seen withoot it like.", C)
 					progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HEAD
 					sleep(30)
 
+					//Year 1 answer: for anyone who is interested!
+					/*This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly it felt like she loved this thing more than any of us, which Ah knew ain't true an it's not like she was hartless or anything but.. well, we had a falling oot when Ah got back home with all me stuff in tow. An all she had done is sent me owl after owl over t' last year aboot this bloody pumpkin and ah had enough. So ah took it, an put it on me head. You know, as ye do. Ah am the great Pumpqueen after all, Ah deserve this.*/
+
 				if("Are you a witch?")
-					visible_message("<b>[src]</b> grumbles, <span class='spooky'>\"If ye must know, Ah got kicked oot of the witch academy fer being too much of a \"loose cannon\". A bloody loose cannon? Nae they were just pissed off Ah had the brass tae proclaim myself as the Pumpqueen! And also maybe the time Ah went and blew up one of the towers by trying tae make a huge batch of astrogen might've had something tae do with it. Ah mean it would've worked fine if the cauldrons weren't so shite and were actually upgraded by the faculty. So technically no, I'm not a witch.\"</span>")
+					visible_message("<b>[src]</b> smirks, <span class='spooky'>\"Weel, after getting kicked oot over a <i>very minor</i> explosion last year, ah wis able tae git back in 'n' finish me witching degree thanks tae me sis! 'twas bloody brutal finishing th' degree though, ah will tell ye, ye take a peek o'er at t' other witches all prim 'n' proper like 'n' it gets in yer heid, ye'r nae as guid. But ah bloody well ended up summoning Nar'Sie last year for the lot o' yous. Aye a'm a loose cannon - but ah get results.\"</span> thumping her chest with pride as she finishes speaking.")
+					jacqrunes("Weel, after getting kicked oot over a very minor explosion last year, ah wis able tae git back in 'n' finish me witching degree thanks tae me sis! 'twas bloody brutal finishing th' degree though, ah will tell ye, ye take a peek o'er at t' other witches all prim 'n' proper like 'n' it gets in yer heid, ye'r nae as guid. But ah bloody well ended up summoning Nar'Sie last year for the lot o' yous. Aye a'm a loose cannon - but ah get results." , C)
 					progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_WITCH
 					sleep(30)
 
-				if("So you got ex-spell-ed?")
-					visible_message("<b>[src]</b> Gives you a blank look at the pun, before continuing, <span class='spooky'>\"Not quite, Ah know Ah ken get back into the academy, it's only an explosion, they happen all the time, but, tae be fair it's my fault that things came tae their explosive climax. You don't know what it's like when you're after a witch doctorate, everyone else is doing well, everyone's making new spells and the like, and I'm just good at making explosions really, or fireworks. So, Ah did something Ah knew was dangerous, because Ah had tae do something tae stand oot, but Ah know this life ain't fer me, Ah don't want tae be locked up in dusty towers, grinding reagent after reagent together, trying tae find new reactions, some of the wizards in there haven't left fer years. Ah want tae live, Ah want tae fly around on a broom, turn people into cats fer a day and disappear cackling! That's what got me into witchcraft!\"</span> she throws her arms up in the arm, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, giving oot a soft sigh, <span class='spooky'>\"Ah know my mother's obsession with this dumb thing on my head is just her trying tae fill the void of me and my sis moving oot, and it really shouldn't be on my head. And Ah know that I'm really here tae get help from my sis.. She's the sensible one, and she gives good hugs.\"</span>")
-					sleep(30)
+					//Year 1 answer for anyone who is interested:
+					/* Are you a witch?
+					If ye must know, Ah got kicked oot of the witch academy fer being too much of a \"loose cannon\". A bloody loose cannon? Nae they were just pissed off Ah had the brass tae proclaim myself as the Pumpqueen! And also maybe the time Ah went and blew up one of the towers by trying tae make a huge batch of astrogen might've had something tae do with it. Ah mean it would've worked fine if the cauldrons weren't so shite and were actually upgraded by the faculty. So technically no, I'm not a witch.*/
+
+				if("What is it like being a witch?") //What is it like being a witch?
+
+					visible_message("<b>[src]</b> says, <span class='spooky'>\"Tae be honest, ah dunnae. Ah mean ah have a piece o’ paper that implies that a’m, ‘n’ a few folk who seem keen in shoving me back in their magic tower, but I don’t know if that’s fer me really.\" </span> she gives the back of her pumpkin a quick scratch as she continues <span class='spooky'> \"What draws me tae witchcraft is the chaos, ah live tae see th’ utter madness that comes fae the spells ah cast ‘n’ th’ like, ‘n’ ah know you do tae, it’s why you’re ‘ere, aye? Ah kin conjure some utterly chaotic things, and ah love tae do it, just tae see what I’ll git! It’s why visiting here is so fun, ye wee lot scurrying about, getting me candies, hoping I’ll conjure up something utterly chaotic!\" </span> she throws her arms up in the arm with a laugh, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, <span class='spooky'> \"But o’ course life ain’t that easy,  ye can’t just go around being a pure agent o’ chaos, ‘n’ ah feel like the reality o’ the world be trying tae dull me, to shove me in a boring dusty auld room where ah spend t’ rest o’ me days researching some boggin’ magic till ah die. Ah want tae bloody well change t’ world, ah want to do something that leaves an impact, but ah dunnae want t’ kill people doing it.\"</span> she gives out a soft sigh, \"Who knows, maybe I’ll bugger off ‘n’ make some pumkinmobiles or something daft like that.\" </span>")
+					jacqrunes("Tae be honest, ah dunnae. Ah mean ah have a piece o’ paper that implies that a’m, ‘n’ a few folk who seem keen in shoving me back in their magic tower, but I don’t know if that’s fer me really." , C)
+					sleep(10)
+					jacqrunes("What draws me tae witchcraft is the chaos, ah live tae see th’ utter madness that comes fae the spells ah cast ‘n’ th’ like, ‘n’ ah know you do tae, it’s why you’re ‘ere, aye? Ah kin conjure some utterly chaotic things, and ah love tae do it, just tae see what I’ll git! It’s why visiting here is so fun, ye wee lot scurrying about, getting me candies, hoping I’ll conjure up something utterly chaotic!" , C)
+					sleep(10)
+					jacqrunes("But o’ course life ain’t that easy,  ye can’t just go around being a pure agent o’ chaos, ‘n’ ah feel like the reality o’ the world be trying tae dull me, to shove me in a boring dusty auld room where ah spend t’ rest o’ me days researching some boggin’ magic till ah die. Ah want tae bloody well change t’ world, ah want to do something that leaves an impact, but ah dunnae want t’ kill people doing it.", C)
+					sleep(10)
+					jacqrunes("Who knows, maybe I’ll bugger off ‘n’ make some pumkinmobiles or something daft like that.", C)
+					sleep(25)
 					visible_message("<b>[src]</b> says, <span class='spooky'>\"Thanks [C], Ah guess Ah didn't realise Ah needed someone tae talk tae but, I'm glad ye spent all your candies talking tae me. Funny how things seem much worse in yer head.\"</span>")
+					jacqrunes("Thanks [C], Ah guess Ah didn't realise Ah needed someone tae talk tae but, I'm glad ye spent all your candies talking tae me. Funny how things seem much worse in yer head." , C)
 					progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_EXPELL
 					sleep(30)
 
+					//Year 1 answer for anyone who is interested:
+					/*"So you got ex-spell-ed?"
+					Gives you a blank look at the pun, before continuing, <span class='spooky'>\"Not quite, Ah know Ah ken get back into the academy, it's only an explosion, they happen all the time, but, tae be fair it's my fault that things came tae their explosive climax. You don't know what it's like when you're after a witch doctorate, everyone else is doing well, everyone's making new spells and the like, and I'm just good at making explosions really, or fireworks. So, Ah did something Ah knew was dangerous, because Ah had tae do something tae stand oot, but Ah know this life ain't fer me, Ah don't want tae be locked up in dusty towers, grinding reagent after reagent together, trying tae find new reactions, some of the wizards in there haven't left fer years. Ah want tae live, Ah want tae fly around on a broom, turn people into cats fer a day and disappear cackling! That's what got me into witchcraft!\"</span> she throws her arms up in the arm, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, giving oot a soft sigh, <span class='spooky'>\"Ah know my mother's obsession with this dumb thing on my head is just her trying tae fill the void of me and my sis moving oot, and it really shouldn't be on my head. And Ah know that I'm really here tae get help from my sis.. She's the sensible one, and she gives good hugs.
+					*/
+
 				if("Can I take you out on a date?")
 					visible_message("<b>[src]</b> blushes, <span class='spooky'>\"...You want tae ask me oot on a date? Me? After all that nonsense Ah just said? It seems a waste of a candy honestly.\"</span>")
-					//progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_DATE
+					jacqrunes("...You want tae ask me oot on a date? Me? After all that nonsense Ah just said? It seems a waste of a candy honestly." , C)
 					visible_message("<b>[src]</b> looks to the side, deep in thought.</span>")
 					dating_start(C, gender)
 
@@ -328,15 +398,18 @@
 	switch(option)
 		if(1)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"Hocus pocus, making friends is now your focus!\"</span>")
+			jacqrunes("Hocus pocus, making friends is now your focus!", C)
 			var/message = pick("make a tasty sandwich for", "compose a poem for", "aquire a nice outfit to give to", "strike up a conversation about pumpkins with", "write a letter and deliver it to", "give a nice hat to")
 			var/mob/living/L2 = pick(GLOB.player_list)
 			message += " [L2.name]."
 			to_chat(C, "<span class='big warning'> You feel an overwhelming desire to [message]")
 		if(2)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"If only you had a better upbringing, your ears are now full of my singing!\"</span>")
-			C.client.tgui_panel?.play_music("https://puu.sh/ExBbv.mp4")
+			jacqrunes("If only you had a better upbringing, your ears are now full of my singing!", C)
+			C.client.tgui_panel?.play_music("https://katlin.dog/v/spooky.mp4")
 		if(3)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"You're cute little bumpkin, On your head is a pumpkin!\"</span>")
+			jacqrunes("You're cute little bumpkin, On your head is a pumpkin!", C)
 			if(C.head)
 				var/obj/item/W = C.head
 				C.dropItemToGround(W, TRUE)
@@ -344,12 +417,15 @@
 			C.equip_to_slot(jaqc_latern, SLOT_HEAD, 1, 1)
 		if(4)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"In your body there's something amiss, you'll find it's a chem made by my sis!\"</span>")
+			jacqrunes("In your body there's something amiss, you'll find it's a chem made by my sis!", C)
 			C.reagents.add_reagent(/datum/reagent/fermi/eigenstate, 30)
 		if(5)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"A new familiar for me, and you'll see it's thee!\"</span>")
-			C.reagents.add_reagent("secretcatchem", 30)
+			jacqrunes("A new familiar for me, and you'll see it's thee!", C)
+			C.reagents.add_reagent(/datum/reagent/fermi/secretcatchem, 30)
 		if(6)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"While you may not be a ghost, for this sheet you'll always be it's host.\"</span>")
+			jacqrunes("While you may not be a ghost, for this sheet you'll always be it's host.", C)
 			var/mob/living/carbon/human/H = C
 			if(H.wear_suit)
 				var/obj/item/W = H.wear_suit
@@ -370,22 +446,30 @@
 				message_admins("[C2]/[C2.key] has agreed to go on a date with [C] as Jacqueline.")
 				log_game("HALLOWEEN: [C2]/[C2.key] has agreed to go on a date with [C] as Jacqueline")
 				to_chat(src, "<span class='big spooky'>You are Jacqueline the great pumpqueen, witch Extraordinaire! You're a very Scottish lass with a kind heart, but also a little crazy. You also blew up the wizarding school and you're suspended for a while, so you visited the station before heading home. On your head lies the prize pumpkin of your Mother's pumpkin patch. You're currently on a date with [C] and well, I didn't think anyone would get this far. <i> Please be good so I can do events like this in the future. </i> </span>")
-				return
+				canmove()
+				return TRUE
 			else
 				candies =- C2
 	visible_message("<b>[src]</b> looks to the side, <span class='spooky'>\"Look, Ah like ye but, Ah don't think Ah can right now. If ye can't tell, the stations covered in volatile candies, I've a few other laddies and lassies running after me treats, and tae top it all off, I've the gods breathing down me neck, watching every treat Ah make fer the lot of yous.\" she sighs, \"But that's not a no, right? That's.. just a nae right noo.\"</span>")
+	jacqrunes("Look, Ah like ye but, Ah don't think Ah can right now. If ye can't tell, the stations covered in volatile candies, I've a few other laddies and lassies running after me treats, and tae top it all off, I've the gods breathing down me neck, watching every treat Ah make fer the lot of yous.", C)
 	sleep(20)
+	jacqrunes("But that's not a no, right? That's.. just a nae right noo.", C)
 	visible_message("<b>[src]</b> takes off the pumpkin on her head, a rich blush on her cheeks. She leans over planting a kiss upon your forehead quickly befere popping the pumpkin back on her head.")
-	sleep(10)
+	sleep(20)
 	visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"There, that aught tae be worth a candy.\"</span>")
+	jacqrunes("There, that aught tae be worth a candy.", C)
 	sleep(20)
 	poof()
 
 /mob/living/simple_animal/jacq/update_mobility()
 	. = ..()
-	if(busy_chatting)
+	if(busy)
 		DISABLE_BITFIELD(., MOBILITY_MOVE)
-		mobility_flags = .
+	else
+		ENABLE_BITFIELD(., MOBILITY_MOVE)
+	mobility_flags = .
+
+
 
 /obj/item/clothing/head/hardhat/pumpkinhead/jaqc
 	name = "Jacq o' latern"

code/modules/holiday/holidays.dm

@@ -351,7 +351,7 @@
 
 /datum/holiday/halloween
 	name = HALLOWEEN
-	begin_day = 28
+	begin_day = 1
 	begin_month = OCTOBER
 	end_day = 2
 	end_month = NOVEMBER

code/modules/hydroponics/grown/grass_carpet.dm

@@ -50,7 +50,7 @@
 	plantname = "Fairygrass"
 	product = /obj/item/reagent_containers/food/snacks/grown/grass/fairy
 	icon_grow = "fairygrass-grow"
-	icon_dead = "fairygrass-dead"
+	icon_dead = "grass-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue)
 	mutatelist = list (/obj/item/seeds/grass/carpet)
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05, /datum/reagent/drug/space_drugs = 0.15)

code/modules/hydroponics/grown/mushrooms.dm

@@ -193,6 +193,8 @@
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
+	icon_grow = "chanter-grow"
+	icon_dead = "chanter-dead"
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
 	mutatelist = list(/obj/item/seeds/chanterelle/jupitercup)
 

code/modules/hydroponics/hydroponics.dm

@@ -42,6 +42,14 @@
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "hydrotray3"
 
+/obj/machinery/hydroponics/constructable/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+	AddComponent(/datum/component/plumbing/simple_demand)
+
+/obj/machinery/hydroponics/constructable/proc/can_be_rotated(mob/user, rotation_type)
+	return !anchored
+
 /obj/machinery/hydroponics/constructable/RefreshParts()
 	var/tmp_capacity = 0
 	for (var/obj/item/stock_parts/matter_bin/M in component_parts)
@@ -285,7 +293,7 @@
 		else
 			plant_overlay.icon_state = myseed.icon_harvest
 	else
-		var/t_growthstate = min(round((age / myseed.maturation) * myseed.growthstages), myseed.growthstages)
+		var/t_growthstate = clamp(round((age / myseed.maturation) * myseed.growthstages), 1, myseed.growthstages)
 		plant_overlay.icon_state = "[myseed.icon_grow][t_growthstate]"
 	add_overlay(plant_overlay)
 

code/modules/integrated_electronics/subtypes/output.dm

@@ -44,18 +44,18 @@
 /obj/item/integrated_circuit/output/screen/large/do_work()
 	..()
 
-	if(isliving(assembly.loc))//this whole block just returns if the assembly is neither in a mobs hands or on the ground
-		var/mob/living/H = assembly.loc
-		if(H.get_active_held_item() != assembly && H.get_inactive_held_item() != assembly)
-			return
-	else
-		if(!isturf(assembly.loc))
-			return
-	
-	var/atom/host = assembly || src
 	var/list/mobs = list()
-	for(var/mob/M in range(0, get_turf(src)))
-		mobs += M
+	if(isliving(assembly.loc))
+		mobs += assembly.loc
+		var/mob/living/L = assembly.loc
+		if(L.is_holding(src))
+			for(var/mob/M in range(1, get_turf(src)))
+				mobs += M
+	else
+		for(var/mob/M in range(2, get_turf(src)))
+			mobs += M
+
+	var/atom/host = assembly || src
 	to_chat(mobs, "<span class='notice'>[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]</span>")
 	host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
 

code/modules/jobs/job_types/_job.dm

@@ -73,6 +73,31 @@
 	/// Starting skill modifiers.
 	var/list/starting_modifiers
 
+/**
+  * Checks if we should be created on a certain map
+  */
+/datum/job/proc/map_check(datum/map_config/C)
+	return (length(C.job_whitelist)? (type in C.job_whitelist) : !(type in C.job_blacklist))
+
+/**
+  * Processes map specific overrides
+  */
+/datum/job/proc/process_map_overrides(datum/map_config/C)
+	if(type in C.job_override_spawn_positions)
+		spawn_positions = C.job_override_spawn_positions[type]
+	if(type in C.job_override_total_positions)
+		total_positions = C.job_override_total_positions[type]
+	if(type in C.job_access_override)
+		access = C.job_access_override[type]
+		minimal_access = access
+	else
+		if(type in C.job_access_add)
+			access += C.job_access_add[type]
+			minimal_access += C.job_access_add[type]
+		if(type in C.job_access_remove)
+			access -= C.job_access_add[type]
+			minimal_access -= C.job_access_remove[type]
+
 //Only override this proc
 //H is usually a human unless an /equip override transformed it
 /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
@@ -175,9 +200,6 @@
 /datum/job/proc/config_check()
 	return TRUE
 
-/datum/job/proc/map_check()
-	return TRUE
-
 /datum/job/proc/radio_help_message(mob/M)
 	to_chat(M, "<b>Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset.</b>")
 

code/modules/jobs/map_changes/map_changes.dm

@@ -1,4 +0,0 @@
-//this needs to come after the job_types subfolder to keep the correct ordering
-
-#include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm"
-#undef JOB_MODIFICATION_MAP_NAME

code/modules/keybindings/bindings_client.dm

@@ -1,6 +1,7 @@
 // Clients aren't datums so we have to define these procs indpendently.
 // These verbs are called for all key press and release events
 /client/verb/keyDown(_key as text)
+	SHOULD_NOT_SLEEP(TRUE)
 	set instant = TRUE
 	set hidden = TRUE
 
@@ -83,6 +84,7 @@
 		keyUp("[key]")
 
 /client/verb/keyUp(_key as text)
+	SHOULD_NOT_SLEEP(TRUE)
 	set instant = TRUE
 	set hidden = TRUE
 

code/modules/keybindings/keybind/movement.dm

@@ -154,7 +154,7 @@
 
 /datum/keybinding/living/toggle_sprint/down(client/user)
 	var/mob/living/L = user.mob
-	L.default_toggle_sprint(TRUE)
+	L.default_toggle_sprint()
 	return TRUE
 
 /datum/keybinding/mob/toggle_move_intent

code/modules/keybindings/setup.dm

@@ -1,12 +1,11 @@
 /datum/proc/key_down(key, client/user) // Called when a key is pressed down initially
-	return
+	SHOULD_NOT_SLEEP(TRUE)
 
 /datum/proc/key_up(key, client/user) // Called when a key is released
-	return
+	SHOULD_NOT_SLEEP(TRUE)
 
 /datum/proc/keyLoop(client/user) // Called once every frame
-	set waitfor = FALSE
-	return
+	SHOULD_NOT_SLEEP(TRUE)
 
 // removes all the existing macros
 /client/proc/erase_all_macros()

code/modules/mapping/map_config.dm

@@ -43,6 +43,21 @@
 	/// Orientation to load in by default.
 	var/orientation = SOUTH		//byond defaults to placing everyting SOUTH.
 
+	/// Jobs whitelist - if this is not empty, ONLY these jobs are allowed. Overrides blacklist.
+	var/list/job_whitelist
+	/// Jobs blacklist - if this is not empty, jobs in this aren't allowed.
+	var/list/job_blacklist
+	/// Job spawn position mod - type = number
+	var/list/job_override_spawn_positions
+	/// Job total position mod - type = number
+	var/list/job_override_total_positions
+	/// Add these accesses to jobs - type = list()
+	var/list/job_access_add
+	/// Remove these accesses from jobs - type = list()
+	var/list/job_access_remove
+	/// Override job accesses - type = list() - overrides everything else
+	var/list/job_access_override
+
 /proc/load_map_config(filename = "data/next_map.json", default_to_box, delete_after, error_if_missing = TRUE)
 	var/datum/map_config/config = new
 	if (default_to_box)
@@ -161,6 +176,69 @@
 
 	allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
 
+	if("job_whitelist" in json)
+		job_whitelist = list()
+		for(var/path in json["job_whitelist"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_whitelist += type
+
+	if("job_blacklist" in json)
+		job_blacklist = list()
+		for(var/path in json["job_blacklist"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_blacklist += type
+
+	if("job_override_spawn_positions" in json)
+		job_override_spawn_positions = list()
+		for(var/path in json["job_override_spawn_positions"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_override_spawn_positions += type
+
+	if("job_override_total_positions" in json)
+		job_override_total_positions = list()
+		for(var/path in json["job_override_total_positions"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_override_total_positions += type
+
+	if("job_access_add" in json)
+		job_access_add = list()
+		for(var/path in json["job_acces_add"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_access_add[type] = json["job_access_add"]
+
+	if("job_access_remove" in json)
+		job_access_remove = list()
+		for(var/path in json["job_acces_add"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_access_remove[type] = json["job_access_remove"]
+
+	if("job_access_override" in json)
+		job_access_override = list()
+		for(var/path in json["job_acces_add"])
+			var/type = text2path(path)
+			if(!path)
+				log_config("map datum [config_filename] failed to validate path [path] in job overrides.")
+				continue
+			job_access_override[type] = json["job_access_override"]
+
 	defaulted = FALSE
 	return TRUE
 #undef CHECK_EXISTS
@@ -190,6 +268,13 @@
 	jsonlist["announcertype"] = announcertype
 	jsonlist["orientation"] = orientation
 	jsonlist["allow_custom_shuttles"] = allow_custom_shuttles
+	jsonlist["job_whitelist"] = job_whitelist
+	jsonlist["job_blacklist"] = job_blacklist
+	jsonlist["job_override_spawn_positions"] = job_override_spawn_positions
+	jsonlist["job_override_total_positions"] = job_override_total_positions
+	jsonlist["job_access_add"] = job_access_add
+	jsonlist["job_access_remove"] = job_access_remove
+	jsonlist["job_access_override"] = job_access_override
 	if(fexists("data/next_map.json"))
 		fdel("data/next_map.json")
 	var/F = file("data/next_map.json")

code/modules/mapping/minimaps.dm

@@ -134,12 +134,13 @@
 			return num;
 		}
 		window.onload = function() {
-			var datas = \[[jointext(datas, ",")]]
-			if(!window.HTMLCanvasElement){
-				//something has gone horribly wrong!
+			if(!window.HTMLCanvasElement) {
+				var label = document.getElementById("label-1");
+				label.textContent = "<h1>WARNING! HTMLCanvasElement not found!</h1>"
 				return false
 			}
-			for(var i = 0; i < [length(minimaps)]; i++){
+			var datas = \[[jointext(datas, ",")]]
+			for(var i = 0; i < [length(minimaps)]; i++) {
 				//the fuck is this wrapped?
 				var data = datas\[i];
 				var img = document.getElementById("map-" + (i + 1));
@@ -160,13 +161,16 @@
 				ctx.drawImage(document.getElementById("map-" + (i+1) + "-meta"), 0, 0);
 
 				var imagedata = ctx.getImageData(0, 0, img.width, img.height);
-				var label = document.getElementById("label-" + (i+1));
+
 				canvas.onmousemove = function(e){
 					var rect = canvas.getBoundingClientRect();
 					var x = Math.floor(e.offsetX * img.width / rect.width);
 					var y = Math.floor(e.offsetY * img.height / rect.height);
+
 					var color_idx = x * 4 + (y * 4 * imagedata.width);
 					var color = "#" + hexify(imagedata.data\[color_idx]) + hexify(imagedata.data\[color_idx+1]) + hexify(imagedata.data\[color_idx+2]);
+					var label = document.getElementById("label-" + (i+1)); //label-String(n)
+
 					label.textContent = data\[color];
 					canvas.title = data\[color];
 				}

code/modules/mapping/ruins.dm

@@ -135,7 +135,12 @@
 		//That's done remove from priority even if it failed
 		if(forced)
 			//TODO : handle forced ruins with multiple variants
+			// this might work?
 			forced_ruins -= current_pick
+			if(!current_pick.allow_duplicates)
+				for(var/datum/map_template/ruin/R in forced_ruins)
+					if(R.id == current_pick.id)
+						forced_ruins -= R
 			forced = FALSE
 
 		if(failed_to_place)

code/modules/mining/equipment/survival_pod.dm

@@ -11,8 +11,8 @@
 /obj/item/survivalcapsule
 	name = "bluespace shelter capsule"
 	desc = "An emergency shelter stored within a pocket of bluespace."
-	icon_state = "capsule"
 	icon = 'icons/obj/mining.dmi'
+	icon_state = "capsule"
 	w_class = WEIGHT_CLASS_TINY
 	var/template_id = "shelter_alpha"
 	var/datum/map_template/shelter/template
@@ -72,9 +72,10 @@
 /obj/item/survivalcapsule/luxury
 	name = "luxury bluespace shelter capsule"
 	desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
+	icon_state = "capsule-lux"
 	template_id = "shelter_beta"
 
-/obj/item/survivalcapsule/luxuryelite
+/obj/item/survivalcapsule/luxury/elitebar
 	name = "luxury elite bar capsule"
 	desc = "A luxury bar in a capsule. Bartender required and not included."
 	template_id = "shelter_charlie"

code/modules/mining/machine_vending.dm

@@ -42,7 +42,7 @@
 		new /datum/data/mining_equipment("Fulton Pack",					/obj/item/extraction_pack,											1000),
 		new /datum/data/mining_equipment("Lazarus Injector",			/obj/item/lazarus_injector,											1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/pickaxe/silver,											1000),
-		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffelbag/mining_conscript,				1000),
+		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffelbag/mining/conscript,				1000),
 		new /datum/data/mining_equipment("1000 Point Transfer Card",	/obj/item/card/mining_point_card/mp1000,							1000),
 		new /datum/data/mining_equipment("1500 Point Transfer Card",	/obj/item/card/mining_point_card/mp1500,							1500),
 		new /datum/data/mining_equipment("2000 Point Transfer Card",	/obj/item/card/mining_point_card/mp2000,							2000),
@@ -55,7 +55,7 @@
 		new /datum/data/mining_equipment("Jump Boots",					/obj/item/clothing/shoes/bhop,										2500),
 		new /datum/data/mining_equipment("Ice hiking boots",            /obj/item/clothing/shoes/winterboots/ice_boots,				        2500),
 		new /datum/data/mining_equipment("Luxury Shelter Capsule",		/obj/item/survivalcapsule/luxury,									3000),
-		new /datum/data/mining_equipment("Luxury Bar Capsule",			/obj/item/survivalcapsule/luxuryelite,								10000),
+		new /datum/data/mining_equipment("Luxury Bar Capsule",			/obj/item/survivalcapsule/luxury/elitebar,							10000),
 		new /datum/data/mining_equipment("Nanotrasen Minebot",			/mob/living/simple_animal/hostile/mining_drone,						800),
 		new /datum/data/mining_equipment("Minebot Melee Upgrade",		/obj/item/mine_bot_upgrade,											400),
 		new /datum/data/mining_equipment("Minebot Armor Upgrade",		/obj/item/mine_bot_upgrade/health,									400),
@@ -70,9 +70,10 @@
 		new /datum/data/mining_equipment("KA Damage Increase",			/obj/item/borg/upgrade/modkit/damage,								1000),
 		new /datum/data/mining_equipment("KA Cooldown Decrease",		/obj/item/borg/upgrade/modkit/cooldown,								1000),
 		new /datum/data/mining_equipment("KA AoE Damage",				/obj/item/borg/upgrade/modkit/aoe/mobs,								2000),
-		new /datum/data/mining_equipment("Miner Full Replacement",		/obj/item/storage/backpack/duffelbag/mining_cloned,					3000),
+		new /datum/data/mining_equipment("Miner Full Replacement",		/obj/item/storage/backpack/duffelbag/mining/cloned,					3000),
 		new /datum/data/mining_equipment("Premium Accelerator",			/obj/item/gun/energy/kinetic_accelerator/premiumka,					8000),
-		new /datum/data/mining_equipment("Kinetic Glaive",				/obj/item/kinetic_crusher/glaive,									2250),
+		new /datum/data/mining_equipment("Kinetic Glaive Kit",			/obj/item/storage/backpack/duffelbag/mining/glaivekit,				2250),
+		new /datum/data/mining_equipment("Survival Dagger",				/obj/item/kitchen/knife/combat/survival/knuckledagger,				550),
 		)
 
 /datum/data/mining_equipment
@@ -222,7 +223,7 @@
 			new /obj/item/extinguisher/mini(drop_location)
 			new /obj/item/kinetic_crusher(drop_location)
 		if("Mining Conscription Kit")
-			new /obj/item/storage/backpack/duffelbag/mining_conscript(drop_location)
+			new /obj/item/storage/backpack/duffelbag/mining/conscript(drop_location)
 
 	SSblackbox.record_feedback("tally", "mining_voucher_redeemed", 1, selection)
 	qdel(voucher)
@@ -328,11 +329,11 @@
 		to_chat(user, "You upgrade [I] with mining access.")
 		qdel(src)
 
-/obj/item/storage/backpack/duffelbag/mining_conscript
+/obj/item/storage/backpack/duffelbag/mining/conscript
 	name = "mining conscription kit"
 	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
 
-/obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents()
+/obj/item/storage/backpack/duffelbag/mining/conscript/PopulateContents()
 	new /obj/item/pickaxe/mini(src)
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
@@ -347,11 +348,11 @@
 
 	//CITADEL ADDITIONS BELOW
 
-/obj/item/storage/backpack/duffelbag/mining_cloned
+/obj/item/storage/backpack/duffelbag/mining/cloned
 	name = "mining replacement kit"
-	desc = "A large bag that has advance tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even has a new ID!"
+	desc = "A large bag that has advanced tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even has a new ID!"
 
-/obj/item/storage/backpack/duffelbag/mining_cloned/PopulateContents()
+/obj/item/storage/backpack/duffelbag/mining/cloned/PopulateContents()
 	new /obj/item/pickaxe/mini(src)
 	new /obj/item/clothing/under/rank/cargo/miner/lavaland(src)
 	new /obj/item/clothing/shoes/workboots/mining(src)
@@ -369,6 +370,12 @@
 	new /obj/item/storage/bag/ore(src)
 	new /obj/item/clothing/glasses/meson/prescription(src)
 
+/obj/item/storage/backpack/duffelbag/mining/glaivekit
+
+/obj/item/storage/backpack/duffelbag/mining/glaivekit/PopulateContents()
+	new /obj/item/kinetic_crusher/glaive(src)
+	new /obj/item/kitchen/knife/combat/survival/knuckledagger(src)
+
 /obj/machinery/mineral/equipment_vendor/proc/RedeemSVoucher(obj/item/suit_voucher/voucher, mob/redeemer)
 	var/items = list(	"Exo-suit" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "exo"),
 						"SEVA suit" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "seva"))

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -26,7 +26,8 @@
 	features = random_features(pref_species?.id, gender)
 	age = rand(AGE_MIN,AGE_MAX)
 
-/datum/preferences/proc/update_preview_icon(equip_job = TRUE)
+/datum/preferences/proc/update_preview_icon(current_tab)
+	var/equip_job = (current_tab != 2)
 	// Determine what job is marked as 'High' priority, and dress them up as such.
 	var/datum/job/previewJob = get_highest_job()
 
@@ -45,9 +46,13 @@
 	mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
 	copy_to(mannequin, initial_spawn = TRUE)
 
-	if(previewJob && equip_job)
-		mannequin.job = previewJob.title
-		previewJob.equip(mannequin, TRUE, preference_source = parent)
+	if(current_tab == 3)
+		//give it its loadout if not on the appearance tab
+		SSjob.equip_loadout(parent.mob, mannequin, FALSE, bypass_prereqs = TRUE, can_drop = FALSE)
+	else
+		if(previewJob && equip_job)
+			mannequin.job = previewJob.title
+			previewJob.equip(mannequin, TRUE, preference_source = parent)
 
 	COMPILE_OVERLAYS(mannequin)
 	parent.show_character_previews(new /mutable_appearance(mannequin))

code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm

@@ -2,7 +2,7 @@
 // Facial Hair Definitions //
 /////////////////////////////
 /datum/sprite_accessory/facial_hair
-	icon = 'icons/mob/human_face.dmi'
+	icon = 'icons/mob/hair.dmi'
 	gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
 
 // please make sure they're sorted alphabetically and categorized

code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm

@@ -2,7 +2,7 @@
 // Hair Definitions //
 //////////////////////
 /datum/sprite_accessory/hair
-	icon = 'icons/mob/human_face.dmi'	  // default icon for all hairs
+	icon = 'icons/mob/hair.dmi'	  // default icon for all hairs
 
 	// please make sure they're sorted alphabetically and, where needed, categorized
 	// try to capitalize the names please~

code/modules/mob/dead/observer/observer.dm

@@ -408,7 +408,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(mind.current.key && mind.current.key[1] != "@")	//makes sure we don't accidentally kick any clients
 		to_chat(usr, "<span class='warning'>Another consciousness is in your body...It is resisting you.</span>")
 		return
-	client.change_view(CONFIG_GET(string/default_view))
+	client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))//Let's reset so people can't become allseeing gods
 	transfer_ckey(mind.current, FALSE)
 	SStgui.on_transfer(src, mind.current) // Transfer NanoUIs.
 	mind.current.client.init_verbs()
@@ -568,15 +568,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "Change your view range."
 
 	var/max_view = client.prefs.unlock_content ? GHOST_MAX_VIEW_RANGE_MEMBER : GHOST_MAX_VIEW_RANGE_DEFAULT
-	if(client.view == CONFIG_GET(string/default_view))
+	if(client.view_size.getView() == client.view_size.default)
 		var/list/views = list()
 		for(var/i in 7 to max_view)
 			views |= i
-		var/new_view = input("Choose your new view", "Modify view range", 7) as null|anything in views
+		var/new_view = input("Choose your new view", "Modify view range", 0) as null|anything in views
 		if(new_view)
-			client.change_view(clamp(new_view, 7, max_view))
+			client.view_size.setTo(clamp(new_view, 7, max_view) - 7)
 	else
-		client.change_view(CONFIG_GET(string/default_view))
+		client.view_size.resetToDefault()
 
 /mob/dead/observer/verb/add_view_range(input as num)
 	set name = "Add View Range"

code/modules/mob/living/carbon/carbon.dm

@@ -191,8 +191,8 @@
 			if(HAS_TRAIT(src, TRAIT_PACIFISM))
 				to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
 				return
-
-			adjustStaminaLossBuffered(STAM_COST_THROW_MOB * ((throwable_mob.mob_size+1)**2))// throwing an entire person shall be very tiring
+			if(!UseStaminaBuffer(STAM_COST_THROW_MOB * ((throwable_mob.mob_size+1)**2), TRUE))
+				return
 			var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
 			var/turf/end_T = get_turf(target)
 			if(start_T && end_T)
@@ -206,7 +206,8 @@
 			to_chat(src, "<span class='notice'>You set [I] down gently on the ground.</span>")
 			return
 
-		adjustStaminaLossBuffered(I.getweight(src, STAM_COST_THROW_MULT, SKILL_THROW_STAM_COST))
+		if(!UseStaminaBuffer(I.getweight(src, STAM_COST_THROW_MULT, SKILL_THROW_STAM_COST), warn = TRUE))
+			return
 
 	if(thrown_thing)
 		var/power_throw = 0
@@ -594,15 +595,23 @@
 		remove_movespeed_modifier(/datum/movespeed_modifier/carbon_softcrit)
 
 /mob/living/carbon/update_stamina()
-	var/stam = getStaminaLoss()
-	if(stam > DAMAGE_PRECISION)
-		var/total_health = (maxHealth - stam)
-		if(total_health <= crit_threshold && !stat)
-			if(CHECK_MOBILITY(src, MOBILITY_STAND))
-				to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
-			KnockToFloor(TRUE)
-			update_health_hud()
-
+	var/total_health = getStaminaLoss()
+	if(total_health)
+		if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health >= STAMINA_CRIT && !stat)
+			to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
+			set_resting(TRUE, FALSE, FALSE)
+			SEND_SIGNAL(src, COMSIG_DISABLE_COMBAT_MODE)
+			ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT)
+			filters += CIT_FILTER_STAMINACRIT
+			update_mobility()
+	if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health <= STAMINA_CRIT)
+		to_chat(src, "<span class='notice'>You don't feel nearly as exhausted anymore.</span>")
+		DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT)
+		filters -= CIT_FILTER_STAMINACRIT
+		update_mobility()
+	UpdateStaminaBuffer()
+	update_health_hud()
+	
 /mob/living/carbon/update_sight()
 	if(!client)
 		return
@@ -979,30 +988,15 @@
 			O.held_index = r_arm_index_next //2, 4, 6, 8...
 			hand_bodyparts += O
 
-/mob/living/carbon/do_after_coefficent()
-	. = ..()
-	var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) //Currently, only carbons or higher use mood, move this once that changes.
-	if(mood)
-		switch(mood.sanity) //Alters do_after delay based on how sane you are
-			if(SANITY_INSANE to SANITY_DISTURBED)
-				. *= 1.25
-			if(SANITY_NEUTRAL to SANITY_GREAT)
-				. *= 0.90
-
-	for(var/i in status_effects)
-		var/datum/status_effect/S = i
-		. *= S.interact_speed_modifier()
-
-
 /mob/living/carbon/proc/create_internal_organs()
 	for(var/X in internal_organs)
 		var/obj/item/organ/I = X
 		I.Insert(src)
 
-/mob/living/carbon/proc/update_disabled_bodyparts()
+/mob/living/carbon/proc/update_disabled_bodyparts(silent = FALSE)
 	for(var/B in bodyparts)
 		var/obj/item/bodypart/BP = B
-		BP.update_disabled()
+		BP.update_disabled(silent)
 
 /mob/living/carbon/vv_get_dropdown()
 	. = ..()

code/modules/mob/living/carbon/human/human.dm

@@ -254,10 +254,10 @@
 		if(href_list["pockets"])
 			var/strip_mod = 1
 			var/strip_silence = FALSE
-			var/obj/item/clothing/gloves/g = gloves
-			if (istype(g))
-				strip_mod = g.strip_mod
-				strip_silence = g.strip_silence
+			var/obj/item/clothing/gloves/G = gloves
+			if(istype(G))
+				strip_mod = G.strip_mod
+				strip_silence = G.strip_silence
 			var/pocket_side = href_list["pockets"]
 			var/pocket_id = (pocket_side == "right" ? SLOT_R_STORE : SLOT_L_STORE)
 			var/obj/item/pocket_item = (pocket_id == SLOT_R_STORE ? r_store : l_store)
@@ -805,7 +805,7 @@
 				hud_used.healthdoll.icon_state = "healthdoll_DEAD"
 
 		hud_used.staminas?.update_icon_state()
-		hud_used.staminabuffer?.update_icon_state()
+		hud_used.staminabuffer?.mark_dirty()
 
 /mob/living/carbon/human/fully_heal(admin_revive = FALSE)
 	if(admin_revive)
@@ -1044,9 +1044,9 @@
 		remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
 		remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
 		return
-	var/stambufferinfluence = (bufferedstam*(100/stambuffer))*0.2 //CIT CHANGE - makes stamina buffer influence movedelay
 	if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))	//if we want to ignore slowdown from damage, but not from equipment
-		var/health_deficiency = ((maxHealth + stambufferinfluence) - health + (getStaminaLoss()*0.75))//CIT CHANGE - reduces the impact of staminaloss and makes stamina buffer influence it
+		var/scaling = maxHealth / 100
+		var/health_deficiency = ((maxHealth / scaling) - (health / scaling) + (getStaminaLoss()*0.75))//CIT CHANGE - reduces the impact of staminaloss and makes stamina buffer influence it
 		if(health_deficiency >= 40)
 			add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown, TRUE, (health_deficiency-39) / 75)
 			add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying, TRUE, (health_deficiency-39) / 25)
@@ -1057,11 +1057,6 @@
 		remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
 		remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
 
-
-/mob/living/carbon/human/do_after_coefficent()
-	. = ..()
-	. *= physiology.do_after_speed
-
 /mob/living/carbon/human/is_bleeding()
 	if(NOBLOOD in dna.species.species_traits || bleedsuppress)
 		return FALSE

code/modules/mob/living/carbon/human/human_defines.dm

@@ -7,7 +7,7 @@
 	buckle_lying = FALSE
 	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
 	/// Enable stamina combat
-	combat_flags = COMBAT_FLAGS_DEFAULT | COMBAT_FLAG_UNARMED_PARRY
+	combat_flags = COMBAT_FLAGS_STAMINA_COMBAT | COMBAT_FLAG_UNARMED_PARRY
 	status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH|CANSTAGGER
 	has_field_of_vision = FALSE //Handled by species.
 

code/modules/mob/living/carbon/human/human_movement.dm

@@ -11,11 +11,6 @@
 
 /mob/living/carbon/human/movement_delay()
 	. = ..()
-	if(CHECK_MOBILITY(src, MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE))
-		var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI
-		if(!SSI)
-			SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase)
-		. -= SSI.config_entry_value
 	if (m_intent == MOVE_INTENT_WALK && HAS_TRAIT(src, TRAIT_SPEEDY_STEP))
 		. -= 1.5
 
@@ -61,7 +56,11 @@
 		HM.on_move(NewLoc)
 	if(. && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && !(movement_type & FLYING) && CHECK_ALL_MOBILITY(src, MOBILITY_MOVE|MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && has_gravity(loc) && (!pulledby || (pulledby.pulledby == src)))
 		if(!HAS_TRAIT(src, TRAIT_FREESPRINT))
-			doSprintLossTiles(1)
+			var/datum/movespeed_modifier/equipment_speedmod/MM = get_movespeed_modifier_datum(/datum/movespeed_modifier/equipment_speedmod)
+			var/amount = 1
+			if(MM?.multiplicative_slowdown >= 1)
+				amount *= (1 + (6 - (3 / MM.multiplicative_slowdown)))
+			doSprintLossTiles(amount)
 		if((oldpseudoheight - pseudo_z_axis) >= 8)
 			to_chat(src, "<span class='warning'>You trip off of the elevated surface!</span>")
 			for(var/obj/item/I in held_items)
@@ -101,3 +100,8 @@
 	if(dna.species.space_move(src))
 		return TRUE
 	return ..()
+
+/mob/living/carbon/human/CanPass(atom/movable/mover, turf/target)
+	if(dna.species.species_pass_check())
+		return TRUE
+	return ..()

code/modules/mob/living/carbon/human/physiology.dm

@@ -23,8 +23,6 @@
 
 	var/hunger_mod = 1		//% of hunger rate taken per tick.
 
-	var/do_after_speed = 1 //Speed mod for do_after. Lower is better. If temporarily adjusting, please only modify using *= and /=, so you don't interrupt other calculations.
-
 	/// footstep type override for both shoeless and not footstep sounds.
 	var/footstep_type
 

code/modules/mob/living/carbon/human/species.dm

@@ -64,7 +64,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/stunmod = 1		// multiplier for stun duration
 	var/punchdamagelow = 1       //lowest possible punch damage. if this is set to 0, punches will always miss
 	var/punchdamagehigh = 10      //highest possible punch damage
-	var/punchstunthreshold = 10//damage at which punches from this race will stun //yes it should be to the attacked race but it's not useful that way even if it's logical
+	var/punchstunthreshold = 10 //damage at which punches from this race will stun //yes it should be to the attacked race but it's not useful that way even if it's logical
+	var/punchwoundbonus = 0 // additional wound bonus. generally zero.
 	var/siemens_coeff = 1 //base electrocution coefficient
 	var/damage_overlay_type = "human" //what kind of damage overlays (if any) appear on our species when wounded?
 	var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"]
@@ -106,7 +107,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	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/icon_limbs //Overrides the icon used for the limbs of this species. Mainly for downstream, and also because hardcoded icons disgust me. Implemented and maintained as a favor in return for a downstream's implementation of synths.
-	var/species_type
+	var/species_category
 
 	var/tail_type //type of tail i.e. mam_tail
 	var/wagging_type //type of wagging i.e. waggingtail_lizard
@@ -118,6 +119,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/list/allowed_limb_ids
 
 	var/override_bp_icon //override for the icon path used when setting bodypart overlays. Intended for species that don't fit in the standard 32x32 files.
+	//the type of eyes this species has
+	var/eye_type = "normal"
 
 ///////////
 // PROCS //
@@ -514,7 +517,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		var/mutable_appearance/hair_overlay = mutable_appearance(layer = -HAIR_LAYER)
 		if(!hair_hidden && !H.getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain
 			if(!(NOBLOOD in species_traits))
-				hair_overlay.icon = 'icons/mob/human_face.dmi'
+				hair_overlay.icon = 'icons/mob/hair.dmi'
 				hair_overlay.icon_state = "debrained"
 
 		else if(H.hair_style && (HAIR in species_traits))
@@ -573,7 +576,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	if(HD && !(HAS_TRAIT(H, TRAIT_HUSK)))
 		// lipstick
 		if(H.lip_style && (LIPS in species_traits))
-			var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[H.lip_style]", -BODY_LAYER)
+			var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/lips.dmi', "lips_[H.lip_style]", -BODY_LAYER)
 			lip_overlay.color = H.lip_color
 
 			if(OFFSET_LIPS in H.dna.species.offset_features)
@@ -586,10 +589,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(!(NOEYES in species_traits))
 			var/has_eyes = H.getorganslot(ORGAN_SLOT_EYES)
 			if(!has_eyes)
-				standing += mutable_appearance('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER)
+				standing += mutable_appearance('icons/mob/eyes.dmi', "eyes_missing", -BODY_LAYER)
 			else
-				var/mutable_appearance/left_eye = mutable_appearance('icons/mob/human_face.dmi', "left_eye", -BODY_LAYER)
-				var/mutable_appearance/right_eye = mutable_appearance('icons/mob/human_face.dmi', "right_eye", -BODY_LAYER)
+				var/left_state = DEFAULT_LEFT_EYE_STATE
+				var/right_state = DEFAULT_RIGHT_EYE_STATE
+				if(eye_type in GLOB.eye_types)
+					left_state = eye_type + "_left_eye"
+					right_state = eye_type + "_right_eye"
+				var/mutable_appearance/left_eye = mutable_appearance('icons/mob/eyes.dmi', left_state, -BODY_LAYER)
+				var/mutable_appearance/right_eye = mutable_appearance('icons/mob/eyes.dmi', right_state, -BODY_LAYER)
 				if((EYECOLOR in species_traits) && has_eyes)
 					left_eye.color = "#" + H.left_eye_color
 					right_eye.color = "#" + H.right_eye_color
@@ -1357,9 +1365,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 	if(!(attackchain_flags & ATTACK_IS_PARRY_COUNTERATTACK))
 		if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes punching cause staminaloss but funny martial artist types get a discount
-			user.adjustStaminaLossBuffered(1.5)
-		else
-			user.adjustStaminaLossBuffered(3.5)
+			if(!user.UseStaminaBuffer(1.5, warn = TRUE))
+				return
+		else if(!user.UseStaminaBuffer(3.5, warn = TRUE))
+			return
 
 	if(attacker_style && attacker_style.harm_act(user,target))
 		return TRUE
@@ -1380,6 +1389,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
 
 		var/damage = rand(user.dna.species.punchdamagelow, user.dna.species.punchdamagehigh)
+		var/punchwoundbonus = user.dna.species.punchwoundbonus
 		var/puncherstam = user.getStaminaLoss()
 		var/puncherbrute = user.getBruteLoss()
 		var/punchedstam = target.getStaminaLoss()
@@ -1395,6 +1405,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		//END OF CITADEL CHANGES
 
 		var/obj/item/bodypart/affecting = target.get_bodypart(ran_zone(user.zone_selected))
+		if(HAS_TRAIT(user, TRAIT_PUGILIST))
+			affecting = target.get_bodypart(check_zone(user.zone_selected)) // if you're going the based unarmed route you won't miss
 
 		if(!affecting) //Maybe the bodypart is missing? Or things just went wrong..
 			affecting = target.get_bodypart(BODY_ZONE_CHEST) //target chest instead, as failsafe. Or hugbox? You decide.
@@ -1406,8 +1418,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			if(user.dna.species.punchdamagelow)
 				if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage)
 					miss_chance = 0
-				else if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists have a flat 10% miss chance
-					miss_chance = 10
+				else if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists, being good at Punching People, also never miss
+					miss_chance = 0
 				else
 					miss_chance = min(10 + max(puncherstam * 0.5, puncherbrute * 0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob()
 
@@ -1421,12 +1433,13 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 
 		var/armor_block = target.run_armor_check(affecting, "melee")
+		if(HAS_TRAIT(user, TRAIT_MAULER)) // maulers get 15 armorpierce because if you're going to punch someone you might as well do a good job of it
+			armor_block = target.run_armor_check(affecting, "melee", armour_penetration = 15) // lot of good that sec jumpsuit did you
 
 		playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1)
-
-		target.visible_message("<span class='danger'>[user] [atk_verb]s [target]!</span>", \
-					"<span class='userdanger'>[user] [atk_verb]s you!</span>", null, COMBAT_MESSAGE_RANGE, null, \
-					user, "<span class='danger'>You [atk_verb] [target]!</span>")
+		target.visible_message("<span class='danger'>[user] [atk_verb]ed [target]!</span>", \
+					"<span class='userdanger'>[user] [atk_verb]ed you!</span>", null, COMBAT_MESSAGE_RANGE, null, \
+					user, "<span class='danger'>You [atk_verb]ed [target]!</span>")
 
 		target.lastattacker = user.real_name
 		target.lastattackerckey = user.ckey
@@ -1436,11 +1449,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			target.dismembering_strike(user, affecting.body_zone)
 
 		if(atk_verb == ATTACK_EFFECT_KICK)//kicks deal 1.5x raw damage + 0.5x stamina damage
-			target.apply_damage(damage*1.5, attack_type, affecting, armor_block)
+			target.apply_damage(damage*1.5, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus)
 			target.apply_damage(damage*0.5, STAMINA, affecting, armor_block)
 			log_combat(user, target, "kicked")
-		else//other attacks deal full raw damage + 2x in stamina damage
-			target.apply_damage(damage, attack_type, affecting, armor_block)
+		else if(HAS_TRAIT(user, TRAIT_MAULER)) // mauler punches deal 1.3x raw damage + 1x stam damage, and have some armor pierce
+			target.apply_damage(damage*1.3, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus)
+			target.apply_damage(damage, STAMINA, affecting, armor_block)
+			log_combat(user, target, "punched (mauler)")
+		else //other attacks deal full raw damage + 2x in stamina damage
+			target.apply_damage(damage, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus)
 			target.apply_damage(damage*2, STAMINA, affecting, armor_block)
 			log_combat(user, target, "punched")
 
@@ -1490,6 +1507,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		return FALSE
 
 	else if(aim_for_mouth && ( target_on_help || target_restrained || target_aiming_for_mouth))
+		if(!user.UseStaminaBuffer(3, warn = TRUE))
+			return
 		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
 
 		target.visible_message(\
@@ -1497,7 +1516,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			"<span class='notice'>[user] slaps you in the face! </span>",\
 			"You hear a slap.", target = user, target_message = "<span class='notice'>You slap [user == target ? "yourself" : "\the [target]"] in the face! </span>")
 		user.do_attack_animation(target, ATTACK_EFFECT_FACE_SLAP)
-		user.adjustStaminaLossBuffered(3)
 		if (!HAS_TRAIT(target, TRAIT_PERMABONER))
 			stop_wagging_tail(target)
 		return FALSE
@@ -1505,8 +1523,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
 			to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!")
 			return FALSE
+		if(!user.UseStaminaBuffer(3, warn = TRUE))
+			return FALSE
 		user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
-		user.adjustStaminaLossBuffered(3)
 		target.adjust_arousal(20,maso = TRUE)
 		if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10))
 			target.mob_climax(forced_climax=TRUE)
@@ -1524,9 +1543,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
 
 		if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes disarmspam cause staminaloss, pugilists can do it almost effortlessly
-			user.adjustStaminaLossBuffered(1)
+			if(!user.UseStaminaBuffer(1, warn = TRUE))
+				return
 		else
-			user.adjustStaminaLossBuffered(3)
+			if(!user.UseStaminaBuffer(1, warn = TRUE))
+				return
 
 		if(attacker_style && attacker_style.disarm_act(user,target))
 			return TRUE
@@ -1762,9 +1783,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(CHECK_MOBILITY(user, MOBILITY_STAND))
 			to_chat(user, "<span class='notice'>You can only force yourself up if you're on the ground.</span>")
 			return
+		if(!user.UseStaminaBuffer(STAMINA_COST_SHOVE_UP, TRUE))
+			return
 		user.visible_message("<span class='notice'>[user] forces [p_them()]self up to [p_their()] feet!</span>", "<span class='notice'>You force yourself up to your feet!</span>")
 		user.set_resting(FALSE, TRUE)
-		user.adjustStaminaLossBuffered(user.stambuffer) //Rewards good stamina management by making it easier to instantly get up from resting
 		playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
 /datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
@@ -1783,8 +1805,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	else
 		if(user == target)
 			return
+		if(!user.UseStaminaBuffer(4, warn = TRUE))
+			return
 		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
-		user.adjustStaminaLossBuffered(4)
 		playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
 
 		if(target.w_uniform)
@@ -1941,6 +1964,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	if(HAS_BONE in species_traits)
 		. |= BIO_JUST_BONE
 
+//a check for if you should render any overlays or not
+/datum/species/proc/should_render(mob/living/carbon/human/H)
+	return TRUE
+
+//a check for if you want to forcibly make CanPass return TRUE for the mob with this species
+/datum/species/proc/species_pass_check()
+	return FALSE
+
 /////////////
 //BREATHING//
 /////////////

code/modules/mob/living/carbon/human/species_types/abductor.dm

@@ -1,12 +1,12 @@
 /datum/species/abductor
 	name = "Abductor"
-	id = "abductor"
+	id = SPECIES_ABDUCTOR
 	say_mod = "gibbers"
 	sexes = FALSE
 	species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,HAS_FLESH,HAS_BONE)
 	inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH)
 	mutanttongue = /obj/item/organ/tongue/abductor
-	species_type = "alien"
+	species_category = SPECIES_CATEGORY_ALIEN
 
 /datum/species/abductor/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()

code/modules/mob/living/carbon/human/species_types/android.dm

@@ -1,6 +1,6 @@
 /datum/species/android
 	name = "Android"
-	id = "android"
+	id = SPECIES_ANDROID
 	say_mod = "states"
 	species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL,ROBOTIC_LIMBS)
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
@@ -11,7 +11,7 @@
 	mutanttongue = /obj/item/organ/tongue/robot
 	species_language_holder = /datum/language_holder/synthetic
 	limbs_id = "synth"
-	species_type = "robotic"
+	species_category = SPECIES_CATEGORY_ROBOT
 
 /datum/species/android/on_species_gain(mob/living/carbon/C)
 	. = ..()

code/modules/mob/living/carbon/human/species_types/angel.dm

@@ -1,6 +1,6 @@
 /datum/species/angel
 	name = "Angel"
-	id = "angel"
+	id = SPECIES_ANGEL
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE)
 	mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "Angel")
@@ -9,7 +9,7 @@
 	blacklisted = 1
 	limbs_id = "human"
 	skinned_type = /obj/item/stack/sheet/animalhide/human
-	species_type = "human" //they're a kind of human
+	species_category = SPECIES_CATEGORY_BASIC //they're a kind of human
 
 	var/datum/action/innate/flight/fly
 

code/modules/mob/living/carbon/human/species_types/anthromorph.dm

@@ -1,6 +1,6 @@
 /datum/species/mammal
 	name = "Anthromorph"
-	id = "mammal"
+	id = SPECIES_MAMMAL
 	default_color = "4B4B4B"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST
@@ -15,6 +15,6 @@
 
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
-	species_type = "furry"
+	species_category = SPECIES_CATEGORY_FURRY
 
-	allowed_limb_ids = list("mammal","aquatic","avian")
+	allowed_limb_ids = list("mammal","aquatic","avian")

code/modules/mob/living/carbon/human/species_types/bugmen.dm

@@ -1,6 +1,6 @@
 /datum/species/insect
 	name = "Anthromorphic Insect"
-	id = "insect"
+	id = SPECIES_INSECT
 	say_mod = "chitters"
 	default_color = "00FF00"
 	species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
@@ -18,6 +18,8 @@
 
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
-	species_type = "insect"
+	species_category = SPECIES_CATEGORY_INSECT
 
 	allowed_limb_ids = list("insect","apid","moth","moth_not_greyscale")
+
+	eye_type = "insect"

code/modules/mob/living/carbon/human/species_types/corporate.dm

@@ -18,4 +18,4 @@
 	inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER)
 	sexes = 0
 	gib_types = /obj/effect/gibspawner/robot
-	species_type = "robotic"
+	species_category = SPECIES_CATEGORY_ROBOT

code/modules/mob/living/carbon/human/species_types/dullahan.dm

@@ -1,6 +1,6 @@
 /datum/species/dullahan
 	name = "Dullahan"
-	id = "dullahan"
+	id = SPECIES_DULLAHAN
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE)
 	inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH)
@@ -14,7 +14,7 @@
 	limbs_id = "human"
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	has_field_of_vision = FALSE //Too much of a trouble, their vision is already bound to their severed head.
-	species_type = "undead"
+	species_category = SPECIES_CATEGORY_UNDEAD
 	var/pumpkin = FALSE
 
 	var/obj/item/dullahan_relay/myhead

code/modules/mob/living/carbon/human/species_types/dwarves.dm

@@ -4,7 +4,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 
 /datum/species/dwarf //not to be confused with the genetic manlets
 	name = "Dwarf"
-	id = "dwarf" //Also called Homo sapiens pumilionis
+	id = SPECIES_DWARF //Also called Homo sapiens pumilionis
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE)
 	inherent_traits = list(TRAIT_DWARF,TRAIT_SNOB)
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	mutant_organs = list(/obj/item/organ/dwarfgland) //Dwarven alcohol gland, literal gland warrior
 	mutantliver = /obj/item/organ/liver/dwarf //Dwarven super liver (Otherwise they r doomed)
 	species_language_holder = /datum/language_holder/dwarf
-	species_type = "human" //a kind of human
+	species_category = SPECIES_CATEGORY_BASIC //a kind of human
 
 /mob/living/carbon/human/species/dwarf //species admin spawn path
 	race = /datum/species/dwarf //and the race the path is set to.

code/modules/mob/living/carbon/human/species_types/ethereal.dm

@@ -2,7 +2,7 @@
 
 /datum/species/ethereal
 	name = "Ethereal"
-	id = "ethereal"
+	id = SPECIES_ETHEREAL
 	attack_verb = "burn"
 	attack_sound = 'sound/weapons/etherealhit.ogg'
 	miss_sound = 'sound/weapons/etherealmiss.ogg'

code/modules/mob/living/carbon/human/species_types/felinid.dm

@@ -1,7 +1,7 @@
 //Subtype of human
 /datum/species/human/felinid
 	name = "Felinid"
-	id = "felinid"
+	id = SPECIES_FELINID
 	limbs_id = "human"
 
 	mutant_bodyparts = list("mam_tail" = "Cat", "mam_ears" = "Cat", "deco_wings" = "None")
@@ -11,7 +11,7 @@
 
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
-	species_type = "furry"
+	species_category = SPECIES_CATEGORY_FURRY
 
 /datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
 	if(ishuman(C))

code/modules/mob/living/carbon/human/species_types/flypeople.dm

@@ -1,6 +1,6 @@
 /datum/species/fly
 	name = "Anthromorphic Fly"
-	id = "fly"
+	id = SPECIES_FLY
 	say_mod = "buzzes"
 	species_traits = list(NOEYES,HAS_FLESH,HAS_BONE)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
@@ -12,7 +12,7 @@
 	liked_food = GROSS
 	exotic_bloodtype = "BUG"
 	exotic_blood_color = BLOOD_COLOR_BUG
-	species_type = "insect"
+	species_category = SPECIES_CATEGORY_INSECT
 
 /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
 	if(istype(chem, /datum/reagent/toxin/pestkiller))

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -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 golem"
+	id = SPECIES_GOLEM
 	species_traits = list(NOBLOOD,MUTCOLORS,NO_UNDERWEAR,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
 	inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
@@ -32,7 +32,7 @@
 	var/special_name_chance = 5
 	var/owner //dobby is a free golem
 
-	species_type = "golem"
+	species_category = SPECIES_CATEGORY_GOLEM
 
 /datum/species/golem/random_name(gender,unique,lastname)
 	var/golem_surname = pick(GLOB.golem_names)

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -1,6 +1,6 @@
 /datum/species/human
 	name = "Human"
-	id = "human"
+	id = SPECIES_HUMAN
 	default_color = "FFFFFF"
 
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE)
@@ -12,7 +12,7 @@
 
 	tail_type = "tail_human"
 	wagging_type = "waggingtail_human"
-	species_type = "human"
+	species_category = SPECIES_CATEGORY_BASIC
 
 /datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)

code/modules/mob/living/carbon/human/species_types/ipc.dm

@@ -1,6 +1,6 @@
 /datum/species/ipc
 	name = "I.P.C."
-	id = "ipc"
+	id = SPECIES_IPC
 	say_mod = "beeps"
 	default_color = "00FF00"
 	blacklisted = 0
@@ -28,7 +28,7 @@
 
 	exotic_bloodtype = "HF"
 	exotic_blood_color = BLOOD_COLOR_OIL
-	species_type = "robotic"
+	species_category = SPECIES_CATEGORY_ROBOT
 
 	var/datum/action/innate/monitor_change/screen
 

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -1,7 +1,7 @@
 /datum/species/jelly
 	// Entirely alien beings that seem to be made entirely out of gel. They have three eyes and a skeleton visible within them.
 	name = "Xenobiological Jelly Entity"
-	id = "jelly"
+	id = SPECIES_JELLY
 	default_color = "00FF90"
 	say_mod = "chirps"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH)
@@ -16,7 +16,8 @@
 	exotic_blood_color = "BLOOD_COLOR_SLIME"
 	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
-	var/datum/action/innate/slime_change/slime_change	//CIT CHANGE
+	var/datum/action/innate/slime_change/slime_change
+	var/datum/action/innate/slime_puddle/slime_puddle
 	liked_food = TOXIC | MEAT
 	disliked_food = null
 	toxic_food = ANTITOXIC
@@ -28,19 +29,22 @@
 
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
-	species_type = "jelly"
+	species_category = SPECIES_CATEGORY_JELLY
 
 /obj/item/organ/brain/jelly
 	name = "slime nucleus"
 	desc = "A slimey membranous mass from a slime person"
 	icon_state = "brain-slime"
 
-
 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
+	if(slime_puddle && slime_puddle.is_puddle)
+		slime_puddle.Activate()
 	if(regenerate_limbs)
 		regenerate_limbs.Remove(C)
-	if(slime_change)	//CIT CHANGE
-		slime_change.Remove(C)	//CIT CHANGE
+	if(slime_change)
+		slime_change.Remove(C)
+	if(slime_puddle)
+		slime_puddle.Remove(C)
 	C.faction -= "slime"
 	..()
 	C.faction -= "slime"
@@ -50,8 +54,10 @@
 	if(ishuman(C))
 		regenerate_limbs = new
 		regenerate_limbs.Grant(C)
-		slime_change = new	//CIT CHANGE
-		slime_change.Grant(C)	//CIT CHANGE
+		slime_change = new
+		slime_change.Grant(C)
+		slime_puddle = new
+		slime_puddle.Grant(C)
 	C.faction |= "slime"
 
 /datum/species/jelly/handle_body(mob/living/carbon/human/H)
@@ -59,6 +65,18 @@
 	//update blood color to body color
 	exotic_blood_color = "#" + H.dna.features["mcolor"]
 
+/datum/species/jelly/should_render()
+	if(slime_puddle && slime_puddle.is_puddle)
+		return FALSE
+	else
+		return ..()
+
+/datum/species/jelly/species_pass_check()
+	if(slime_puddle && slime_puddle.is_puddle)
+		return TRUE
+	else
+		return ..()
+
 /datum/species/jelly/spec_life(mob/living/carbon/human/H)
 	if(H.stat == DEAD || HAS_TRAIT(H, TRAIT_NOMARROW)) //can't farm slime jelly from a dead slime/jelly person indefinitely, and no regeneration for blooduskers
 		return
@@ -140,7 +158,7 @@
 
 /datum/species/jelly/slime
 	name = "Xenobiological Slime Entity"
-	id = "slime"
+	id = SPECIES_SLIME
 	default_color = "00FFFF"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
 	say_mod = "says"
@@ -274,7 +292,17 @@
 		\"steps out\" of [H.p_them()].</span>",
 		"<span class='notice'>...and after a moment of disorentation, \
 		you're besides yourself!</span>")
-
+	if(H != spare && isslimeperson(spare) && isslimeperson(H))
+		// transfer the swap-body ui if it's open
+		var/datum/action/innate/swap_body/this_swap = origin_datum.swap_body
+		var/datum/action/innate/swap_body/other_swap = spare_datum.swap_body
+		var/datum/tgui/ui = SStgui.get_open_ui(H, this_swap, "main") || SStgui.get_open_ui(spare, this_swap, "main")
+		if(ui)
+			SStgui.on_close(ui) // basically removes it from lists is all this proc does.
+			ui.user = spare
+			ui.src_object = other_swap
+			SStgui.on_open(ui) // stick it back on the lists
+			ui.process(force = TRUE)
 
 /datum/action/innate/swap_body
 	name = "Swap Body"
@@ -327,6 +355,8 @@
 				stat = "Conscious"
 			if(UNCONSCIOUS)
 				stat = "Unconscious"
+			if(SOFT_CRIT)
+				stat = "Barely Conscious"
 			if(DEAD)
 				stat = "Dead"
 		var/occupied
@@ -373,7 +403,6 @@
 			var/mob/living/carbon/human/selected = locate(params["ref"]) in SS.bodies
 			if(!can_swap(selected))
 				return
-			SStgui.close_uis(src)
 			swap_to_dupe(H.mind, selected)
 
 /datum/action/innate/swap_body/proc/can_swap(mob/living/carbon/human/dupe)
@@ -407,6 +436,7 @@
 /datum/action/innate/swap_body/proc/swap_to_dupe(datum/mind/M, mob/living/carbon/human/dupe)
 	if(!can_swap(dupe)) //sanity check
 		return
+	var/mob/living/carbon/human/old = M.current
 	if(M.current.stat == CONSCIOUS)
 		M.current.visible_message("<span class='notice'>[M.current] \
 			stops moving and starts staring vacantly into space.</span>",
@@ -418,13 +448,26 @@
 	dupe.visible_message("<span class='notice'>[dupe] blinks and looks \
 		around.</span>",
 		"<span class='notice'>...and move this one instead.</span>")
-
+	if(old != M.current && dupe == M.current && isslimeperson(dupe))
+		var/datum/species/jelly/slime/other_spec = dupe.dna.species
+		var/datum/action/innate/swap_body/other_swap = other_spec.swap_body
+		// theoretically the transfer_to proc is supposed to transfer the ui from the mob.
+		// so I try to get the UI from one of the two mobs and schlump it over to the new action button
+		var/datum/tgui/ui = SStgui.get_open_ui(old, src, "main") || SStgui.get_open_ui(dupe, src, "main")
+		if(ui)
+			// transfer the UI over. This code is slightly hacky but it fixes the problem
+			// I'd use SStgui.on_transfer but that doesn't let you transfer the src_object as well s
+			SStgui.on_close(ui) // basically removes it from lists is all this proc does.
+			ui.user = dupe
+			ui.src_object = other_swap
+			SStgui.on_open(ui) // stick it back on the lists
+			ui.process(force = TRUE)
 
 ////////////////////////////////////////////////////////Round Start Slimes///////////////////////////////////////////////////////////////////
 
 /datum/species/jelly/roundstartslime
 	name = "Xenobiological Slime Hybrid"
-	id = "slimeperson"
+	id = SPECIES_SLIME_HYBRID
 	limbs_id = "slime"
 	default_color = "00FFFF"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
@@ -466,7 +509,7 @@
 		var/new_color = input(owner, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null
 		if(new_color)
 			var/temp_hsv = RGBtoHSV(new_color)
-			if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
+			if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright
 				H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6)
 				H.update_body()
 				H.update_hair()
@@ -645,6 +688,88 @@
 	else
 		return
 
+/datum/action/innate/slime_puddle
+	name = "Puddle Transformation"
+	check_flags = AB_CHECK_CONSCIOUS
+	button_icon_state = "slimepuddle"
+	icon_icon = 'icons/mob/actions/actions_slime.dmi'
+	background_icon_state = "bg_alien"
+	required_mobility_flags = MOBILITY_STAND
+	var/is_puddle = FALSE
+	var/in_transformation_duration = 12
+	var/out_transformation_duration = 7
+	var/puddle_into_effect = /obj/effect/temp_visual/slime_puddle
+	var/puddle_from_effect = /obj/effect/temp_visual/slime_puddle/reverse
+	var/puddle_icon = 'icons/mob/mob.dmi'
+	var/puddle_state = "puddle"
+	var/tracked_overlay
+	var/datum/component/squeak/squeak
+	var/transforming = FALSE
+	var/last_use
+
+/datum/action/innate/slime_puddle/IsAvailable()
+	if(!transforming)
+		return ..()
+	else
+		return FALSE
+
+/datum/action/innate/slime_puddle/Activate()
+	if(isjellyperson(owner) && IsAvailable())
+		transforming = TRUE
+		UpdateButtonIcon()
+		var/mob/living/carbon/human/H = owner
+		var/mutcolor = "#" + H.dna.features["mcolor"]
+		if(!is_puddle)
+			if(CHECK_MOBILITY(H, MOBILITY_USE))
+				is_puddle = TRUE
+				owner.cut_overlays()
+				var/obj/effect/puddle_effect = new puddle_into_effect(get_turf(owner), owner.dir)
+				puddle_effect.color = mutcolor
+				H.Stun(in_transformation_duration, ignore_canstun = TRUE)
+				ADD_TRAIT(H, TRAIT_PARALYSIS_L_ARM, SLIMEPUDDLE_TRAIT)
+				ADD_TRAIT(H, TRAIT_PARALYSIS_R_ARM, SLIMEPUDDLE_TRAIT)
+				ADD_TRAIT(H, TRAIT_MOBILITY_NOPICKUP, SLIMEPUDDLE_TRAIT)
+				ADD_TRAIT(H, TRAIT_MOBILITY_NOUSE, SLIMEPUDDLE_TRAIT)
+				ADD_TRAIT(H, TRAIT_SPRINT_LOCKED, SLIMEPUDDLE_TRAIT)
+				ADD_TRAIT(H, TRAIT_COMBAT_MODE_LOCKED, SLIMEPUDDLE_TRAIT)
+				ADD_TRAIT(H, TRAIT_MOBILITY_NOREST, SLIMEPUDDLE_TRAIT)
+				H.add_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
+				H.update_disabled_bodyparts(silent = TRUE)
+				H.layer -= 1 //go one layer down so people go over you
+				ENABLE_BITFIELD(H.pass_flags, PASSMOB)
+				squeak = H.AddComponent(/datum/component/squeak, custom_sounds = list('sound/effects/blobattack.ogg'))
+				sleep(in_transformation_duration)
+				var/mutable_appearance/puddle_overlay = mutable_appearance(icon = puddle_icon, icon_state = puddle_state)
+				puddle_overlay.color = mutcolor
+				tracked_overlay = puddle_overlay
+				owner.add_overlay(puddle_overlay)
+				transforming = FALSE
+				UpdateButtonIcon()
+		else
+			owner.cut_overlay(tracked_overlay)
+			var/obj/effect/puddle_effect = new puddle_from_effect(get_turf(owner), owner.dir)
+			puddle_effect.color = mutcolor
+			H.Stun(out_transformation_duration, ignore_canstun = TRUE)
+			sleep(out_transformation_duration)
+			REMOVE_TRAIT(H, TRAIT_PARALYSIS_L_ARM, SLIMEPUDDLE_TRAIT)
+			REMOVE_TRAIT(H, TRAIT_PARALYSIS_R_ARM, SLIMEPUDDLE_TRAIT)
+			REMOVE_TRAIT(H, TRAIT_MOBILITY_NOPICKUP, SLIMEPUDDLE_TRAIT)
+			REMOVE_TRAIT(H, TRAIT_MOBILITY_NOUSE, SLIMEPUDDLE_TRAIT)
+			REMOVE_TRAIT(H, TRAIT_SPRINT_LOCKED, SLIMEPUDDLE_TRAIT)
+			REMOVE_TRAIT(H, TRAIT_COMBAT_MODE_LOCKED, SLIMEPUDDLE_TRAIT)
+			REMOVE_TRAIT(H, TRAIT_MOBILITY_NOREST, SLIMEPUDDLE_TRAIT)
+			H.update_disabled_bodyparts(silent = TRUE)
+			H.remove_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
+			H.layer += 1 //go one layer back above!
+			DISABLE_BITFIELD(H.pass_flags, PASSMOB)
+			is_puddle = FALSE
+			if(squeak)
+				squeak.RemoveComponent()
+			owner.regenerate_icons()
+			transforming = FALSE
+			UpdateButtonIcon()
+	else
+		to_chat(owner, "<span class='warning'>You need to be standing up to do this!") //just assume they're a slime because it's such a weird edgecase to have it and not be one (it shouldn't even be possible)
 
 ///////////////////////////////////LUMINESCENTS//////////////////////////////////////////
 
@@ -652,7 +777,7 @@
 
 /datum/species/jelly/luminescent
 	name = "Luminescent Slime Entity"
-	id = "lum"
+	id = SPECIES_SLIME_LUMI
 	say_mod = "says"
 	var/glow_intensity = LUMINESCENT_DEFAULT_GLOW
 	var/obj/effect/dummy/luminescent_glow/glow
@@ -819,7 +944,7 @@
 
 /datum/species/jelly/stargazer
 	name = "Stargazer Slime Entity"
-	id = "stargazer"
+	id = SPECIES_STARGAZER
 	var/datum/action/innate/project_thought/project_thought
 	var/datum/action/innate/link_minds/link_minds
 	var/list/mob/living/linked_mobs = list()

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -1,7 +1,7 @@
 /datum/species/lizard
 	// Reptilian humanoids with scaled skin and tails.
 	name = "Anthromorphic Lizard"
-	id = "lizard"
+	id = SPECIES_LIZARD
 	say_mod = "hisses"
 	default_color = "00FF00"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
@@ -28,7 +28,7 @@
 
 	tail_type = "tail_lizard"
 	wagging_type = "waggingtail_lizard"
-	species_type = "lizard"
+	species_category = "lizard"
 
 /datum/species/lizard/random_name(gender,unique,lastname)
 	if(unique)
@@ -46,7 +46,7 @@
 */
 /datum/species/lizard/ashwalker
 	name = "Ash Walker"
-	id = "ashlizard"
+	id = SPECIES_ASHWALKER
 	limbs_id = "lizard"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE)
 	inherent_traits = list(TRAIT_CHUNKYFINGERS)

code/modules/mob/living/carbon/human/species_types/mushpeople.dm

@@ -1,6 +1,6 @@
 /datum/species/mush //mush mush codecuck
 	name = "Anthromorphic Mushroom"
-	id = "mush"
+	id = SPECIES_MUSHROOM
 	mutant_bodyparts = list("caps" = "Round")
 
 	fixed_mut_color = "DBBF92"
@@ -21,7 +21,7 @@
 	burnmod = 1.25
 	heatmod = 1.5
 
-	species_type = "plant"
+	species_category = SPECIES_CATEGORY_PLANT
 
 	mutanteyes = /obj/item/organ/eyes/night_vision/mushroom
 	var/datum/martial_art/mushpunch/mush

code/modules/mob/living/carbon/human/species_types/plasmamen.dm

@@ -1,6 +1,6 @@
 /datum/species/plasmaman
 	name = "Plasmaman"
-	id = "plasmaman"
+	id = SPECIES_PLASMAMAN
 	say_mod = "rattles"
 	sexes = 0
 	meat = /obj/item/stack/sheet/mineral/plasma
@@ -22,7 +22,7 @@
 	liked_food = VEGETABLES
 	outfit_important_for_life = /datum/outfit/plasmaman
 
-	species_type = "skeleton"
+	species_category = SPECIES_CATEGORY_SKELETON
 
 /datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
 	var/datum/gas_mixture/environment = H.loc.return_air()

code/modules/mob/living/carbon/human/species_types/podpeople.dm

@@ -1,7 +1,7 @@
 /datum/species/pod
 	// A mutation caused by a human being ressurected in a revival pod. These regain health in light, and begin to wither in darkness.
 	name = "Anthromorphic Plant"
-	id = "pod"
+	id = SPECIES_POD
 	default_color = "59CE00"
 	species_traits = list(MUTCOLORS,EYECOLOR,CAN_SCAR,HAS_FLESH,HAS_BONE)
 	attack_verb = "slash"
@@ -19,7 +19,7 @@
 	var/light_burnheal = -1
 	var/light_bruteheal = -1
 
-	species_type = "plant"
+	species_category = SPECIES_CATEGORY_PLANT
 
 	allowed_limb_ids = list("pod","mush")
 
@@ -66,7 +66,7 @@
 
 /datum/species/pod/pseudo_weak
 	name = "Anthromorphic Plant"
-	id = "podweak"
+	id = SPECIES_POD_WEAK
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS)
 	mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs")
 	limbs_id = "pod"

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -4,7 +4,7 @@
 /datum/species/shadow
 	// Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
 	name = "???"
-	id = "shadow"
+	id = SPECIES_SHADOW
 	sexes = 0
 	blacklisted = 1
 	ignored_by = list(/mob/living/simple_animal/hostile/faithless)
@@ -15,7 +15,7 @@
 	dangerous_existence = 1
 	mutanteyes = /obj/item/organ/eyes/night_vision
 
-	species_type = "shadow"
+	species_category = SPECIES_CATEGORY_SHADOW
 
 /datum/species/shadow/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -32,7 +32,7 @@
 
 /datum/species/shadow/nightmare
 	name = "Nightmare"
-	id = "nightmare"
+	id = SPECIES_NIGHTMARE
 	limbs_id = "shadow"
 	burnmod = 1.5
 	blacklisted = TRUE

code/modules/mob/living/carbon/human/species_types/skeletons.dm

@@ -1,6 +1,6 @@
 /datum/species/skeleton
 	name = "Skeleton"
-	id = "skeleton"
+	id = SPECIES_SKELETON
 	say_mod = "rattles"
 	blacklisted = 0
 	sexes = 0
@@ -15,7 +15,7 @@
 	brutemod = 1.25
 	burnmod = 1.25
 
-	species_type = "skeleton" //they have their own category that's disassociated from undead, paired with plasmapeople
+	species_category = SPECIES_CATEGORY_SKELETON //they have their own category that's disassociated from undead, paired with plasmapeople
 
 /datum/species/skeleton/New()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) //skeletons are stronger during the spooky season!
@@ -31,7 +31,7 @@
 
 /datum/species/skeleton/space
 	name = "Spooky Spacey Skeleton"
-	id = "spaceskeleton"
+	id = SPECIES_SKELETON_SPACE
 	limbs_id = "skeleton"
 	blacklisted = 1
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT, TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)