Merge branch 'master' into assu

# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

code/_onclick/click.dm

@@ -200,7 +200,7 @@
 			if (!target.loc)
 				continue
 
-			if(!(SEND_SIGNAL(target.loc, COMSIG_ATOM_CANREACH, next) & COMPONENT_BLOCK_REACH))
+			if(!(SEND_SIGNAL(target.loc, COMSIG_ATOM_CANREACH, next) & COMPONENT_BLOCK_REACH) && target.loc.canReachInto(src, ultimate_target, next, view_only, tool))
 				next += target.loc
 
 		checking = next
@@ -215,6 +215,10 @@
 /mob/living/DirectAccess(atom/target)
 	return ..() + GetAllContents()
 
+//This is called reach into but it's called on the deepest things first so uh, make sure to account for that!
+/atom/proc/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
+	return TRUE
+
 /atom/proc/AllowClick()
 	return FALSE
 

code/datums/components/storage/storage.dm

@@ -96,6 +96,7 @@
 	RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
 
 	RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/close_all)
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_views)
 
 	RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click)
 	RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
@@ -386,6 +387,11 @@
 		close(M)
 		. = TRUE //returns TRUE if any mobs actually got a close(M) call
 
+/datum/component/storage/proc/check_views()
+	for(var/mob/M in can_see_contents())
+		if(!isobserver(M) && !M.CanReach(src, view_only = TRUE))
+			close(M)
+
 /datum/component/storage/proc/emp_act(datum/source, severity)
 	if(emp_shielded)
 		return

code/game/objects/items/cards_ids.dm

@@ -80,6 +80,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
 	item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
 	var/prox_check = TRUE //If the emag requires you to be in range
+	var/uses = 15
 
 /obj/item/card/emag/bluespace
 	name = "bluespace cryptographic sequencer"
@@ -110,6 +111,37 @@
 		user.visible_message("<span class='warning'>[src] fizzles and sparks. It seems like it's out of charges.</span>")
 		playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
 
+/obj/item/card/emag/examine(mob/user)
+	. = ..()
+	to_chat(user, "<span class='notice'>It has <b>[uses ? uses : "no"]</b> charges left.</span>")
+
+/obj/item/card/emag/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/emagrecharge))
+		var/obj/item/emagrecharge/ER = W
+		if(ER.uses)
+			uses += ER.uses
+			to_chat(user, "<span class='notice'>You have added [ER.uses] charges to [src]. It now has [uses] charges.</span>")
+			playsound(src, "sparks", 100, 1)
+			ER.uses = 0
+		else
+			to_chat(user, "<span class='warning'>[ER] has no charges left.</span>")
+		return
+	. = ..()
+
+/obj/item/emagrecharge
+	name = "electromagnet charging device"
+	desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices, sadly this can't be recharged like a normal cell."
+	icon = 'icons/obj/module.dmi'
+	icon_state = "cell_mini"
+	item_flags = NOBLUDGEON
+	var/uses = 5	//Dictates how many charges the device adds to compatible items
+
+/obj/item/emagrecharge/examine(mob/user)
+	. = ..()
+	if(uses)
+		to_chat(user, "<span class='notice'>It can add up to [uses] charges to compatible devices</span>")
+	else
+		to_chat(user, "<span class='warning'>It has a small, red, blinking light coming from inside of it. It's spent.</span>")
 
 /obj/item/card/emagfake
 	desc = "It's a card with a magnetic strip attached to some circuitry. Closer inspection shows that this card is a poorly made replica, with a \"DonkCo\" logo stamped on the back."
@@ -451,3 +483,58 @@ update_label("John Doe", "Clowny")
 	name = "APC Access ID"
 	desc = "A special ID card that allows access to APC terminals."
 	access = list(ACCESS_ENGINE_EQUIP)
+
+//Polychromatic Knight Badge
+
+/obj/item/card/id/knight
+	var/id_color = "#00FF00" //defaults to green
+	name = "knight badge"
+	icon_state = "knight"
+	desc = "A badge denoting the owner as a knight! It has a strip for swiping like an ID"
+
+/obj/item/card/id/knight/update_label(newname, newjob)
+	if(newname || newjob)
+		name = "[(!newname)	? "knight badge"	: "[newname]'s Knight Badge"][(!newjob) ? "" : " ([newjob])"]"
+		return
+
+	name = "[(!registered_name)	? "knight badge"	: "[registered_name]'s Knight Badge"][(!assignment) ? "" : " ([assignment])"]"
+
+/obj/item/card/id/knight/update_icon()
+	var/mutable_appearance/id_overlay = mutable_appearance(icon, "knight_overlay")
+
+	if(id_color)
+		id_overlay.color = id_color
+	cut_overlays()
+
+	add_overlay(id_overlay)
+
+/obj/item/card/id/knight/AltClick(mob/living/user)
+	. = ..()
+	if(!in_range(src, user))	//Basic checks to prevent abuse
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(alert("Are you sure you want to recolor your id?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/energy_color_input = input(usr,"","Choose Energy Color",id_color) as color|null
+		if(!in_range(src, user) || !energy_color_input)
+			return
+		if(user.incapacitated() || !istype(user))
+			to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+			return
+		id_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+		update_icon()
+
+/obj/item/card/id/knight/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/card/id/knight/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+
+/obj/item/card/id/knight/blue
+	id_color = "#0000FF"
+
+/obj/item/card/id/knight/captain
+	id_color = "#FFD700"

code/game/objects/items/melee/energy.dm

@@ -233,3 +233,152 @@
 	desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
 	icon_state = "lightblade"
 	item_state = "lightblade"
+
+/*/////////////////////////////////////////////////////////////////////////
+/////////////		The TRUE Energy Sword		///////////////////////////
+*//////////////////////////////////////////////////////////////////////////
+
+/obj/item/melee/transforming/energy/sword/cx
+	name = "non-eutactic blade"
+	desc = "The Non-Eutactic Blade utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable."
+	icon_state = "cxsword_hilt"
+	item_state = "cxsword"
+	force = 3
+	force_on = 21
+	throwforce = 5
+	throwforce_on = 20
+	hitsound = "swing_hit" //it starts deactivated
+	hitsound_on = 'sound/weapons/nebhit.ogg'
+	attack_verb_off = list("tapped", "poked")
+	throw_speed = 3
+	throw_range = 5
+	sharpness = IS_SHARP
+	embedding = list("embedded_pain_multiplier" = 6, "embed_chance" = 20, "embedded_fall_chance" = 60)
+	armour_penetration = 10
+	block_chance = 35
+	light_color = "#37FFF7"
+	actions_types = list()
+
+/obj/item/melee/transforming/energy/sword/cx/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
+	altafterattack(A, user, TRUE, params)
+	return TRUE
+
+/obj/item/melee/transforming/energy/sword/cx/altafterattack(atom/target, mob/living/carbon/user, proximity_flag, click_parameters)	//does right click memes
+	if(istype(user))
+		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
+	return TRUE
+
+/obj/item/melee/transforming/energy/sword/cx/transform_weapon(mob/living/user, supress_message_text)
+	active = !active				//I'd use a ..() here but it'd inherit from the regular esword's proc instead, so SPAGHETTI CODE
+	if(active)						//also I'd need to rip out the iconstate changing bits
+		force = force_on
+		throwforce = throwforce_on
+		hitsound = hitsound_on
+		throw_speed = 4
+		if(attack_verb_on.len)
+			attack_verb = attack_verb_on
+		w_class = w_class_on
+		START_PROCESSING(SSobj, src)
+		set_light(brightness_on)
+		update_icon()
+	else
+		force = initial(force)
+		throwforce = initial(throwforce)
+		hitsound = initial(hitsound)
+		throw_speed = initial(throw_speed)
+		if(attack_verb_off.len)
+			attack_verb = attack_verb_off
+		w_class = initial(w_class)
+		STOP_PROCESSING(SSobj, src)
+		set_light(0)
+		update_icon()
+	transform_messages(user, supress_message_text)
+	add_fingerprint(user)
+	return TRUE
+
+/obj/item/melee/transforming/energy/sword/cx/transform_messages(mob/living/user, supress_message_text)
+	playsound(user, active ? 'sound/weapons/nebon.ogg' : 'sound/weapons/neboff.ogg', 65, 1)
+	if(!supress_message_text)
+		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
+
+/obj/item/melee/transforming/energy/sword/cx/update_icon()
+	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")
+	var/mutable_appearance/gem_overlay = mutable_appearance(icon, "cxsword_gem")
+
+	if(light_color)
+		blade_overlay.color = light_color
+		gem_overlay.color = light_color
+
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+
+	add_overlay(gem_overlay)
+
+	if(active)
+		add_overlay(blade_overlay)
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
+
+/obj/item/melee/transforming/energy/sword/cx/AltClick(mob/living/user)
+	if(!in_range(src, user))	//Basic checks to prevent abuse
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+
+	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
+		if(energy_color_input)
+			light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+		update_icon()
+		update_light()
+
+/obj/item/melee/transforming/energy/sword/cx/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+
+/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
+	. = ..()
+	if(active)
+		if(isinhands)
+			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "cxsword_blade")
+			blade_inhand.color = light_color
+			. += blade_inhand
+
+//Broken version. Not a toy, but not as strong.
+/obj/item/melee/transforming/energy/sword/cx/broken
+	name = "misaligned non-eutactic blade"
+	desc = "The Non-Eutactic Blade utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable. This one seems to have a damaged handle and misaligned components, causing the blade to be unstable at best"
+	force_on = 15 //As strong a survival knife/bone dagger
+
+/obj/item/melee/transforming/energy/sword/cx/attackby(obj/item/W, mob/living/user, params)
+	if(istype(W, /obj/item/melee/transforming/energy/sword/cx))
+		if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
+			to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
+			return
+		else
+			to_chat(user, "<span class='notice'>You combine the two light swords, making a single supermassive blade! You're cool.</span>")
+			new /obj/item/twohanded/dualsaber/hypereutactic(user.drop_location())
+			qdel(W)
+			qdel(src)
+	else
+		return ..()
+
+////////		Tatortot NEB		/////////////// (same stats as regular esword)
+/obj/item/melee/transforming/energy/sword/cx/traitor
+	name = "\improper Dragon's Tooth Sword"
+	desc = "The Dragon's Tooth sword is a blackmarket modification of a Non-Eutactic Blade, \
+			which utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable. \
+			It appears to have a wooden grip and a shaved down guard."
+	icon_state = "cxsword_hilt_traitor"
+	force_on = 30
+	armour_penetration = 50
+	embedding = list("embedded_pain_multiplier" = 10, "embed_chance" = 75, "embedded_fall_chance" = 0, "embedded_impact_pain_multiplier" = 10)
+	block_chance = 50
+	hitsound_on = 'sound/weapons/blade1.ogg'
+	light_color = "#37F0FF"
+
+/obj/item/melee/transforming/energy/sword/cx/traitor/transform_messages(mob/living/user, supress_message_text)
+	playsound(user, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, 1)
+	if(!supress_message_text)
+		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")

code/game/objects/items/toys.dm

@@ -276,6 +276,106 @@
 /obj/item/toy/sword/getweight()
 	return (active ? total_mass_on : total_mass) || w_class *1.25
 
+/obj/item/toy/sword/cx
+	name = "\improper DX Non-Euplastic LightSword"
+	desc = "A deluxe toy replica of an energy sword. Realistic visuals and sounds! Ages 8 and up."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "cxsword_hilt"
+	item_state = "cxsword"
+	active = FALSE
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("poked", "jabbed", "hit")
+	light_color = "#37FFF7"
+	var/light_brightness = 3
+	actions_types = list()
+
+/obj/item/toy/sword/cx/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
+	altafterattack(A, user, TRUE, params)
+	return TRUE
+
+/obj/item/toy/sword/cx/altafterattack(atom/target, mob/living/carbon/user, proximity_flag, click_parameters)	//does right click memes
+	if(istype(user))
+		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
+	return TRUE
+
+/obj/item/toy/sword/cx/attack_self(mob/user)
+	active = !( active )
+
+	if (active)
+		to_chat(user, "<span class='notice'>You activate the holographic blade with a press of a button.</span>")
+		playsound(user, 'sound/weapons/nebon.ogg', 50, 1)
+		w_class = WEIGHT_CLASS_BULKY
+		attack_verb = list("slashed", "stabbed", "ravaged")
+		set_light(light_brightness)
+		update_icon()
+
+	else
+		to_chat(user, "<span class='notice'>You deactivate the holographic blade with a press of a button.</span>")
+		playsound(user, 'sound/weapons/neboff.ogg', 50, 1)
+		w_class = WEIGHT_CLASS_SMALL
+		attack_verb = list("poked", "jabbed", "hit")
+		set_light(0)
+		update_icon()
+
+	add_fingerprint(user)
+
+/obj/item/toy/sword/cx/update_icon()
+	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")
+	var/mutable_appearance/gem_overlay = mutable_appearance(icon, "cxsword_gem")
+
+	if(light_color)
+		blade_overlay.color = light_color
+		gem_overlay.color = light_color
+
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+
+	add_overlay(gem_overlay)
+
+	if(active)
+		add_overlay(blade_overlay)
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
+
+/obj/item/toy/sword/cx/AltClick(mob/living/user)
+	if(!in_range(src, user))	//Basic checks to prevent abuse
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+
+	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
+		if(energy_color_input)
+			light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+		update_icon()
+		update_light()
+
+/obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file)
+	. = ..()
+	if(active)
+		if(isinhands)
+			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "cxsword_blade")
+			blade_inhand.color = light_color
+			. += blade_inhand
+
+/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params)
+	if(istype(W, /obj/item/toy/sword/cx))
+		if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
+			to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
+			return
+		else
+			to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>")
+			new /obj/item/twohanded/dualsaber/hypereutactic/toy(user.loc)
+			qdel(W)
+			qdel(src)
+	else
+		return ..()
+
+/obj/item/toy/sword/cx/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+
 /*
  * Foam armblade
  */
@@ -337,6 +437,30 @@
 /obj/item/twohanded/dualsaber/toy/IsReflect()//Stops Toy Dualsabers from reflecting energy projectiles
 	return FALSE
 
+/obj/item/twohanded/dualsaber/hypereutactic/toy
+	name = "\improper DX Hyper-Euplastic LightSword"
+	desc = "A supermassive toy envisioned to cleave the very fabric of space and time itself in twain. Realistic visuals and sounds! Ages 8 and up."
+	force = 0
+	throwforce = 0
+	throw_speed = 3
+	throw_range = 5
+	force_unwielded = 0
+	force_wielded = 0
+	attack_verb = list("attacked", "struck", "hit")
+	total_mass_on = TOTAL_MASS_TOY_SWORD
+	slowdown_wielded = 0
+
+/obj/item/twohanded/dualsaber/hypereutactic/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	return FALSE
+
+/obj/item/twohanded/dualsaber/hypereutactic/toy/IsReflect()//Stops it from reflecting energy projectiles
+	return FALSE
+
+/obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
+	name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
+	desc = "A custom-built toy with fancy rainbow lights built-in."
+	hacked = TRUE
+
 /obj/item/toy/katana
 	name = "replica katana"
 	desc = "Woefully underpowered in D20."

code/game/objects/items/twohanded.dm

@@ -6,6 +6,7 @@
  *		Spears
  *		CHAINSAWS
  *		Bone Axe and Spear
