Merge branch 'master' into upstream-merge-37749

2018-05-15 00:50:13 -05:00
parent 21bc6c48ef 19306a2d9b
commit 7c3c270e2a
109 changed files with 1133 additions and 699 deletions
@@ -6,6 +6,7 @@
 #define PLANE_SPACE -95
 #define PLANE_SPACE_PARALLAX -90

+#define FLOOR_PLANE -2
 #define GAME_PLANE -1
 #define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals
 #define SPACE_LAYER 1.8
@@ -448,6 +448,5 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE

 // Used by PDA and cartridge code to reduce repetitiveness of spritesheets
 #define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}
-
 //Filters
 #define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, border=4, color="#04080FAA")
@@ -258,7 +258,7 @@

 // Roundstart trait system

-#define MAX_TRAITS 6 //The maximum amount of traits one character can have at roundstart
+#define MAX_QUIRKS 6 //The maximum amount of quirks one character can have at roundstart

 // AI Toggles
 #define AI_CAMERA_LUMINOSITY	5
@@ -56,7 +56,7 @@
 #define INIT_ORDER_RESEARCH 14
 #define INIT_ORDER_EVENTS 13
 #define INIT_ORDER_JOBS 12
-#define INIT_ORDER_TRAITS 11
+#define INIT_ORDER_QUIRKS 11
 #define INIT_ORDER_TICKER 10
 #define INIT_ORDER_MAPPING 9
 #define INIT_ORDER_NETWORKS 8
@@ -359,7 +359,7 @@
 			for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
 				borg_num--
 				if(robo.mind)
-					robolist += "<b>[robo.name]</b> (Played by: <b>[robo.mind.key]</b>)[robo.stat ? " <span class='redtext'>(Deactivated)</span>" : ""][borg_num ?", ":""]<br>"
+					robolist += "<b>[robo.name]</b> (Played by: <b>[robo.mind.key]</b>)[robo.stat == DEAD ? " <span class='redtext'>(Deactivated)</span>" : ""][borg_num ?", ":""]<br>"
 			parts += "[robolist]"
 		if(!borg_spacer)
 			borg_spacer = TRUE
@@ -16,12 +16,22 @@
 //Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong.
 /obj/screen/plane_master/proc/backdrop(mob/mymob)

+/obj/screen/plane_master/floor
+	name = "floor plane master"
+	plane = FLOOR_PLANE
+	appearance_flags = PLANE_MASTER
+	blend_mode = BLEND_OVERLAY
+
 /obj/screen/plane_master/game_world
 	name = "game world plane master"
 	plane = GAME_PLANE
 	appearance_flags = PLANE_MASTER //should use client color
 	blend_mode = BLEND_OVERLAY

+/obj/screen/plane_master/game_world/backdrop(mob/mymob)
+	if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion)
+		filters += AMBIENT_OCCLUSION
+
 /obj/screen/plane_master/lighting
 	name = "lighting plane master"
 	plane = LIGHTING_PLANE
@@ -0,0 +1,34 @@
+//Used to process and handle roundstart quirks
+// - Quirk strings are used for faster checking in code
+// - Quirk datums are stored and hold different effects, as well as being a vector for applying trait string
+PROCESSING_SUBSYSTEM_DEF(quirks)
+	name = "Quirks"
+	init_order = INIT_ORDER_QUIRKS
+	flags = SS_BACKGROUND
+	wait = 10
+	runlevels = RUNLEVEL_GAME
+
+	var/list/quirks = list()		//Assoc. list of all roundstart quirk datum types; "name" = /path/
+	var/list/quirk_points = list()	//Assoc. list of quirk names and their "point cost"; positive numbers are good traits, and negative ones are bad
+	var/list/quirk_objects = list()	//A list of all quirk objects in the game, since some may process
+
+/datum/controller/subsystem/processing/quirks/Initialize(timeofday)
+	if(!quirks.len)
+		SetupQuirks()
+	..()
+
+/datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
+	for(var/V in subtypesof(/datum/quirk))
+		var/datum/quirk/T = V
+		quirks[initial(T.name)] = T
+		quirk_points[initial(T.name)] = initial(T.value)
+
+/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects)
+	GenerateQuirks(cli)
+	for(var/V in cli.prefs.character_quirks)
+		user.add_quirk(V, spawn_effects)
+
+/datum/controller/subsystem/processing/quirks/proc/GenerateQuirks(client/user)
+	if(user.prefs.character_quirks.len)
+		return
+	user.prefs.character_quirks = user.prefs.all_quirks
@@ -391,7 +391,7 @@ SUBSYSTEM_DEF(ticker)
 			if(player.mind.assigned_role != player.mind.special_role)
 				SSjob.EquipRank(N, player.mind.assigned_role, 0)
 			if(CONFIG_GET(flag/roundstart_traits))
-				SStraits.AssignTraits(player, N.client, TRUE)
+				SSquirks.AssignQuirks(player, N.client, TRUE)
 		CHECK_TICK
 	if(captainless)
 		for(var/mob/dead/new_player/N in GLOB.player_list)
@@ -0,0 +1,78 @@
+/datum/component/armor_plate
+	var/amount = 0
+	var/maxamount = 3
+	var/upgrade_item = /obj/item/stack/sheet/animalhide/goliath_hide
+	var/datum/armor/added_armor = list("melee" = 10)
+	var/upgrade_name
+
+/datum/component/armor_plate/Initialize(_maxamount,obj/item/_upgrade_item,datum/armor/_added_armor)
+	if(!isobj(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/applyplate)
+	RegisterSignal(COMSIG_PARENT_PREQDELETED, .proc/dropplates)
+
+	if(_maxamount)
+		maxamount = _maxamount
+	if(_upgrade_item)
+		upgrade_item = _upgrade_item
+	if(_added_armor)
+		if(islist(_added_armor))
+			added_armor = getArmor(arglist(_added_armor))
+		else if (istype(_added_armor, /datum/armor))
+			added_armor = _added_armor
+		else
+			stack_trace("Invalid type [_added_armor.type] passed as _armor_item argument to armorplate component")
+	else
+		added_armor = getArmor(arglist(added_armor))
+	var/obj/item/typecast = upgrade_item
+	upgrade_name = initial(typecast.name)
+
+/datum/component/armor_plate/proc/examine(mob/user)
+	//upgrade_item could also be typecast here instead
+	if(ismecha(parent))
+		if(amount)
+			if(amount < maxamount)
+				to_chat(user, "<span class='notice'>Its armor is enhanced with [amount] [upgrade_name].</span>")
+			else
+				to_chat(user, "<span class='notice'>It's wearing a fearsome carapace entirely composed of [upgrade_name] - its pilot must be an experienced monster hunter.</span>")
+		else
+			to_chat(user, "<span class='notice'>It has attachment points for strapping monster hide on for added protection.</span>")
+	else
+		if(amount)
+			to_chat(user, "<span class='notice'>It has been strengthened with [amount]/[maxamount] [upgrade_name].</span>")
+		else
+			to_chat(user, "<span class='notice'>It can be strengthened with up to [maxamount] [upgrade_name].</span>")
+
+/datum/component/armor_plate/proc/applyplate(obj/item/I, mob/user, params)
+	if(!istype(I,upgrade_item))
+		return
+	if(amount >= maxamount)
+		to_chat(user, "<span class='warning'>You can't improve [parent] any further!</span>")
+		return
+
+	if(istype(I,/obj/item/stack))
+		I.use(1)
+	else
+		if(length(I.contents))
+			to_chat(user, "<span class='warning'>[I] cannot be used for armoring while there's something inside!</span>")
+			return
+		qdel(I)
+
+	var/obj/O = parent
+	amount++
+	O.armor = O.armor.attachArmor(added_armor)
+
+	if(ismecha(O))
+		var/obj/mecha/R = O
+		R.update_icon()
+		to_chat(user, "<span class='info'>You strengthen [R], improving its resistance against melee, bullet and laser damage.</span>")
+	else
+		to_chat(user, "<span class='info'>You strengthen [O], improving its resistance against melee attacks.</span>")
+
+
+/datum/component/armor_plate/proc/dropplates(force)
+	if(ismecha(parent)) //items didn't drop the plates before and it causes erroneous behavior for the time being with collapsible helmets
+		for(var/i in 1 to amount)
+			new upgrade_item(get_turf(parent))
@@ -1,94 +1,94 @@
-//every trait in this folder should be coded around being applied on spawn
-//these are NOT "mob traits" like GOTTAGOFAST, but exist as a medium to apply them and other different effects
-/datum/trait
-	var/name = "Test Trait"
-	var/desc = "This is a test trait."
+//every quirk in this folder should be coded around being applied on spawn
+//these are NOT "mob quirks" like GOTTAGOFAST, but exist as a medium to apply them and other different effects
+/datum/quirk
+	var/name = "Test Quirk"
+	var/desc = "This is a test quirk."
 	var/value = 0
 	var/human_only = TRUE
 	var/gain_text
 	var/lose_text
 	var/medical_record_text //This text will appear on medical records for the trait. Not yet implemented
-	var/mood_trait = FALSE //if true, this trait affects mood and is unavailable if moodlets are disabled
+	var/mood_quirk = FALSE //if true, this quirk affects mood and is unavailable if moodlets are disabled
 	var/mob_trait //if applicable, apply and remove this mob trait
-	var/mob/living/trait_holder
+	var/mob/living/quirk_holder

-/datum/trait/New(mob/living/trait_mob, spawn_effects)
+/datum/quirk/New(mob/living/quirk_mob, spawn_effects)
 	..()
-	if(!trait_mob || (human_only && !ishuman(trait_mob)) || trait_mob.has_trait_datum(type))
+	if(!quirk_mob || (human_only && !ishuman(quirk_mob)) || quirk_mob.has_quirk(type))
 		qdel(src)
-	trait_holder = trait_mob
-	SStraits.trait_objects += src
-	to_chat(trait_holder, gain_text)
-	trait_holder.roundstart_traits += src
+	quirk_holder = quirk_mob
+	SSquirks.quirk_objects += src
+	to_chat(quirk_holder, gain_text)
+	quirk_holder.roundstart_quirks += src
 	if(mob_trait)
-		trait_holder.add_trait(mob_trait, ROUNDSTART_TRAIT)
-	START_PROCESSING(SStraits, src)
+		quirk_holder.add_trait(mob_trait, ROUNDSTART_TRAIT)
+	START_PROCESSING(SSquirks, src)
 	add()
 	if(spawn_effects)
 		on_spawn()
 		addtimer(CALLBACK(src, .proc/post_add), 30)

-/datum/trait/Destroy()
-	STOP_PROCESSING(SStraits, src)
+/datum/quirk/Destroy()
+	STOP_PROCESSING(SSquirks, src)
 	remove()
-	if(trait_holder)
-		to_chat(trait_holder, lose_text)
-		trait_holder.roundstart_traits -= src
+	if(quirk_holder)
+		to_chat(quirk_holder, lose_text)
+		quirk_holder.roundstart_quirks -= src
 		if(mob_trait)
-			trait_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT, TRUE)
-	SStraits.trait_objects -= src
+			quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT, TRUE)
+	SSquirks.quirk_objects -= src
 	return ..()

-/datum/trait/proc/transfer_mob(mob/living/to_mob)
-	trait_holder.roundstart_traits -= src
-	to_mob.roundstart_traits += src
+/datum/quirk/proc/transfer_mob(mob/living/to_mob)
+	quirk_holder.roundstart_quirks -= src
+	to_mob.roundstart_quirks += src
 	if(mob_trait)
-		trait_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
+		quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
 		to_mob.add_trait(mob_trait, ROUNDSTART_TRAIT)
-	trait_holder = to_mob
+	quirk_holder = to_mob
 	on_transfer()

-/datum/trait/proc/add() //special "on add" effects
-/datum/trait/proc/on_spawn() //these should only trigger when the character is being created for the first time, i.e. roundstart/latejoin
-/datum/trait/proc/remove() //special "on remove" effects
-/datum/trait/proc/on_process() //process() has some special checks, so this is the actual process
-/datum/trait/proc/post_add() //for text, disclaimers etc. given after you spawn in with the trait
-/datum/trait/proc/on_transfer() //code called when the trait is transferred to a new mob
+/datum/quirk/proc/add() //special "on add" effects
+/datum/quirk/proc/on_spawn() //these should only trigger when the character is being created for the first time, i.e. roundstart/latejoin
+/datum/quirk/proc/remove() //special "on remove" effects
+/datum/quirk/proc/on_process() //process() has some special checks, so this is the actual process
+/datum/quirk/proc/post_add() //for text, disclaimers etc. given after you spawn in with the trait
+/datum/quirk/proc/on_transfer() //code called when the trait is transferred to a new mob

-/datum/trait/process()
-	if(QDELETED(trait_holder))
-		trait_holder = null
+/datum/quirk/process()
+	if(QDELETED(quirk_holder))
+		quirk_holder = null
 		qdel(src)
 		return
-	if(trait_holder.stat == DEAD)
+	if(quirk_holder.stat == DEAD)
 		return
 	on_process()

 /mob/living/proc/get_trait_string(medical) //helper string. gets a string of all the traits the mob has
 	var/list/dat = list()
 	if(!medical)
-		for(var/V in roundstart_traits)
-			var/datum/trait/T = V
+		for(var/V in roundstart_quirks)
+			var/datum/quirk/T = V
 			dat += T.name
 		if(!dat.len)
 			return "None"
 		return dat.Join(", ")
 	else
-		for(var/V in roundstart_traits)
-			var/datum/trait/T = V
+		for(var/V in roundstart_quirks)
+			var/datum/quirk/T = V
 			dat += T.medical_record_text
 		if(!dat.len)
 			return "None"
 		return dat.Join("<br>")

 /mob/living/proc/cleanse_trait_datums() //removes all trait datums
-	for(var/V in roundstart_traits)
-		var/datum/trait/T = V
+	for(var/V in roundstart_quirks)
+		var/datum/quirk/T = V
 		qdel(T)

 /mob/living/proc/transfer_trait_datums(mob/living/to_mob)