+ *		And more
  */
 
 /*##################################################################
@@ -464,6 +465,116 @@
 	else
 		return ..()
 
+/////////////////////////////////////////////////////
+//	HYPEREUTACTIC Blades	/////////////////////////
+/////////////////////////////////////////////////////
+
+/obj/item/twohanded/dualsaber/hypereutactic
+	icon = 'icons/obj/1x2.dmi'
+	icon_state = "hypereutactic"
+	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+	item_state = "hypereutactic"
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
+	name = "hypereutactic blade"
+	desc = "A supermassive weapon envisioned to cleave the very fabric of space and time itself in twain, the hypereutactic blade dynamically flash-forges a hypereutactic crystaline nanostructure capable of passing through most known forms of matter like a hot knife through butter."
+	force = 7
+	force_unwielded = 7
+	force_wielded = 40
+	wieldsound = 'sound/weapons/nebon.ogg'
+	unwieldsound = 'sound/weapons/neboff.ogg'
+	hitsound_on = 'sound/weapons/nebhit.ogg'
+	slowdown_wielded = 1
+	armour_penetration = 60
+	light_color = "#37FFF7"
+	rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "destroyed", "ripped", "devastated", "shredded")
+	spinnable = FALSE
+	total_mass_on = 4
+
+/obj/item/twohanded/dualsaber/hypereutactic/chaplain
+	name = "\improper divine lightblade"
+	desc = "A giant blade of bright and holy light, said to cut down the wicked with ease."
+	force = 5
+	force_unwielded = 5
+	force_wielded = 20
+	block_chance = 50
+	armour_penetration = 0
+	var/chaplain_spawnable = TRUE
+	obj_flags = UNIQUE_RENAME
+
+/obj/item/twohanded/dualsaber/hypereutactic/chaplain/Initialize()
+	. = ..()
+	AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+
+/obj/item/twohanded/dualsaber/hypereutactic/chaplain/IsReflect()
+	return FALSE
+
+/obj/item/twohanded/dualsaber/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
+	altafterattack(A, user, TRUE, params)
+	return TRUE
+
+/obj/item/twohanded/dualsaber/hypereutactic/altafterattack(atom/target, mob/living/user, proximity_flag, click_parameters)	//does right click memes
+	if(istype(user))
+		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
+	return TRUE
+
+/obj/item/twohanded/dualsaber/hypereutactic/update_icon()
+	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "hypereutactic_blade")
+	var/mutable_appearance/gem_overlay = mutable_appearance(icon, "hypereutactic_gem")
+
+	if(light_color)
+		blade_overlay.color = light_color
+		gem_overlay.color = light_color
+
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+
+	add_overlay(gem_overlay)
+
+	if(wielded)
+		add_overlay(blade_overlay)
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
+
+	clean_blood()
+
+/obj/item/twohanded/dualsaber/hypereutactic/AltClick(mob/living/user)
+	if(!user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
+		if(!energy_color_input || !user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
+			return
+		light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+		update_icon()
+		update_light()
+
+/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file)
+	. = ..()
+	if(isinhands)
+		var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
+		gem_inhand.color = light_color
+		. += gem_inhand
+		if(wielded)
+			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "hypereutactic_blade")
+			blade_inhand.color = light_color
+			. += blade_inhand
+
+/obj/item/twohanded/dualsaber/hypereutactic/examine(mob/user)
+	..()
+	if(!hacked)
+		to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+
+/obj/item/twohanded/dualsaber/hypereutactic/rainbow_process()
+	. = ..()
+	update_icon()
+	update_light()
+
 //spears
 /obj/item/twohanded/spear
 	icon_state = "spearglass0"

code/game/objects/structures/crates_lockers/closets.dm

@@ -614,3 +614,6 @@
 		user.resting = FALSE
 		togglelock(user)
 		T1.visible_message("<span class='warning'>[user] dives into [src]!</span>")
+
+/obj/structure/closet/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
+	return ..() && opened

code/modules/admin/verbs/adminhelp.dm

@@ -318,6 +318,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	RemoveActive()
 	state = AHELP_CLOSED
 	GLOB.ahelp_tickets.ListInsert(src)
+	to_chat(initiator, "<span class='adminhelp'>Ticket closed by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"].</span>")
 	AddInteraction("<font color='red'>Closed by [key_name].</font>")
 	if(!silent)
 		SSblackbox.record_feedback("tally", "ahelp_stats", 1, "closed")
@@ -336,7 +337,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50)
 
 	AddInteraction("<font color='green'>Resolved by [key_name].</font>")
-	to_chat(initiator, "<span class='adminhelp'>Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.</span>")
+	to_chat(initiator, "<span class='adminhelp'>Your ticket has been resolved by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"]. The Adminhelp verb will be returned to you shortly.</span>")
 	if(!silent)
 		SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved")
 		var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]"
@@ -353,7 +354,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 		SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))
 
-		to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
+		to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"]! -</b></font>")
 		to_chat(initiator, "<font color='red'><b>Your admin help was rejected.</b> The adminhelp verb has been returned to you so that you may try again.</font>")
 		to_chat(initiator, "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting.")
 
@@ -369,7 +370,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if(state != AHELP_ACTIVE)
 		return
 
-	var/msg = "<font color='red' size='4'><b>- AdminHelp marked as IC issue! -</b></font><br>"
+	var/msg = "<font color='red' size='4'><b>- AdminHelp marked as IC issue by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"]! -</b></font><br>"
 	msg += "<font color='red'><b>Losing is part of the game!</b></font><br>"
 	msg += "<font color='red'>It is also possible that your ahelp is unable to be answered properly, due to events occurring in the round.</font>"
 	if(initiator)

code/modules/antagonists/revenant/revenant_abilities.dm

@@ -27,6 +27,7 @@
 		if(prob(10))
 			to_chat(target, "You feel as if you are being watched.")
 		return
+	face_atom(target)
 	draining = TRUE
 	essence_drained += rand(15, 20)
 	to_chat(src, "<span class='revennotice'>You search for the soul of [target].</span>")

code/modules/awaymissions/corpse.dm

@@ -587,3 +587,57 @@
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	suit = /obj/item/clothing/suit/armor/vest
 	glasses = /obj/item/clothing/glasses/sunglasses/reagent
+
+/obj/effect/mob_spawn/human/lavaknight
+	name = "odd cryogenics pod"
+	desc = "A humming cryo pod. You can barely recognise a faint glow underneath the built up ice. The machine is attempting to wake up its occupant."
+	mob_name = "a displaced knight from another dimension"
+	icon = 'icons/obj/machines/sleeper.dmi'
+	icon_state = "sleeper"
+	roundstart = FALSE
+	id_job = "Knight"
+	job_description = "Cydonian Knight"
+	death = FALSE
+	random = TRUE
+	outfit = /datum/outfit/lavaknight
+	mob_species = /datum/species/human
+	flavour_text = "<font size=3><b>Y</b></font><b>ou are a knight who conveniently has some form of retrograde amnesia. \
+	You cannot remember where you came from. However, a few things remain burnt into your mind, most prominently a vow to never harm another sapient being under any circumstances unless it is hellbent on ending your life. \
+	Remember: hostile creatures and such are fair game for attacking, but <span class='danger'>under no circumstances are you to attack anything capable of thought and/or speech</span> unless it has made it its life's calling to chase you to the ends of the earth."
+	assignedrole = "Cydonian Knight"
+
+/obj/effect/mob_spawn/human/lavaknight/special(mob/living/new_spawn)
+	if(ishuman(new_spawn))
+		var/mob/living/carbon/human/H = new_spawn
+		H.dna.features["mam_ears"] = "Cat, Big"	//cat people
+		H.dna.features["mcolor"] = H.hair_color
+		H.update_body()
+
+/obj/effect/mob_spawn/human/lavaknight/Destroy()
+	new/obj/structure/showcase/machinery/oldpod/used(drop_location())
+	return ..()
+
+/datum/outfit/lavaknight
+	name = "Cydonian Knight"
+	uniform = /obj/item/clothing/under/assistantformal
+	mask = /obj/item/clothing/mask/breath
+	shoes = /obj/item/clothing/shoes/sneakers/black
+	r_pocket = /obj/item/melee/transforming/energy/sword/cx
+	suit = /obj/item/clothing/suit/space/hardsuit/lavaknight
+	suit_store = /obj/item/tank/internals/oxygen
+	id = /obj/item/card/id/knight/blue
+
+/obj/effect/mob_spawn/human/lavaknight/captain
+	name = "odd gilded cryogenics pod"
+	desc = "A humming cryo pod that appears to be gilded. You can barely recognise a faint glow underneath the built up ice. The machine is attempting to wake up its occupant."
+	flavour_text = "<font size=3><b>Y</b></font><b>ou are a knight who conveniently has some form of retrograde amnesia. \
+	You cannot remember where you came from. However, a few things remain burnt into your mind, most prominently a vow to never harm another sapient being under any circumstances unless it is hellbent on ending your life. \
+	Remember: hostile creatures and such are fair game for attacking, but <span class='danger'>under no circumstances are you to attack anything capable of thought and/or speech</span> unless it has made it its life's calling to chase you to the ends of the earth. \
+	You feel a natural instict to lead, and as such, you should strive to lead your comrades to safety, and hopefully home. You also feel a burning determination to uphold your vow, as well as your fellow comrade's."
+	outfit = /datum/outfit/lavaknight/captain
+	id_job = "Knight Captain"
+
+/datum/outfit/lavaknight/captain
+	name ="Cydonian Knight Captain"
+	l_pocket = /obj/item/twohanded/dualsaber/hypereutactic
+	id = /obj/item/card/id/knight/captain

code/modules/clothing/spacesuits/hardsuit.dm

@@ -867,3 +867,133 @@
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	actions_types = list()
+
+/*
+			CYDONIAN ARMOR THAT IS RGB AND STUFF WOOOOOOOOOO
+*/
+
+/obj/item/clothing/head/helmet/space/hardsuit/lavaknight
+	name = "cydonian helmet"
+	desc = "A helmet designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
+	icon_state = "knight_cydonia"
+	item_state = "knight_yellow"
+	item_color = null
+	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+	resistance_flags = FIRE_PROOF | LAVA_PROOF
+	heat_protection = HEAD
+	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100)
+	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)
+	var/energy_color = "#35FFF0"
+	var/obj/item/clothing/suit/space/hardsuit/lavaknight/linkedsuit = null
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/Initialize()
+	. = ..()
+	if(istype(loc, /obj/item/clothing/suit/space/hardsuit/lavaknight))
+		var/obj/item/clothing/suit/space/hardsuit/lavaknight/S = loc
+		energy_color = S.energy_color
+	update_icon()
+
+/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/attack_self(mob/user)
+	on = !on
+
+	if(on)
+		set_light(brightness_on)
+	else
+		set_light(0)
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
+
+/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/update_icon()
+	var/mutable_appearance/helm_overlay = mutable_appearance(icon, "knight_cydonia_overlay")
+
+	if(energy_color)
+		helm_overlay.color = energy_color
+
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+
+	add_overlay(helm_overlay)
+
+/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file)
+	. = ..()
+	if(!isinhands)
+		var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER)
+		energy_overlay.plane = ABOVE_LIGHTING_LAYER
+		energy_overlay.color = energy_color
+		. += energy_overlay
+
+/obj/item/clothing/suit/space/hardsuit/lavaknight
+	icon_state = "knight_cydonia"
+	name = "cydonian armor"
+	desc = "A suit designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
+	item_state = "swat_suit"
+	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+	resistance_flags = FIRE_PROOF | LAVA_PROOF
+	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100)
+	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/lavaknight
+	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	tauric = TRUE		//Citadel Add for tauric hardsuits
+
+	var/energy_color = "#35FFF0"
+
+/obj/item/clothing/suit/space/hardsuit/lavaknight/Initialize()
+	..()
+	light_color = energy_color
+	set_light(1)
+	update_icon()
+
+/obj/item/clothing/suit/space/hardsuit/lavaknight/update_icon()
+	var/mutable_appearance/suit_overlay = mutable_appearance(icon, "knight_cydonia_overlay")
+
+	if(energy_color)
+		suit_overlay.color = energy_color
+
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+
+	add_overlay(suit_overlay)
+
+/obj/item/clothing/suit/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file)
+	. = ..()
+	if(!isinhands)
+		var/mutable_appearance/energy_overlay
+		if(taurmode == SNEK_TAURIC)
+			energy_overlay = mutable_appearance('modular_citadel/icons/mob/taur_naga.dmi', "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER)
+		else if(taurmode == PAW_TAURIC)
+			energy_overlay = mutable_appearance('modular_citadel/icons/mob/taur_canine.dmi', "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER)
+		else
+			energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER)
+
+		energy_overlay.plane = ABOVE_LIGHTING_LAYER
+		energy_overlay.color = energy_color
+		. += energy_overlay
+
+/obj/item/clothing/suit/space/hardsuit/lavaknight/AltClick(mob/living/user)
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(!in_range(src, user))
+		return
+	if(user.incapacitated() || !istype(user) || !in_range(src, user))
+		return
+
+	if(alert("Are you sure you want to recolor your armor stripes?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/energy_color_input = input(usr,"","Choose Energy Color",energy_color) as color|null
+		if(energy_color_input)
+			energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+			user.update_inv_wear_suit()
+			if(helmet)
+				var/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/H = helmet
+				H.energy_color = energy_color
+				user.update_inv_head()
+				H.update_icon()
+			update_icon()
+			user.update_inv_wear_suit()
+			light_color = energy_color
+			update_light()
+
+/obj/item/clothing/suit/space/hardsuit/lavaknight/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")

code/modules/events/blob.dm

@@ -4,6 +4,7 @@
 	weight = 10
 	max_occurrences = 1
 
+	earliest_start = 60 MINUTES
 	min_players = 40
 
 	gamemode_blacklist = list("blob") //Just in case a blob survives that long

code/modules/events/wizard/magicarp.dm

@@ -36,10 +36,11 @@
 	projectilesound = 'sound/weapons/emitter.ogg'
 	maxHealth = 50
 	health = 50
+	gold_core_spawnable = NO_SPAWN
 	var/allowed_projectile_types = list(/obj/item/projectile/magic/change, /obj/item/projectile/magic/animate, /obj/item/projectile/magic/resurrection,
 	/obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball,
 	/obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage)
-	
+
 /mob/living/simple_animal/hostile/carp/ranged/Initialize()
 	projectiletype = pick(allowed_projectile_types)
 	. = ..()

code/modules/jobs/job_types/_job.dm

@@ -61,6 +61,9 @@
 
 	var/display_order = JOB_DISPLAY_ORDER_DEFAULT
 
+	//If a job complies with dresscodes, loadout items will not be equipped instead of the job's outfit, instead placing the items into the player's backpack.
+	var/dresscodecompliant = TRUE
+
 //Only override this proc
 //H is usually a human unless an /equip override transformed it
 /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)

code/modules/jobs/job_types/assistant.dm

@@ -15,6 +15,7 @@ Assistant
 	outfit = /datum/outfit/job/assistant
 	antag_rep = 7
 	display_order = JOB_DISPLAY_ORDER_ASSISTANT
+	dresscodecompliant = FALSE
 
 /datum/job/assistant/get_access()
 	if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set

code/modules/jobs/job_types/atmospheric_technician.dm

@@ -15,7 +15,8 @@
 
 	access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
 									ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM)
+	minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE,
+									ACCESS_ENGINE_EQUIP, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM)
 	display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN
 
 /datum/outfit/job/atmos

code/modules/jobs/job_types/captain.dm

@@ -10,9 +10,9 @@
 	supervisors = "Nanotrasen officials and Space law"
 	selection_color = "#aac1ee"
 	req_admin_notify = 1
-	minimal_player_age = 14
+	minimal_player_age = 20
 	exp_requirements = 180
-	exp_type = EXP_TYPE_CREW
+	exp_type = EXP_TYPE_COMMAND
 	exp_type_department = EXP_TYPE_COMMAND
 
 	outfit = /datum/outfit/job/captain

code/modules/jobs/job_types/cargo_technician.dm

@@ -11,7 +11,8 @@
 
 	outfit = /datum/outfit/job/cargo_tech
 
-	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING,
+				ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
 
 	display_order = JOB_DISPLAY_ORDER_CARGO_TECHNICIAN

code/modules/jobs/job_types/chemist.dm

@@ -32,5 +32,7 @@
 	satchel = /obj/item/storage/backpack/satchel/chem
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
+	backpack_contents = list(/obj/item/storage/hypospraykit/regular)
+
 	chameleon_extras = /obj/item/gun/syringe
 

code/modules/jobs/job_types/chief_engineer.dm

@@ -11,7 +11,7 @@
 	supervisors = "the captain"
 	selection_color = "#ee7400"
 	req_admin_notify = 1
-	minimal_player_age = 7
+	minimal_player_age = 10
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW
 	exp_type_department = EXP_TYPE_ENGINEERING

code/modules/jobs/job_types/chief_medical_officer.dm

@@ -11,7 +11,7 @@
 	supervisors = "the captain"
 	selection_color = "#509ed1"
 	req_admin_notify = 1
-	minimal_player_age = 7
+	minimal_player_age = 10
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW
 	exp_type_department = EXP_TYPE_MEDICAL

code/modules/jobs/job_types/head_of_personnel.dm

@@ -11,7 +11,7 @@
 	supervisors = "the captain"
 	selection_color = "#3a8529"
 	req_admin_notify = 1
-	minimal_player_age = 10
+	minimal_player_age = 20
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW
 	exp_type_department = EXP_TYPE_SERVICE
@@ -21,13 +21,13 @@
 	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
 			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
 			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
-			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
+			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
 			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
 			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
 			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
 			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
-			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
+			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
 			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
 			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
 

code/modules/jobs/job_types/head_of_security.dm

@@ -11,7 +11,7 @@
 	supervisors = "the captain"
 	selection_color = "#b90000"
 	req_admin_notify = 1
-	minimal_player_age = 14
+	minimal_player_age = 10
 	exp_requirements = 300
 	exp_type = EXP_TYPE_CREW
 	exp_type_department = EXP_TYPE_SECURITY

code/modules/jobs/job_types/medical_doctor.dm

@@ -32,4 +32,6 @@
 	satchel = /obj/item/storage/backpack/satchel/med
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
+	backpack_contents = list(/obj/item/storage/hypospraykit/regular)
+
 	chameleon_extras = /obj/item/gun/syringe

code/modules/jobs/job_types/quartermaster.dm

@@ -11,17 +11,19 @@
 	supervisors = "the captain"
 	selection_color = "#a06121"
 	req_admin_notify = 1
-	minimal_player_age = 7
+	minimal_player_age = 10
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW
 	exp_type_department = EXP_TYPE_SUPPLY
 
 	outfit = /datum/outfit/job/quartermaster
 
-	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION,
-					ACCESS_MINERAL_STOREROOM, ACCESS_VAULT)
-	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING,
-					ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT)
+	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING,
+					ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE,
+					ACCESS_SEC_DOORS, ACCESS_HEADS)
+	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING,
+					ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE,
+					ACCESS_SEC_DOORS, ACCESS_HEADS)
 
 	display_order = JOB_DISPLAY_ORDER_QUARTERMASTER
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity)
@@ -31,11 +33,13 @@
 	jobtype = /datum/job/qm
 
 	belt = /obj/item/pda/quartermaster
-	ears = /obj/item/radio/headset/headset_cargo
+	ears = /obj/item/radio/headset/heads/qm
 	uniform = /obj/item/clothing/under/rank/cargo
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	glasses = /obj/item/clothing/glasses/sunglasses
 	l_hand = /obj/item/clipboard
+	id = /obj/item/card/id/silver
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic = 1, /obj/item/modular_computer/tablet/preset/advanced = 1)
 
 	chameleon_extras = /obj/item/stamp/qm
 

code/modules/jobs/job_types/research_director.dm

@@ -11,7 +11,7 @@
 	supervisors = "the captain"
 	selection_color = "#7544cc"
 	req_admin_notify = 1
-	minimal_player_age = 7
+	minimal_player_age = 10
 	exp_type_department = EXP_TYPE_SCIENCE
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW

code/modules/jobs/job_types/shaft_miner.dm

@@ -13,7 +13,8 @@
 
 	outfit = /datum/outfit/job/miner
 
-	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING,
+				ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
 
 	display_order = JOB_DISPLAY_ORDER_SHAFT_MINER
@@ -47,7 +48,7 @@
 	name = "Shaft Miner (Asteroid)"
 	uniform = /obj/item/clothing/under/rank/miner
 	shoes = /obj/item/clothing/shoes/workboots
-	
+
 /datum/outfit/job/miner/equipped
 	name = "Shaft Miner (Lavaland + Equipment)"
 	suit = /obj/item/clothing/suit/hooded/explorer/standard

code/modules/jobs/job_types/warden.dm

@@ -42,7 +42,7 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	r_pocket = /obj/item/assembly/flash/handheld
 	l_pocket = /obj/item/restraints/handcuffs
-	suit_store = /obj/item/gun/energy/e_gun/advtaser
+	suit_store = /obj/item/gun/energy/pumpaction/defender
 	backpack_contents = list(/obj/item/melee/baton/loaded=1)
 
 	backpack = /obj/item/storage/backpack/security

code/modules/mob/inventory.dm

@@ -468,3 +468,6 @@
 			bodyparts += BP
 			hand_bodyparts[i] = BP
 	..() //Don't redraw hands until we have organs for them
+
+/mob/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
+	return ..() && (user == src)

code/modules/mob/living/silicon/ai/vox_sounds.dm

@@ -975,4 +975,635 @@ GLOBAL_LIST_INIT(vox_sounds, list("abduction" = 'sound/vox_fem/abduction.ogg',
 "zombie" = 'sound/vox_fem/zombie.ogg',
 "zone" = 'sound/vox_fem/zone.ogg',
 "zulu" = 'sound/vox_fem/zulu.ogg'))
+
+//for vim
+// :%s/\(\(.*\)\.ogg\)/"\2" = 'sound\/vox\/\1',/g
+GLOBAL_LIST_INIT(vox_sounds_male, list("," = 'sound/vox/_comma.ogg',
+"." = 'sound/vox/_period.ogg',
+"a" = 'sound/vox/a.ogg',
+"accelerating" = 'sound/vox/accelerating.ogg',
+"accelerator" = 'sound/vox/accelerator.ogg',
+"accepted" = 'sound/vox/accepted.ogg',
+"access" = 'sound/vox/access.ogg',
+"acknowledge" = 'sound/vox/acknowledge.ogg',
+"acknowledged" = 'sound/vox/acknowledged.ogg',
+"acquired" = 'sound/vox/acquired.ogg',
+"acquisition" = 'sound/vox/acquisition.ogg',
+"across" = 'sound/vox/across.ogg',
+"activate" = 'sound/vox/activate.ogg',
+"activated" = 'sound/vox/activated.ogg',
+"activity" = 'sound/vox/activity.ogg',
+"adios" = 'sound/vox/adios.ogg',
+"administration" = 'sound/vox/administration.ogg',
+"advanced" = 'sound/vox/advanced.ogg',
+"after" = 'sound/vox/after.ogg',
+"agent" = 'sound/vox/agent.ogg',
+"alarm" = 'sound/vox/alarm.ogg',
+"alert" = 'sound/vox/alert.ogg',
+"alien" = 'sound/vox/alien.ogg',
+"aligned" = 'sound/vox/aligned.ogg',
+"all" = 'sound/vox/all.ogg',
+"alpha" = 'sound/vox/alpha.ogg',
+"am" = 'sound/vox/am.ogg',
+"amigo" = 'sound/vox/amigo.ogg',
+"ammunition" = 'sound/vox/ammunition.ogg',
+"an" = 'sound/vox/an.ogg',
+"and" = 'sound/vox/and.ogg',
+"announcement" = 'sound/vox/announcement.ogg',
+"anomalous" = 'sound/vox/anomalous.ogg',
+"antenna" = 'sound/vox/antenna.ogg',
+"any" = 'sound/vox/any.ogg',
+"apprehend" = 'sound/vox/apprehend.ogg',
+"approach" = 'sound/vox/approach.ogg',
+"are" = 'sound/vox/are.ogg',
+"area" = 'sound/vox/area.ogg',
+"arm" = 'sound/vox/arm.ogg',
+"armed" = 'sound/vox/armed.ogg',
+"armor" = 'sound/vox/armor.ogg',
+"armory" = 'sound/vox/armory.ogg',
+"arrest" = 'sound/vox/arrest.ogg',
+"ass" = 'sound/vox/ass.ogg',
+"at" = 'sound/vox/at.ogg',
+"atomic" = 'sound/vox/atomic.ogg',
+"attention" = 'sound/vox/attention.ogg',
+"authorize" = 'sound/vox/authorize.ogg',
+"authorized" = 'sound/vox/authorized.ogg',
+"automatic" = 'sound/vox/automatic.ogg',
+"away" = 'sound/vox/away.ogg',
+"b" = 'sound/vox/b.ogg',
+"back" = 'sound/vox/back.ogg',
+"backman" = 'sound/vox/backman.ogg',
+"bad" = 'sound/vox/bad.ogg',
+"bag" = 'sound/vox/bag.ogg',
+"bailey" = 'sound/vox/bailey.ogg',
+"barracks" = 'sound/vox/barracks.ogg',
+"base" = 'sound/vox/base.ogg',
+"bay" = 'sound/vox/bay.ogg',
+"be" = 'sound/vox/be.ogg',
+"been" = 'sound/vox/been.ogg',
+"before" = 'sound/vox/before.ogg',
+"beyond" = 'sound/vox/beyond.ogg',
+"biohazard" = 'sound/vox/biohazard.ogg',
+"biological" = 'sound/vox/biological.ogg',
+"birdwell" = 'sound/vox/birdwell.ogg',
+"bizwarn" = 'sound/vox/bizwarn.ogg',
+"black" = 'sound/vox/black.ogg',
+"blast" = 'sound/vox/blast.ogg',
+"blocked" = 'sound/vox/blocked.ogg',
+"bloop" = 'sound/vox/bloop.ogg',
+"blue" = 'sound/vox/blue.ogg',
+"bottom" = 'sound/vox/bottom.ogg',
+"bravo" = 'sound/vox/bravo.ogg',
+"breach" = 'sound/vox/breach.ogg',
+"breached" = 'sound/vox/breached.ogg',
+"break" = 'sound/vox/break.ogg',
+"bridge" = 'sound/vox/bridge.ogg',
+"bust" = 'sound/vox/bust.ogg',
+"but" = 'sound/vox/but.ogg',
+"button" = 'sound/vox/button.ogg',
+"buzwarn" = 'sound/vox/buzwarn.ogg',
+"bypass" = 'sound/vox/bypass.ogg',
+"c" = 'sound/vox/c.ogg',
+"cable" = 'sound/vox/cable.ogg',
+"call" = 'sound/vox/call.ogg',
+"called" = 'sound/vox/called.ogg',
+"canal" = 'sound/vox/canal.ogg',
+"cap" = 'sound/vox/cap.ogg',
+"captain" = 'sound/vox/captain.ogg',
+"capture" = 'sound/vox/capture.ogg',
+"captured" = 'sound/vox/captured.ogg',
+"ceiling" = 'sound/vox/ceiling.ogg',
+"celsius" = 'sound/vox/celsius.ogg',
+"center" = 'sound/vox/center.ogg',
+"centi" = 'sound/vox/centi.ogg',
+"central" = 'sound/vox/central.ogg',
+"chamber" = 'sound/vox/chamber.ogg',
+"charlie" = 'sound/vox/charlie.ogg',
+"check" = 'sound/vox/check.ogg',
+"checkpoint" = 'sound/vox/checkpoint.ogg',
+"chemical" = 'sound/vox/chemical.ogg',
+"cleanup" = 'sound/vox/cleanup.ogg',
+"clear" = 'sound/vox/clear.ogg',
+"clearance" = 'sound/vox/clearance.ogg',
+"close" = 'sound/vox/close.ogg',
+"clown" = 'sound/vox/clown.ogg',
+"code" = 'sound/vox/code.ogg',
+"coded" = 'sound/vox/coded.ogg',
+"collider" = 'sound/vox/collider.ogg',
+"command" = 'sound/vox/command.ogg',
+"communication" = 'sound/vox/communication.ogg',
+"complex" = 'sound/vox/complex.ogg',
+"computer" = 'sound/vox/computer.ogg',
+"condition" = 'sound/vox/condition.ogg',
+"containment" = 'sound/vox/containment.ogg',
+"contamination" = 'sound/vox/contamination.ogg',
+"control" = 'sound/vox/control.ogg',
+"coolant" = 'sound/vox/coolant.ogg',
+"coomer" = 'sound/vox/coomer.ogg',
+"core" = 'sound/vox/core.ogg',
+"correct" = 'sound/vox/correct.ogg',
+"corridor" = 'sound/vox/corridor.ogg',
+"crew" = 'sound/vox/crew.ogg',
+"cross" = 'sound/vox/cross.ogg',
+"cryogenic" = 'sound/vox/cryogenic.ogg',
+"d" = 'sound/vox/d.ogg',
+"dadeda" = 'sound/vox/dadeda.ogg',
+"damage" = 'sound/vox/damage.ogg',
+"damaged" = 'sound/vox/damaged.ogg',
+"danger" = 'sound/vox/danger.ogg',
+"day" = 'sound/vox/day.ogg',
+"deactivated" = 'sound/vox/deactivated.ogg',
+"decompression" = 'sound/vox/decompression.ogg',
+"decontamination" = 'sound/vox/decontamination.ogg',
+"deeoo" = 'sound/vox/deeoo.ogg',
+"defense" = 'sound/vox/defense.ogg',
+"degrees" = 'sound/vox/degrees.ogg',
+"delta" = 'sound/vox/delta.ogg',
+"denied" = 'sound/vox/denied.ogg',
+"deploy" = 'sound/vox/deploy.ogg',
+"deployed" = 'sound/vox/deployed.ogg',
+"destroy" = 'sound/vox/destroy.ogg',
+"destroyed" = 'sound/vox/destroyed.ogg',
+"detain" = 'sound/vox/detain.ogg',
+"detected" = 'sound/vox/detected.ogg',
+"detonation" = 'sound/vox/detonation.ogg',
+"device" = 'sound/vox/device.ogg',
+"did" = 'sound/vox/did.ogg',
+"die" = 'sound/vox/die.ogg',
+"dimensional" = 'sound/vox/dimensional.ogg',
+"dirt" = 'sound/vox/dirt.ogg',
+"disengaged" = 'sound/vox/disengaged.ogg',
+"dish" = 'sound/vox/dish.ogg',
+"disposal" = 'sound/vox/disposal.ogg',
+"distance" = 'sound/vox/distance.ogg',
+"distortion" = 'sound/vox/distortion.ogg',
+"do" = 'sound/vox/do.ogg',
+"doctor" = 'sound/vox/doctor.ogg',
+"doop" = 'sound/vox/doop.ogg',
+"door" = 'sound/vox/door.ogg',
+"down" = 'sound/vox/down.ogg',
+"dual" = 'sound/vox/dual.ogg',
+"duct" = 'sound/vox/duct.ogg',
+"e" = 'sound/vox/e.ogg',
+"east" = 'sound/vox/east.ogg',
+"echo" = 'sound/vox/echo.ogg',
+"ed" = 'sound/vox/ed.ogg',
+"effect" = 'sound/vox/effect.ogg',
+"egress" = 'sound/vox/egress.ogg',
+"eight" = 'sound/vox/eight.ogg',
+"eighteen" = 'sound/vox/eighteen.ogg',
+"eighty" = 'sound/vox/eighty.ogg',
+"electric" = 'sound/vox/electric.ogg',
+"electromagnetic" = 'sound/vox/electromagnetic.ogg',
+"elevator" = 'sound/vox/elevator.ogg',
+"eleven" = 'sound/vox/eleven.ogg',
+"eliminate" = 'sound/vox/eliminate.ogg',
+"emergency" = 'sound/vox/emergency.ogg',
+"enemy" = 'sound/vox/enemy.ogg',
+"energy" = 'sound/vox/energy.ogg',
+"engage" = 'sound/vox/engage.ogg',
+"engaged" = 'sound/vox/engaged.ogg',
+"engine" = 'sound/vox/engine.ogg',
+"enter" = 'sound/vox/enter.ogg',
+"entry" = 'sound/vox/entry.ogg',
+"environment" = 'sound/vox/environment.ogg',
+"error" = 'sound/vox/error.ogg',
+"escape" = 'sound/vox/escape.ogg',
+"evacuate" = 'sound/vox/evacuate.ogg',
+"exchange" = 'sound/vox/exchange.ogg',
+"exit" = 'sound/vox/exit.ogg',
+"expect" = 'sound/vox/expect.ogg',
+"experiment" = 'sound/vox/experiment.ogg',
+"experimental" = 'sound/vox/experimental.ogg',
+"explode" = 'sound/vox/explode.ogg',
+"explosion" = 'sound/vox/explosion.ogg',
+"exposure" = 'sound/vox/exposure.ogg',
+"exterminate" = 'sound/vox/exterminate.ogg',
+"extinguish" = 'sound/vox/extinguish.ogg',
+"extinguisher" = 'sound/vox/extinguisher.ogg',
+"extreme" = 'sound/vox/extreme.ogg',
+"f" = 'sound/vox/f.ogg',
+"face" = 'sound/vox/face.ogg',
+"facility" = 'sound/vox/facility.ogg',
+"fahrenheit" = 'sound/vox/fahrenheit.ogg',
+"failed" = 'sound/vox/failed.ogg',
+"failure" = 'sound/vox/failure.ogg',
+"farthest" = 'sound/vox/farthest.ogg',
+"fast" = 'sound/vox/fast.ogg',
+"feet" = 'sound/vox/feet.ogg',
+"field" = 'sound/vox/field.ogg',
+"fifteen" = 'sound/vox/fifteen.ogg',
+"fifth" = 'sound/vox/fifth.ogg',
+"fifty" = 'sound/vox/fifty.ogg',
+"final" = 'sound/vox/final.ogg',
+"fine" = 'sound/vox/fine.ogg',
+"fire" = 'sound/vox/fire.ogg',
+"first" = 'sound/vox/first.ogg',
+"five" = 'sound/vox/five.ogg',
+"flag" = 'sound/vox/flag.ogg',
+"flooding" = 'sound/vox/flooding.ogg',
+"floor" = 'sound/vox/floor.ogg',
+"fool" = 'sound/vox/fool.ogg',
+"for" = 'sound/vox/for.ogg',
+"forbidden" = 'sound/vox/forbidden.ogg',
+"force" = 'sound/vox/force.ogg',
+"forms" = 'sound/vox/forms.ogg',
+"found" = 'sound/vox/found.ogg',
+"four" = 'sound/vox/four.ogg',
+"fourteen" = 'sound/vox/fourteen.ogg',
+"fourth" = 'sound/vox/fourth.ogg',
+"fourty" = 'sound/vox/fourty.ogg',
+"foxtrot" = 'sound/vox/foxtrot.ogg',
+"freeman" = 'sound/vox/freeman.ogg',
+"freezer" = 'sound/vox/freezer.ogg',
+"from" = 'sound/vox/from.ogg',
+"front" = 'sound/vox/front.ogg',
+"fuel" = 'sound/vox/fuel.ogg',
+"g" = 'sound/vox/g.ogg',
+"gay" = 'sound/vox/gay.ogg',
+"get" = 'sound/vox/get.ogg',
+"go" = 'sound/vox/go.ogg',
+"going" = 'sound/vox/going.ogg',
+"good" = 'sound/vox/good.ogg',
+"goodbye" = 'sound/vox/goodbye.ogg',
+"gordon" = 'sound/vox/gordon.ogg',
+"got" = 'sound/vox/got.ogg',
+"government" = 'sound/vox/government.ogg',
+"granted" = 'sound/vox/granted.ogg',
+"great" = 'sound/vox/great.ogg',
+"green" = 'sound/vox/green.ogg',
+"grenade" = 'sound/vox/grenade.ogg',
+"guard" = 'sound/vox/guard.ogg',
+"gulf" = 'sound/vox/gulf.ogg',
+"gun" = 'sound/vox/gun.ogg',
+"guthrie" = 'sound/vox/guthrie.ogg',
+"handling" = 'sound/vox/handling.ogg',
+"hangar" = 'sound/vox/hangar.ogg',
+"has" = 'sound/vox/has.ogg',
+"have" = 'sound/vox/have.ogg',
+"hazard" = 'sound/vox/hazard.ogg',
+"head" = 'sound/vox/head.ogg',
+"health" = 'sound/vox/health.ogg',
+"heat" = 'sound/vox/heat.ogg',
+"helicopter" = 'sound/vox/helicopter.ogg',
+"helium" = 'sound/vox/helium.ogg',
+"hello" = 'sound/vox/hello.ogg',
+"help" = 'sound/vox/help.ogg',
+"here" = 'sound/vox/here.ogg',
+"hide" = 'sound/vox/hide.ogg',
+"high" = 'sound/vox/high.ogg',
+"highest" = 'sound/vox/highest.ogg',
+"hit" = 'sound/vox/hit.ogg',
+"holds" = 'sound/vox/holds.ogg',
+"hole" = 'sound/vox/hole.ogg',
+"hostile" = 'sound/vox/hostile.ogg',
+"hot" = 'sound/vox/hot.ogg',
+"hotel" = 'sound/vox/hotel.ogg',
+"hour" = 'sound/vox/hour.ogg',
+"hours" = 'sound/vox/hours.ogg',
+"hundred" = 'sound/vox/hundred.ogg',
+"hydro" = 'sound/vox/hydro.ogg',
+"i" = 'sound/vox/i.ogg',
+"idiot" = 'sound/vox/idiot.ogg',
+"illegal" = 'sound/vox/illegal.ogg',
+"immediate" = 'sound/vox/immediate.ogg',
+"immediately" = 'sound/vox/immediately.ogg',
+"in" = 'sound/vox/in.ogg',
+"inches" = 'sound/vox/inches.ogg',
+"india" = 'sound/vox/india.ogg',
+"ing" = 'sound/vox/ing.ogg',
+"inoperative" = 'sound/vox/inoperative.ogg',
+"inside" = 'sound/vox/inside.ogg',
+"inspection" = 'sound/vox/inspection.ogg',
+"inspector" = 'sound/vox/inspector.ogg',
+"interchange" = 'sound/vox/interchange.ogg',
+"intruder" = 'sound/vox/intruder.ogg',
+"invallid" = 'sound/vox/invallid.ogg',
+"invasion" = 'sound/vox/invasion.ogg',
+"is" = 'sound/vox/is.ogg',
+"it" = 'sound/vox/it.ogg',
+"johnson" = 'sound/vox/johnson.ogg',
+"juliet" = 'sound/vox/juliet.ogg',
+"key" = 'sound/vox/key.ogg',
+"kill" = 'sound/vox/kill.ogg',
+"kilo" = 'sound/vox/kilo.ogg',
+"kit" = 'sound/vox/kit.ogg',
+"lab" = 'sound/vox/lab.ogg',
+"lambda" = 'sound/vox/lambda.ogg',
+"laser" = 'sound/vox/laser.ogg',
+"last" = 'sound/vox/last.ogg',
+"launch" = 'sound/vox/launch.ogg',
+"leak" = 'sound/vox/leak.ogg',
+"leave" = 'sound/vox/leave.ogg',
+"left" = 'sound/vox/left.ogg',
+"legal" = 'sound/vox/legal.ogg',
+"level" = 'sound/vox/level.ogg',
+"lever" = 'sound/vox/lever.ogg',
+"lie" = 'sound/vox/lie.ogg',
+"lieutenant" = 'sound/vox/lieutenant.ogg',
+"life" = 'sound/vox/life.ogg',
+"light" = 'sound/vox/light.ogg',
+"lima" = 'sound/vox/lima.ogg',
+"liquid" = 'sound/vox/liquid.ogg',
+"loading" = 'sound/vox/loading.ogg',
+"locate" = 'sound/vox/locate.ogg',
+"located" = 'sound/vox/located.ogg',
+"location" = 'sound/vox/location.ogg',
+"lock" = 'sound/vox/lock.ogg',
+"locked" = 'sound/vox/locked.ogg',
+"locker" = 'sound/vox/locker.ogg',
+"lockout" = 'sound/vox/lockout.ogg',
+"lower" = 'sound/vox/lower.ogg',
+"lowest" = 'sound/vox/lowest.ogg',
+"magnetic" = 'sound/vox/magnetic.ogg',
+"main" = 'sound/vox/main.ogg',
+"maintenance" = 'sound/vox/maintenance.ogg',
+"malfunction" = 'sound/vox/malfunction.ogg',
+"man" = 'sound/vox/man.ogg',
+"mass" = 'sound/vox/mass.ogg',
+"materials" = 'sound/vox/materials.ogg',
+"maximum" = 'sound/vox/maximum.ogg',
+"may" = 'sound/vox/may.ogg',
+"med" = 'sound/vox/med.ogg',
+"medical" = 'sound/vox/medical.ogg',
+"men" = 'sound/vox/men.ogg',
+"mercy" = 'sound/vox/mercy.ogg',
+"mesa" = 'sound/vox/mesa.ogg',
+"message" = 'sound/vox/message.ogg',
+"meter" = 'sound/vox/meter.ogg',
+"micro" = 'sound/vox/micro.ogg',
+"middle" = 'sound/vox/middle.ogg',
+"mike" = 'sound/vox/mike.ogg',
+"miles" = 'sound/vox/miles.ogg',
+"military" = 'sound/vox/military.ogg',
+"milli" = 'sound/vox/milli.ogg',
+"million" = 'sound/vox/million.ogg',
+"minefield" = 'sound/vox/minefield.ogg',
+"minimum" = 'sound/vox/minimum.ogg',
+"minutes" = 'sound/vox/minutes.ogg',
+"mister" = 'sound/vox/mister.ogg',
+"mode" = 'sound/vox/mode.ogg',
+"motor" = 'sound/vox/motor.ogg',
+"motorpool" = 'sound/vox/motorpool.ogg',
+"move" = 'sound/vox/move.ogg',
+"must" = 'sound/vox/must.ogg',
+"nearest" = 'sound/vox/nearest.ogg',
+"nice" = 'sound/vox/nice.ogg',
+"nine" = 'sound/vox/nine.ogg',
+"nineteen" = 'sound/vox/nineteen.ogg',
+"ninety" = 'sound/vox/ninety.ogg',
+"no" = 'sound/vox/no.ogg',
+"nominal" = 'sound/vox/nominal.ogg',
+"north" = 'sound/vox/north.ogg',
+"not" = 'sound/vox/not.ogg',
+"november" = 'sound/vox/november.ogg',
+"now" = 'sound/vox/now.ogg',
+"number" = 'sound/vox/number.ogg',
+"objective" = 'sound/vox/objective.ogg',
+"observation" = 'sound/vox/observation.ogg',
+"of" = 'sound/vox/of.ogg',
+"officer" = 'sound/vox/officer.ogg',
+"ok" = 'sound/vox/ok.ogg',
+"on" = 'sound/vox/on.ogg',
+"one" = 'sound/vox/one.ogg',
+"open" = 'sound/vox/open.ogg',
+"operating" = 'sound/vox/operating.ogg',
+"operations" = 'sound/vox/operations.ogg',
+"operative" = 'sound/vox/operative.ogg',
+"option" = 'sound/vox/option.ogg',
+"order" = 'sound/vox/order.ogg',
+"organic" = 'sound/vox/organic.ogg',
+"oscar" = 'sound/vox/oscar.ogg',
+"out" = 'sound/vox/out.ogg',
+"outside" = 'sound/vox/outside.ogg',
+"over" = 'sound/vox/over.ogg',
+"overload" = 'sound/vox/overload.ogg',
+"override" = 'sound/vox/override.ogg',
+"pacify" = 'sound/vox/pacify.ogg',
+"pain" = 'sound/vox/pain.ogg',
+"pal" = 'sound/vox/pal.ogg',
+"panel" = 'sound/vox/panel.ogg',
+"percent" = 'sound/vox/percent.ogg',
+"perimeter" = 'sound/vox/perimeter.ogg',
+"permitted" = 'sound/vox/permitted.ogg',
+"personnel" = 'sound/vox/personnel.ogg',
+"pipe" = 'sound/vox/pipe.ogg',
+"plant" = 'sound/vox/plant.ogg',
+"platform" = 'sound/vox/platform.ogg',
+"please" = 'sound/vox/please.ogg',
+"point" = 'sound/vox/point.ogg',
+"portal" = 'sound/vox/portal.ogg',
+"power" = 'sound/vox/power.ogg',
+"presence" = 'sound/vox/presence.ogg',
+"press" = 'sound/vox/press.ogg',
+"primary" = 'sound/vox/primary.ogg',
+"proceed" = 'sound/vox/proceed.ogg',
+"processing" = 'sound/vox/processing.ogg',
+"progress" = 'sound/vox/progress.ogg',
+"proper" = 'sound/vox/proper.ogg',
+"propulsion" = 'sound/vox/propulsion.ogg',
+"prosecute" = 'sound/vox/prosecute.ogg',
+"protective" = 'sound/vox/protective.ogg',
+"push" = 'sound/vox/push.ogg',
+"quantum" = 'sound/vox/quantum.ogg',
+"quebec" = 'sound/vox/quebec.ogg',
+"question" = 'sound/vox/question.ogg',
+"questioning" = 'sound/vox/questioning.ogg',
+"quick" = 'sound/vox/quick.ogg',
+"quit" = 'sound/vox/quit.ogg',
+"radiation" = 'sound/vox/radiation.ogg',
+"radioactive" = 'sound/vox/radioactive.ogg',
+"rads" = 'sound/vox/rads.ogg',
+"rapid" = 'sound/vox/rapid.ogg',
+"reach" = 'sound/vox/reach.ogg',
+"reached" = 'sound/vox/reached.ogg',
+"reactor" = 'sound/vox/reactor.ogg',
+"red" = 'sound/vox/red.ogg',
+"relay" = 'sound/vox/relay.ogg',
+"released" = 'sound/vox/released.ogg',
+"remaining" = 'sound/vox/remaining.ogg',
+"renegade" = 'sound/vox/renegade.ogg',
+"repair" = 'sound/vox/repair.ogg',
+"report" = 'sound/vox/report.ogg',
+"reports" = 'sound/vox/reports.ogg',
+"required" = 'sound/vox/required.ogg',
+"research" = 'sound/vox/research.ogg',
+"reset" = 'sound/vox/reset.ogg',
+"resevoir" = 'sound/vox/resevoir.ogg',
+"resistance" = 'sound/vox/resistance.ogg',
+"returned" = 'sound/vox/returned.ogg',
+"right" = 'sound/vox/right.ogg',
+"rocket" = 'sound/vox/rocket.ogg',
+"roger" = 'sound/vox/roger.ogg',
+"romeo" = 'sound/vox/romeo.ogg',
+"room" = 'sound/vox/room.ogg',
+"round" = 'sound/vox/round.ogg',
+"run" = 'sound/vox/run.ogg',
+"safe" = 'sound/vox/safe.ogg',
+"safety" = 'sound/vox/safety.ogg',
+"sargeant" = 'sound/vox/sargeant.ogg',
+"satellite" = 'sound/vox/satellite.ogg',
+"save" = 'sound/vox/save.ogg',
+"science" = 'sound/vox/science.ogg',
+"scores" = 'sound/vox/scores.ogg',
+"scream" = 'sound/vox/scream.ogg',
+"screen" = 'sound/vox/screen.ogg',
+"search" = 'sound/vox/search.ogg',
+"second" = 'sound/vox/second.ogg',
+"secondary" = 'sound/vox/secondary.ogg',
+"seconds" = 'sound/vox/seconds.ogg',
+"sector" = 'sound/vox/sector.ogg',
+"secure" = 'sound/vox/secure.ogg',
+"secured" = 'sound/vox/secured.ogg',
+"security" = 'sound/vox/security.ogg',
+"select" = 'sound/vox/select.ogg',
+"selected" = 'sound/vox/selected.ogg',
+"service" = 'sound/vox/service.ogg',
+"seven" = 'sound/vox/seven.ogg',
+"seventeen" = 'sound/vox/seventeen.ogg',
+"seventy" = 'sound/vox/seventy.ogg',
+"severe" = 'sound/vox/severe.ogg',
+"sewage" = 'sound/vox/sewage.ogg',
+"sewer" = 'sound/vox/sewer.ogg',
+"shield" = 'sound/vox/shield.ogg',
+"shipment" = 'sound/vox/shipment.ogg',
+"shock" = 'sound/vox/shock.ogg',
+"shoot" = 'sound/vox/shoot.ogg',
+"shower" = 'sound/vox/shower.ogg',
+"shut" = 'sound/vox/shut.ogg',
+"side" = 'sound/vox/side.ogg',
+"sierra" = 'sound/vox/sierra.ogg',
+"sight" = 'sound/vox/sight.ogg',
+"silo" = 'sound/vox/silo.ogg',
+"six" = 'sound/vox/six.ogg',
+"sixteen" = 'sound/vox/sixteen.ogg',
+"sixty" = 'sound/vox/sixty.ogg',
+"slime" = 'sound/vox/slime.ogg',
+"slow" = 'sound/vox/slow.ogg',
+"soldier" = 'sound/vox/soldier.ogg',
+"some" = 'sound/vox/some.ogg',
+"someone" = 'sound/vox/someone.ogg',
+"something" = 'sound/vox/something.ogg',
+"son" = 'sound/vox/son.ogg',
+"sorry" = 'sound/vox/sorry.ogg',
+"south" = 'sound/vox/south.ogg',
+"squad" = 'sound/vox/squad.ogg',
+"square" = 'sound/vox/square.ogg',
+"stairway" = 'sound/vox/stairway.ogg',
+"status" = 'sound/vox/status.ogg',
+"sterile" = 'sound/vox/sterile.ogg',
+"sterilization" = 'sound/vox/sterilization.ogg',
+"stolen" = 'sound/vox/stolen.ogg',
+"storage" = 'sound/vox/storage.ogg',
+"sub" = 'sound/vox/sub.ogg',
+"subsurface" = 'sound/vox/subsurface.ogg',
+"sudden" = 'sound/vox/sudden.ogg',
+"suit" = 'sound/vox/suit.ogg',
+"superconducting" = 'sound/vox/superconducting.ogg',
+"supercooled" = 'sound/vox/supercooled.ogg',
+"supply" = 'sound/vox/supply.ogg',
+"surface" = 'sound/vox/surface.ogg',
+"surrender" = 'sound/vox/surrender.ogg',
+"surround" = 'sound/vox/surround.ogg',
+"surrounded" = 'sound/vox/surrounded.ogg',
+"switch" = 'sound/vox/switch.ogg',
+"system" = 'sound/vox/system.ogg',
+"systems" = 'sound/vox/systems.ogg',
+"tactical" = 'sound/vox/tactical.ogg',
+"take" = 'sound/vox/take.ogg',
+"talk" = 'sound/vox/talk.ogg',
+"tango" = 'sound/vox/tango.ogg',
+"tank" = 'sound/vox/tank.ogg',
+"target" = 'sound/vox/target.ogg',
+"team" = 'sound/vox/team.ogg',
+"temperature" = 'sound/vox/temperature.ogg',
+"temporal" = 'sound/vox/temporal.ogg',
+"ten" = 'sound/vox/ten.ogg',
+"terminal" = 'sound/vox/terminal.ogg',
+"terminated" = 'sound/vox/terminated.ogg',
+"termination" = 'sound/vox/termination.ogg',
+"test" = 'sound/vox/test.ogg',
+"that" = 'sound/vox/that.ogg',
+"the" = 'sound/vox/the.ogg',
+"then" = 'sound/vox/then.ogg',
+"there" = 'sound/vox/there.ogg',
+"third" = 'sound/vox/third.ogg',
+"thirteen" = 'sound/vox/thirteen.ogg',
+"thirty" = 'sound/vox/thirty.ogg',
+"this" = 'sound/vox/this.ogg',
+"those" = 'sound/vox/those.ogg',
+"thousand" = 'sound/vox/thousand.ogg',
+"threat" = 'sound/vox/threat.ogg',
+"three" = 'sound/vox/three.ogg',
+"through" = 'sound/vox/through.ogg',
+"time" = 'sound/vox/time.ogg',
+"to" = 'sound/vox/to.ogg',
+"top" = 'sound/vox/top.ogg',
+"topside" = 'sound/vox/topside.ogg',
+"touch" = 'sound/vox/touch.ogg',
+"towards" = 'sound/vox/towards.ogg',
+"track" = 'sound/vox/track.ogg',
+"train" = 'sound/vox/train.ogg',
+"transportation" = 'sound/vox/transportation.ogg',
+"truck" = 'sound/vox/truck.ogg',
+"tunnel" = 'sound/vox/tunnel.ogg',
+"turn" = 'sound/vox/turn.ogg',
+"turret" = 'sound/vox/turret.ogg',
+"twelve" = 'sound/vox/twelve.ogg',
+"twenty" = 'sound/vox/twenty.ogg',
+"two" = 'sound/vox/two.ogg',
+"unauthorized" = 'sound/vox/unauthorized.ogg',
+"under" = 'sound/vox/under.ogg',
+"uniform" = 'sound/vox/uniform.ogg',
+"unlocked" = 'sound/vox/unlocked.ogg',
+"until" = 'sound/vox/until.ogg',
+"up" = 'sound/vox/up.ogg',
+"upper" = 'sound/vox/upper.ogg',
+"uranium" = 'sound/vox/uranium.ogg',
+"us" = 'sound/vox/us.ogg',
+"usa" = 'sound/vox/usa.ogg',
+"use" = 'sound/vox/use.ogg',
+"used" = 'sound/vox/used.ogg',
+"user" = 'sound/vox/user.ogg',
+"vacate" = 'sound/vox/vacate.ogg',
+"valid" = 'sound/vox/valid.ogg',
+"vapor" = 'sound/vox/vapor.ogg',
+"vent" = 'sound/vox/vent.ogg',
+"ventillation" = 'sound/vox/ventillation.ogg',
+"victor" = 'sound/vox/victor.ogg',
+"violated" = 'sound/vox/violated.ogg',
+"violation" = 'sound/vox/violation.ogg',
+"voltage" = 'sound/vox/voltage.ogg',
+"vox_login" = 'sound/vox/vox_login.ogg',
+"walk" = 'sound/vox/walk.ogg',
+"wall" = 'sound/vox/wall.ogg',
+"want" = 'sound/vox/want.ogg',
+"wanted" = 'sound/vox/wanted.ogg',
+"warm" = 'sound/vox/warm.ogg',
+"warn" = 'sound/vox/warn.ogg',
+"warning" = 'sound/vox/warning.ogg',
+"waste" = 'sound/vox/waste.ogg',
+"water" = 'sound/vox/water.ogg',
+"we" = 'sound/vox/we.ogg',
+"weapon" = 'sound/vox/weapon.ogg',
+"west" = 'sound/vox/west.ogg',
+"whiskey" = 'sound/vox/whiskey.ogg',
+"white" = 'sound/vox/white.ogg',
+"wilco" = 'sound/vox/wilco.ogg',
+"will" = 'sound/vox/will.ogg',
+"with" = 'sound/vox/with.ogg',
+"without" = 'sound/vox/without.ogg',
+"woop" = 'sound/vox/woop.ogg',
+"xeno" = 'sound/vox/xeno.ogg',
+"yankee" = 'sound/vox/yankee.ogg',
+"yards" = 'sound/vox/yards.ogg',
+"year" = 'sound/vox/year.ogg',
+"yellow" = 'sound/vox/yellow.ogg',
+"yes" = 'sound/vox/yes.ogg',
+"you" = 'sound/vox/you.ogg',
+"your" = 'sound/vox/your.ogg',
+"yourself" = 'sound/vox/yourself.ogg',
+"zero" = 'sound/vox/zero.ogg',
+"zone" = 'sound/vox/zone.ogg',
+"zulu" = 'sound/vox/zulu.ogg',))
 #endif

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -51,6 +51,7 @@
 	var/treatment_fire = "kelotane"
 	var/treatment_tox_avoid = "tricordrazine"
 	var/treatment_tox = "charcoal"