-	for(var/V in roundstart_traits)
-		var/datum/trait/T = V
+	for(var/V in roundstart_quirks)
+		var/datum/quirk/T = V
 		T.transfer_mob(to_mob)

 /*
@@ -96,7 +96,7 @@
 Commented version of Nearsighted to help you add your own traits
 Use this as a guideline

-/datum/trait/nearsighted
+/datum/quirk/nearsighted
 	name = "Nearsighted"
 	///The trait's name

@@ -116,8 +116,8 @@ Use this as a guideline
 	medical_record_text = "Subject has permanent nearsightedness."
 	///These three are self-explanatory

-/datum/trait/nearsighted/on_spawn()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/nearsighted/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
 	H.put_in_hands(glasses)
 	H.equip_to_slot(glasses, slot_glasses)
@@ -1,7 +1,7 @@
 //predominantly positive traits
 //this file is named weirdly so that positive traits are listed above negative ones

-/datum/trait/alcohol_tolerance
+/datum/quirk/alcohol_tolerance
 	name = "Alcohol Tolerance"
 	desc = "You become drunk more slowly and suffer fewer drawbacks from alcohol."
 	value = 1
@@ -11,25 +11,25 @@



-/datum/trait/apathetic
+/datum/quirk/apathetic
 	name = "Apathetic"
 	desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess."
 	value = 1
-	mood_trait = TRUE
+	mood_quirk = TRUE

-/datum/trait/apathetic/add()
-	GET_COMPONENT_FROM(mood, /datum/component/mood, trait_holder)
+/datum/quirk/apathetic/add()
+	GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
 	if(mood)
 		mood.mood_modifier = 0.8

-/datum/trait/apathetic/remove()
-	GET_COMPONENT_FROM(mood, /datum/component/mood, trait_holder)
+/datum/quirk/apathetic/remove()
+	GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
 	if(mood)
 		mood.mood_modifier = 1 //Change this once/if species get their own mood modifiers.



-/datum/trait/freerunning
+/datum/quirk/freerunning
 	name = "Freerunning"
 	desc = "You're great at quick moves! You can climb tables more quickly."
 	value = 2
@@ -39,16 +39,16 @@



-/datum/trait/jolly
+/datum/quirk/jolly
 	name = "Jolly"
 	desc = "You sometimes just feel happy, for no reason at all."
 	value = 1
 	mob_trait = TRAIT_JOLLY
-	mood_trait = TRUE
+	mood_quirk = TRUE



-/datum/trait/light_step
+/datum/quirk/light_step
 	name = "Light Step"
 	desc = "You walk with a gentle step, making stepping on sharp objects quieter and less painful."
 	value = 1
@@ -58,7 +58,7 @@



-/datum/trait/night_vision
+/datum/quirk/night_vision
 	name = "Night Vision"
 	desc = "You can see slightly more clearly in full darkness than most people."
 	value = 1
@@ -66,8 +66,8 @@
 	gain_text = "<span class='notice'>The shadows seem a little less dark.</span>"
 	lose_text = "<span class='danger'>Everything seems a little darker.</span>"

-/datum/trait/night_vision/on_spawn()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/night_vision/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/organ/eyes/eyes = H.getorgan(/obj/item/organ/eyes)
 	if(!eyes || eyes.lighting_alpha)
 		return
@@ -75,7 +75,7 @@



-/datum/trait/selfaware
+/datum/quirk/selfaware
 	name = "Self-Aware"
 	desc = "You know your body well, and can accurately assess the extent of your wounds."
 	value = 2
@@ -83,7 +83,7 @@



-/datum/trait/skittish
+/datum/quirk/skittish
 	name = "Skittish"
 	desc = "You can conceal yourself in danger. Ctrl-shift-click a closed locker to jump into it, as long as you have access."
 	value = 2
@@ -91,7 +91,7 @@



-/datum/trait/spiritual
+/datum/quirk/spiritual
 	name = "Spiritual"
 	desc = "You're in tune with the gods, and your prayers may be more likely to be heard. Or not."
 	value = 1
@@ -101,7 +101,7 @@



-/datum/trait/voracious
+/datum/quirk/voracious
 	name = "Voracious"
 	desc = "Nothing gets between you and your food. You eat twice as fast as everyone else!"
 	value = 1
@@ -1,6 +1,6 @@
 //predominantly negative traits

-/datum/trait/blooddeficiency
+/datum/quirk/blooddeficiency
 	name = "Acute Blood Deficiency"
 	desc = "Your body can't produce enough blood to sustain itself."
 	value = -2
@@ -8,12 +8,12 @@
 	lose_text = "<span class='notice'>You feel vigorous again.</span>"
 	medical_record_text = "Patient requires regular treatment for blood loss due to low production of blood."

-/datum/trait/blooddeficiency/on_process()
-	trait_holder.blood_volume -= 0.275
+/datum/quirk/blooddeficiency/on_process()
+	quirk_holder.blood_volume -= 0.275



-/datum/trait/depression
+/datum/quirk/depression
 	name = "Depression"
 	desc = "You sometimes just hate life."
 	mob_trait = TRAIT_DEPRESSION
@@ -21,22 +21,22 @@
 	gain_text = "<span class='danger'>You start feeling depressed.</span>"
 	lose_text = "<span class='notice'>You no longer feel depressed.</span>" //if only it were that easy!
 	medical_record_text = "Patient has a severe mood disorder causing them to experience sudden moments of sadness."
-	mood_trait = TRUE
+	mood_quirk = TRUE



-/datum/trait/family_heirloom
+/datum/quirk/family_heirloom
 	name = "Family Heirloom"
 	desc = "You are the current owner of an heirloom. passed down for generations. You have to keep it safe!"
 	value = -1
-	mood_trait = TRUE
+	mood_quirk = TRUE
 	var/obj/item/heirloom
 	var/where_text

-/datum/trait/family_heirloom/on_spawn()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/family_heirloom/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/heirloom_type
-	switch(trait_holder.mind.assigned_role)
+	switch(quirk_holder.mind.assigned_role)
 		if("Clown")
 			heirloom_type = /obj/item/bikehorn/golden
 		if("Mime")
@@ -56,7 +56,7 @@
 		/obj/item/toy/cards/deck,
 		/obj/item/lighter,
 		/obj/item/dice/d20)
-	heirloom = new heirloom_type(get_turf(trait_holder))
+	heirloom = new heirloom_type(get_turf(quirk_holder))
 	var/list/slots = list(
 		"in your backpack" = slot_in_backpack,
 		"in your left pocket" = slot_l_store,
@@ -69,22 +69,22 @@
 		H.back.SendSignal(COMSIG_TRY_STORAGE_SHOW, H)
 	where_text = "<span class='boldnotice'>There is a precious family [heirloom.name] [where], passed down from generation to generation. Keep it safe!</span>"

-/datum/trait/family_heirloom/post_add()
-	to_chat(trait_holder, where_text)
-	var/list/family_name = splittext(trait_holder.real_name, " ")
+/datum/quirk/family_heirloom/post_add()
+	to_chat(quirk_holder, where_text)
+	var/list/family_name = splittext(quirk_holder.real_name, " ")
 	heirloom.name = "\improper [family_name[family_name.len]] family [heirloom.name]"

-/datum/trait/family_heirloom/on_process()
-	if(heirloom in trait_holder.GetAllContents())
-		trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
-		trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)
+/datum/quirk/family_heirloom/on_process()
+	if(heirloom in quirk_holder.GetAllContents())
+		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
+		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)
 	else
-		trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
-		trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
+		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
+		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)



-/datum/trait/heavy_sleeper
+/datum/quirk/heavy_sleeper
 	name = "Heavy Sleeper"
 	desc = "You sleep like a rock! Whenever you're put to sleep, you sleep for a little bit longer."
 	value = -1
@@ -93,7 +93,7 @@
 	lose_text = "<span class='notice'>You feel awake again.</span>"
 	medical_record_text = "Patient has abnormal sleep study results and is difficult to wake up."

-/datum/trait/brainproblems
+/datum/quirk/brainproblems
 	name = "Brain Tumor"
 	desc = "You have a little friend in your brain that is slowly destroying it. Better bring some mannitol!"
 	value = -3
@@ -101,12 +101,12 @@
 	lose_text = "<span class='notice'>You feel wrinkled again.</span>"
 	medical_record_text = "Patient has a tumor in their brain that is slowly driving them to brain death."

-/datum/trait/brainproblems/on_process()
-	trait_holder.adjustBrainLoss(0.2)
+/datum/quirk/brainproblems/on_process()
+	quirk_holder.adjustBrainLoss(0.2)



-/datum/trait/nearsighted //t. errorage
+/datum/quirk/nearsighted //t. errorage
 	name = "Nearsighted"
 	desc = "You are nearsighted without prescription glasses, but spawn with a pair."
 	value = -1
@@ -114,11 +114,11 @@
 	lose_text = "<span class='notice'>You start seeing faraway things normally again.</span>"
 	medical_record_text = "Patient requires prescription glasses in order to counteract nearsightedness."

-/datum/trait/nearsighted/add()
-	trait_holder.become_nearsighted(ROUNDSTART_TRAIT)
+/datum/quirk/nearsighted/add()
+	quirk_holder.become_nearsighted(ROUNDSTART_TRAIT)

-/datum/trait/nearsighted/on_spawn()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/nearsighted/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
 	H.put_in_hands(glasses)
 	H.equip_to_slot(glasses, slot_glasses)
@@ -126,28 +126,28 @@



-/datum/trait/nyctophobia
+/datum/quirk/nyctophobia
 	name = "Nyctophobia"
 	desc = "As far as you can remember, you've always been afraid of the dark. While in the dark without a light source, you instinctually act careful, and constantly feel a sense of dread."
 	value = -1

-/datum/trait/nyctophobia/on_process()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/nyctophobia/on_process()
+	var/mob/living/carbon/human/H = quirk_holder
 	if(H.dna.species.id in list("shadow", "nightmare"))
 		return //we're tied with the dark, so we don't get scared of it; don't cleanse outright to avoid cheese
-	var/turf/T = get_turf(trait_holder)
+	var/turf/T = get_turf(quirk_holder)
 	var/lums = T.get_lumcount()
 	if(lums <= 0.2)
-		if(trait_holder.m_intent == MOVE_INTENT_RUN)
-			to_chat(trait_holder, "<span class='warning'>Easy, easy, take it slow... you're in the dark...</span>")
-			trait_holder.toggle_move_intent()
-		trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
+		if(quirk_holder.m_intent == MOVE_INTENT_RUN)
+			to_chat(quirk_holder, "<span class='warning'>Easy, easy, take it slow... you're in the dark...</span>")
+			quirk_holder.toggle_move_intent()
+		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
 	else
-		trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")
+		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")



-/datum/trait/nonviolent
+/datum/quirk/nonviolent
 	name = "Pacifist"
 	desc = "The thought of violence makes you sick. So much so, in fact, that you can't hurt anyone."
 	value = -2
@@ -156,14 +156,14 @@
 	lose_text = "<span class='notice'>You think you can defend yourself again.</span>"
 	medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm."

-/datum/trait/nonviolent/on_process()
-	if(trait_holder.mind && LAZYLEN(trait_holder.mind.antag_datums))
-		to_chat(trait_holder, "<span class='boldannounce'>Your antagonistic nature has caused you to renounce your pacifism.</span>")
+/datum/quirk/nonviolent/on_process()
+	if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
+		to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused you to renounce your pacifism.</span>")
 		qdel(src)



-/datum/trait/poor_aim
+/datum/quirk/poor_aim
 	name = "Poor Aim"
 	desc = "You're terrible with guns and can't line up a straight shot to save your life. Dual-wielding is right out."
 	value = -1
@@ -172,7 +172,7 @@



-/datum/trait/prosopagnosia
+/datum/quirk/prosopagnosia
 	name = "Prosopagnosia"
 	desc = "You have a mental disorder that prevents you from being able to recognize faces at all."
 	value = -1
@@ -181,41 +181,41 @@



-/datum/trait/prosthetic_limb
+/datum/quirk/prosthetic_limb
 	name = "Prosthetic Limb"
 	desc = "An accident caused you to lose one of your limbs. Because of this, you now have a random prosthetic!"
 	value = -1
 	var/slot_string = "limb"

-/datum/trait/prosthetic_limb/on_spawn()
+/datum/quirk/prosthetic_limb/on_spawn()
 	var/limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
-	var/mob/living/carbon/human/H = trait_holder
+	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/bodypart/old_part = H.get_bodypart(limb_slot)
 	var/obj/item/bodypart/prosthetic
 	switch(limb_slot)
 		if(BODY_ZONE_L_ARM)
-			prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(trait_holder)
+			prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(quirk_holder)
 			slot_string = "left arm"
 		if(BODY_ZONE_R_ARM)
-			prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(trait_holder)
+			prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder)
 			slot_string = "right arm"
 		if(BODY_ZONE_L_LEG)
-			prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(trait_holder)
+			prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder)
 			slot_string = "left leg"
 		if(BODY_ZONE_R_LEG)
-			prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(trait_holder)
+			prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
 			slot_string = "right leg"
 	prosthetic.replace_limb(H)
 	qdel(old_part)
 	H.regenerate_icons()

-/datum/trait/prosthetic_limb/post_add()
-	to_chat(trait_holder, "<span class='boldannounce'>Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
+/datum/quirk/prosthetic_limb/post_add()
+	to_chat(quirk_holder, "<span class='boldannounce'>Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
 	you need to use a welding tool and cables to repair it, instead of bruise packs and ointment.</span>")



-/datum/trait/insanity
+/datum/quirk/insanity
 	name = "Reality Dissociation Syndrome"
 	desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. <b>This is not a license to grief.</b>"
 	value = -2
@@ -224,32 +224,32 @@
 	lose_text = "<span class='notice'>You feel in tune with the world again.</span>"
 	medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations."

-/datum/trait/insanity/on_process()
-	if(trait_holder.reagents.has_reagent("mindbreaker"))
-		trait_holder.hallucination = 0
+/datum/quirk/insanity/on_process()
+	if(quirk_holder.reagents.has_reagent("mindbreaker"))
+		quirk_holder.hallucination = 0
 		return
 	if(prob(2)) //we'll all be mad soon enough
 		madness()

-/datum/trait/insanity/proc/madness(mad_fools)
+/datum/quirk/insanity/proc/madness(mad_fools)
 	set waitfor = FALSE
 	if(!mad_fools)
 		mad_fools = prob(20)
 	if(mad_fools)
 		var/hallucination_type = pick(subtypesof(/datum/hallucination/rds))
-		new hallucination_type (trait_holder, FALSE)
+		new hallucination_type (quirk_holder, FALSE)
 	else
-		trait_holder.hallucination += rand(10, 50)
+		quirk_holder.hallucination += rand(10, 50)

-/datum/trait/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
-	if(!trait_holder.mind || trait_holder.mind.special_role)
+/datum/quirk/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
+	if(!quirk_holder.mind || quirk_holder.mind.special_role)
 		return
-	to_chat(trait_holder, "<span class='big bold info'>Please note that your dissociation syndrome does NOT give you the right to attack people or otherwise cause any interference to \
+	to_chat(quirk_holder, "<span class='big bold info'>Please note that your dissociation syndrome does NOT give you the right to attack people or otherwise cause any interference to \
 	the round. You are not an antagonist, and the rules will treat you the same as other crewmembers.</span>")



-/datum/trait/social_anxiety
+/datum/quirk/social_anxiety
 	name = "Social Anxiety"
 	desc = "Talking to people is very difficult for you, and you often stutter or even lock up."
 	value = -1
@@ -258,12 +258,12 @@
 	medical_record_text = "Patient is usually anxious in social encounters and prefers to avoid them."
 	var/dumb_thing = TRUE

-/datum/trait/social_anxiety/on_process()
+/datum/quirk/social_anxiety/on_process()
 	var/nearby_people = 0
-	for(var/mob/living/carbon/human/H in view(5, trait_holder))
+	for(var/mob/living/carbon/human/H in view(5, quirk_holder))
 		if(H.client)
 			nearby_people++
-	var/mob/living/carbon/human/H = trait_holder
+	var/mob/living/carbon/human/H = quirk_holder
 	if(prob(2 + nearby_people))
 		H.stuttering = max(3, H.stuttering)
 	else if(prob(min(3, nearby_people)) && !H.silent)
@@ -1,7 +1,7 @@
 //traits with no real impact that can be taken freely
 //MAKE SURE THESE DO NOT MAJORLY IMPACT GAMEPLAY. those should be positive or negative traits.

-/datum/trait/no_taste
+/datum/quirk/no_taste
 	name = "Ageusia"
 	desc = "You can't taste anything! Toxic food will still poison you."
 	value = 0
@@ -12,75 +12,75 @@



-/datum/trait/pineapple_liker
+/datum/quirk/pineapple_liker
 	name = "Ananas Affinity"
 	desc = "You find yourself greatly enjoying fruits of the ananas genus. You can't seem to ever get enough of their sweet goodness!"
 	value = 0
 	gain_text = "<span class='notice'>You feel an intense craving for pineapple.</span>"
 	lose_text = "<span class='notice'>Your feelings towards pineapples seem to return to a lukewarm state.</span>"

-/datum/trait/pineapple_liker/add()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/pineapple_liker/add()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	species.liked_food |= PINEAPPLE

-/datum/trait/pineapple_liker/remove()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/pineapple_liker/remove()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	species.liked_food &= ~PINEAPPLE

-/datum/trait/pineapple_hater
+/datum/quirk/pineapple_hater
 	name = "Ananas Aversion"
 	desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?"
 	value = 0
 	gain_text = "<span class='notice'>You find yourself pondering what kind of idiot actually enjoys pineapples...</span>"
 	lose_text = "<span class='notice'>Your feelings towards pineapples seem to return to a lukewarm state.</span>"

-/datum/trait/pineapple_hater/add()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/pineapple_hater/add()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	species.disliked_food |= PINEAPPLE

-/datum/trait/pineapple_hater/remove()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/pineapple_hater/remove()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	species.disliked_food &= ~PINEAPPLE

-/datum/trait/deviant_tastes
+/datum/quirk/deviant_tastes
 	name = "Deviant Tastes"
 	desc = "You dislike food that most people enjoy, and find delicious what they don't."
 	value = 0
 	gain_text = "<span class='notice'>You start craving something that tastes strange.</span>"
 	lose_text = "<span class='notice'>You feel like eating normal food again.</span>"

-/datum/trait/deviant_tastes/add()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/deviant_tastes/add()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	var/liked = species.liked_food
 	species.liked_food = species.disliked_food
 	species.disliked_food = liked

-/datum/trait/deviant_tastes/remove()
-	var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/deviant_tastes/remove()
+	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	species.liked_food = initial(species.liked_food)
 	species.disliked_food = initial(species.disliked_food)



-/datum/trait/monochromatic
+/datum/quirk/monochromatic
 	name = "Monochromacy"
 	desc = "You suffer from full colorblindness, and perceive nearly the entire world in blacks and whites."
 	value = 0
 	medical_record_text = "Patient is afflicted with almost complete color blindness."

-/datum/trait/monochromatic/add()
-	trait_holder.add_client_colour(/datum/client_colour/monochrome)
+/datum/quirk/monochromatic/add()
+	quirk_holder.add_client_colour(/datum/client_colour/monochrome)

-/datum/trait/monochromatic/post_add()
-	if(trait_holder.mind.assigned_role == "Detective")
-		to_chat(trait_holder, "<span class='boldannounce'>Mmm. Nothing's ever clear on this station. It's all shades of gray...</span>")
-		trait_holder.playsound_local(trait_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE)
+/datum/quirk/monochromatic/post_add()
+	if(quirk_holder.mind.assigned_role == "Detective")
+		to_chat(quirk_holder, "<span class='boldannounce'>Mmm. Nothing's ever clear on this station. It's all shades of gray...</span>")
+		quirk_holder.playsound_local(quirk_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE)

-/datum/trait/monochromatic/remove()
-	trait_holder.remove_client_colour(/datum/client_colour/monochrome)
+/datum/quirk/monochromatic/remove()
+	quirk_holder.remove_client_colour(/datum/client_colour/monochrome)
@@ -7,6 +7,7 @@
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "unknown"
 	layer = AREA_LAYER
+	plane = BLACKNESS_PLANE //Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE.
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	invisibility = INVISIBILITY_LIGHTING

@@ -518,4 +519,4 @@ GLOBAL_LIST_EMPTY(teleportlocs)

 // A hook so areas can modify the incoming args
 /area/proc/PlaceOnTopReact(list/new_baseturfs, turf/fake_turf_type, flags)
-	return flags
+	return flags
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "ai-slipper0"
 	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+	plane = FLOOR_PLANE
 	anchored = TRUE
 	max_integrity = 200
 	armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
@@ -126,7 +126,7 @@
 	return examine(user)

 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions, list/traits)
+/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions, list/quirks)
 	if(panel_open)
 		return FALSE
 	if(mess || attempting)
@@ -203,7 +203,7 @@
 	if(H)
 		H.faction |= factions

-		for(var/V in traits)
+		for(var/V in quirks)
 			new V(H)

 		H.set_cloned_appearance()
@@ -71,7 +71,7 @@
 		if(pod.occupant)
 			continue	//how though?

-		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["traits"]))
+		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"]))
 			temp = "[R.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 			records -= R

@@ -400,7 +400,7 @@
 			else if(pod.occupant)
 				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["traits"]))
+			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"]))
 				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 				records.Remove(C)
@@ -473,10 +473,10 @@
 	R.fields["blood_type"] = dna.blood_type
 	R.fields["features"] = dna.features
 	R.fields["factions"] = mob_occupant.faction
-	R.fields["traits"] = list()
-	for(var/V in mob_occupant.roundstart_traits)
-		var/datum/trait/T = V
-		R.fields["traits"] += T.type
+	R.fields["quirks"] = list()
+	for(var/V in mob_occupant.roundstart_quirks)
+		var/datum/quirk/T = V
+		R.fields["quirks"] += T.type

 	if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.fields["mind"] = "[REF(mob_occupant.mind)]"
@@ -174,25 +174,26 @@

 	else
 		var/list/S = power_station.linked_stations
-		if(!S.len)
-			to_chat(user, "<span class='alert'>No connected stations located.</span>")
-			return
 		for(var/obj/machinery/teleport/station/R in S)
-			if(is_eligible(R))
+			if(is_eligible(R) && R.teleporter_hub)
 				var/area/A = get_area(R)
 				L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
+		if(!L.len)
+			to_chat(user, "<span class='alert'>No active connected stations located.</span>")
+			return
 		var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L
-		target = L[desc]
-		if(target)
-			var/obj/machinery/teleport/station/trg = target
-			trg.linked_stations |= power_station
-			trg.stat &= ~NOPOWER
-			if(trg.teleporter_hub)
-				trg.teleporter_hub.stat &= ~NOPOWER
-				trg.teleporter_hub.update_icon()
-			if(trg.teleporter_console)
-				trg.teleporter_console.stat &= ~NOPOWER
-				trg.teleporter_console.update_icon()
+		var/obj/machinery/teleport/station/target_station = L[desc]
+		if(!target_station || !target_station.teleporter_hub)
+			return
+		target = target_station.teleporter_hub
+		target_station.linked_stations |= power_station
+		target_station.stat &= ~NOPOWER
+		if(target_station.teleporter_hub)
+			target_station.teleporter_hub.stat &= ~NOPOWER
+			target_station.teleporter_hub.update_icon()
+		if(target_station.teleporter_console)
+			target_station.teleporter_console.stat &= ~NOPOWER
+			target_station.teleporter_console.update_icon()

 /obj/machinery/computer/teleporter/proc/is_eligible(atom/movable/AM)
 	var/turf/T = get_turf(AM)
@@ -355,8 +355,7 @@
 					return
 				user.visible_message("<span class='notice'>[user] removes the wires from [src].</span>", \
 									 "<span class='notice'>You remove the wiring from [src], exposing the circuit board.</span>")
-				var/obj/item/stack/cable_coil/B = new(get_turf(src))
-				B.amount = 5
+				new/obj/item/stack/cable_coil(get_turf(src), 5)
 				constructionStep = CONSTRUCTION_GUTTED
 				update_icon()
 				return
@@ -32,6 +32,7 @@ Possible to do for anyone motivated enough:
 	desc = "It's a floor-mounted device for projecting holographic images."
 	icon_state = "holopad0"
 	layer = LOW_OBJ_LAYER
+	plane = FLOOR_PLANE
 	flags_1 = HEAR_1
 	anchored = TRUE
 	use_power = IDLE_POWER_USE
@@ -66,7 +67,7 @@ Possible to do for anyone motivated enough:
 	flags_1 = NODECONSTRUCT_1
 	on_network = FALSE
 	var/proximity_range = 1
-	
+
 /obj/machinery/holopad/tutorial/Initialize(mapload)
 	. = ..()
 	if(proximity_range)
@@ -86,7 +87,7 @@ Possible to do for anyone motivated enough:
 		replay_stop()
 	else if(disk && disk.record)
 		replay_start()
-	
+
 /obj/machinery/holopad/tutorial/HasProximity(atom/movable/AM)
 	if (!isliving(AM))
 		return
@@ -487,7 +488,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	if(QDELETED(user) || user.incapacitated() || !user.client)
 		return FALSE
 	return TRUE
-		
+
 //Can we display holos there
 //Area check instead of line of sight check because this is a called a lot if AI wants to move around.
 /obj/machinery/holopad/proc/validate_location(turf/T,check_los = FALSE)
@@ -3,6 +3,7 @@
 	desc = "It's useful for igniting plasma."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "igniter0"
+	plane = FLOOR_PLANE
 	var/id = null
 	var/on = FALSE
 	anchored = TRUE
@@ -12,7 +13,7 @@
 	max_integrity = 300
 	armor = list("melee" = 50, "bullet" = 30, "laser" = 70, "energy" = 50, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
 	resistance_flags = FIRE_PROOF
-	
+
 /obj/machinery/igniter/on
 	on = TRUE
 	icon_state = "igniter1"
@@ -47,7 +47,6 @@
 		return
 	if(is_ready())
 		teleport(AM)
-		use_power(5000)

 /obj/machinery/teleport/hub/attackby(obj/item/W, mob/user, params)
 	if(default_deconstruction_screwdriver(user, "tele-o", "tele0", W))
@@ -61,13 +60,15 @@

 /obj/machinery/teleport/hub/proc/teleport(atom/movable/M as mob|obj, turf/T)
 	var/obj/machinery/computer/teleporter/com = power_station.teleporter_console
-	if (!com)
+	if (QDELETED(com))
 		return
-	if (!com.target)
+	if (QDELETED(com.target))
+		com.target = null
 		visible_message("<span class='alert'>Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.</span>")
 		return
 	if (ismovableatom(M))
 		if(do_teleport(M, com.target))
+			use_power(5000)
 			if(!calibrated && prob(30 - ((accurate) * 10))) //oh dear a problem
 				if(ishuman(M))//don't remove people from the round randomly you jerks
 					var/mob/living/carbon/human/human = M
@@ -65,8 +65,7 @@
 	return

 /obj/item/stack/sheet/hairlesshide/machine_wash(obj/machinery/washing_machine/WM)
-	var/obj/item/stack/sheet/wetleather/WL = new(loc)
-	WL.amount = amount
+	new /obj/item/stack/sheet/wetleather(drop_location(), amount)
 	qdel(src)

 /obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM)
@@ -367,8 +367,7 @@
 	return ..()

 /obj/item/mecha_parts/mecha_equipment/generator/proc/generator_init()
-	fuel = new /obj/item/stack/sheet/mineral/plasma(src)
-	fuel.amount = 0
+	fuel = new /obj/item/stack/sheet/mineral/plasma(src, 0)

 /obj/item/mecha_parts/mecha_equipment/generator/detach()
 	STOP_PROCESSING(SSobj, src)
@@ -472,8 +471,7 @@
 	var/rad_per_cycle = 3

 /obj/item/mecha_parts/mecha_equipment/generator/nuclear/generator_init()
-	fuel = new /obj/item/stack/sheet/mineral/uranium(src)
-	fuel.amount = 0
+	fuel = new /obj/item/stack/sheet/mineral/uranium(src, 0)

 /obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail()
 	return
@@ -301,8 +301,7 @@

 /obj/item/mecha_parts/mecha_equipment/cable_layer/Initialize()
 	. = ..()
-	cable = new(src)
-	cable.amount = 0
+	cable = new(src, 0)

 /obj/item/mecha_parts/mecha_equipment/cable_layer/can_attach(obj/mecha/working/M)
 	if(..())
@@ -333,8 +332,7 @@
 		if(to_load)
 			to_load = min(target.amount, to_load)
 			if(!cable)
-				cable = new(src)
-				cable.amount = 0
+				cable = new(src, 0)
 			cable.amount += to_load
 			target.use(to_load)
 			occupant_message("<span class='notice'>[to_load] meters of cable successfully loaded.</span>")
@@ -358,8 +356,7 @@
 			m = min(m, cable.amount)
 			if(m)
 				use_cable(m)
-				var/obj/item/stack/cable_coil/CC = new (get_turf(chassis))
-				CC.amount = m
+				new /obj/item/stack/cable_coil(get_turf(chassis), m)
 		else
 			occupant_message("There's no more cable on the reel.")
 	return
@@ -31,8 +31,6 @@
 					ore.forceMove(ore_box)

 /obj/mecha/working/ripley/Destroy()
-	for(var/i=1, i <= hides, i++)
-		new /obj/item/stack/sheet/animalhide/goliath_hide(loc) //If a goliath-plated ripley gets killed, all the plates drop
 	for(var/atom/movable/A in cargo)
 		A.forceMove(drop_location())
 		step_rand(A)
@@ -49,13 +47,18 @@

 /obj/mecha/working/ripley/update_icon()
 	..()
-	if (hides)
+	GET_COMPONENT(C,/datum/component/armor_plate)
+	if (C.amount)
 		cut_overlays()
-		if(hides < 3)
+		if(C.amount < 3)
 			add_overlay(occupant ? "ripley-g" : "ripley-g-open")
 		else
 			add_overlay(occupant ? "ripley-g-full" : "ripley-g-full-open")

+/obj/mecha/working/ripley/Initialize()
+	. = ..()
+	AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list("melee" = 10, "bullet" = 5, "laser" = 5))
+

 /obj/mecha/working/ripley/firefighter
 	desc = "Autonomous Power Loader Unit. This model is refitted with additional thermal protection."
@@ -1,5 +1,6 @@
 /obj/effect/decal
 	name = "decal"
+	plane = FLOOR_PLANE
 	anchored = TRUE
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/turf_loc_check = TRUE
@@ -104,8 +104,7 @@
 			to_chat(user, "<span class='warning'>There is another network terminal here!</span>")
 			return
 		else
-			var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(T)
-			C.amount = 10
+			new /obj/item/stack/cable_coil(T, 10)
 			to_chat(user, "<span class='notice'>You cut the cables and disassemble the unused power terminal.</span>")
 			qdel(E)
 	return TRUE
@@ -118,6 +118,7 @@

 /obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
 	M.SendSignal(COMSIG_ADD_MOOD_EVENT, "honk", /datum/mood_event/honk)
+	return ..()

 /obj/item/bikehorn/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] solemnly points the horn at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -170,7 +170,6 @@
 			to_chat(user, "<span class='warning'>You need a free hand to hold the paddles!</span>")
 			update_icon()
 			return
-		paddles.forceMove(user)
 	else
 		//Remove from their hands and back onto the defib unit
 		paddles.unwield()
@@ -174,7 +174,7 @@ GAS ANALYZER
 				trauma_desc += B.scan_desc
 				trauma_text += trauma_desc
 			to_chat(user, "\t<span class='alert'>Cerebral traumas detected: subjects appears to be suffering from [english_list(trauma_text)].</span>")
-		if(C.roundstart_traits.len)
+		if(C.roundstart_quirks.len)
 			to_chat(user, "\t<span class='info'>Subject has the following physiological traits: [C.get_trait_string()].</span>")
 	if(advanced)
 		to_chat(user, "\t<span class='info'>Brain Activity Level: [(200 - M.getBrainLoss())/2]%.</span>")
@@ -127,6 +127,18 @@
 	self_delay = 20
 	max_amount = 12

+/obj/item/stack/medical/gauze/wirecutter_act(mob/living/user, obj/item/I)
+	if(get_amount() < 2)
+		to_chat(user, "<span class='warning'>You need at least two gauze to do this!</span>")
+		return
+	new /obj/item/stack/sheet/cloth(user.drop_location())
+	user.visible_message("[user] cuts [src] into pieces of cloth with [I].", \
+				 "<span class='notice'>You cut [src] into pieces of cloth with [I].</span>", \
+				 "<span class='italics'>You hear cutting.</span>")
+	var/obj/item/stack/medical/gauze/R = src
+	src = null
+	R.use(2)
+
 /obj/item/stack/medical/gauze/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!</span>")
 	return OXYLOSS
@@ -155,5 +167,5 @@
 	grind_results = list("silver_sulfadiazine" = 10)

 /obj/item/stack/medical/ointment/suicide_act(mob/living/user)
-	user.visible_message("<span class='suicide'>[user] is squeezing \the [src] into [user.p_their()] mouth! Don't they know that stuff is toxic?</span>")
-	return TOXLOSS
+	user.visible_message("<span class='suicide'>[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?</span>")
+	return TOXLOSS
@@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	singular_name = "plasma glass sheet"
 	icon_state = "sheet-pglass"
 	item_state = "sheet-pglass"
-	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plasmaglass
@@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
 	item_state = "sheet-rglass"
-	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/rglass
@@ -175,7 +175,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	singular_name = "reinforced plasma glass sheet"
 	icon_state = "sheet-prglass"
 	item_state = "sheet-prglass"
-	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT, MAT_METAL = MINERAL_MATERIAL_AMOUNT * 0.5,)
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plasmarglass
@@ -195,7 +195,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
 	singular_name = "titanium glass sheet"
 	icon_state = "sheet-titaniumglass"
 	item_state = "sheet-titaniumglass"
-	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/titaniumglass
@@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	singular_name = "plastitanium glass sheet"
 	icon_state = "sheet-plastitaniumglass"
 	item_state = "sheet-plastitaniumglass"
-	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plastitaniumglass
@@ -211,10 +211,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 	if(W.is_sharp())
 		playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
 		user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
-		if(do_after(user,50, target = src))
+		if(do_after(user, 50, target = src))
 			to_chat(user, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
-			var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc)
-			HS.amount = 1
+			new /obj/item/stack/sheet/hairlesshide(user.drop_location(), 1)
 			use(1)
 	else
 		return ..()
@@ -228,21 +227,11 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 	if(exposed_temperature >= drying_threshold_temperature)
 		wetness--
 		if(wetness == 0)
-			//Try locating an exisitng stack on the tile and add to there if possible
-			for(var/obj/item/stack/sheet/leather/HS in src.loc)
-				if(HS.amount < 50)
-					HS.amount++
-					src.use(1)
-					wetness = initial(wetness)
-					break
-			//If it gets to here it means it did not find a suitable stack on the tile.
-			var/obj/item/stack/sheet/leather/HS = new(src.loc)
-			HS.amount = 1
+			new /obj/item/stack/sheet/leather(drop_location(), 1)
 			wetness = initial(wetness)
-			src.use(1)
+			use(1)

 /obj/item/stack/sheet/wetleather/microwave_act(obj/machinery/microwave/MW)
 	..()
-	var/obj/item/stack/sheet/leather/L = new(loc)
-	L.amount = amount
+	new /obj/item/stack/sheet/leather(drop_location(), amount)
 	qdel(src)
@@ -14,13 +14,12 @@
 	grind_results = list("silicon" = 20, "copper" = 5)

 /obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
-
+	var/atom/Tsec = user.drop_location()
 	if(istype(O, /obj/item/wirecutters))
-		var/obj/item/stack/cable_coil/CC = new (user.loc)
-		CC.amount = 5
+		var/obj/item/stack/cable_coil/CC = new (Tsec, 5)
 		CC.add_fingerprint(user)
 		amount--
-		var/obj/item/stack/sheet/glass/G = new (user.loc)
+		var/obj/item/stack/sheet/glass/G = new (Tsec)
 		G.add_fingerprint(user)
 		if(amount <= 0)
 			qdel(src)
@@ -28,7 +27,6 @@
 	else if(istype(O, /obj/item/stack/sheet/metal))
 		var/obj/item/stack/sheet/metal/M = O
 		if (M.use(1))
-			use(1)
 			var/obj/item/L = new /obj/item/stack/tile/light(user.loc)
 			to_chat(user, "<span class='notice'>You make a light tile.</span>")
 			L.add_fingerprint(user)
@@ -121,6 +121,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 /obj/item/stack/sheet/metal/twenty
 	amount = 20

+/obj/item/stack/sheet/metal/ten
+	amount = 10
+
 /obj/item/stack/sheet/metal/five
 	amount = 5

@@ -33,10 +33,13 @@
 		return
 	return TRUE

-/obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE)
+/obj/item/stack/Initialize(mapload, new_amount, merge = TRUE)
 	. = ..()
-	if(new_amount)
+	if(new_amount != null)
 		amount = new_amount
+	while(amount > max_amount)
+		amount -= max_amount
+		new type(loc, max_amount, FALSE)
 	if(!merge_type)
 		merge_type = type
 	if(merge)
@@ -49,7 +49,6 @@
 			on = FALSE
 			to_chat(user, "<span class='warning'>You need a free hand to hold the mister!</span>")
 			return
-		noz.forceMove(user)
 	else
 		//Remove from their hands and put back "into" the tank
 		remove_noz()
@@ -147,8 +147,7 @@
 						to_chat(user, "<span class='notice'>You remove the cables.</span>")
 						state = SCREWED_CORE
 						update_icon()
-						var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc )
-						A.amount = 5
+						new /obj/item/stack/cable_coil(drop_location(), 5)
 					return

 				if(istype(P, /obj/item/stack/sheet/rglass))
@@ -148,6 +148,8 @@
 	new /obj/item/storage/backpack/duffelbag/sec(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/rank/security(src)
+	for(var/i in 1 to 2)
+		new /obj/item/clothing/under/rank/security/skirt(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/jackboots(src)
 	for(var/i in 1 to 3)
@@ -1,115 +1,115 @@
-/obj/structure/closet/syndicate
-	name = "armory closet"
-	desc = "Why is this here?"
-	icon_state = "syndicate"
-
-/obj/structure/closet/syndicate/personal
-	desc = "It's a personal storage unit for operative gear."
-
-/obj/structure/closet/syndicate/personal/PopulateContents()
-	..()
-	new /obj/item/clothing/under/syndicate(src)
-	new /obj/item/clothing/shoes/sneakers/black(src)
-	new /obj/item/radio/headset/syndicate(src)
-	new /obj/item/ammo_box/magazine/m10mm(src)
-	new /obj/item/storage/belt/military(src)
-	new /obj/item/crowbar/red(src)
-	new /obj/item/clothing/glasses/night(src)
-
-/obj/structure/closet/syndicate/nuclear
-	desc = "It's a storage unit for a Syndicate boarding party."
-
-/obj/structure/closet/syndicate/nuclear/PopulateContents()
-	for(var/i in 1 to 5)
-		new /obj/item/ammo_box/magazine/m10mm(src)
-	new /obj/item/storage/box/flashbangs(src)
-	new /obj/item/storage/box/teargas(src)
-	new /obj/item/storage/backpack/duffelbag/syndie/med(src)
-	new /obj/item/pda/syndicate(src)
-
-/obj/structure/closet/syndicate/resources
-	desc = "An old, dusty locker."
-
-/obj/structure/closet/syndicate/resources/PopulateContents()
-	..()
-	var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
-	var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
-	var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
-	var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
-
-
-	var/pickednum = rand(1, 50)
-
-	//Sad trombone
-	if(pickednum == 1)
-		var/obj/item/paper/P = new /obj/item/paper(src)
-		P.name = "\improper IOU"
-		P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
-
-	//Metal (common ore)
-	if(pickednum >= 2)
-		new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
-
-	//Glass (common ore)
-	if(pickednum >= 5)
-		new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
-
-	//Plasteel (common ore) Because it has a million more uses then plasma
-	if(pickednum >= 10)
-		new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
-
-	//Plasma (rare ore)
-	if(pickednum >= 15)
-		new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
-
-	//Silver (rare ore)
-	if(pickednum >= 20)
-		new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
-
-	//Gold (rare ore)
-	if(pickednum >= 30)
-		new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
-
-	//Uranium (rare ore)
-	if(pickednum >= 40)
-		new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
-
-	//Titanium (rare ore)
-	if(pickednum >= 40)
-		new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
-
-	//Plastitanium (rare ore)
-	if(pickednum >= 40)
-		new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
-
-	//Diamond (rare HONK)
-	if(pickednum >= 45)
-		new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
-
-	//Jetpack (You hit the jackpot!)
-	if(pickednum == 50)
-		new /obj/item/tank/jetpack/carbondioxide(src)
-
-/obj/structure/closet/syndicate/resources/everything
-	desc = "It's an emergency storage closet for repairs."
-
-/obj/structure/closet/syndicate/resources/everything/PopulateContents()
-	var/list/resources = list(
-	/obj/item/stack/sheet/metal,
-	/obj/item/stack/sheet/glass,
-	/obj/item/stack/sheet/mineral/gold,
-	/obj/item/stack/sheet/mineral/silver,
-	/obj/item/stack/sheet/mineral/plasma,
-	/obj/item/stack/sheet/mineral/uranium,
-	/obj/item/stack/sheet/mineral/diamond,
-	/obj/item/stack/sheet/mineral/bananium,
-	/obj/item/stack/sheet/plasteel,
-	/obj/item/stack/sheet/mineral/titanium,
-	/obj/item/stack/sheet/mineral/plastitanium,
-	/obj/item/stack/rods
-	)
-
-	for(var/i = 0, i<2, i++)
-		for(var/res in resources)
-			var/obj/item/stack/R = new res(src)
-			R.amount = R.max_amount
+/obj/structure/closet/syndicate
+	name = "armory closet"
+	desc = "Why is this here?"
+	icon_state = "syndicate"
+
+/obj/structure/closet/syndicate/personal
+	desc = "It's a personal storage unit for operative gear."
+
+/obj/structure/closet/syndicate/personal/PopulateContents()
+	..()
+	new /obj/item/clothing/under/syndicate(src)
+	new /obj/item/clothing/shoes/sneakers/black(src)
+	new /obj/item/radio/headset/syndicate(src)
+	new /obj/item/ammo_box/magazine/m10mm(src)
+	new /obj/item/storage/belt/military(src)
+	new /obj/item/crowbar/red(src)
+	new /obj/item/clothing/glasses/night(src)
+
+/obj/structure/closet/syndicate/nuclear
+	desc = "It's a storage unit for a Syndicate boarding party."
+
+/obj/structure/closet/syndicate/nuclear/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/ammo_box/magazine/m10mm(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/storage/box/teargas(src)
+	new /obj/item/storage/backpack/duffelbag/syndie/med(src)
+	new /obj/item/pda/syndicate(src)
+
+/obj/structure/closet/syndicate/resources
+	desc = "An old, dusty locker."
+
+/obj/structure/closet/syndicate/resources/PopulateContents()
+	..()
+	var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
+	var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
+	var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
+	var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
+
+
+	var/pickednum = rand(1, 50)
+
+	//Sad trombone
+	if(pickednum == 1)
+		var/obj/item/paper/P = new /obj/item/paper(src)
+		P.name = "\improper IOU"
+		P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
+
+	//Metal (common ore)
+	if(pickednum >= 2)
+		new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
+
+	//Glass (common ore)
+	if(pickednum >= 5)
+		new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
+
+	//Plasteel (common ore) Because it has a million more uses then plasma
+	if(pickednum >= 10)
+		new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
+
+	//Plasma (rare ore)
+	if(pickednum >= 15)
+		new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
+
+	//Silver (rare ore)
+	if(pickednum >= 20)
+		new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
+
+	//Gold (rare ore)
+	if(pickednum >= 30)
+		new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
+
+	//Uranium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
+
+	//Titanium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
+
+	//Plastitanium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
+
+	//Diamond (rare HONK)
+	if(pickednum >= 45)
+		new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
+
+	//Jetpack (You hit the jackpot!)
+	if(pickednum == 50)
+		new /obj/item/tank/jetpack/carbondioxide(src)
+
+/obj/structure/closet/syndicate/resources/everything
+	desc = "It's an emergency storage closet for repairs."
+
+/obj/structure/closet/syndicate/resources/everything/PopulateContents()
+	var/list/resources = list(
+	/obj/item/stack/sheet/metal,
+	/obj/item/stack/sheet/glass,
+	/obj/item/stack/sheet/mineral/gold,
+	/obj/item/stack/sheet/mineral/silver,
+	/obj/item/stack/sheet/mineral/plasma,
+	/obj/item/stack/sheet/mineral/uranium,
+	/obj/item/stack/sheet/mineral/diamond,
+	/obj/item/stack/sheet/mineral/bananium,
+	/obj/item/stack/sheet/plasteel,
+	/obj/item/stack/sheet/mineral/titanium,
+	/obj/item/stack/sheet/mineral/plastitanium,
+	/obj/item/stack/rods
+	)
+
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources)
+			var/obj/item/stack/R = res
+			new res(src, initial(R.max_amount))
@@ -8,6 +8,7 @@
 	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
 	max_integrity = 50
 	layer = LATTICE_LAYER //under pipes
+	plane = FLOOR_PLANE
 	var/number_of_rods = 1
 	canSmoothWith = list(/obj/structure/lattice,
 	/turf/open/floor,
@@ -1,4 +1,5 @@
 /turf/open
+	plane = FLOOR_PLANE
 	var/slowdown = 0 //negative for faster, positive for slower

 	var/mutable_appearance/wet_overlay
@@ -95,7 +95,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)
+/client/proc/Getmob(mob/M in GLOB.mob_list - GLOB.dummy_mob_list)
 	set category = "Admin"
 	set name = "Get Mob"
 	set desc = "Mob to teleport"
@@ -708,6 +708,11 @@ structure_check() searches for nearby cultist structures required for the invoca
 		fail_invoke()
 		log_game("Summon Cultist rune failed - target died")
 		return
+	if(cultist_to_summon.pulledby || cultist_to_summon.buckled)
+		to_chat(user, "<span class='cult italic'>[cultist_to_summon] is being held in place!</span>")
+		fail_invoke()
+		log_game("Summon Cultist rune failed - target restrained")
+		return
 	if(!iscultist(cultist_to_summon))
 		to_chat(user, "<span class='cult italic'>[cultist_to_summon] is not a follower of the Geometer!</span>")
 		fail_invoke()
@@ -493,10 +493,10 @@
 	D.pixel_z = target.pixel_z
 	if(do_mob(src, target, 100))
 		to_chat(src, "<span class='info'>Dismantling complete.</span>")
-		var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc)
-		M.amount = 5
+		var/atom/Tsec = target.drop_location()
+		new /obj/item/stack/sheet/metal(Tsec, 5)
 		for(var/obj/item/I in target.component_parts)
-			I.forceMove(M.drop_location())
+			I.forceMove(Tsec)
 		var/obj/effect/temp_visual/swarmer/disintegration/N = new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
 		N.pixel_x = target.pixel_x
 		N.pixel_y = target.pixel_y
@@ -505,7 +505,7 @@
 		if(istype(target, /obj/machinery/computer))
 			var/obj/machinery/computer/C = target
 			if(C.circuit)
-				C.circuit.forceMove(M.drop_location())
+				C.circuit.forceMove(Tsec)
 		qdel(target)


@@ -34,8 +34,10 @@ Iconnery
 	var/turf/T = loc
 	if(level == 2 || !T.intact)
 		showpipe = TRUE
+		plane = GAME_PLANE
 	else
 		showpipe = FALSE
+		plane = FLOOR_PLANE

 	if(!showpipe)
 		return //no need to update the pipes if they aren't showing
@@ -157,9 +157,7 @@ GLOBAL_LIST_EMPTY(asset_datums)

 //get an assetdatum or make a new one
 /proc/get_asset_datum(var/type)
-	if (!(type in GLOB.asset_datums))
-		return new type()
-	return GLOB.asset_datums[type]
+	return GLOB.asset_datums[type] || new type()

 /datum/asset
 	var/_abstract = /datum/asset
@@ -496,12 +494,21 @@ GLOBAL_LIST_EMPTY(asset_datums)
 	)

 /datum/asset/group/goonchat
-	children = list(/datum/asset/simple/goonchat, /datum/asset/spritesheet/goonchat)
+	children = list(
+		/datum/asset/simple/jquery,
+		/datum/asset/simple/goonchat,
+		/datum/asset/spritesheet/goonchat
+	)
+
+/datum/asset/simple/jquery
+	verify = FALSE
+	assets = list(
+		"jquery.min.js"            = 'code/modules/goonchat/browserassets/js/jquery.min.js',
+	)

 /datum/asset/simple/goonchat
 	verify = FALSE
 	assets = list(
-		"jquery.min.js"            = 'code/modules/goonchat/browserassets/js/jquery.min.js',
 		"json2.min.js"             = 'code/modules/goonchat/browserassets/js/json2.min.js',
 		"errorHandler.js"          = 'code/modules/goonchat/browserassets/js/errorHandler.js',
 		"browserOutput.js"         = 'code/modules/goonchat/browserassets/js/browserOutput.js',
@@ -83,12 +83,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		//Mob preview
 	var/icon/preview_icon = null

-		//Trait list
-	var/list/positive_traits = list()
-	var/list/negative_traits = list()
-	var/list/neutral_traits = list()
-	var/list/all_traits = list()
-	var/list/character_traits = list()
+		//Quirk list
+	var/list/positive_quirks = list()
+	var/list/negative_quirks = list()
+	var/list/neutral_quirks = list()
+	var/list/all_quirks = list()
+	var/list/character_quirks = list()

 		//Jobs, uses bitflags
 	var/job_civilian_high = 0
@@ -120,6 +120,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 	var/parallax

+	var/ambientocclusion = TRUE
+
 	var/uplink_spawn_loc = UPLINK_PDA

 	var/list/exp = list()
@@ -193,9 +195,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<center><h2>Occupation Choices</h2>"
 			dat += "<a href='?_src_=prefs;preference=job;task=menu'>Set Occupation Preferences</a><br></center>"
 			if(CONFIG_GET(flag/roundstart_traits))
-				dat += "<center><h2>Trait Setup</h2>"
-				dat += "<a href='?_src_=prefs;preference=trait;task=menu'>Configure Traits</a><br></center>"
-				dat += "<center><b>Current traits:</b> [all_traits.len ? all_traits.Join(", ") : "None"]</center>"
+				dat += "<center><h2>Quirk Setup</h2>"
+				dat += "<a href='?_src_=prefs;preference=trait;task=menu'>Configure Quirks</a><br></center>"
+				dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
 			dat += "<h2>Identity</h2>"
 			dat += "<table width='100%'><tr><td width='75%' valign='top'>"
 			if(jobban_isbanned(user, "appearance"))
@@ -490,6 +492,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "High"
 			dat += "</a><br>"

+			dat += "<b>Ambient Occlusion:</b> <a href='?_src_=prefs;preference=ambientocclusion'>[ambientocclusion ? "Enabled" : "Disabled"]</a><br>"
+
 			dat += "</td><td width='300px' height='300px' valign='top'>"

 			dat += "<h2>Special Role Settings</h2>"
@@ -855,20 +859,20 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					return job_engsec_low
 	return 0

-/datum/preferences/proc/SetTraits(mob/user)
-	if(!SStraits)
-		to_chat(user, "<span class='danger'>The trait subsystem is still initializing! Try again in a minute.</span>")
+/datum/preferences/proc/SetQuirks(mob/user)
+	if(!SSquirks)
+		to_chat(user, "<span class='danger'>The quirk subsystem is still initializing! Try again in a minute.</span>")
 		return

 	var/list/dat = list()
-	if(!SStraits.traits.len)
-		dat += "The trait subsystem hasn't finished initializing, please hold..."
+	if(!SSquirks.quirks.len)
+		dat += "The quirk subsystem hasn't finished initializing, please hold..."
 		dat += "<center><a href='?_src_=prefs;preference=trait;task=close'>Done</a></center><br>"

 	else
-		dat += "<center><b>Choose trait setup</b></center><br>"
-		dat += "<div align='center'>Left-click to add or remove traits. You need one negative trait for every positive trait.<br>\
-		Traits are applied at roundstart and cannot normally be removed.</div>"
+		dat += "<center><b>Choose quirk setup</b></center><br>"
+		dat += "<div align='center'>Left-click to add or remove quirks. You need negative quirks to have positive ones.<br>\
+		Quirks are applied at roundstart and cannot normally be removed.</div>"
 		dat += "<center><a href='?_src_=prefs;preference=trait;task=close'>Done</a></center>"
 		dat += "<hr>"
 		dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
@@ -880,47 +884,47 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			var/has_quirk
 			var/quirk_cost = initial(T.value) * -1
 			var/lock_reason = "This trait is unavailable."
-			var/trait_conflict = FALSE
-			for(var/_V in all_traits)
-				if(_V == trait_name)
-					has_trait = TRUE
-			if(initial(T.mood_trait) && CONFIG_GET(flag/disable_human_mood))
+			var/quirk_conflict = FALSE
+			for(var/_V in all_quirks)
+				if(_V == quirk_name)
+					has_quirk = TRUE
+			if(initial(T.mood_quirk) && CONFIG_GET(flag/disable_human_mood))
 				lock_reason = "Mood is disabled."
-				trait_conflict = TRUE
-			if(has_trait)
-				if(trait_conflict)
-					all_traits -= trait_name
-					has_trait = FALSE
+				quirk_conflict = TRUE
+			if(has_quirk)
+				if(quirk_conflict)
+					all_quirks -= quirk_name
+					has_quirk = FALSE
 				else
-					trait_cost *= -1 //invert it back, since we'd be regaining this amount
-			if(trait_cost > 0)
-				trait_cost = "+[trait_cost]"
+					quirk_cost *= -1 //invert it back, since we'd be regaining this amount
+			if(quirk_cost > 0)
+				quirk_cost = "+[quirk_cost]"
 			var/font_color = "#AAAAFF"
 			if(initial(T.value) != 0)
 				font_color = initial(T.value) > 0 ? "#AAFFAA" : "#FFAAAA"
-			if(trait_conflict)
-				dat += "<font color='[font_color]'>[trait_name]</font> - [initial(T.desc)] \
+			if(quirk_conflict)
+				dat += "<font color='[font_color]'>[quirk_name]</font> - [initial(T.desc)] \
 				<font color='red'><b>LOCKED: [lock_reason]</b></font><br>"
 			else
-				if(has_trait)
-					dat += "<b><font color='[font_color]'>[trait_name]</font></b> - [initial(T.desc)] \
-					<a href='?_src_=prefs;preference=trait;task=update;trait=[trait_name]'>[has_trait ? "Lose" : "Take"] ([trait_cost] pts.)</a><br>"
+				if(has_quirk)
+					dat += "<b><font color='[font_color]'>[quirk_name]</font></b> - [initial(T.desc)] \
+					<a href='?_src_=prefs;preference=trait;task=update;trait=[quirk_name]'>[has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.)</a><br>"
 				else
-					dat += "<font color='[font_color]'>[trait_name]</font> - [initial(T.desc)] \
-					<a href='?_src_=prefs;preference=trait;task=update;trait=[trait_name]'>[has_trait ? "Lose" : "Take"] ([trait_cost] pts.)</a><br>"
+					dat += "<font color='[font_color]'>[quirk_name]</font> - [initial(T.desc)] \
+					<a href='?_src_=prefs;preference=trait;task=update;trait=[quirk_name]'>[has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.)</a><br>"
 		dat += "<br><center><a href='?_src_=prefs;preference=trait;task=reset'>Reset Traits</a></center>"

 	user << browse(null, "window=preferences")
-	var/datum/browser/popup = new(user, "mob_occupation", "<div align='center'>Trait Preferences</div>", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
+	var/datum/browser/popup = new(user, "mob_occupation", "<div align='center'>Quirk Preferences</div>", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
 	popup.set_window_options("can_close=0")
 	popup.set_content(dat.Join())
 	popup.open(0)
 	return

-/datum/preferences/proc/GetTraitBalance()
+/datum/preferences/proc/GetQuirkBalance()
 	var/bal = 0
-	for(var/V in all_traits)
-		var/datum/trait/T = SStraits.traits[V]
+	for(var/V in all_quirks)
+		var/datum/quirk/T = SSquirks.quirks[V]
 		bal -= initial(T.value)
 	return bal

@@ -977,49 +981,49 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				user << browse(null, "window=mob_occupation")
 				ShowChoices(user)
 			if("update")
-				var/trait = href_list["trait"]
-				if(!SStraits.traits[trait])
+				var/quirk = href_list["trait"]
+				if(!SSquirks.quirks[quirk])
 					return
-				var/value = SStraits.trait_points[trait]
+				var/value = SSquirks.quirk_points[quirk]
 				if(value == 0)
-					if(trait in neutral_traits)
-						neutral_traits -= trait
-						all_traits -= trait
+					if(quirk in neutral_quirks)
+						neutral_quirks -= quirk
+						all_quirks -= quirk
 					else
 						neutral_quirks += quirk
 						all_quirks += quirk
 				else
-					var/balance = GetTraitBalance()
-					if(trait in positive_traits)
-						positive_traits -= trait
-						all_traits -= trait
-					else if(trait in negative_traits)
+					var/balance = GetQuirkBalance()
+					if(quirk in positive_quirks)
+						positive_quirks -= quirk
+						all_quirks -= quirk
+					else if(quirk in negative_quirks)
 						if(balance + value < 0)
 							to_chat(user, "<span class='warning'>Refunding this would cause you to go below your balance!</span>")
 							return
-						negative_traits -= trait
-						all_traits -= trait
+						negative_quirks -= quirk
+						all_quirks -= quirk
 					else if(value > 0)
 						if(positive_quirks.len >= MAX_QUIRKS)
 							to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] positive quirks!</span>")
 							return
 						if(balance - value < 0)
-							to_chat(user, "<span class='warning'>You don't have enough balance to gain this trait!</span>")
+							to_chat(user, "<span class='warning'>You don't have enough balance to gain this quirk!</span>")
 							return
-						positive_traits += trait
-						all_traits += trait
+						positive_quirks += quirk
+						all_quirks += quirk
 					else
 						negative_quirks += quirk
 						all_quirks += quirk
 				SetQuirks(user)
 			if("reset")
-				all_traits = list()
-				positive_traits = list()
-				negative_traits = list()
-				neutral_traits = list()
-				SetTraits(user)
+				all_quirks = list()
+				positive_quirks = list()
+				negative_quirks = list()
+				neutral_quirks = list()
+				SetQuirks(user)
 			else
-				SetTraits(user)
+				SetQuirks(user)
 		return TRUE

 	switch(href_list["task"])
@@ -1529,6 +1533,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					cit_toggles ^= DIGESTION_NOISES
 				//END CITADEL EDIT

+				if("ambientocclusion")
+					ambientocclusion = !ambientocclusion
+					if(parent && parent.screen && parent.screen.len)
+						var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
+						PM.filters -= AMBIENT_OCCLUSION
+						if(ambientocclusion)
+							PM.filters += AMBIENT_OCCLUSION
+
 				if("save")
 					save_preferences()
 					save_character()
@@ -130,6 +130,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["uses_glasses_colour"]>> uses_glasses_colour
 	S["clientfps"]			>> clientfps
 	S["parallax"]			>> parallax
+	S["ambientocclusion"]	>> ambientocclusion
 	S["menuoptions"]		>> menuoptions
 	S["enable_tips"]		>> enable_tips
 	S["tip_delay"]			>> tip_delay
@@ -160,6 +161,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	toggles			= sanitize_integer(toggles, 0, 65535, initial(toggles))
 	clientfps		= sanitize_integer(clientfps, 0, 1000, 0)
 	parallax		= sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
+	ambientocclusion	= sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
 	ghost_form		= sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form))
 	ghost_orbit 	= sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit))
 	ghost_accs		= sanitize_inlist(ghost_accs, GLOB.ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION)
@@ -210,6 +212,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["uses_glasses_colour"], uses_glasses_colour)
 	WRITE_FILE(S["clientfps"], clientfps)
 	WRITE_FILE(S["parallax"], parallax)
+	WRITE_FILE(S["ambientocclusion"], ambientocclusion)
 	WRITE_FILE(S["menuoptions"], menuoptions)
 	WRITE_FILE(S["enable_tips"], enable_tips)
 	WRITE_FILE(S["tip_delay"], tip_delay)
@@ -310,11 +313,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["job_engsec_med"]		>> job_engsec_med
 	S["job_engsec_low"]		>> job_engsec_low

-	//Traits
-	S["all_traits"]			>> all_traits
-	S["positive_traits"]	>> positive_traits
-	S["negative_traits"]	>> negative_traits
-	S["neutral_traits"]		>> neutral_traits
+	//Quirks
+	S["all_quirks"]			>> all_quirks
+	S["positive_quirks"]	>> positive_quirks
+	S["negative_quirks"]	>> negative_quirks
+	S["neutral_quirks"]		>> neutral_quirks

 	//Citadel code
 	S["feature_genitals_use_skintone"]	>> features["genitals_use_skintone"]
@@ -421,10 +424,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	job_engsec_med = sanitize_integer(job_engsec_med, 0, 65535, initial(job_engsec_med))
 	job_engsec_low = sanitize_integer(job_engsec_low, 0, 65535, initial(job_engsec_low))

-	all_traits = SANITIZE_LIST(all_traits)
-	positive_traits = SANITIZE_LIST(positive_traits)
-	negative_traits = SANITIZE_LIST(negative_traits)
-	neutral_traits = SANITIZE_LIST(neutral_traits)
+	all_quirks = SANITIZE_LIST(all_quirks)
+	positive_quirks = SANITIZE_LIST(positive_quirks)
+	negative_quirks = SANITIZE_LIST(negative_quirks)
+	neutral_quirks = SANITIZE_LIST(neutral_quirks)

 	cit_character_pref_load(S)

@@ -491,11 +494,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["job_engsec_med"]		, job_engsec_med)
 	WRITE_FILE(S["job_engsec_low"]		, job_engsec_low)

-	//Traits
-	WRITE_FILE(S["all_traits"]		, all_traits)
-	WRITE_FILE(S["positive_traits"]		, positive_traits)
-	WRITE_FILE(S["negative_traits"]		, negative_traits)
-	WRITE_FILE(S["neutral_traits"]		, neutral_traits)
+	//Quirks
+	WRITE_FILE(S["all_quirks"]			, all_quirks)
+	WRITE_FILE(S["positive_quirks"]		, positive_quirks)
+	WRITE_FILE(S["negative_quirks"]		, negative_quirks)
+	WRITE_FILE(S["neutral_quirks"]		, neutral_quirks)

 	cit_character_pref_save(S)

@@ -126,7 +126,7 @@
 		if(user.transferItemToLoc(I, src))
 			jetpack = I
 			to_chat(user, "<span class='notice'>You successfully install the jetpack into [src].</span>")
-
+			return
 	else if(istype(I, /obj/item/screwdriver))
 		if(!jetpack)
 			to_chat(user, "<span class='warning'>[src] has no jetpack installed.</span>")
@@ -139,6 +139,8 @@
 		jetpack.forceMove(drop_location())
 		jetpack = null
 		to_chat(user, "<span class='notice'>You successfully remove the jetpack from [src].</span>")
+		return
+	return ..()


 /obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot)
@@ -237,6 +239,9 @@
 	brightness_on = 7
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)

+/obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize()
+	. = ..()
+	AddComponent(/datum/component/armor_plate)

 /obj/item/clothing/suit/space/hardsuit/mining
 	icon_state = "hardsuit-mining"
@@ -250,6 +255,10 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS

+/obj/item/clothing/suit/space/hardsuit/mining/Initialize()
+	. = ..()
+	AddComponent(/datum/component/armor_plate)
+
 	//Syndicate hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi
 	name = "blood-red hardsuit helmet"
@@ -28,6 +28,14 @@
 	item_state = "gy_suit"
 	item_color = "security"

+/obj/item/clothing/under/rank/security/skirt
+	name = "security jumpskirt"
+	desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
+	icon_state = "secskirt"
+	item_state = "r_suit"
+	item_color = "secskirt"
+	can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone
+

 /obj/item/clothing/under/rank/warden
 	name = "security suit"
@@ -344,6 +344,15 @@
 	list_reagents = list("limejuice" = 100)
 	foodtype = FRUIT

+/obj/item/reagent_containers/food/drinks/bottle/menthol
+	name = "menthol"
+	desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
+	icon_state = "mentholbox"
+	item_state = "carton"
+	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+	isGlass = FALSE
+	list_reagents = list("menthol" = 100)

 ////////////////////////// MOLOTOV ///////////////////////
 /obj/item/reagent_containers/food/drinks/bottle/molotov
@@ -158,7 +158,7 @@
 	desc = "A timeless classic."
 	ingredients_placement = INGREDIENTS_STACKPLUSTOP
 	icon = 'icons/obj/food/burgerbread.dmi'
-	icon_state = "bun"
+	icon_state = "custburg"
 	foodtype = GRAIN


@@ -299,8 +299,7 @@
 			qdel(S)
 		return TRUE
 	for(var/obj/item/stack/sheet/wetleather/WL in src)
-		var/obj/item/stack/sheet/leather/L = new(drop_location())
-		L.amount = WL.amount
+		new /obj/item/stack/sheet/leather(drop_location(), WL.amount)
 		qdel(WL)
 		return TRUE
 	return FALSE
@@ -623,4 +623,42 @@
 	id = "crevice_spike"
 	results = list("crevice_spike" = 6)
 	required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy)
-	mix_message = "The mixture stings your eyes as it settles."
+	mix_message = "The mixture stings your eyes as it settles."
+
+/datum/chemical_reaction/sake
+	name = "sake"
+	id = "sake"
+	results = list("sake" = 10)
+	required_reagents = list("rice" = 10)
+	required_catalysts = list("enzyme" = 5)
+	mix_message = "The rice grains ferment into a clear, sweet-smelling liquid."
+
+/datum/chemical_reaction/alexander
+	name = "Alexander"
+	id = "alexander"
+	results = list("alexander" = 3)
+	required_reagents = list("cognac" = 1, "creme_de_cacao" = 1, "cream" = 1)
+
+/datum/chemical_reaction/sidecar
+	name = "Sidecar"
+	id = "sidecar"
+	results = list("sidecar" = 4)
+	required_reagents = list("cognac" = 2, "triple_sec" = 1, "lemonjuice" = 1)
+
+/datum/chemical_reaction/between_the_sheets
+	name = "Between the Sheets"
+	id = "between_the_sheets"
+	results = list("between_the_sheets" = 5)
+	required_reagents = list("rum" = 1, "sidecar" = 4)
+
+/datum/chemical_reaction/kamikaze
+	name = "Kamikaze"
+	id = "kamikaze"
+	results = list("kamikaze" = 3)
+	required_reagents = list("vodka" = 1, "triple_sec" = 1, "limejuice" = 1)
+
+/datum/chemical_reaction/mojito
+	name = "Mojito"
+	id = "mojito"
+	results = list("mojito" = 5)
+	required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
@@ -262,8 +262,7 @@
 		if(!check_cost(D.materials, amount))
 			return FALSE

-		var/obj/item/stack/product = new D.build_path(loc)
-		product.amount = amount
+		new D.build_path(drop_location(), amount)
 		for(var/R in D.make_reagents)
 			beaker.reagents.add_reagent(R, D.make_reagents[R]*amount)
 	else
@@ -85,14 +85,15 @@
 			interact(user)
 		return
 	else if(istype(I, /obj/item/disk/plantgene))
-		if(disk)
-			to_chat(user, "<span class='warning'>A data disk is already loaded into the machine!</span>")
-		else
-			if(!user.transferItemToLoc(I, src))
-				return
-			disk = I
-			to_chat(user, "<span class='notice'>You add [I] to the machine.</span>")
-			interact(user)
+		if (operation)
+			to_chat(user, "<span class='notice'>Please complete current operation.</span>")
+			return
+		eject_disk()
+		if(!user.transferItemToLoc(I, src))
+			return
+		disk = I
+		to_chat(user, "<span class='notice'>You add [I] to the machine.</span>")
+		interact(user)
 	else
 		..()

@@ -266,18 +267,13 @@
 				to_chat(usr, "<span class='notice'>You add [I] to the machine.</span>")
 		update_icon()
 	else if(href_list["eject_disk"] && !operation)
-		if (disk)
-			disk.forceMove(drop_location())
-			disk.verb_pickup()
-			disk = null
-			update_genes()
-		else
-			var/obj/item/I = usr.get_active_held_item()
-			if(istype(I, /obj/item/disk/plantgene))
-				if(!usr.transferItemToLoc(I, src))
-					return
-				disk = I
-				to_chat(usr, "<span class='notice'>You add [I] to the machine.</span>")
+		var/obj/item/I = usr.get_active_held_item()
+		eject_disk()
+		if(istype(I, /obj/item/disk/plantgene))
+			if(!usr.transferItemToLoc(I, src))
+				return
+			disk = I
+			to_chat(usr, "<span class='notice'>You add [I] to the machine.</span>")
 	else if(href_list["op"] == "insert" && disk && disk.gene && seed)
 		if(!operation) // Wait for confirmation
 			operation = "insert"
@@ -365,6 +361,16 @@
 	update_genes()
 	update_icon()

+/obj/machinery/plantgenes/proc/eject_disk()
+	if (disk && !operation)
+		if(Adjacent(usr) && !issilicon(usr))
+			if (!usr.put_in_hands(disk))
+				disk.forceMove(drop_location())
+		else
+			disk.forceMove(drop_location())
+		disk = null
+		update_genes()
+
 /obj/machinery/plantgenes/proc/update_genes()
 	core_genes = list()
 	reagent_genes = list()
@@ -36,19 +36,8 @@
 			continue
 		grassAmt += 1 + round(G.seed.potency * tile_coefficient)
 		qdel(G)
-	var/obj/item/stack/tile/GT = new stacktype(user.loc)
-	while(grassAmt > GT.max_amount)
-		GT.amount = GT.max_amount
-		grassAmt -= GT.max_amount
-		GT = new stacktype(user.loc)
-	GT.amount = grassAmt
-	for(var/obj/item/stack/tile/T in user.loc)
-		if((T.type == stacktype) && (T.amount < T.max_amount))
-			GT.merge(T)
-			if(GT.amount <= 0)
-				break
+	new stacktype(user.drop_location(), grassAmt)
 	qdel(src)
-	return

 // Carpet
 /obj/item/seeds/grass/carpet
@@ -22,7 +22,7 @@
 	var/blood_type = null
 	var/list/features = null
 	var/factions = null
-	var/list/traits = null
+	var/list/quirks = null
 	var/contains_sample = 0

 /obj/item/seeds/replicapod/Initialize()
@@ -42,7 +42,7 @@
 				blood_type = B.data["blood_type"]
 				features = B.data["features"]
 				factions = B.data["factions"]
-				factions = B.data["traits"]
+				factions = B.data["quirks"]
 				contains_sample = TRUE
 				visible_message("<span class='notice'>The [src] is injected with a fresh blood sample.</span>")
 			else
@@ -114,7 +114,7 @@
 		podman.faction |= factions
 		if(!features["mcolor"])
 			features["mcolor"] = "#59CE00"
-		for(var/V in traits)
+		for(var/V in quirks)
 			new V(podman)
 		podman.hardset_dna(null,null,podman.real_name,blood_type, new /datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
 		podman.set_cloned_appearance()
@@ -25,6 +25,14 @@
 	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
 	resistance_flags = FIRE_PROOF

+/obj/item/clothing/suit/hooded/explorer/Initialize()
+	. = ..()
+	AddComponent(/datum/component/armor_plate)
+
+/obj/item/clothing/head/hooded/explorer/Initialize()
+	. = ..()
+	AddComponent(/datum/component/armor_plate)
+
 /obj/item/clothing/mask/gas/explorer
 	name = "explorer gas mask"
 	desc = "A military-grade gas mask that can be connected to an air supply."
@@ -9,38 +9,4 @@
 	novariants = FALSE
 	flags_1 = NOBLUDGEON_1
 	w_class = WEIGHT_CLASS_NORMAL
-	layer = MOB_LAYER
-	var/static/list/goliath_platable_armor_typecache = typecacheof(list(
-	/obj/item/clothing/head/helmet/space/hardsuit/mining,
-	/obj/item/clothing/suit/space/hardsuit/mining,
-	/obj/item/clothing/head/hooded/explorer,
-	/obj/item/clothing/suit/hooded/explorer))
-
-/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
-	if(!proximity_flag)
-		return
-	if(is_type_in_typecache(target, goliath_platable_armor_typecache))
-		var/obj/item/clothing/C = target
-		if(C.armor.melee < 60)
-			C.armor = C.armor.setRating(melee = min(C.armor.melee + 10, 60))
-			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
-			use(1)
-		else
-			to_chat(user, "<span class='warning'>You can't improve [C] any further!</span>")
-	else if(istype(target, /obj/mecha/working/ripley))
-		var/obj/mecha/working/ripley/D = target
-		if(D.hides < 3)
-			D.hides++
-			D.armor = D.armor.setRating(\
-				melee = min(D.armor.melee + 10, 70),\
-				bullet = min(D.armor.bullet + 5, 50),\
-				laser = min(D.armor.laser + 5, 50))
-			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
-			D.update_icon()
-			if(D.hides == 3)
-				D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter."
-			else
-				D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
-			use(1)
-		else
-			to_chat(user, "<span class='warning'>You can't improve [D] any further!</span>")
+	layer = MOB_LAYER
@@ -303,13 +303,12 @@
 					desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num
 				var/amount = round(min(desired,50,smelt_amount))
 				materials.use_amount(alloy.materials, amount)
-				var/output = new alloy.build_path(src)
-				if(istype(output, /obj/item/stack/sheet))
-					var/obj/item/stack/sheet/produced_alloy = output
-					produced_alloy.amount = amount
-					unload_mineral(produced_alloy)
+				var/output
+				if(ispath(alloy.build_path, /obj/item/stack/sheet))
+					output = new alloy.build_path(src, amount)
 				else
-					unload_mineral(output)
+					output = new alloy.build_path(src)
+				unload_mineral(output)
 			else
 				to_chat(usr, "<span class='warning'>Required access not found.</span>")
 			return TRUE
@@ -44,8 +44,7 @@
 		if(!(text2path(href_list["release"]) in machine.stack_list))
 			return //someone tried to spawn materials by spoofing hrefs
 		var/obj/item/stack/sheet/inp = machine.stack_list[text2path(href_list["release"])]
-		var/obj/item/stack/sheet/out = new inp.type()
-		out.amount = inp.amount
+		var/obj/item/stack/sheet/out = new inp.type(null, inp.amount)
 		inp.amount = 0
 		machine.unload_mineral(out)

@@ -81,14 +80,12 @@

 /obj/machinery/mineral/stacking_machine/proc/process_sheet(obj/item/stack/sheet/inp)
 	if(!(inp.type in stack_list)) //It's the first of this sheet added
-		var/obj/item/stack/sheet/s = new inp.type(src,0)
-		s.amount = 0
+		var/obj/item/stack/sheet/s = new inp.type(src, 0)
 		stack_list[inp.type] = s
 	var/obj/item/stack/sheet/storage = stack_list[inp.type]
 	storage.amount += inp.amount //Stack the sheets
 	qdel(inp) //Let the old sheet garbage collect
 	while(storage.amount > stack_amt) //Get rid of excessive stackage
-		var/obj/item/stack/sheet/out = new inp.type()
-		out.amount = stack_amt
+		var/obj/item/stack/sheet/out = new inp.type(null, stack_amt)
 		unload_mineral(out)
 		storage.amount -= stack_amt
@@ -400,7 +400,7 @@
 						SSticker.mode.make_antag_chance(humanc)

 	if(humanc && CONFIG_GET(flag/roundstart_traits))
-		SStraits.AssignTraits(humanc, humanc.client, TRUE)
+		SSquirks.AssignQuirks(humanc, humanc.client, TRUE)

 	log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)

@@ -592,6 +592,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp

 	var/list/possessible = list()
 	for(var/mob/living/L in GLOB.alive_mob_list)
+		if(istype(L,/mob/living/carbon/human/dummy) || !get_turf(L)) //Haha no.
+			continue
 		if(!(L in GLOB.player_list) && !L.mind)
 			possessible += L

@@ -193,10 +193,10 @@
 		blood_data["real_name"] = real_name
 		blood_data["features"] = dna.features
 		blood_data["factions"] = faction
-		blood_data["traits"] = list()
-		for(var/V in roundstart_traits)
-			var/datum/trait/T = V
-			blood_data["traits"] += T.type
+		blood_data["quirks"] = list()
+		for(var/V in roundstart_quirks)
+			var/datum/quirk/T = V
+			blood_data["quirks"] += T.type
 		return blood_data

 //get the id of the substance this mob use as blood.
@@ -19,6 +19,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)

 //Inefficient pooling/caching way.
 GLOBAL_LIST_EMPTY(human_dummy_list)
+GLOBAL_LIST_EMPTY(dummy_mob_list)

 /proc/generate_or_wait_for_human_dummy(slotkey)
 	if(!slotkey)
@@ -31,6 +32,7 @@ GLOBAL_LIST_EMPTY(human_dummy_list)
 	if(QDELETED(D))
 		D = new
 		GLOB.human_dummy_list[slotkey] = D
+		GLOB.dummy_mob_list += D
 	D.in_use = TRUE
 	return D

@@ -733,8 +733,8 @@
 				if(0 to NUTRITION_LEVEL_STARVING)
 					to_chat(src, "<span class='danger'>You're starving!</span>")

-			if(roundstart_traits.len)
-				to_chat(src, "<span class='notice'>You have these traits: [get_trait_string()].</span>")
+			if(roundstart_quirks.len)
+				to_chat(src, "<span class='notice'>You have these quirks: [get_trait_string()].</span>")
 		else
 			if(wear_suit)
 				wear_suit.add_fingerprint(M)
@@ -492,6 +492,11 @@
 	ExtinguishMob()
 	fire_stacks = 0
 	update_canmove()
+	GET_COMPONENT(mood, /datum/component/mood)
+	if (mood)
+		QDEL_LIST(mood.mood_events)
+		mood.sanity = SANITY_GREAT
+		mood.update_mood()


 //proc called by revive(), to check if we can actually ressuscitate the mob (we don't want to revive him and have him instantly die again)
@@ -34,7 +34,7 @@

 	var/list/status_traits = list()

-	var/list/roundstart_traits = list()
+	var/list/roundstart_quirks = list()

 	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.

@@ -164,12 +164,7 @@
 	update_controls()

 /mob/living/simple_animal/bot/floorbot/proc/empty_tiles()
-	var/atom/Tsec = drop_location()
-
-	while(specialtiles > initial(tiletype.max_amount))
-		new tiletype(Tsec,initial(tiletype.max_amount))
-		specialtiles -= initial(tiletype.max_amount)
-	new tiletype(Tsec,specialtiles)
+	new tiletype(drop_location(), specialtiles)
 	specialtiles = 0
 	tiletype = null

@@ -378,8 +373,7 @@
 	if(prob(50))
 		drop_part(robot_arm, Tsec)

-	var/obj/item/stack/tile/plasteel/T = new (Tsec)
-	T.amount = 1
+	new /obj/item/stack/tile/plasteel(Tsec, 1)

 	do_sparks(3, TRUE, src)
 	..()
@@ -9,7 +9,7 @@
 	icon_dead = "Fugu_dead"
 	icon_gib = "syndicate_gib"
 	mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
-	mouse_opacity = MOUSE_OPACITY_OPAQUE
+	mouse_opacity = MOUSE_OPACITY_ICON
 	move_to_delay = 5
 	friendly = "floats near"
 	speak_emote = list("puffs")
@@ -146,12 +146,12 @@
 	else
 		status_traits[trait] |= list(source)

-/mob/living/proc/add_trait_datum(trait, spawn_effects) //separate proc due to the way these ones are handled
-	if(has_trait(trait))
+/mob/living/proc/add_quirk(quirk, spawn_effects) //separate proc due to the way these ones are handled
+	if(has_trait(quirk))
 		return
-	if(!SStraits || !SStraits.traits[trait])
+	if(!SSquirks || !SSquirks.quirks[quirk])
 		return
-	var/datum/trait/T = SStraits.traits[trait]
+	var/datum/quirk/T = SSquirks.quirks[quirk]
 	new T (src, spawn_effects)
 	return TRUE

@@ -180,8 +180,8 @@
 	if(!LAZYLEN(status_traits[trait]))
 		status_traits -= trait

-/mob/living/proc/remove_trait_datum(trait)
-	var/datum/trait/T = roundstart_traits[trait]
+/mob/living/proc/remove_quirk(quirk)
+	var/datum/quirk/T = roundstart_quirks[quirk]
 	if(T)
 		qdel(T)
 		return TRUE
@@ -201,8 +201,8 @@
 	else if(LAZYLEN(status_traits[trait]))
 		return TRUE

-/mob/living/proc/has_trait_datum(trait)
-	return roundstart_traits[trait]
+/mob/living/proc/has_quirk(quirk)
+	return roundstart_quirks[quirk]

 /mob/living/proc/remove_all_traits()
 	status_traits = list()
@@ -70,7 +70,7 @@

 	message = src.say_quote(message, get_spans())
 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
-
+	log_message("DEAD: [message]", INDIVIDUAL_SAY_LOG)
 	deadchat_broadcast(rendered, follow_target = src, speaker_key = K)

 /mob/proc/check_emote(message)
@@ -111,13 +111,8 @@

 /obj/machinery/power/port_gen/pacman/DropFuel()
 	if(sheets)
-		var/fail_safe = FALSE
-		while(sheets > 0 && fail_safe < 100)
-			fail_safe += 1
-			var/obj/item/stack/sheet/S = new sheet_path(loc)
-			var/amount = min(sheets, S.max_amount)
-			S.amount = amount
-			sheets -= amount
+		new sheet_path(drop_location(), sheets)
+		sheets = 0

 /obj/machinery/power/port_gen/pacman/UseFuel()
 	var/needed_sheets = 1 / (time_per_sheet * consumption / power_output)
@@ -191,12 +191,12 @@

 // Give back the glass type we were supplied with
 /obj/item/solar_assembly/proc/give_glass(device_broken)
+	var/atom/Tsec = drop_location()
 	if(device_broken)
-		new /obj/item/shard(loc)
-		new /obj/item/shard(loc)
+		new /obj/item/shard(Tsec)
+		new /obj/item/shard(Tsec)
 	else if(glass_type)
-		var/obj/item/stack/sheet/S = new glass_type(loc)
-		S.amount = 2
+		new glass_type(Tsec, 2)
 	glass_type = null


@@ -40,7 +40,6 @@
 					to_chat(user, "<span class='warning'>You need a free hand to hold the gun!</span>")
 					return
 				update_icon()
-				gun.forceMove(user)
 				user.update_inv_back()
 		else
 			to_chat(user, "<span class='warning'>You are already holding the gun!</span>")
@@ -433,7 +433,8 @@ obj/machinery/chem_dispenser/proc/work_animation()
 		"orangejuice",
 		"limejuice",
 		"tomatojuice",
-		"lemonjuice"
+		"lemonjuice",
+		"menthol"
 	)
 	emagged_reagents = list(
 		"thirteenloko",
@@ -465,7 +466,8 @@ obj/machinery/chem_dispenser/proc/work_animation()
 		"hcider",
 		"creme_de_menthe",
 		"creme_de_cacao",
-		"triple_sec"
+		"triple_sec",
+		"sake"
 	)
 	emagged_reagents = list(
 		"ethanol",
@@ -499,3 +501,17 @@ obj/machinery/chem_dispenser/proc/work_animation()
 		"ammonia",
 		"ash",
 		"diethylamine")
+
+/obj/machinery/chem_dispenser/fullupgrade //fully upgraded stock parts
+	
+/obj/machinery/chem_dispenser/fullupgrade/Initialize()
+	. = ..()
+	component_parts = list()
+	component_parts += new /obj/item/circuitboard/machine/chem_dispenser(null)
+	component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
+	component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
+	component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
+	component_parts += new /obj/item/stock_parts/manipulator/femto(null)
+	component_parts += new /obj/item/stack/sheet/glass(null)
+	component_parts += new /obj/item/stock_parts/cell/bluespace(null)
+	RefreshParts()
@@ -0,0 +1,85 @@
+/obj/machinery/chem_dispenser/chem_synthesizer //formerly SCP-294 made by mrty, but now only for testing purposes
+	name = "\improper debug chemical synthesizer"
+	desc = "If you see this, yell at adminbus."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "dispenser"
+	amount = 10
+	resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
+	working_state = null
+	nopower_state = null
+	flags_1 = NODECONSTRUCT_1
+	var/static/list/shortcuts = list(
+		"meth" = "methamphetamine",
+		"tricord" = "tricordrazine"
+	)
+	var/mutable_appearance/top_overlay
+
+/obj/machinery/chem_dispenser/chem_synthesizer/Initialize()
+	. = ..()
+	GLOB.poi_list += src
+	top_overlay = mutable_appearance(icon, "disp_beaker", layer = ABOVE_ALL_MOB_LAYER)
+	update_icon()
+
+/obj/machinery/chem_dispenser/chem_synthesizer/update_icon()
+	cut_overlays()
+	add_overlay(top_overlay)
+
+/obj/machinery/chem_dispenser/chem_synthesizer/Destroy()
+	. = ..()
+	GLOB.poi_list -= src
+	QDEL_NULL(top_overlay)
+
+/obj/machinery/chem_dispenser/chem_synthesizer/display_beaker()
+	return
+
+/obj/machinery/chem_dispenser/chem_synthesizer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "chem_synthesizer", name, 390, 315, master_ui, state)
+		ui.open()
+
+/obj/machinery/chem_dispenser/chem_synthesizer/ui_act(action, params)
+	if(..())
+		return
+	update_icon()
+	switch(action)
+		if("ejectBeaker")
+			if(beaker)
+				beaker.forceMove(drop_location())
+				if(Adjacent(usr) && !issilicon(usr))
+					usr.put_in_hands(beaker)
+				beaker = null
+				. = TRUE
+		if("input")
+			var/input_reagent = replacetext(lowertext(input("Enter the name of any liquid", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name
+			if(shortcuts[input_reagent])
+				input_reagent = shortcuts[input_reagent]
+			else
+				input_reagent = find_reagent(input_reagent)
+			if(!input_reagent || !GLOB.chemical_reagents_list[input_reagent])
+				say("OUT OF RANGE")
+				return
+			else
+				if(!beaker)
+					return
+				else if(!beaker.reagents && !QDELETED(beaker))
+					beaker.create_reagents(beaker.volume)
+				beaker.reagents.add_reagent(input_reagent, amount)
+		if("makecup")
+			if(beaker)
+				return
+			beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+			visible_message("<span class='notice'>[src] dispenses a bluespace beaker.</span>")
+
+/obj/machinery/chem_dispenser/chem_synthesizer/proc/find_reagent(input)
+	. = FALSE
+	if(GLOB.chemical_reagents_list[input]) //prefer IDs!
+		var/datum/reagent/R = GLOB.chemical_reagents_list[input]
+		if(R.can_synth_debug)
+			return input
+	else
+		for(var/X in GLOB.chemical_reagents_list)
+			var/datum/reagent/R = GLOB.chemical_reagents_list[X]
+			if(R.can_synth_debug && input == replacetext(lowertext(R.name), " ", ""))
+				return X
@@ -20,7 +20,8 @@
 	var/current_cycle = 0
 	var/volume = 0
 	var/color = "#000000" // rgb: 0, 0, 0
-	var/can_synth = TRUE
+	var/can_synth = TRUE // can this reagent be synthesized? (for example: odysseus syringe gun)
+	var/can_synth_debug = TRUE // can this reagent be synthesized by the debug chem synthesizer?
 	var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob
 	var/overrides_metab = 0
 	var/overdose_threshold = 0
@@ -1546,4 +1546,70 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably."

 /datum/reagent/consumable/ethanol/crevice_spike/on_mob_add(mob/living/L) //damage only applies when drink first enters system and won't again until drink metabolizes out
-	L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
+	L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
+
+/datum/reagent/consumable/ethanol/sake
+	name = "Sake"
+	id = "sake"
+	description = "A sweet rice wine of questionable legality and extreme potency."
+	color = "#DDDDDD"
+	boozepwr = 70
+	taste_description = "sweet rice wine"
+	glass_icon_state = "sakecup"
+	glass_name = "cup of sake"
+	glass_desc = "A traditional cup of sake."
+
+/datum/reagent/consumable/ethanol/alexander
+	name = "Alexander"
+	id = "alexander"
+	description = "A creamy, indulgent delight that is stronger than it seems."
+	color = "#F5E9D3"
+	boozepwr = 80
+	taste_description = "bitter, creamy cacao"
+	glass_icon_state = "alexander"
+	glass_name = "Alexander"
+	glass_desc = "A creamy, indulgent delight that is stronger than it seems."
+
+/datum/reagent/consumable/ethanol/sidecar
+	name = "Sidecar"
+	id = "sidecar"
+	description = "The one ride you’ll gladly give up the wheel for."
+	color = "#FFC55B"
+	boozepwr = 80
+	taste_description = "delicious freedom"
+	glass_icon_state = "sidecar"
+	glass_name = "Sidecar"
+	glass_desc = "The one ride you’ll gladly give up the wheel for."
+
+/datum/reagent/consumable/ethanol/between_the_sheets
+	name = "Between the Sheets"
+	id = "between_the_sheets"
+	description = "A provocatively named classic."
+	color = "#F4C35A"
+	boozepwr = 80
+	taste_description = "seduction"
+	glass_icon_state = "between_the_sheets"
+	glass_name = "Between the Sheets"
+	glass_desc = "A provocatively named classic."
+
+/datum/reagent/consumable/ethanol/kamikaze
+	name = "Kamikaze"
+	id = "kamikaze"
+	description = "Divinely windy."
+	color = "#EEF191"
+	boozepwr = 60
+	taste_description = "divine windiness"
+	glass_icon_state = "kamikaze"
+	glass_name = "Kamikaze"
+	glass_desc = "Divinely windy."
+
+/datum/reagent/consumable/ethanol/mojito
+	name = "Mojito"
+	id = "mojito"
+	description = "A drink that looks as refreshing as it tastes."
+	color = "#DFFAD9"
+	boozepwr = 30
+	taste_description = "refreshing mint"
+	glass_icon_state = "mojito"
+	glass_name = "Mojito"
+	glass_desc = "A drink that looks as refreshing as it tastes."
@@ -721,3 +721,13 @@
 	description = "Milk for cool kids."
 	color = "#7D4E29"
 	taste_description = "chocolate milk"
+
+/datum/reagent/consumable/menthol
+	name = "Menthol"
+	id = "menthol"
+	description = "Tastes naturally minty, and imparts a very mild numbing sensation."
+	color = "#80AF9C"
+	taste_description = "mint"
+	glass_icon_state = "glass_green"
+	glass_name = "glass of menthol"
+	glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
@@ -57,15 +57,6 @@
 	..()
 	. = 1

-/datum/reagent/drug/menthol
-	name = "Menthol"
-	id = "menthol"
-	description = "Tastes naturally minty, and imparts a very mild numbing sensation."
-	taste_description = "mint"
-	reagent_state = LIQUID
-	color = "#80AF9C"
-	trippy = FALSE
-
 /datum/reagent/drug/crank
 	name = "Crank"
 	id = "crank"
@@ -171,8 +171,7 @@

 	else if(istype(O, /obj/item/stack/sheet/hairlesshide))
 		var/obj/item/stack/sheet/hairlesshide/HH = O
-		var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH))
-		WL.amount = HH.amount
+		new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount)
 		qdel(HH)

 /*
@@ -728,7 +728,7 @@
 /datum/reagent/toxin/rotatium/on_mob_life(mob/living/M)
 	if(M.hud_used)
 		if(current_cycle >= 20 && current_cycle%20 == 0)
-			var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+			var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
 			var/rotation = min(round(current_cycle/20), 89) // By this point the player is probably puking and quitting anyway
 			for(var/whole_screen in screens)
 				animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
@@ -737,7 +737,7 @@

 /datum/reagent/toxin/rotatium/on_mob_delete(mob/living/M)
 	if(M && M.hud_used)
-		var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+		var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
 		for(var/whole_screen in screens)
 			animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
 	..()
@@ -755,7 +755,7 @@
 /datum/reagent/toxin/skewium/on_mob_life(mob/living/M)
 	if(M.hud_used)
 		if(current_cycle >= 5 && current_cycle % 3 == 0)
-			var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+			var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
 			var/matrix/skew = matrix()
 			var/intensity = 8
 			skew.set_skew(rand(-intensity,intensity), rand(-intensity,intensity))
@@ -772,7 +772,7 @@

 /datum/reagent/toxin/skewium/on_mob_delete(mob/living/M)
 	if(M && M.hud_used)
-		var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+		var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
 		for(var/whole_screen in screens)
 			animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
 	..()
@@ -21,15 +21,23 @@
 	name = "Plasma + Glass alloy"
 	id = "plasmaglass"
 	build_type = SMELTER
-	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
 	build_path = /obj/item/stack/sheet/plasmaglass
 	category = list("initial")

+/datum/design/plasmarglass_alloy
+	name = "Plasma + Metal + Glass alloy"
+	id = "plasmareinforcedglass"
+	build_type = SMELTER
+	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_METAL = MINERAL_MATERIAL_AMOUNT * 0.5,  MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+	build_path = /obj/item/stack/sheet/plasmarglass
+	category = list("initial")
+
 /datum/design/titaniumglass_alloy
 	name = "Titanium + Glass alloy"
 	id = "titaniumglass"
 	build_type = SMELTER
-	materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
 	build_path = /obj/item/stack/sheet/titaniumglass
 	category = list("initial")

@@ -37,7 +45,7 @@
 	name = "Plasma + Titanium + Glass alloy"
 	id = "plastitaniumglass"
 	build_type = SMELTER
-	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
 	build_path = /obj/item/stack/sheet/plastitaniumglass
 	category = list("initial")

@@ -448,8 +448,7 @@ datum/status_effect/stabilized/blue/on_remove()
 	else if(istype(O, /obj/item/stack/sheet/hairlesshide))
 		to_chat(owner, "<span class='warning'>[linked_extract] kept your hands wet! It wets [O]!</span>")
 		var/obj/item/stack/sheet/hairlesshide/HH = O
-		var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH))
-		WL.amount = HH.amount
+		new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount)
 		qdel(HH)
 	..()

@@ -66,10 +66,8 @@ Charged extracts:
 	colour = "metal"

 /obj/item/slimecross/charged/metal/do_effect(mob/user)
-	var/obj/item/stack/sheet/metal/M = new(get_turf(user))
-	M.amount = 25
-	var/obj/item/stack/sheet/plasteel/P = new(get_turf(user))
-	P.amount = 10
+	new /obj/item/stack/sheet/metal(get_turf(user), 25)
+	new /obj/item/stack/sheet/plasteel(get_turf(user), 10)
 	user.visible_message("<span class='notice'>[src] grows into a plethora of metals!</span>")
 	..()

@@ -85,8 +83,7 @@ Charged extracts:
 	colour = "dark purple"

 /obj/item/slimecross/charged/darkpurple/do_effect(mob/user)
-	var/obj/item/stack/sheet/mineral/plasma/M = new(get_turf(user))
-	M.amount = 10
+	new /obj/item/stack/sheet/mineral/plasma(get_turf(user), 10)
 	user.visible_message("<span class='notice'>[src] produces a large amount of plasma!</span>")
 	..()

@@ -113,8 +110,7 @@ Charged extracts:
 	colour = "bluespace"

 /obj/item/slimecross/charged/bluespace/do_effect(mob/user)
-	var/obj/item/stack/sheet/bluespace_crystal/M = new(get_turf(user))
-	M.amount = 10
+	new /obj/item/stack/sheet/bluespace_crystal(get_turf(user), 10)
 	user.visible_message("<span class='notice'>[src] produces several sheets of polycrystal!</span>")
 	..()

@@ -138,8 +134,7 @@ Charged extracts:
 	colour = "pyrite"

 /obj/item/slimecross/charged/pyrite/do_effect(mob/user)
-	var/obj/item/stack/sheet/mineral/bananium/M = new(get_turf(user))
-	M.amount = 10
+	new /obj/item/stack/sheet/mineral/bananium(get_turf(user), 10)
 	user.visible_message("<span class='warning'>[src] solidifies with a horrifying banana stench!</span>")
 	..()

@@ -75,12 +75,7 @@ Industrial extracts:
 /obj/item/slimecross/industrial/metal
 	colour = "metal"
 	plasmarequired = 3
-	itempath = /obj/item/stack/sheet/metal
-
-/obj/item/slimecross/industrial/metal/do_after_spawn(obj/item/spawned)
-	var/obj/item/stack/sheet/metal/M = spawned
-	if(istype(M))
-		M.amount = 10
+	itempath = /obj/item/stack/sheet/metal/ten

 /obj/item/slimecross/industrial/yellow
 	colour = "yellow"
@@ -42,6 +42,8 @@ Notes:
 /datum/tooltip/New(client/C)
 	if (C)
 		owner = C
+		var/datum/asset/stuff = get_asset_datum(/datum/asset/simple/jquery)
+		stuff.send(owner)
 		owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]")

 	..()
@@ -19,6 +19,7 @@
 					/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
+					/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
 					/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
 					/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
@@ -37,5 +38,5 @@
 /obj/item/vending_refill/boozeomat
 	machine_name = "Booze-O-Mat"
 	icon_state = "refill_booze"
-	charges = list(58, 4, 0)//of 174 standard, 12 contraband
-	init_charges = list(58, 4, 0)
+	charges = list(59, 4, 0)//of 178 standard, 12 contraband
+	init_charges = list(59, 4, 0)