+	var/treatment_tox_toxlover = "toxin"
 	var/treatment_virus_avoid = null
 	var/treatment_virus = "spaceacillin"
 	var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
@@ -381,8 +382,8 @@
 
 	if((!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire)))
 		return TRUE
-
-	if((!C.reagents.has_reagent(treatment_tox_avoid)) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
+	var/treatment_toxavoid = get_avoidchem_toxin(C)
+	if(((treatment_toxavoid && !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C))))
 		return TRUE
 
 	if(treat_virus && !C.reagents.has_reagent(treatment_virus_avoid) && !C.reagents.has_reagent(treatment_virus))
@@ -396,6 +397,12 @@
 
 	return FALSE
 
+/mob/living/simple_animal/bot/medbot/proc/get_avoidchem_toxin(mob/M)
+	return HAS_TRAIT(M, TRAIT_TOXINLOVER)? null : treatment_tox_avoid
+
+/mob/living/simple_animal/bot/medbot/proc/get_healchem_toxin(mob/M)
+	return HAS_TRAIT(M, TRAIT_TOXINLOVER)? treatment_tox_toxlover : treatment_tox
+
 /mob/living/simple_animal/bot/medbot/UnarmedAttack(atom/A)
 	if(iscarbon(A))
 		var/mob/living/carbon/C = A
@@ -463,8 +470,10 @@
 				reagent_id = treatment_fire
 
 		if(!reagent_id && (C.getToxLoss() >= heal_threshold))
-			if(!C.reagents.has_reagent(treatment_tox) && !C.reagents.has_reagent(treatment_tox_avoid))
-				reagent_id = treatment_tox
+			var/toxin_heal_avoid = get_avoidchem_toxin(C)
+			var/toxin_healchem = get_healchem_toxin(C)
+			if(!C.reagents.has_reagent(toxin_healchem) && (toxin_heal_avoid && !C.reagents.has_reagent(toxin_heal_avoid)))
+				reagent_id = toxin_healchem
 
 		//If the patient is injured but doesn't have our special reagent in them then we should give it to them first
 		if(reagent_id && use_beaker && reagent_glass && reagent_glass.reagents.total_volume)

code/modules/research/designs/electronics_designs.dm

@@ -131,3 +131,30 @@
 	category = list("Misc")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
 
+/datum/design/xenobio_upgrade
+	name = "owo"
+	desc = "someone's bussin"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/xenobio_upgrade/xenobiomonkeys
+	name = "Xenobiology console monkey upgrade disk"
+	desc = "This disk will add the ability to remotely recycle monkeys via the Xenobiology console."
+	id = "xenobio_monkeys"
+	build_path = /obj/item/disk/xenobio_console_upgrade/monkey
+
+/datum/design/xenobio_upgrade/xenobioslimebasic
+	name = "Xenobiology console basic slime upgrade disk"
+	desc = "This disk will add the ability to remotely manipulate slimes via the Xenobiology console."
+	id = "xenobio_slimebasic"
+	build_path = /obj/item/disk/xenobio_console_upgrade/slimebasic
+
+/datum/design/xenobio_upgrade/xenobioslimeadv
+	name = "Xenobiology console advanced slime upgrade disk"
+	desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
+	id = "xenobio_slimeadv"
+	build_path = /obj/item/disk/xenobio_console_upgrade/slimeadv
+
+

code/modules/research/designs/machine_desings/machine_designs_all_misc.dm

@@ -98,3 +98,11 @@
 	build_path = /obj/item/circuitboard/machine/vr_sleeper
 	departmental_flags = DEPARTMENTAL_FLAG_ALL
 	category = list ("Medical Machinery")
+
+/datum/design/board/autoylathe
+	name = "Machine Design (Autoylathe)"
+	desc = "The circuit board for an autoylathe."
+	id = "autoylathe"
+	build_path = /obj/item/circuitboard/machine/autoylathe
+	departmental_flags = DEPARTMENTAL_FLAG_ALL
+	category = list("Misc. Machinery")

code/modules/research/techweb/_techweb.dm

@@ -372,3 +372,7 @@
 
 /datum/techweb/specialized/autounlocking/exofab
 	allowed_buildtypes = MECHFAB
+
+/datum/techweb/specialized/autounlocking/autoylathe
+	design_autounlock_buildtypes = AUTOYLATHE
+	allowed_buildtypes = AUTOYLATHE

code/modules/research/xenobiology/xenobio_camera.dm

@@ -31,8 +31,9 @@
 
 	var/list/stored_slimes
 	var/obj/item/slimepotion/slime/current_potion
-	var/max_slimes = 5
+	var/max_slimes = 1
 	var/monkeys = 0
+	var/upgradetier = 0
 
 	icon_screen = "slime_comp"
 	icon_keyboard = "rd_key"
@@ -106,6 +107,22 @@
 		stored_slimes -= deleted
 
 /obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
+	if(istype(O, /obj/item/disk/xenobio_console_upgrade))
+		var/obj/item/disk/xenobio_console_upgrade/diskthing = O
+		var/successfulupgrade = FALSE
+		for(var/I in diskthing.upgradetypes)
+			if(upgradetier & I)
+				continue
+			else
+				upgradetier |= I
+				successfulupgrade = TRUE
+			if(I == XENOBIO_UPGRADE_SLIMEADV)
+				max_slimes = 10
+		if(successfulupgrade)
+			to_chat(user, "<span class='notice'>You have successfully upgraded [src] with [O].</span>")
+		else
+			to_chat(user, "<span class='warning'>[src] already has the contents of [O] installed!</span>")
+		return
 	if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube) && (upgradetier & XENOBIO_UPGRADE_MONKEYS)) //CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS
 		monkeys++
 		to_chat(user, "<span class='notice'>You feed [O] to [src]. It now has [monkeys] monkey cubes stored.</span>")
@@ -264,3 +281,29 @@
 			break
 	else
 		to_chat(owner, "<span class='notice'>Target is not near a camera. Cannot proceed.</span>")
+
+/obj/item/disk/xenobio_console_upgrade
+	name = "Xenobiology console upgrade disk"
+	desc = "Allan please add detail."
+	icon_state = "datadisk5"
+	var/list/upgradetypes = list()
+
+/obj/item/disk/xenobio_console_upgrade/admin
+	name = "Xenobio all access thing"
+	desc = "'the consoles are literally useless!!!!!!!!!!!!!!!'"
+	upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC, XENOBIO_UPGRADE_SLIMEADV, XENOBIO_UPGRADE_MONKEYS)
+
+/obj/item/disk/xenobio_console_upgrade/monkey
+	name = "Xenobiology console monkey upgrade disk"
+	desc = "This disk will add the ability to remotely recycle monkeys via the Xenobiology console."
+	upgradetypes = list(XENOBIO_UPGRADE_MONKEYS)
+
+/obj/item/disk/xenobio_console_upgrade/slimebasic
+	name = "Xenobiology console basic slime upgrade disk"
+	desc = "This disk will add the ability to remotely manipulate slimes via the Xenobiology console."
+	upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC)
+
+/obj/item/disk/xenobio_console_upgrade/slimeadv
+	name = "Xenobiology console advanced slime upgrade disk"
+	desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
+	upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC, XENOBIO_UPGRADE_SLIMEADV)

code/modules/ruins/spaceruin_code/hilbertshotel.dm

@@ -223,7 +223,6 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
 /turf/open/space/bluespace/Entered(atom/movable/A)
     . = ..()
     A.forceMove(get_turf(parentSphere))
-    do_sparks(3, FALSE, get_turf(A))
 
 /turf/closed/indestructible/hoteldoor
     name = "Hotel Door"

code/modules/uplink/uplink_items.dm

@@ -1920,6 +1920,13 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
 			Radio headset does not include encryption key. No gun included."
 	item = /obj/item/storage/box/syndie_kit/centcom_costume
 
+/datum/uplink_item/badass/claymore
+	name = "Claymore"
+	cost = 8
+	player_minimum = 25
+	desc = "A claymore. We don't know why you'd do this."
+	item = /obj/item/claymore
+
 /datum/uplink_item/badass/costumes/clown
 	name = "Clown Costume"
 	desc = "Nothing is more terrifying than clowns with fully automatic weaponry."

html/changelogs/AutoChangeLog-pr-9513.yml

@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "Medibots no longer kill slimes when trying to heal their toxins."

html/changelogs/AutoChangeLog-pr-9539.yml

@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - rscadd: "The Syndicate started selling claymores to their agents."

html/changelogs/AutoChangeLog-pr-9572.yml

@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - bugfix: "Fixes storage bugs regarding reaching into things you shouldn't be able to reach into."

html/changelogs/AutoChangeLog-pr-9599.yml

@@ -0,0 +1,4 @@
+author: "Onule & Nemvar (ported by Ghommie)"
+delete-after: True
+changes: 
+  - imageadd: "New Revenant icons"

html/changelogs/AutoChangeLog-pr-9603.yml

@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "fixing cydonian armor a bit."

modular_citadel/code/game/objects/ids.dm

@@ -1,83 +0,0 @@
-
-//Polychromatic Knight Badge
-
-/obj/item/card/id/knight
-	var/id_color = "#00FF00" //defaults to green
-	name = "knight badge"
-	icon = 'modular_citadel/icons/obj/id.dmi'
-	icon_state = "knight"
-	desc = "A badge denoting the owner as a knight! It has a strip for swiping like an ID"
-
-/obj/item/card/id/knight/update_label(newname, newjob)
-	. = ..()
-	if(newname || newjob)
-		name = "[(!newname)	? "identification card"	: "[newname]'s Knight Badge"][(!newjob) ? "" : " ([newjob])"]"
-		return
-
-	name = "[(!registered_name)	? "identification card"	: "[registered_name]'s Knight Badge"][(!assignment) ? "" : " ([assignment])"]"
-
-/obj/item/card/id/knight/update_icon()
-	var/mutable_appearance/id_overlay = mutable_appearance('modular_citadel/icons/obj/id.dmi', "knight_overlay")
-
-	if(id_color)
-		id_overlay.color = id_color
-	cut_overlays()
-
-	add_overlay(id_overlay)
-
-/obj/item/card/id/knight/AltClick(mob/living/user)
-	if(!in_range(src, user))	//Basic checks to prevent abuse
-		return
-	if(user.incapacitated() || !istype(user))
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-	if(alert("Are you sure you want to recolor your id?", "Confirm Repaint", "Yes", "No") == "Yes")
-		var/energy_color_input = input(usr,"","Choose Energy Color",id_color) as color|null
-		if(energy_color_input)
-			id_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
-		update_icon()
-
-/obj/item/card/id/knight/Initialize()
-	. = ..()
-	update_icon()
-
-/obj/item/card/id/knight/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
-
-//=================================================
-
-/obj/item/emagrecharge
-	name = "electromagnet charging device"
-	desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices, sadly this can't be recharged like a normal cell."
-	icon = 'icons/obj/module.dmi'
-	icon_state = "cell_mini"
-	item_flags = NOBLUDGEON
-	var/uses = 5	//Dictates how many charges the device adds to compatible items
-
-/obj/item/emagrecharge/examine(mob/user)
-	. = ..()
-	if(uses)
-		to_chat(user, "<span class='notice'>It can add up to [uses] charges to compatible devices</span>")
-	else
-		to_chat(user, "<span class='warning'>It has a small, red, blinking light coming from inside of it. It's spent.</span>")
-
-/obj/item/card/emag
-	var/uses = 15
-
-/obj/item/card/emag/examine(mob/user)
-	. = ..()
-	to_chat(user, "<span class='notice'>It has <b>[uses ? uses : "no"]</b> charges left.</span>")
-
-/obj/item/card/emag/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/emagrecharge))
-		var/obj/item/emagrecharge/ER = W
-		if(ER.uses)
-			uses += ER.uses
-			to_chat(user, "<span class='notice'>You have added [ER.uses] charges to [src]. It now has [uses] charges.</span>")
-			playsound(src, "sparks", 100, 1)
-			ER.uses = 0
-		else
-			to_chat(user, "<span class='warning'>[ER] has no charges left.</span>")
-		return
-	. = ..()

modular_citadel/code/game/objects/items/melee/eutactic_blades.dm

@@ -1,392 +0,0 @@
-/*/////////////////////////////////////////////////////////////////////////
-/////////////		The TRUE Energy Sword		///////////////////////////
-*//////////////////////////////////////////////////////////////////////////
-
-/obj/item/melee/transforming/energy/sword/cx
-	name = "non-eutactic blade"
-	desc = "The Non-Eutactic Blade utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable."
-	icon_state = "cxsword_hilt"
-	icon = 'modular_citadel/icons/eutactic/item/noneutactic.dmi'
-	item_state = "cxsword"
-	lefthand_file = 'modular_citadel/icons/eutactic/mob/noneutactic_left.dmi'
-	righthand_file = 'modular_citadel/icons/eutactic/mob/noneutactic_right.dmi'
-	force = 3
-	force_on = 21
-	throwforce = 5
-	throwforce_on = 20
-	hitsound = "swing_hit" //it starts deactivated
-	hitsound_on = 'sound/weapons/nebhit.ogg'
-	attack_verb_off = list("tapped", "poked")
-	throw_speed = 3
-	throw_range = 5
-	sharpness = IS_SHARP
-	embedding = list("embedded_pain_multiplier" = 6, "embed_chance" = 20, "embedded_fall_chance" = 60)
-	armour_penetration = 10
-	block_chance = 35
-	light_color = "#37FFF7"
-	actions_types = list()
-
-/obj/item/melee/transforming/energy/sword/cx/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
-	altafterattack(A, user, TRUE, params)
-	return TRUE
-
-/obj/item/melee/transforming/energy/sword/cx/altafterattack(atom/target, mob/living/carbon/user, proximity_flag, click_parameters)	//does right click memes
-	if(istype(user))
-		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
-	return TRUE
-
-/obj/item/melee/transforming/energy/sword/cx/transform_weapon(mob/living/user, supress_message_text)
-	active = !active				//I'd use a ..() here but it'd inherit from the regular esword's proc instead, so SPAGHETTI CODE
-	if(active)						//also I'd need to rip out the iconstate changing bits
-		force = force_on
-		throwforce = throwforce_on
-		hitsound = hitsound_on
-		throw_speed = 4
-		if(attack_verb_on.len)
-			attack_verb = attack_verb_on
-		w_class = w_class_on
-		START_PROCESSING(SSobj, src)
-		set_light(brightness_on)
-		update_icon()
-	else
-		force = initial(force)
-		throwforce = initial(throwforce)
-		hitsound = initial(hitsound)
-		throw_speed = initial(throw_speed)
-		if(attack_verb_off.len)
-			attack_verb = attack_verb_off
-		w_class = initial(w_class)
-		STOP_PROCESSING(SSobj, src)
-		set_light(0)
-		update_icon()
-	transform_messages(user, supress_message_text)
-	add_fingerprint(user)
-	return TRUE
-
-/obj/item/melee/transforming/energy/sword/cx/transform_messages(mob/living/user, supress_message_text)
-	playsound(user, active ? 'sound/weapons/nebon.ogg' : 'sound/weapons/neboff.ogg', 65, 1)
-	if(!supress_message_text)
-		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
-
-/obj/item/melee/transforming/energy/sword/cx/update_icon()
-	var/mutable_appearance/blade_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/noneutactic.dmi', "cxsword_blade")
-	var/mutable_appearance/gem_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/noneutactic.dmi', "cxsword_gem")
-
-	if(light_color)
-		blade_overlay.color = light_color
-		gem_overlay.color = light_color
-
-	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
-
-	add_overlay(gem_overlay)
-
-	if(active)
-		add_overlay(blade_overlay)
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_hands()
-
-/obj/item/melee/transforming/energy/sword/cx/AltClick(mob/living/user)
-	if(!in_range(src, user))	//Basic checks to prevent abuse
-		return
-	if(user.incapacitated() || !istype(user))
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-
-	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
-		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
-		if(energy_color_input)
-			light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
-		update_icon()
-		update_light()
-
-/obj/item/melee/transforming/energy/sword/cx/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
-
-/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
-	. = ..()
-	if(active)
-		if(isinhands)
-			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "cxsword_blade")
-			blade_inhand.color = light_color
-			. += blade_inhand
-//Broken version. Not a toy, but not as strong.
-/obj/item/melee/transforming/energy/sword/cx/broken
-	name = "misaligned non-eutactic blade"
-	desc = "The Non-Eutactic Blade utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable. This one seems to have a damaged handle and misaligned components, causing the blade to be unstable at best"
-	force_on = 15 //As strong a survival knife/bone dagger
-
-/obj/item/melee/transforming/energy/sword/cx/attackby(obj/item/W, mob/living/user, params)
-	if(istype(W, /obj/item/melee/transforming/energy/sword/cx))
-		if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
-			to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
-			return
-		else
-			to_chat(user, "<span class='notice'>You combine the two light swords, making a single supermassive blade! You're cool.</span>")
-			new /obj/item/twohanded/dualsaber/hypereutactic(user.drop_location())
-			qdel(W)
-			qdel(src)
-	else
-		return ..()
-
-//OBLIGATORY TOY MEMES	/////////////////////////////////////
-
-/obj/item/toy/sword/cx
-	name = "\improper DX Non-Euplastic LightSword"
-	desc = "A deluxe toy replica of an energy sword. Realistic visuals and sounds! Ages 8 and up."
-	icon = 'modular_citadel/icons/eutactic/item/noneutactic.dmi'
-	icon_state = "cxsword_hilt"
-	item_state = "cxsword"
-	lefthand_file = 'modular_citadel/icons/eutactic/mob/noneutactic_left.dmi'
-	righthand_file = 'modular_citadel/icons/eutactic/mob/noneutactic_right.dmi'
-	active = FALSE
-	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("poked", "jabbed", "hit")
-	light_color = "#37FFF7"
-	var/light_brightness = 3
-	actions_types = list()
-
-/obj/item/toy/sword/cx/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
-	altafterattack(A, user, TRUE, params)
-	return TRUE
-
-/obj/item/toy/sword/cx/altafterattack(atom/target, mob/living/carbon/user, proximity_flag, click_parameters)	//does right click memes
-	if(istype(user))
-		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
-	return TRUE
-
-/obj/item/toy/sword/cx/attack_self(mob/user)
-	active = !( active )
-
-	if (active)
-		to_chat(user, "<span class='notice'>You activate the holographic blade with a press of a button.</span>")
-		playsound(user, 'sound/weapons/nebon.ogg', 50, 1)
-		w_class = WEIGHT_CLASS_BULKY
-		attack_verb = list("slashed", "stabbed", "ravaged")
-		set_light(light_brightness)
-		update_icon()
-
-	else
-		to_chat(user, "<span class='notice'>You deactivate the holographic blade with a press of a button.</span>")
-		playsound(user, 'sound/weapons/neboff.ogg', 50, 1)
-		w_class = WEIGHT_CLASS_SMALL
-		attack_verb = list("poked", "jabbed", "hit")
-		set_light(0)
-		update_icon()
-
-	add_fingerprint(user)
-
-/obj/item/toy/sword/cx/update_icon()
-	var/mutable_appearance/blade_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/noneutactic.dmi', "cxsword_blade")
-	var/mutable_appearance/gem_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/noneutactic.dmi', "cxsword_gem")
-
-	if(light_color)
-		blade_overlay.color = light_color
-		gem_overlay.color = light_color
-
-	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
-
-	add_overlay(gem_overlay)
-
-	if(active)
-		add_overlay(blade_overlay)
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_hands()
-
-/obj/item/toy/sword/cx/AltClick(mob/living/user)
-	if(!in_range(src, user))	//Basic checks to prevent abuse
-		return
-	if(user.incapacitated() || !istype(user))
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-
-	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
-		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
-		if(energy_color_input)
-			light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
-		update_icon()
-		update_light()
-
-/obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file)
-	. = ..()
-	if(active)
-		if(isinhands)
-			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "cxsword_blade")
-			blade_inhand.color = light_color
-			. += blade_inhand
-
-/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params)
-	if(istype(W, /obj/item/toy/sword/cx))
-		if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
-			to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
-			return
-		else
-			to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>")
-			new /obj/item/twohanded/dualsaber/hypereutactic/toy(user.loc)
-			qdel(W)
-			qdel(src)
-	else
-		return ..()
-
-/obj/item/toy/sword/cx/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
-
-/////////////////////////////////////////////////////
-//	HYPEREUTACTIC Blades	/////////////////////////
-/////////////////////////////////////////////////////
-
-/obj/item/twohanded/dualsaber/hypereutactic
-	icon = 'modular_citadel/icons/eutactic/item/hypereutactic.dmi'
-	icon_state = "hypereutactic"
-	lefthand_file = 'modular_citadel/icons/eutactic/mob/hypereutactic_left.dmi'
-	righthand_file = 'modular_citadel/icons/eutactic/mob/hypereutactic_right.dmi'
-	item_state = "hypereutactic"
-	inhand_x_dimension = 64
-	inhand_y_dimension = 64
-	name = "hypereutactic blade"
-	desc = "A supermassive weapon envisioned to cleave the very fabric of space and time itself in twain, the hypereutactic blade dynamically flash-forges a hypereutactic crystaline nanostructure capable of passing through most known forms of matter like a hot knife through butter."
-	force = 7
-	force_unwielded = 7
-	force_wielded = 40
-	wieldsound = 'sound/weapons/nebon.ogg'
-	unwieldsound = 'sound/weapons/neboff.ogg'
-	hitsound_on = 'sound/weapons/nebhit.ogg'
-	slowdown_wielded = 1
-	armour_penetration = 60
-	light_color = "#37FFF7"
-	rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "destroyed", "ripped", "devastated", "shredded")
-	spinnable = FALSE
-	total_mass_on = 4
-
-/obj/item/twohanded/dualsaber/hypereutactic/chaplain
-	name = "\improper divine lightblade"
-	desc = "A giant blade of bright and holy light, said to cut down the wicked with ease."
-	force = 5
-	force_unwielded = 5
-	force_wielded = 20
-	block_chance = 50
-	armour_penetration = 0
-	var/chaplain_spawnable = TRUE
-	obj_flags = UNIQUE_RENAME
-
-/obj/item/twohanded/dualsaber/hypereutactic/chaplain/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE)
-
-/obj/item/twohanded/dualsaber/hypereutactic/chaplain/IsReflect()
-	return FALSE
-
-/obj/item/twohanded/dualsaber/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
-	altafterattack(A, user, TRUE, params)
-	return TRUE
-
-/obj/item/twohanded/dualsaber/hypereutactic/altafterattack(atom/target, mob/living/user, proximity_flag, click_parameters)	//does right click memes
-	if(istype(user))
-		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
-	return TRUE
-
-/obj/item/twohanded/dualsaber/hypereutactic/update_icon()
-	var/mutable_appearance/blade_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/hypereutactic.dmi', "hypereutactic_blade")
-	var/mutable_appearance/gem_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/hypereutactic.dmi', "hypereutactic_gem")
-
-	if(light_color)
-		blade_overlay.color = light_color
-		gem_overlay.color = light_color
-
-	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
-
-	add_overlay(gem_overlay)
-
-	if(wielded)
-		add_overlay(blade_overlay)
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_hands()
-
-	clean_blood()
-
-/obj/item/twohanded/dualsaber/hypereutactic/AltClick(mob/living/user)
-	if(!user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
-		return
-	if(user.incapacitated() || !istype(user))
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
-		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
-		if(!energy_color_input || !user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
-			return
-		light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
-		update_icon()
-		update_light()
-
-/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file)
-	. = ..()
-	if(isinhands)
-		var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
-		gem_inhand.color = light_color
-		. += gem_inhand
-		if(wielded)
-			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "hypereutactic_blade")
-			blade_inhand.color = light_color
-			. += blade_inhand
-
-/obj/item/twohanded/dualsaber/hypereutactic/examine(mob/user)
-	..()
-	if(!hacked)
-		to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
-
-/obj/item/twohanded/dualsaber/hypereutactic/rainbow_process()
-	. = ..()
-	update_icon()
-	update_light()
-
-//////////////////	TOY VERSION	/////////////////////////////
-
-/obj/item/twohanded/dualsaber/hypereutactic/toy
-	name = "\improper DX Hyper-Euplastic LightSword"
-	desc = "A supermassive toy envisioned to cleave the very fabric of space and time itself in twain. Realistic visuals and sounds! Ages 8 and up."
-	force = 0
-	throwforce = 0
-	throw_speed = 3
-	throw_range = 5
-	force_unwielded = 0
-	force_wielded = 0
-	attack_verb = list("attacked", "struck", "hit")
-	total_mass_on = TOTAL_MASS_TOY_SWORD
-	slowdown_wielded = 0
-
-/obj/item/twohanded/dualsaber/hypereutactic/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	return FALSE
-
-/obj/item/twohanded/dualsaber/hypereutactic/toy/IsReflect()//Stops it from reflecting energy projectiles
-	return FALSE
-
-////////		Tatortot NEB		/////////////// (same stats as regular esword)
-/obj/item/melee/transforming/energy/sword/cx/traitor
-	name = "\improper Dragon's Tooth Sword"
-	desc = "The Dragon's Tooth sword is a blackmarket modification of a Non-Eutactic Blade, \
-			which utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable. \
-			It appears to have a wooden grip and a shaved down guard."
-	icon_state = "cxsword_hilt_traitor"
-	force_on = 30
-	armour_penetration = 50
-	embedding = list("embedded_pain_multiplier" = 10, "embed_chance" = 75, "embedded_fall_chance" = 0, "embedded_impact_pain_multiplier" = 10)
-	block_chance = 50
-	hitsound_on = 'sound/weapons/blade1.ogg'
-	light_color = "#37F0FF"
-
-/obj/item/melee/transforming/energy/sword/cx/traitor/transform_messages(mob/living/user, supress_message_text)
-	playsound(user, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, 1)
-	if(!supress_message_text)
-		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
-
-//RAINBOW MEMES
-
-/obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
-	name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
-	desc = "A custom-built toy with fancy rainbow lights built-in."
-	hacked = TRUE

modular_citadel/code/modules/awaymissions/citadel_ghostrole_spawners.dm

@@ -1,73 +0,0 @@
-/obj/effect/mob_spawn/human/lavaknight
-	name = "odd cryogenics pod"
-	desc = "A humming cryo pod. You can barely recognise a faint glow underneath the built up ice. The machine is attempting to wake up its occupant."
-	mob_name = "a displaced knight from another dimension"
-	icon = 'icons/obj/machines/sleeper.dmi'
-	icon_state = "sleeper"
-	roundstart = FALSE
-	job_description = "Cydonian Knight"
-	death = FALSE
-	random = TRUE
-	outfit = /datum/outfit/lavaknight
-	mob_species = /datum/species/human
-	flavour_text = "<font size=3><b>Y</b></font><b>ou are a knight who conveniently has some form of retrograde amnesia. \
-	You cannot remember where you came from. However, a few things remain burnt into your mind, most prominently a vow to never harm another sapient being under any circumstances unless it is hellbent on ending your life. \
-	Remember: hostile creatures and such are fair game for attacking, but <span class='danger'>under no circumstances are you to attack anything capable of thought and/or speech</span> unless it has made it its life's calling to chase you to the ends of the earth."
-	assignedrole = "Cydonian Knight"
-
-/obj/effect/mob_spawn/human/lavaknight/special(mob/living/new_spawn)
-	if(ishuman(new_spawn))
-		var/mob/living/carbon/human/H = new_spawn
-		H.dna.features["mam_ears"] = "Cat, Big"	//cat people
-		H.dna.features["mcolor"] = H.hair_color
-		H.update_body()
-
-/obj/effect/mob_spawn/human/lavaknight/Destroy()
-	new/obj/structure/showcase/machinery/oldpod/used(drop_location())
-	return ..()
-
-/datum/outfit/lavaknight
-	name = "Cydonian Knight"
-	uniform = /obj/item/clothing/under/assistantformal
-	mask = /obj/item/clothing/mask/breath
-	shoes = /obj/item/clothing/shoes/sneakers/black
-	r_pocket = /obj/item/melee/transforming/energy/sword/cx
-	suit = /obj/item/clothing/suit/space/hardsuit/lavaknight
-	suit_store = /obj/item/tank/internals/oxygen
-	id = /obj/item/card/id/knight
-
-/datum/outfit/lavaknight/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	if(visualsOnly)
-		return
-
-	var/obj/item/card/id/knight/W = H.wear_id
-	W.assignment = "Knight"
-	W.registered_name = H.real_name
-	W.id_color = "#0000FF" //Regular knights get simple blue. Doesn't matter much because it's variable anyway
-	W.update_label(H.real_name)
-	W.update_icon()
-
-/datum/outfit/lavaknight/captain
-	name ="Cydonian Knight Captain"
-	l_pocket = /obj/item/twohanded/dualsaber/hypereutactic
-
-/datum/outfit/lavaknight/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	if(visualsOnly)
-		return
-
-	var/obj/item/card/id/knight/W = H.wear_id
-	W.assignment = "Knight Captain"
-	W.registered_name = H.real_name
-	W.id_color = "#FFD700" //Captains get gold, duh. Doesn't matter because it's variable anyway
-	W.update_label(H.real_name)
-	W.update_icon()
-
-
-/obj/effect/mob_spawn/human/lavaknight/captain
-	name = "odd gilded cryogenics pod"
-	desc = "A humming cryo pod that appears to be gilded. You can barely recognise a faint glow underneath the built up ice. The machine is attempting to wake up its occupant."
-	flavour_text = "<font size=3><b>Y</b></font><b>ou are a knight who conveniently has some form of retrograde amnesia. \
-	You cannot remember where you came from. However, a few things remain burnt into your mind, most prominently a vow to never harm another sapient being under any circumstances unless it is hellbent on ending your life. \
-	Remember: hostile creatures and such are fair game for attacking, but <span class='danger'>under no circumstances are you to attack anything capable of thought and/or speech</span> unless it has made it its life's calling to chase you to the ends of the earth. \
-	You feel a natural instict to lead, and as such, you should strive to lead your comrades to safety, and hopefully home. You also feel a burning determination to uphold your vow, as well as your fellow comrade's."
-	outfit = /datum/outfit/lavaknight/captain

modular_citadel/code/modules/clothing/spacesuits/cydonian_armor.dm

@@ -1,176 +0,0 @@
-/*
-			CYDONIAN ARMOR THAT IS RGB AND STUFF WOOOOOOOOOO
-*/
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight
-	name = "cydonian helmet"
-	desc = "A helmet designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
-	icon = 'modular_citadel/icons/lavaknight/item/head.dmi'
-	icon_state = "knight_cydonia"
-	item_state = "knight_yellow"
-	item_color = null
-	alternate_worn_icon = 'modular_citadel/icons/lavaknight/mob/head.dmi'
-	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
-	resistance_flags = FIRE_PROOF | LAVA_PROOF
-	heat_protection = HEAD
-	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100)
-	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)
-	var/energy_color = "#35FFF0"
-	var/obj/item/clothing/suit/space/hardsuit/lavaknight/linkedsuit = null
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/New()
-	..()
-	if(istype(loc, /obj/item/clothing/suit/space/hardsuit/lavaknight))
-		linkedsuit = loc
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/attack_self(mob/user)
-	on = !on
-
-	if(on)
-		set_light(brightness_on)
-	else
-		set_light(0)
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.UpdateButtonIcon()
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/update_icon()
-	var/mutable_appearance/helm_overlay = mutable_appearance('modular_citadel/icons/lavaknight/item/head.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-
-	if(energy_color)
-		helm_overlay.color = energy_color
-
-	helm_overlay.plane = LIGHTING_PLANE + 1	//Magic number is used here because we have no ABOVE_LIGHTING_PLANE plane defined. Lighting plane is 15, HUD is 18
-
-	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
-
-	add_overlay(helm_overlay)
-
-	emissivelights()
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/equipped(mob/user, slot)
-	..()
-	if(slot == SLOT_HEAD)
-		emissivelights()
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/dropped(mob/user)
-	..()
-	emissivelightsoff()
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/proc/emissivelights(mob/user = usr)
-	var/mutable_appearance/energy_overlay = mutable_appearance('modular_citadel/icons/lavaknight/mob/head.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-	energy_overlay.color = energy_color
-	energy_overlay.plane = LIGHTING_PLANE + 1
-	user.cut_overlay(energy_overlay)	//honk
-	user.add_overlay(energy_overlay)	//honk
-
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/proc/emissivelightsoff(mob/user = usr)
-	user.cut_overlay()
-	linkedsuit.emissivelights()	//HONK HONK HONK MAXIMUM SPAGHETTI
-	user.regenerate_icons()    //honk
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight
-	icon = 'modular_citadel/icons/lavaknight/item/suit.dmi'
-	icon_state = "knight_cydonia"
-	name = "cydonian armor"
-	desc = "A suit designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
-	item_state = "swat_suit"
-	alternate_worn_icon = 'modular_citadel/icons/lavaknight/mob/suit.dmi'
-	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
-	resistance_flags = FIRE_PROOF | LAVA_PROOF
-	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100)
-	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
-	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/lavaknight
-	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	actions_types = list(/datum/action/item_action/toggle_helmet)
-	var/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/linkedhelm
-	tauric = TRUE		//Citadel Add for tauric hardsuits
-
-	var/energy_color = "#35FFF0"
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/New()
-	..()
-	if(helmet)
-		linkedhelm = helmet
-	light_color = energy_color
-	set_light(1)
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/Initialize()
-	..()
-	update_icon()
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/update_icon()
-	var/mutable_appearance/suit_overlay
-
-	if(taurmode == SNEK_TAURIC)
-		suit_overlay = mutable_appearance('modular_citadel/icons/mob/taur_naga.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-	else if(taurmode == PAW_TAURIC)
-		suit_overlay = mutable_appearance('modular_citadel/icons/mob/taur_canine.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-	else
-		suit_overlay = mutable_appearance('modular_citadel/icons/lavaknight/item/suit.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-
-	if(energy_color)
-		suit_overlay.color = energy_color
-
-	suit_overlay.plane = LIGHTING_PLANE + 1		//Magic number is used here because we have no ABOVE_LIGHTING_PLANE plane defined. Lighting plane is 15.
-
-	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
-
-	add_overlay(suit_overlay)
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/equipped(mob/user, slot)
-	..()
-	if(slot == SLOT_WEAR_SUIT)
-		emissivelights()
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/dropped(mob/user)
-	..()
-	emissivelightsoff()
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/proc/emissivelights(mob/user = usr)
-	var/mutable_appearance/energy_overlay
-	if(taurmode == SNEK_TAURIC)
-		energy_overlay = mutable_appearance('modular_citadel/icons/mob/taur_naga.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-	else if(taurmode == PAW_TAURIC)
-		energy_overlay = mutable_appearance('modular_citadel/icons/mob/taur_canine.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-	else
-		energy_overlay = mutable_appearance('modular_citadel/icons/lavaknight/mob/suit.dmi', "knight_cydonia_overlay", LIGHTING_LAYER + 1)
-
-	energy_overlay.color = energy_color
-	energy_overlay.plane = LIGHTING_PLANE + 1
-	user.cut_overlay(energy_overlay)	//honk
-	user.add_overlay(energy_overlay)	//honk
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/proc/emissivelightsoff(mob/user = usr)
-	user.cut_overlays()
-	user.regenerate_icons()    //honk
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/AltClick(mob/living/user)
-	if(user.incapacitated() || !istype(user))
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-	if(!in_range(src, user))
-		return
-	if(user.incapacitated() || !istype(user) || !in_range(src, user))
-		return
-
-	if(alert("Are you sure you want to recolor your armor stripes?", "Confirm Repaint", "Yes", "No") == "Yes")
-		var/energy_color_input = input(usr,"","Choose Energy Color",energy_color) as color|null
-		if(energy_color_input)
-			energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
-			user.update_inv_wear_suit()
-			if(linkedhelm)
-				linkedhelm.energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
-				user.update_inv_head()
-				linkedhelm.update_icon()
-			update_icon()
-			user.update_inv_wear_suit()
-			light_color = energy_color
-			emissivelights()
-			update_light()
-
-/obj/item/clothing/suit/space/hardsuit/lavaknight/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")

modular_citadel/code/modules/events/blob.dm

@@ -1,2 +0,0 @@
-/datum/round_event_control/blob
-  earliest_start = 60 MINUTES

modular_citadel/code/modules/events/wizard/magicarp.dm

@@ -1,2 +0,0 @@
-/mob/living/simple_animal/hostile/carp/ranged
-    gold_core_spawnable = NO_SPAWN

modular_citadel/code/modules/jobs/dresscode_values.dm

@@ -1,8 +0,0 @@
-//This file controls whether or not a job complies with dresscodes.
-//If a job complies with dresscodes, loadout items will not be equipped instead of the job's outfit, instead placing the items into the player's backpack.
-
-/datum/job
-	var/dresscodecompliant = TRUE
-
-/datum/job/assistant
-	dresscodecompliant = FALSE

modular_citadel/code/modules/jobs/job_types/captain.dm

@@ -1,21 +0,0 @@
-/datum/job/captain
-	minimal_player_age = 20
-	exp_type = EXP_TYPE_COMMAND
-
-/datum/job/hop
-	minimal_player_age = 20
-	exp_type_department = EXP_TYPE_SERVICE
-
-	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
-			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
-			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
-			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
-			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
-			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
-			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
-			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
-			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
-			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
-			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
-

modular_citadel/code/modules/jobs/job_types/cargo_service.dm

@@ -1,31 +0,0 @@
-/datum/job/bartender
-	access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM)
-
-/datum/job/qm
-	department_head = list("Captain")
-	supervisors = "the captain"
-	req_admin_notify = 1
-	minimal_player_age = 10
-	exp_requirements = 180
-	exp_type_department = EXP_TYPE_SUPPLY
-
-	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS)
-	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS)
-
-/datum/outfit/job/quartermaster
-	id = /obj/item/card/id/silver
-	ears = /obj/item/radio/headset/heads/qm
-	backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
-
-/datum/job/cargo_tech
-	department_head = list("Quartermaster")
-	supervisors = "the quartermaster"
-
-	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
-
-/datum/job/mining
-	department_head = list("Quartermaster")
-	supervisors = "the quartermaster"
-
-	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)

modular_citadel/code/modules/jobs/job_types/engineering.dm

@@ -1,14 +0,0 @@
-/datum/job/chief_engineer
-	minimal_player_age = 10
-	
-/datum/job/engineer
-	access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
-									ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
-									ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
-
-/datum/job/atmos
-	access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
-		ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE, 
-		ACCESS_ENGINE_EQUIP, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM)

modular_citadel/code/modules/jobs/job_types/medical.dm

@@ -1,8 +0,0 @@
-/datum/job/cmo
-	minimal_player_age = 10
-
-/datum/outfit/job/doctor
-	backpack_contents = list(/obj/item/storage/hypospraykit/regular)
-
-/datum/outfit/job/chemist
-	backpack_contents = list(/obj/item/storage/hypospraykit/regular)

modular_citadel/code/modules/jobs/job_types/science.dm

@@ -1,2 +0,0 @@
-/datum/job/rd
-	minimal_player_age = 10

modular_citadel/code/modules/jobs/job_types/security.dm

@@ -1,5 +0,0 @@
-/datum/job/hos
-	minimal_player_age = 10
-	
-/datum/outfit/job/warden
-	suit_store = /obj/item/gun/energy/pumpaction/defender

modular_citadel/code/modules/mob/living/living.dm

@@ -13,7 +13,7 @@
 	var/sprint_buffer_max = 42
 	var/sprint_buffer_regen_ds = 0.3		//Tiles per world.time decisecond
 	var/sprint_buffer_regen_last = 0		//last world.time this was regen'd for math.
-	var/sprint_stamina_cost = 0.55			//stamina loss per tile while insufficient sprint buffer.
+	var/sprint_stamina_cost = 0.70			//stamina loss per tile while insufficient sprint buffer.
 	//---End
 
 /mob/living/movement_delay(ignorewalk = 0)

modular_citadel/code/modules/mob/living/silicon/ai/vox_sounds.dm

@@ -1,633 +0,0 @@
-// List is required to compile the resources into the game when it loads.
-// Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable.
-#ifdef AI_VOX
-
-GLOBAL_LIST_INIT(vox_sounds_male, list("," = 'modular_citadel/sound/vox/_comma.ogg',
-"." = 'modular_citadel/sound/vox/_period.ogg',
-"a" = 'modular_citadel/sound/vox/a.ogg',
-"accelerating" = 'modular_citadel/sound/vox/accelerating.ogg',
-"accelerator" = 'modular_citadel/sound/vox/accelerator.ogg',
-"accepted" = 'modular_citadel/sound/vox/accepted.ogg',
-"access" = 'modular_citadel/sound/vox/access.ogg',
-"acknowledge" = 'modular_citadel/sound/vox/acknowledge.ogg',
-"acknowledged" = 'modular_citadel/sound/vox/acknowledged.ogg',
-"acquired" = 'modular_citadel/sound/vox/acquired.ogg',
-"acquisition" = 'modular_citadel/sound/vox/acquisition.ogg',
-"across" = 'modular_citadel/sound/vox/across.ogg',
-"activate" = 'modular_citadel/sound/vox/activate.ogg',
-"activated" = 'modular_citadel/sound/vox/activated.ogg',
-"activity" = 'modular_citadel/sound/vox/activity.ogg',
-"adios" = 'modular_citadel/sound/vox/adios.ogg',
-"administration" = 'modular_citadel/sound/vox/administration.ogg',
-"advanced" = 'modular_citadel/sound/vox/advanced.ogg',
-"after" = 'modular_citadel/sound/vox/after.ogg',
-"agent" = 'modular_citadel/sound/vox/agent.ogg',
-"alarm" = 'modular_citadel/sound/vox/alarm.ogg',
-"alert" = 'modular_citadel/sound/vox/alert.ogg',
-"alien" = 'modular_citadel/sound/vox/alien.ogg',
-"aligned" = 'modular_citadel/sound/vox/aligned.ogg',
-"all" = 'modular_citadel/sound/vox/all.ogg',
-"alpha" = 'modular_citadel/sound/vox/alpha.ogg',
-"am" = 'modular_citadel/sound/vox/am.ogg',
-"amigo" = 'modular_citadel/sound/vox/amigo.ogg',
-"ammunition" = 'modular_citadel/sound/vox/ammunition.ogg',
-"an" = 'modular_citadel/sound/vox/an.ogg',
-"and" = 'modular_citadel/sound/vox/and.ogg',
-"announcement" = 'modular_citadel/sound/vox/announcement.ogg',
-"anomalous" = 'modular_citadel/sound/vox/anomalous.ogg',
-"antenna" = 'modular_citadel/sound/vox/antenna.ogg',
-"any" = 'modular_citadel/sound/vox/any.ogg',
-"apprehend" = 'modular_citadel/sound/vox/apprehend.ogg',
-"approach" = 'modular_citadel/sound/vox/approach.ogg',
-"are" = 'modular_citadel/sound/vox/are.ogg',
-"area" = 'modular_citadel/sound/vox/area.ogg',
-"arm" = 'modular_citadel/sound/vox/arm.ogg',
-"armed" = 'modular_citadel/sound/vox/armed.ogg',
-"armor" = 'modular_citadel/sound/vox/armor.ogg',
-"armory" = 'modular_citadel/sound/vox/armory.ogg',
-"arrest" = 'modular_citadel/sound/vox/arrest.ogg',
-"ass" = 'modular_citadel/sound/vox/ass.ogg',
-"at" = 'modular_citadel/sound/vox/at.ogg',
-"atomic" = 'modular_citadel/sound/vox/atomic.ogg',
-"attention" = 'modular_citadel/sound/vox/attention.ogg',
-"authorize" = 'modular_citadel/sound/vox/authorize.ogg',
-"authorized" = 'modular_citadel/sound/vox/authorized.ogg',
-"automatic" = 'modular_citadel/sound/vox/automatic.ogg',
-"away" = 'modular_citadel/sound/vox/away.ogg',
-"b" = 'modular_citadel/sound/vox/b.ogg',
-"back" = 'modular_citadel/sound/vox/back.ogg',
-"backman" = 'modular_citadel/sound/vox/backman.ogg',
-"bad" = 'modular_citadel/sound/vox/bad.ogg',
-"bag" = 'modular_citadel/sound/vox/bag.ogg',
-"bailey" = 'modular_citadel/sound/vox/bailey.ogg',
-"barracks" = 'modular_citadel/sound/vox/barracks.ogg',
-"base" = 'modular_citadel/sound/vox/base.ogg',
-"bay" = 'modular_citadel/sound/vox/bay.ogg',
-"be" = 'modular_citadel/sound/vox/be.ogg',
-"been" = 'modular_citadel/sound/vox/been.ogg',
-"before" = 'modular_citadel/sound/vox/before.ogg',
-"beyond" = 'modular_citadel/sound/vox/beyond.ogg',
-"biohazard" = 'modular_citadel/sound/vox/biohazard.ogg',
-"biological" = 'modular_citadel/sound/vox/biological.ogg',
-"birdwell" = 'modular_citadel/sound/vox/birdwell.ogg',
-"bizwarn" = 'modular_citadel/sound/vox/bizwarn.ogg',
-"black" = 'modular_citadel/sound/vox/black.ogg',
-"blast" = 'modular_citadel/sound/vox/blast.ogg',
-"blocked" = 'modular_citadel/sound/vox/blocked.ogg',
-"bloop" = 'modular_citadel/sound/vox/bloop.ogg',
-"blue" = 'modular_citadel/sound/vox/blue.ogg',
-"bottom" = 'modular_citadel/sound/vox/bottom.ogg',
-"bravo" = 'modular_citadel/sound/vox/bravo.ogg',
-"breach" = 'modular_citadel/sound/vox/breach.ogg',
-"breached" = 'modular_citadel/sound/vox/breached.ogg',
-"break" = 'modular_citadel/sound/vox/break.ogg',
-"bridge" = 'modular_citadel/sound/vox/bridge.ogg',
-"bust" = 'modular_citadel/sound/vox/bust.ogg',
-"but" = 'modular_citadel/sound/vox/but.ogg',
-"button" = 'modular_citadel/sound/vox/button.ogg',
-"buzwarn" = 'modular_citadel/sound/vox/buzwarn.ogg',
-"bypass" = 'modular_citadel/sound/vox/bypass.ogg',
-"c" = 'modular_citadel/sound/vox/c.ogg',
-"cable" = 'modular_citadel/sound/vox/cable.ogg',
-"call" = 'modular_citadel/sound/vox/call.ogg',
-"called" = 'modular_citadel/sound/vox/called.ogg',
-"canal" = 'modular_citadel/sound/vox/canal.ogg',
-"cap" = 'modular_citadel/sound/vox/cap.ogg',
-"captain" = 'modular_citadel/sound/vox/captain.ogg',
-"capture" = 'modular_citadel/sound/vox/capture.ogg',
-"captured" = 'modular_citadel/sound/vox/captured.ogg',
-"ceiling" = 'modular_citadel/sound/vox/ceiling.ogg',
-"celsius" = 'modular_citadel/sound/vox/celsius.ogg',
-"center" = 'modular_citadel/sound/vox/center.ogg',
-"centi" = 'modular_citadel/sound/vox/centi.ogg',
-"central" = 'modular_citadel/sound/vox/central.ogg',
-"chamber" = 'modular_citadel/sound/vox/chamber.ogg',
-"charlie" = 'modular_citadel/sound/vox/charlie.ogg',
-"check" = 'modular_citadel/sound/vox/check.ogg',
-"checkpoint" = 'modular_citadel/sound/vox/checkpoint.ogg',
-"chemical" = 'modular_citadel/sound/vox/chemical.ogg',
-"cleanup" = 'modular_citadel/sound/vox/cleanup.ogg',
-"clear" = 'modular_citadel/sound/vox/clear.ogg',
-"clearance" = 'modular_citadel/sound/vox/clearance.ogg',
-"close" = 'modular_citadel/sound/vox/close.ogg',
-"clown" = 'modular_citadel/sound/vox/clown.ogg',
-"code" = 'modular_citadel/sound/vox/code.ogg',
-"coded" = 'modular_citadel/sound/vox/coded.ogg',
-"collider" = 'modular_citadel/sound/vox/collider.ogg',
-"command" = 'modular_citadel/sound/vox/command.ogg',
-"communication" = 'modular_citadel/sound/vox/communication.ogg',
-"complex" = 'modular_citadel/sound/vox/complex.ogg',
-"computer" = 'modular_citadel/sound/vox/computer.ogg',
-"condition" = 'modular_citadel/sound/vox/condition.ogg',
-"containment" = 'modular_citadel/sound/vox/containment.ogg',
-"contamination" = 'modular_citadel/sound/vox/contamination.ogg',
-"control" = 'modular_citadel/sound/vox/control.ogg',
-"coolant" = 'modular_citadel/sound/vox/coolant.ogg',
-"coomer" = 'modular_citadel/sound/vox/coomer.ogg',
-"core" = 'modular_citadel/sound/vox/core.ogg',
-"correct" = 'modular_citadel/sound/vox/correct.ogg',
-"corridor" = 'modular_citadel/sound/vox/corridor.ogg',
-"crew" = 'modular_citadel/sound/vox/crew.ogg',
-"cross" = 'modular_citadel/sound/vox/cross.ogg',
-"cryogenic" = 'modular_citadel/sound/vox/cryogenic.ogg',
-"d" = 'modular_citadel/sound/vox/d.ogg',
-"dadeda" = 'modular_citadel/sound/vox/dadeda.ogg',
-"damage" = 'modular_citadel/sound/vox/damage.ogg',
-"damaged" = 'modular_citadel/sound/vox/damaged.ogg',
-"danger" = 'modular_citadel/sound/vox/danger.ogg',
-"day" = 'modular_citadel/sound/vox/day.ogg',
-"deactivated" = 'modular_citadel/sound/vox/deactivated.ogg',
-"decompression" = 'modular_citadel/sound/vox/decompression.ogg',
-"decontamination" = 'modular_citadel/sound/vox/decontamination.ogg',
-"deeoo" = 'modular_citadel/sound/vox/deeoo.ogg',
-"defense" = 'modular_citadel/sound/vox/defense.ogg',
-"degrees" = 'modular_citadel/sound/vox/degrees.ogg',
-"delta" = 'modular_citadel/sound/vox/delta.ogg',
-"denied" = 'modular_citadel/sound/vox/denied.ogg',
-"deploy" = 'modular_citadel/sound/vox/deploy.ogg',
-"deployed" = 'modular_citadel/sound/vox/deployed.ogg',
-"destroy" = 'modular_citadel/sound/vox/destroy.ogg',
-"destroyed" = 'modular_citadel/sound/vox/destroyed.ogg',
-"detain" = 'modular_citadel/sound/vox/detain.ogg',
-"detected" = 'modular_citadel/sound/vox/detected.ogg',
-"detonation" = 'modular_citadel/sound/vox/detonation.ogg',
-"device" = 'modular_citadel/sound/vox/device.ogg',
-"did" = 'modular_citadel/sound/vox/did.ogg',
-"die" = 'modular_citadel/sound/vox/die.ogg',
-"dimensional" = 'modular_citadel/sound/vox/dimensional.ogg',
-"dirt" = 'modular_citadel/sound/vox/dirt.ogg',
-"disengaged" = 'modular_citadel/sound/vox/disengaged.ogg',
-"dish" = 'modular_citadel/sound/vox/dish.ogg',
-"disposal" = 'modular_citadel/sound/vox/disposal.ogg',
-"distance" = 'modular_citadel/sound/vox/distance.ogg',
-"distortion" = 'modular_citadel/sound/vox/distortion.ogg',
-"do" = 'modular_citadel/sound/vox/do.ogg',
-"doctor" = 'modular_citadel/sound/vox/doctor.ogg',
-"doop" = 'modular_citadel/sound/vox/doop.ogg',
-"door" = 'modular_citadel/sound/vox/door.ogg',
-"down" = 'modular_citadel/sound/vox/down.ogg',
-"dual" = 'modular_citadel/sound/vox/dual.ogg',
-"duct" = 'modular_citadel/sound/vox/duct.ogg',
-"e" = 'modular_citadel/sound/vox/e.ogg',
-"east" = 'modular_citadel/sound/vox/east.ogg',
-"echo" = 'modular_citadel/sound/vox/echo.ogg',
-"ed" = 'modular_citadel/sound/vox/ed.ogg',
-"effect" = 'modular_citadel/sound/vox/effect.ogg',
-"egress" = 'modular_citadel/sound/vox/egress.ogg',
-"eight" = 'modular_citadel/sound/vox/eight.ogg',
-"eighteen" = 'modular_citadel/sound/vox/eighteen.ogg',
-"eighty" = 'modular_citadel/sound/vox/eighty.ogg',
-"electric" = 'modular_citadel/sound/vox/electric.ogg',
-"electromagnetic" = 'modular_citadel/sound/vox/electromagnetic.ogg',
-"elevator" = 'modular_citadel/sound/vox/elevator.ogg',
-"eleven" = 'modular_citadel/sound/vox/eleven.ogg',
-"eliminate" = 'modular_citadel/sound/vox/eliminate.ogg',
-"emergency" = 'modular_citadel/sound/vox/emergency.ogg',
-"enemy" = 'modular_citadel/sound/vox/enemy.ogg',
-"energy" = 'modular_citadel/sound/vox/energy.ogg',
-"engage" = 'modular_citadel/sound/vox/engage.ogg',
-"engaged" = 'modular_citadel/sound/vox/engaged.ogg',
-"engine" = 'modular_citadel/sound/vox/engine.ogg',
-"enter" = 'modular_citadel/sound/vox/enter.ogg',
-"entry" = 'modular_citadel/sound/vox/entry.ogg',
-"environment" = 'modular_citadel/sound/vox/environment.ogg',
-"error" = 'modular_citadel/sound/vox/error.ogg',
-"escape" = 'modular_citadel/sound/vox/escape.ogg',
-"evacuate" = 'modular_citadel/sound/vox/evacuate.ogg',
-"exchange" = 'modular_citadel/sound/vox/exchange.ogg',
-"exit" = 'modular_citadel/sound/vox/exit.ogg',
-"expect" = 'modular_citadel/sound/vox/expect.ogg',
-"experiment" = 'modular_citadel/sound/vox/experiment.ogg',
-"experimental" = 'modular_citadel/sound/vox/experimental.ogg',
-"explode" = 'modular_citadel/sound/vox/explode.ogg',
-"explosion" = 'modular_citadel/sound/vox/explosion.ogg',
-"exposure" = 'modular_citadel/sound/vox/exposure.ogg',
-"exterminate" = 'modular_citadel/sound/vox/exterminate.ogg',
-"extinguish" = 'modular_citadel/sound/vox/extinguish.ogg',
-"extinguisher" = 'modular_citadel/sound/vox/extinguisher.ogg',
-"extreme" = 'modular_citadel/sound/vox/extreme.ogg',
-"f" = 'modular_citadel/sound/vox/f.ogg',
-"face" = 'modular_citadel/sound/vox/face.ogg',
-"facility" = 'modular_citadel/sound/vox/facility.ogg',
-"fahrenheit" = 'modular_citadel/sound/vox/fahrenheit.ogg',
-"failed" = 'modular_citadel/sound/vox/failed.ogg',
-"failure" = 'modular_citadel/sound/vox/failure.ogg',
-"farthest" = 'modular_citadel/sound/vox/farthest.ogg',
-"fast" = 'modular_citadel/sound/vox/fast.ogg',
-"feet" = 'modular_citadel/sound/vox/feet.ogg',
-"field" = 'modular_citadel/sound/vox/field.ogg',
-"fifteen" = 'modular_citadel/sound/vox/fifteen.ogg',
-"fifth" = 'modular_citadel/sound/vox/fifth.ogg',
-"fifty" = 'modular_citadel/sound/vox/fifty.ogg',
-"final" = 'modular_citadel/sound/vox/final.ogg',
-"fine" = 'modular_citadel/sound/vox/fine.ogg',
-"fire" = 'modular_citadel/sound/vox/fire.ogg',
-"first" = 'modular_citadel/sound/vox/first.ogg',
-"five" = 'modular_citadel/sound/vox/five.ogg',
-"flag" = 'modular_citadel/sound/vox/flag.ogg',
-"flooding" = 'modular_citadel/sound/vox/flooding.ogg',
-"floor" = 'modular_citadel/sound/vox/floor.ogg',
-"fool" = 'modular_citadel/sound/vox/fool.ogg',
-"for" = 'modular_citadel/sound/vox/for.ogg',
-"forbidden" = 'modular_citadel/sound/vox/forbidden.ogg',
-"force" = 'modular_citadel/sound/vox/force.ogg',
-"forms" = 'modular_citadel/sound/vox/forms.ogg',
-"found" = 'modular_citadel/sound/vox/found.ogg',
-"four" = 'modular_citadel/sound/vox/four.ogg',
-"fourteen" = 'modular_citadel/sound/vox/fourteen.ogg',
-"fourth" = 'modular_citadel/sound/vox/fourth.ogg',
-"fourty" = 'modular_citadel/sound/vox/fourty.ogg',
-"foxtrot" = 'modular_citadel/sound/vox/foxtrot.ogg',
-"freeman" = 'modular_citadel/sound/vox/freeman.ogg',
-"freezer" = 'modular_citadel/sound/vox/freezer.ogg',
-"from" = 'modular_citadel/sound/vox/from.ogg',
-"front" = 'modular_citadel/sound/vox/front.ogg',
-"fuel" = 'modular_citadel/sound/vox/fuel.ogg',
-"g" = 'modular_citadel/sound/vox/g.ogg',
-"gay" = 'modular_citadel/sound/vox/gay.ogg',
-"get" = 'modular_citadel/sound/vox/get.ogg',
-"go" = 'modular_citadel/sound/vox/go.ogg',
-"going" = 'modular_citadel/sound/vox/going.ogg',
-"good" = 'modular_citadel/sound/vox/good.ogg',
-"goodbye" = 'modular_citadel/sound/vox/goodbye.ogg',
-"gordon" = 'modular_citadel/sound/vox/gordon.ogg',
-"got" = 'modular_citadel/sound/vox/got.ogg',
-"government" = 'modular_citadel/sound/vox/government.ogg',
-"granted" = 'modular_citadel/sound/vox/granted.ogg',
-"great" = 'modular_citadel/sound/vox/great.ogg',
-"green" = 'modular_citadel/sound/vox/green.ogg',
-"grenade" = 'modular_citadel/sound/vox/grenade.ogg',
-"guard" = 'modular_citadel/sound/vox/guard.ogg',
-"gulf" = 'modular_citadel/sound/vox/gulf.ogg',
-"gun" = 'modular_citadel/sound/vox/gun.ogg',
-"guthrie" = 'modular_citadel/sound/vox/guthrie.ogg',
-"handling" = 'modular_citadel/sound/vox/handling.ogg',
-"hangar" = 'modular_citadel/sound/vox/hangar.ogg',
-"has" = 'modular_citadel/sound/vox/has.ogg',
-"have" = 'modular_citadel/sound/vox/have.ogg',
-"hazard" = 'modular_citadel/sound/vox/hazard.ogg',
-"head" = 'modular_citadel/sound/vox/head.ogg',
-"health" = 'modular_citadel/sound/vox/health.ogg',
-"heat" = 'modular_citadel/sound/vox/heat.ogg',
-"helicopter" = 'modular_citadel/sound/vox/helicopter.ogg',
-"helium" = 'modular_citadel/sound/vox/helium.ogg',
-"hello" = 'modular_citadel/sound/vox/hello.ogg',
-"help" = 'modular_citadel/sound/vox/help.ogg',
-"here" = 'modular_citadel/sound/vox/here.ogg',
-"hide" = 'modular_citadel/sound/vox/hide.ogg',
-"high" = 'modular_citadel/sound/vox/high.ogg',
-"highest" = 'modular_citadel/sound/vox/highest.ogg',
-"hit" = 'modular_citadel/sound/vox/hit.ogg',
-"holds" = 'modular_citadel/sound/vox/holds.ogg',
-"hole" = 'modular_citadel/sound/vox/hole.ogg',
-"hostile" = 'modular_citadel/sound/vox/hostile.ogg',
-"hot" = 'modular_citadel/sound/vox/hot.ogg',
-"hotel" = 'modular_citadel/sound/vox/hotel.ogg',
-"hour" = 'modular_citadel/sound/vox/hour.ogg',
-"hours" = 'modular_citadel/sound/vox/hours.ogg',
-"hundred" = 'modular_citadel/sound/vox/hundred.ogg',
-"hydro" = 'modular_citadel/sound/vox/hydro.ogg',
-"i" = 'modular_citadel/sound/vox/i.ogg',
-"idiot" = 'modular_citadel/sound/vox/idiot.ogg',
-"illegal" = 'modular_citadel/sound/vox/illegal.ogg',
-"immediate" = 'modular_citadel/sound/vox/immediate.ogg',
-"immediately" = 'modular_citadel/sound/vox/immediately.ogg',
-"in" = 'modular_citadel/sound/vox/in.ogg',
-"inches" = 'modular_citadel/sound/vox/inches.ogg',
-"india" = 'modular_citadel/sound/vox/india.ogg',
-"ing" = 'modular_citadel/sound/vox/ing.ogg',
-"inoperative" = 'modular_citadel/sound/vox/inoperative.ogg',
-"inside" = 'modular_citadel/sound/vox/inside.ogg',
-"inspection" = 'modular_citadel/sound/vox/inspection.ogg',
-"inspector" = 'modular_citadel/sound/vox/inspector.ogg',
-"interchange" = 'modular_citadel/sound/vox/interchange.ogg',
-"intruder" = 'modular_citadel/sound/vox/intruder.ogg',
-"invallid" = 'modular_citadel/sound/vox/invallid.ogg',
-"invasion" = 'modular_citadel/sound/vox/invasion.ogg',
-"is" = 'modular_citadel/sound/vox/is.ogg',
-"it" = 'modular_citadel/sound/vox/it.ogg',
-"johnson" = 'modular_citadel/sound/vox/johnson.ogg',
-"juliet" = 'modular_citadel/sound/vox/juliet.ogg',
-"key" = 'modular_citadel/sound/vox/key.ogg',
-"kill" = 'modular_citadel/sound/vox/kill.ogg',
-"kilo" = 'modular_citadel/sound/vox/kilo.ogg',
-"kit" = 'modular_citadel/sound/vox/kit.ogg',
-"lab" = 'modular_citadel/sound/vox/lab.ogg',
-"lambda" = 'modular_citadel/sound/vox/lambda.ogg',
-"laser" = 'modular_citadel/sound/vox/laser.ogg',
-"last" = 'modular_citadel/sound/vox/last.ogg',
-"launch" = 'modular_citadel/sound/vox/launch.ogg',
-"leak" = 'modular_citadel/sound/vox/leak.ogg',
-"leave" = 'modular_citadel/sound/vox/leave.ogg',
-"left" = 'modular_citadel/sound/vox/left.ogg',
-"legal" = 'modular_citadel/sound/vox/legal.ogg',
-"level" = 'modular_citadel/sound/vox/level.ogg',
-"lever" = 'modular_citadel/sound/vox/lever.ogg',
-"lie" = 'modular_citadel/sound/vox/lie.ogg',
-"lieutenant" = 'modular_citadel/sound/vox/lieutenant.ogg',
-"life" = 'modular_citadel/sound/vox/life.ogg',
-"light" = 'modular_citadel/sound/vox/light.ogg',
-"lima" = 'modular_citadel/sound/vox/lima.ogg',
-"liquid" = 'modular_citadel/sound/vox/liquid.ogg',
-"loading" = 'modular_citadel/sound/vox/loading.ogg',
-"locate" = 'modular_citadel/sound/vox/locate.ogg',
-"located" = 'modular_citadel/sound/vox/located.ogg',
-"location" = 'modular_citadel/sound/vox/location.ogg',
-"lock" = 'modular_citadel/sound/vox/lock.ogg',
-"locked" = 'modular_citadel/sound/vox/locked.ogg',
-"locker" = 'modular_citadel/sound/vox/locker.ogg',
-"lockout" = 'modular_citadel/sound/vox/lockout.ogg',
-"lower" = 'modular_citadel/sound/vox/lower.ogg',
-"lowest" = 'modular_citadel/sound/vox/lowest.ogg',
-"magnetic" = 'modular_citadel/sound/vox/magnetic.ogg',
-"main" = 'modular_citadel/sound/vox/main.ogg',
-"maintenance" = 'modular_citadel/sound/vox/maintenance.ogg',
-"malfunction" = 'modular_citadel/sound/vox/malfunction.ogg',
-"man" = 'modular_citadel/sound/vox/man.ogg',
-"mass" = 'modular_citadel/sound/vox/mass.ogg',
-"materials" = 'modular_citadel/sound/vox/materials.ogg',
-"maximum" = 'modular_citadel/sound/vox/maximum.ogg',
-"may" = 'modular_citadel/sound/vox/may.ogg',
-"med" = 'modular_citadel/sound/vox/med.ogg',
-"medical" = 'modular_citadel/sound/vox/medical.ogg',
-"men" = 'modular_citadel/sound/vox/men.ogg',
-"mercy" = 'modular_citadel/sound/vox/mercy.ogg',
-"mesa" = 'modular_citadel/sound/vox/mesa.ogg',
-"message" = 'modular_citadel/sound/vox/message.ogg',
-"meter" = 'modular_citadel/sound/vox/meter.ogg',
-"micro" = 'modular_citadel/sound/vox/micro.ogg',
-"middle" = 'modular_citadel/sound/vox/middle.ogg',
-"mike" = 'modular_citadel/sound/vox/mike.ogg',
-"miles" = 'modular_citadel/sound/vox/miles.ogg',
-"military" = 'modular_citadel/sound/vox/military.ogg',
-"milli" = 'modular_citadel/sound/vox/milli.ogg',
-"million" = 'modular_citadel/sound/vox/million.ogg',
-"minefield" = 'modular_citadel/sound/vox/minefield.ogg',
-"minimum" = 'modular_citadel/sound/vox/minimum.ogg',
-"minutes" = 'modular_citadel/sound/vox/minutes.ogg',
-"mister" = 'modular_citadel/sound/vox/mister.ogg',
-"mode" = 'modular_citadel/sound/vox/mode.ogg',
-"motor" = 'modular_citadel/sound/vox/motor.ogg',
-"motorpool" = 'modular_citadel/sound/vox/motorpool.ogg',
-"move" = 'modular_citadel/sound/vox/move.ogg',
-"must" = 'modular_citadel/sound/vox/must.ogg',
-"nearest" = 'modular_citadel/sound/vox/nearest.ogg',
-"nice" = 'modular_citadel/sound/vox/nice.ogg',
-"nine" = 'modular_citadel/sound/vox/nine.ogg',
-"nineteen" = 'modular_citadel/sound/vox/nineteen.ogg',
-"ninety" = 'modular_citadel/sound/vox/ninety.ogg',
-"no" = 'modular_citadel/sound/vox/no.ogg',
-"nominal" = 'modular_citadel/sound/vox/nominal.ogg',
-"north" = 'modular_citadel/sound/vox/north.ogg',
-"not" = 'modular_citadel/sound/vox/not.ogg',
-"november" = 'modular_citadel/sound/vox/november.ogg',
-"now" = 'modular_citadel/sound/vox/now.ogg',
-"number" = 'modular_citadel/sound/vox/number.ogg',
-"objective" = 'modular_citadel/sound/vox/objective.ogg',
-"observation" = 'modular_citadel/sound/vox/observation.ogg',
-"of" = 'modular_citadel/sound/vox/of.ogg',
-"officer" = 'modular_citadel/sound/vox/officer.ogg',
-"ok" = 'modular_citadel/sound/vox/ok.ogg',
-"on" = 'modular_citadel/sound/vox/on.ogg',
-"one" = 'modular_citadel/sound/vox/one.ogg',
-"open" = 'modular_citadel/sound/vox/open.ogg',
-"operating" = 'modular_citadel/sound/vox/operating.ogg',
-"operations" = 'modular_citadel/sound/vox/operations.ogg',
-"operative" = 'modular_citadel/sound/vox/operative.ogg',
-"option" = 'modular_citadel/sound/vox/option.ogg',
-"order" = 'modular_citadel/sound/vox/order.ogg',
-"organic" = 'modular_citadel/sound/vox/organic.ogg',
-"oscar" = 'modular_citadel/sound/vox/oscar.ogg',
-"out" = 'modular_citadel/sound/vox/out.ogg',
-"outside" = 'modular_citadel/sound/vox/outside.ogg',
-"over" = 'modular_citadel/sound/vox/over.ogg',
-"overload" = 'modular_citadel/sound/vox/overload.ogg',
-"override" = 'modular_citadel/sound/vox/override.ogg',
-"pacify" = 'modular_citadel/sound/vox/pacify.ogg',
-"pain" = 'modular_citadel/sound/vox/pain.ogg',
-"pal" = 'modular_citadel/sound/vox/pal.ogg',
-"panel" = 'modular_citadel/sound/vox/panel.ogg',
-"percent" = 'modular_citadel/sound/vox/percent.ogg',
-"perimeter" = 'modular_citadel/sound/vox/perimeter.ogg',
-"permitted" = 'modular_citadel/sound/vox/permitted.ogg',
-"personnel" = 'modular_citadel/sound/vox/personnel.ogg',
-"pipe" = 'modular_citadel/sound/vox/pipe.ogg',
-"plant" = 'modular_citadel/sound/vox/plant.ogg',
-"platform" = 'modular_citadel/sound/vox/platform.ogg',
-"please" = 'modular_citadel/sound/vox/please.ogg',
-"point" = 'modular_citadel/sound/vox/point.ogg',
-"portal" = 'modular_citadel/sound/vox/portal.ogg',
-"power" = 'modular_citadel/sound/vox/power.ogg',
-"presence" = 'modular_citadel/sound/vox/presence.ogg',
-"press" = 'modular_citadel/sound/vox/press.ogg',
-"primary" = 'modular_citadel/sound/vox/primary.ogg',
-"proceed" = 'modular_citadel/sound/vox/proceed.ogg',
-"processing" = 'modular_citadel/sound/vox/processing.ogg',
-"progress" = 'modular_citadel/sound/vox/progress.ogg',
-"proper" = 'modular_citadel/sound/vox/proper.ogg',
-"propulsion" = 'modular_citadel/sound/vox/propulsion.ogg',
-"prosecute" = 'modular_citadel/sound/vox/prosecute.ogg',
-"protective" = 'modular_citadel/sound/vox/protective.ogg',
-"push" = 'modular_citadel/sound/vox/push.ogg',
-"quantum" = 'modular_citadel/sound/vox/quantum.ogg',
-"quebec" = 'modular_citadel/sound/vox/quebec.ogg',
-"question" = 'modular_citadel/sound/vox/question.ogg',
-"questioning" = 'modular_citadel/sound/vox/questioning.ogg',
-"quick" = 'modular_citadel/sound/vox/quick.ogg',
-"quit" = 'modular_citadel/sound/vox/quit.ogg',
-"radiation" = 'modular_citadel/sound/vox/radiation.ogg',
-"radioactive" = 'modular_citadel/sound/vox/radioactive.ogg',
-"rads" = 'modular_citadel/sound/vox/rads.ogg',
-"rapid" = 'modular_citadel/sound/vox/rapid.ogg',
-"reach" = 'modular_citadel/sound/vox/reach.ogg',
-"reached" = 'modular_citadel/sound/vox/reached.ogg',
-"reactor" = 'modular_citadel/sound/vox/reactor.ogg',
-"red" = 'modular_citadel/sound/vox/red.ogg',
-"relay" = 'modular_citadel/sound/vox/relay.ogg',
-"released" = 'modular_citadel/sound/vox/released.ogg',
-"remaining" = 'modular_citadel/sound/vox/remaining.ogg',
-"renegade" = 'modular_citadel/sound/vox/renegade.ogg',
-"repair" = 'modular_citadel/sound/vox/repair.ogg',
-"report" = 'modular_citadel/sound/vox/report.ogg',
-"reports" = 'modular_citadel/sound/vox/reports.ogg',
-"required" = 'modular_citadel/sound/vox/required.ogg',
-"research" = 'modular_citadel/sound/vox/research.ogg',
-"reset" = 'modular_citadel/sound/vox/reset.ogg',
-"resevoir" = 'modular_citadel/sound/vox/resevoir.ogg',
-"resistance" = 'modular_citadel/sound/vox/resistance.ogg',
-"returned" = 'modular_citadel/sound/vox/returned.ogg',
-"right" = 'modular_citadel/sound/vox/right.ogg',
-"rocket" = 'modular_citadel/sound/vox/rocket.ogg',
-"roger" = 'modular_citadel/sound/vox/roger.ogg',
-"romeo" = 'modular_citadel/sound/vox/romeo.ogg',
-"room" = 'modular_citadel/sound/vox/room.ogg',
-"round" = 'modular_citadel/sound/vox/round.ogg',
-"run" = 'modular_citadel/sound/vox/run.ogg',
-"safe" = 'modular_citadel/sound/vox/safe.ogg',
-"safety" = 'modular_citadel/sound/vox/safety.ogg',
-"sargeant" = 'modular_citadel/sound/vox/sargeant.ogg',
-"satellite" = 'modular_citadel/sound/vox/satellite.ogg',
-"save" = 'modular_citadel/sound/vox/save.ogg',
-"science" = 'modular_citadel/sound/vox/science.ogg',
-"scores" = 'modular_citadel/sound/vox/scores.ogg',
-"scream" = 'modular_citadel/sound/vox/scream.ogg',
-"screen" = 'modular_citadel/sound/vox/screen.ogg',
-"search" = 'modular_citadel/sound/vox/search.ogg',
-"second" = 'modular_citadel/sound/vox/second.ogg',
-"secondary" = 'modular_citadel/sound/vox/secondary.ogg',
-"seconds" = 'modular_citadel/sound/vox/seconds.ogg',
-"sector" = 'modular_citadel/sound/vox/sector.ogg',
-"secure" = 'modular_citadel/sound/vox/secure.ogg',
-"secured" = 'modular_citadel/sound/vox/secured.ogg',
-"security" = 'modular_citadel/sound/vox/security.ogg',
-"select" = 'modular_citadel/sound/vox/select.ogg',
-"selected" = 'modular_citadel/sound/vox/selected.ogg',
-"service" = 'modular_citadel/sound/vox/service.ogg',
-"seven" = 'modular_citadel/sound/vox/seven.ogg',
-"seventeen" = 'modular_citadel/sound/vox/seventeen.ogg',
-"seventy" = 'modular_citadel/sound/vox/seventy.ogg',
-"severe" = 'modular_citadel/sound/vox/severe.ogg',
-"sewage" = 'modular_citadel/sound/vox/sewage.ogg',
-"sewer" = 'modular_citadel/sound/vox/sewer.ogg',
-"shield" = 'modular_citadel/sound/vox/shield.ogg',
-"shipment" = 'modular_citadel/sound/vox/shipment.ogg',
-"shock" = 'modular_citadel/sound/vox/shock.ogg',
-"shoot" = 'modular_citadel/sound/vox/shoot.ogg',
-"shower" = 'modular_citadel/sound/vox/shower.ogg',
-"shut" = 'modular_citadel/sound/vox/shut.ogg',
-"side" = 'modular_citadel/sound/vox/side.ogg',
-"sierra" = 'modular_citadel/sound/vox/sierra.ogg',
-"sight" = 'modular_citadel/sound/vox/sight.ogg',
-"silo" = 'modular_citadel/sound/vox/silo.ogg',
-"six" = 'modular_citadel/sound/vox/six.ogg',
-"sixteen" = 'modular_citadel/sound/vox/sixteen.ogg',
-"sixty" = 'modular_citadel/sound/vox/sixty.ogg',
-"slime" = 'modular_citadel/sound/vox/slime.ogg',
-"slow" = 'modular_citadel/sound/vox/slow.ogg',
-"soldier" = 'modular_citadel/sound/vox/soldier.ogg',
-"some" = 'modular_citadel/sound/vox/some.ogg',
-"someone" = 'modular_citadel/sound/vox/someone.ogg',
-"something" = 'modular_citadel/sound/vox/something.ogg',
-"son" = 'modular_citadel/sound/vox/son.ogg',
-"sorry" = 'modular_citadel/sound/vox/sorry.ogg',
-"south" = 'modular_citadel/sound/vox/south.ogg',
-"squad" = 'modular_citadel/sound/vox/squad.ogg',
-"square" = 'modular_citadel/sound/vox/square.ogg',
-"stairway" = 'modular_citadel/sound/vox/stairway.ogg',
-"status" = 'modular_citadel/sound/vox/status.ogg',
-"sterile" = 'modular_citadel/sound/vox/sterile.ogg',
-"sterilization" = 'modular_citadel/sound/vox/sterilization.ogg',
-"stolen" = 'modular_citadel/sound/vox/stolen.ogg',
-"storage" = 'modular_citadel/sound/vox/storage.ogg',
-"sub" = 'modular_citadel/sound/vox/sub.ogg',
-"subsurface" = 'modular_citadel/sound/vox/subsurface.ogg',
-"sudden" = 'modular_citadel/sound/vox/sudden.ogg',
-"suit" = 'modular_citadel/sound/vox/suit.ogg',
-"superconducting" = 'modular_citadel/sound/vox/superconducting.ogg',
-"supercooled" = 'modular_citadel/sound/vox/supercooled.ogg',
-"supply" = 'modular_citadel/sound/vox/supply.ogg',
-"surface" = 'modular_citadel/sound/vox/surface.ogg',
-"surrender" = 'modular_citadel/sound/vox/surrender.ogg',
-"surround" = 'modular_citadel/sound/vox/surround.ogg',
-"surrounded" = 'modular_citadel/sound/vox/surrounded.ogg',
-"switch" = 'modular_citadel/sound/vox/switch.ogg',
-"system" = 'modular_citadel/sound/vox/system.ogg',
-"systems" = 'modular_citadel/sound/vox/systems.ogg',
-"tactical" = 'modular_citadel/sound/vox/tactical.ogg',
-"take" = 'modular_citadel/sound/vox/take.ogg',
-"talk" = 'modular_citadel/sound/vox/talk.ogg',
-"tango" = 'modular_citadel/sound/vox/tango.ogg',
-"tank" = 'modular_citadel/sound/vox/tank.ogg',
-"target" = 'modular_citadel/sound/vox/target.ogg',
-"team" = 'modular_citadel/sound/vox/team.ogg',
-"temperature" = 'modular_citadel/sound/vox/temperature.ogg',
-"temporal" = 'modular_citadel/sound/vox/temporal.ogg',
-"ten" = 'modular_citadel/sound/vox/ten.ogg',
-"terminal" = 'modular_citadel/sound/vox/terminal.ogg',
-"terminated" = 'modular_citadel/sound/vox/terminated.ogg',
-"termination" = 'modular_citadel/sound/vox/termination.ogg',
-"test" = 'modular_citadel/sound/vox/test.ogg',
-"that" = 'modular_citadel/sound/vox/that.ogg',
-"the" = 'modular_citadel/sound/vox/the.ogg',
-"then" = 'modular_citadel/sound/vox/then.ogg',
-"there" = 'modular_citadel/sound/vox/there.ogg',
-"third" = 'modular_citadel/sound/vox/third.ogg',
-"thirteen" = 'modular_citadel/sound/vox/thirteen.ogg',
-"thirty" = 'modular_citadel/sound/vox/thirty.ogg',
-"this" = 'modular_citadel/sound/vox/this.ogg',
-"those" = 'modular_citadel/sound/vox/those.ogg',
-"thousand" = 'modular_citadel/sound/vox/thousand.ogg',
-"threat" = 'modular_citadel/sound/vox/threat.ogg',
-"three" = 'modular_citadel/sound/vox/three.ogg',
-"through" = 'modular_citadel/sound/vox/through.ogg',
-"time" = 'modular_citadel/sound/vox/time.ogg',
-"to" = 'modular_citadel/sound/vox/to.ogg',
-"top" = 'modular_citadel/sound/vox/top.ogg',
-"topside" = 'modular_citadel/sound/vox/topside.ogg',
-"touch" = 'modular_citadel/sound/vox/touch.ogg',
-"towards" = 'modular_citadel/sound/vox/towards.ogg',
-"track" = 'modular_citadel/sound/vox/track.ogg',
-"train" = 'modular_citadel/sound/vox/train.ogg',
-"transportation" = 'modular_citadel/sound/vox/transportation.ogg',
-"truck" = 'modular_citadel/sound/vox/truck.ogg',
-"tunnel" = 'modular_citadel/sound/vox/tunnel.ogg',
-"turn" = 'modular_citadel/sound/vox/turn.ogg',
-"turret" = 'modular_citadel/sound/vox/turret.ogg',
-"twelve" = 'modular_citadel/sound/vox/twelve.ogg',
-"twenty" = 'modular_citadel/sound/vox/twenty.ogg',
-"two" = 'modular_citadel/sound/vox/two.ogg',
-"unauthorized" = 'modular_citadel/sound/vox/unauthorized.ogg',
-"under" = 'modular_citadel/sound/vox/under.ogg',
-"uniform" = 'modular_citadel/sound/vox/uniform.ogg',
-"unlocked" = 'modular_citadel/sound/vox/unlocked.ogg',
-"until" = 'modular_citadel/sound/vox/until.ogg',
-"up" = 'modular_citadel/sound/vox/up.ogg',
-"upper" = 'modular_citadel/sound/vox/upper.ogg',
-"uranium" = 'modular_citadel/sound/vox/uranium.ogg',
-"us" = 'modular_citadel/sound/vox/us.ogg',
-"usa" = 'modular_citadel/sound/vox/usa.ogg',
-"use" = 'modular_citadel/sound/vox/use.ogg',
-"used" = 'modular_citadel/sound/vox/used.ogg',
-"user" = 'modular_citadel/sound/vox/user.ogg',
-"vacate" = 'modular_citadel/sound/vox/vacate.ogg',
-"valid" = 'modular_citadel/sound/vox/valid.ogg',
-"vapor" = 'modular_citadel/sound/vox/vapor.ogg',
-"vent" = 'modular_citadel/sound/vox/vent.ogg',
-"ventillation" = 'modular_citadel/sound/vox/ventillation.ogg',
-"victor" = 'modular_citadel/sound/vox/victor.ogg',
-"violated" = 'modular_citadel/sound/vox/violated.ogg',
-"violation" = 'modular_citadel/sound/vox/violation.ogg',
-"voltage" = 'modular_citadel/sound/vox/voltage.ogg',
-"vox_login" = 'modular_citadel/sound/vox/vox_login.ogg',
-"walk" = 'modular_citadel/sound/vox/walk.ogg',
-"wall" = 'modular_citadel/sound/vox/wall.ogg',
-"want" = 'modular_citadel/sound/vox/want.ogg',
-"wanted" = 'modular_citadel/sound/vox/wanted.ogg',
-"warm" = 'modular_citadel/sound/vox/warm.ogg',
-"warn" = 'modular_citadel/sound/vox/warn.ogg',
-"warning" = 'modular_citadel/sound/vox/warning.ogg',
-"waste" = 'modular_citadel/sound/vox/waste.ogg',
-"water" = 'modular_citadel/sound/vox/water.ogg',
-"we" = 'modular_citadel/sound/vox/we.ogg',
-"weapon" = 'modular_citadel/sound/vox/weapon.ogg',
-"west" = 'modular_citadel/sound/vox/west.ogg',
-"whiskey" = 'modular_citadel/sound/vox/whiskey.ogg',
-"white" = 'modular_citadel/sound/vox/white.ogg',
-"wilco" = 'modular_citadel/sound/vox/wilco.ogg',
-"will" = 'modular_citadel/sound/vox/will.ogg',
-"with" = 'modular_citadel/sound/vox/with.ogg',
-"without" = 'modular_citadel/sound/vox/without.ogg',
-"woop" = 'modular_citadel/sound/vox/woop.ogg',
-"xeno" = 'modular_citadel/sound/vox/xeno.ogg',
-"yankee" = 'modular_citadel/sound/vox/yankee.ogg',
-"yards" = 'modular_citadel/sound/vox/yards.ogg',
-"year" = 'modular_citadel/sound/vox/year.ogg',
-"yellow" = 'modular_citadel/sound/vox/yellow.ogg',
-"yes" = 'modular_citadel/sound/vox/yes.ogg',
-"you" = 'modular_citadel/sound/vox/you.ogg',
-"your" = 'modular_citadel/sound/vox/your.ogg',
-"yourself" = 'modular_citadel/sound/vox/yourself.ogg',
-"zero" = 'modular_citadel/sound/vox/zero.ogg',
-"zone" = 'modular_citadel/sound/vox/zone.ogg',
-"zulu" = 'modular_citadel/sound/vox/zulu.ogg',))
-#endif

modular_citadel/code/modules/research/designs/machine_designs.dm

@@ -1,6 +0,0 @@
-/datum/design/board/autoylathe
-	name = "Machine Design (Autoylathe)"
-	desc = "The circuit board for an autoylathe."
-	id = "autoylathe"
-	build_path = /obj/item/circuitboard/machine/autoylathe
-	category = list("Misc. Machinery")

modular_citadel/code/modules/research/designs/weapon_designs.dm

@@ -1,7 +0,0 @@
-/datum/design/mag_oldsmg/rubber_mag
-	name = "WT-550 Semi-Auto SMG rubberbullets Magazine (4.6x30mm rubber)"
-	desc = "A 20 round rubber shots magazine for the out of date security WT-550 Semi-Auto SMG"
-	id = "mag_oldsmg_rubber"
-	materials = list(MAT_METAL = 6000)
-	build_path = /obj/item/ammo_box/magazine/wt550m9/wtrubber
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY

modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm

@@ -1,7 +0,0 @@
-/datum/design/mag_oldsmg/tx_mag
-	name = "WT-550 Semi-Auto SMG Uranium Magazine (4.6x30mm TX)"
-	desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Semi-Auto SMG."
-	id = "mag_oldsmg_tx"
-	materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000)
-	build_path = /obj/item/ammo_box/magazine/wt550m9/wttx
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY

modular_citadel/code/modules/research/designs/xenobio_designs.dm

@@ -1,25 +0,0 @@
-/datum/design/xenobio_upgrade
-	name = "owo"
-	desc = "someone's bussin"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/xenobio_upgrade/xenobiomonkeys
-	name = "Xenobiology console monkey upgrade disk"
-	desc = "This disk will add the ability to remotely recycle monkeys via the Xenobiology console."
-	id = "xenobio_monkeys"
-	build_path = /obj/item/disk/xenobio_console_upgrade/monkey
-
-/datum/design/xenobio_upgrade/xenobioslimebasic
-	name = "Xenobiology console basic slime upgrade disk"
-	desc = "This disk will add the ability to remotely manipulate slimes via the Xenobiology console."
-	id = "xenobio_slimebasic"
-	build_path = /obj/item/disk/xenobio_console_upgrade/slimebasic
-
-/datum/design/xenobio_upgrade/xenobioslimeadv
-	name = "Xenobiology console advanced slime upgrade disk"
-	desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
-	id = "xenobio_slimeadv"
-	build_path = /obj/item/disk/xenobio_console_upgrade/slimeadv

modular_citadel/code/modules/research/techweb/_techweb.dm

@@ -1,3 +0,0 @@
-/datum/techweb/specialized/autounlocking/autoylathe
-	design_autounlock_buildtypes = AUTOYLATHE
-	allowed_buildtypes = AUTOYLATHE

modular_citadel/code/modules/research/xenobiology/xenobio_camera.dm

@@ -1,48 +0,0 @@
-/obj/machinery/computer/camera_advanced/xenobio
-	max_slimes = 1
-	var/upgradetier = 0
-
-/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/disk/xenobio_console_upgrade))
-		var/obj/item/disk/xenobio_console_upgrade/diskthing = O
-		var/successfulupgrade = FALSE
-		for(var/I in diskthing.upgradetypes)
-			if(upgradetier & I)
-				continue
-			else
-				upgradetier |= I
-				successfulupgrade = TRUE
-			if(I == XENOBIO_UPGRADE_SLIMEADV)
-				max_slimes = 10
-		if(successfulupgrade)
-			to_chat(user, "<span class='notice'>You have successfully upgraded [src] with [O].</span>")
-		else
-			to_chat(user, "<span class='warning'>[src] already has the contents of [O] installed!</span>")
-		return
-	. = ..()
-
-/obj/item/disk/xenobio_console_upgrade
-	name = "Xenobiology console upgrade disk"
-	desc = "Allan please add detail."
-	icon_state = "datadisk5"
-	var/list/upgradetypes = list()
-
-/obj/item/disk/xenobio_console_upgrade/admin
-	name = "Xenobio all access thing"
-	desc = "'the consoles are literally useless!!!!!!!!!!!!!!!'"
-	upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC, XENOBIO_UPGRADE_SLIMEADV, XENOBIO_UPGRADE_MONKEYS)
-
-/obj/item/disk/xenobio_console_upgrade/monkey
-	name = "Xenobiology console monkey upgrade disk"
-	desc = "This disk will add the ability to remotely recycle monkeys via the Xenobiology console."
-	upgradetypes = list(XENOBIO_UPGRADE_MONKEYS)
-
-/obj/item/disk/xenobio_console_upgrade/slimebasic
-	name = "Xenobiology console basic slime upgrade disk"
-	desc = "This disk will add the ability to remotely manipulate slimes via the Xenobiology console."
-	upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC)
-
-/obj/item/disk/xenobio_console_upgrade/slimeadv
-	name = "Xenobiology console advanced slime upgrade disk"
-	desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
-	upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC, XENOBIO_UPGRADE_SLIMEADV)