Merge pull request #2798 from Rykka-Stormheart/shep-dev-compile-errors

Misc DMLang/VSCode Compiler Fixes + Some Actual Compiler Fixes
2026-08-23 05:07:51 +01:00 · 2021-09-17 03:15:52 -07:00
parent 98d416df6e e622a208c4
commit 362caffe59
56 changed files with 719 additions and 715 deletions
@@ -8,11 +8,4 @@
 #define MAT_CARPET_SILVERBLUE	"silver blue carpet"
 #define MAT_CARPET_PINK			"pink carpet"
 #define MAT_CARPET_PURPLE		"purple carpet"
-#define MAT_CARPET_ORANGE		"orange carpet"
-
-//Casino prize dispenser stuff
-#define CAT_WEAPONS		1
-#define CAT_GEAR		2
-#define CAT_CLOTHING	  4
-#define CAT_MISC		8
-#define CAT_DRINKS		16
+#define MAT_CARPET_ORANGE		"orange carpet"
@@ -18,7 +18,7 @@ var/datum/controller/transfer_controller/transfer_controller
 	currenttick = currenttick + 1
 	//VOREStation Edit START
 	if (round_duration_in_ds >= shift_last_vote - 2 MINUTES)
-		shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again.
+		shift_last_vote = 1000000000000 //Setting to a stupidly high number since it'll be not used again.
 		to_world("<b>Warning: This upcoming round-extend vote will be your last chance to vote for shift extension. Wrap up your scenes in the next 60 minutes if the round is extended.</b>") //CHOMPStation Edit
 	if (round_duration_in_ds >= shift_hard_end - 1 MINUTE)
 		init_shift_change(null, 1)
@@ -583,7 +583,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/muffin = 30,
 		/obj/item/weapon/reagent_containers/food/snacks/berrymuffin = 30,
 		/obj/item/weapon/reagent_containers/food/snacks/cherrypie = 30,
-		/obj/item/weapon/reagent_containers/food/snacks/cookie = 30,
+		/obj/item/weapon/reagent_containers/food/snacks/sugarcookie = 30,
 		/obj/item/weapon/reagent_containers/food/snacks/croissant = 30,
 		/obj/item/weapon/reagent_containers/food/snacks/pie = 30,
 		/obj/item/weapon/reagent_containers/food/snacks/poppypretzel = 30,
@@ -1332,4 +1332,4 @@
 /datum/lore/codex/page/casinomanual_managementguide/add_content()
 	name = "Golden Space Goose Management Guide"
 	keywords += list("Staff", "Guide")
-	data = "WIP"
+	data = "WIP"
@@ -67,8 +67,7 @@
 	if(default_deconstruction_screwdriver(user, W))
 		if(do_after(user, 15))
 			to_chat(user, "You deconstruct the feeder.")
-			var/obj/item/stack/material/plastic/A = new /obj/item/stack/material/plastic(src.loc)
-			A.amount = 4
+			new /obj/item/stack/material/plastic(src.loc, 4)
 			if(beaker)
 				beaker.loc = get_turf(src)
 				beaker = null
@@ -25,16 +25,19 @@
 	var/hasRecord = FALSE	//Check to see if this passes or not.
 	for(var/datum/stored_item/I in item_records)
 		if((O.type == I.item_path) && (O.name == I.item_name))
-			mod_amount(I,O.amount)
+			mod_amount(I,O.get_amount())
 			hasRecord = TRUE
 			qdel(O)
 			break
 	if(!hasRecord)
-		var/datum/stored_item/item = new/datum/stored_item(src,O.type,O.name,O.amount)
+		var/datum/stored_item/item = new/datum/stored_item(src,O.type,O.name,O.get_amount())
 		item_records.Add(item)
 		qdel(O)

 /obj/machinery/smartfridge/tcrystal/tgui_act(action, params)
+	if(..())
+		return TRUE
+	
 	add_fingerprint(usr)
 	switch(action)
 		if("Release")
@@ -142,8 +142,7 @@
 				holder.icon_state = "scarab_wire2"
 			else
 				user.visible_message("[user] removes the wiring from [holder].", "You remove the wiring from [holder].")
-				var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder))
-				coil.amount = 4
+				new /obj/item/stack/cable_coil(get_turf(holder), 4)
 				holder.icon_state = "scarab_chassis_complete"
 		if(16)
 			if(diff==FORWARD)
@@ -238,8 +237,7 @@
 				holder.icon_state = "scarab_chip5"
 			else
 				user.visible_message("[user] pries internal armor layer from [holder].", "You prie internal armor layer from [holder].")
-				var/obj/item/stack/material/steel/MS = new /obj/item/stack/material/steel(get_turf(holder))
-				MS.amount = 5
+				new /obj/item/stack/material/steel(get_turf(holder), 5)
 				holder.icon_state = "scarab_chip5"
 		if(4)
 			if(diff==FORWARD)
@@ -261,8 +259,7 @@
 				holder.icon_state = "scarab_weld2"
 			else
 				user.visible_message("[user] pries the external armor layer from [holder].", "You pry external armor layer from [holder].")
-				var/obj/item/stack/material/plasteel/MS = new /obj/item/stack/material/plasteel(get_turf(holder))
-				MS.amount = 5
+				new /obj/item/stack/material/plasteel(get_turf(holder), 5)
 				holder.icon_state = "scarab_weld1"
 		if(1)
 			if(diff==FORWARD)
@@ -3,9 +3,9 @@
 	icon = 'icons/mecha/mech_construct_ch.dmi'
 	icon_state = "scarab_chassis"

-	New()
-		..()
-		construct = new /datum/construction/mecha/scarab_chassis(src)
+/obj/item/mecha_parts/chassis/scarab/New()
+	..()
+	construct = new /datum/construction/mecha/scarab_chassis(src)

 /obj/item/mecha_parts/part/scarab_torso
 	name="Scarab Torso"
@@ -38,10 +38,10 @@
 	icon = 'icons/obj/closets/bodybag_large.dmi'
 	w_class = ITEMSIZE_LARGE

-	attack_self(mob/user)
-		var/obj/structure/closet/body_bag/large/R = new /obj/structure/closet/body_bag/large(user.loc)
-		R.add_fingerprint(user)
-		qdel(src)
+/obj/item/bodybag/large/attack_self(mob/user)
+	var/obj/structure/closet/body_bag/large/R = new /obj/structure/closet/body_bag/large(user.loc)
+	R.add_fingerprint(user)
+	qdel(src)

 /obj/structure/closet/body_bag/large
 	name = "mass grave body bag"
@@ -12,35 +12,35 @@
 	var/mob/living/capsuleowner = null //taken from Capsule Code
 	var/sizetouse = 0.25

-	pickup(mob/user)
-		if(!capsuleowner)
-			capsuleowner = user
+/obj/item/device/buttonofnormal/pickup(mob/user)
+	if(!capsuleowner)
+		capsuleowner = user

-	attack_self(mob/user)
+/obj/item/device/buttonofnormal/attack_self(mob/user)
+	if(colorindex)
+		nonrandom()
+	sleep(10)
+	capsuleowner.resize(sizetouse)
+	sizetouse = rand(25,200)/100 //randmization occurs after press
+
+/obj/item/device/buttonofnormal/throw_impact(atom/A, speed, mob/user)
+	..()
+	if(isliving(A))
 		if(colorindex)
 			nonrandom()
-		sleep(10)
-		capsuleowner.resize(sizetouse)
+		sleep(5)
+		var/mob/living/capsulehit = A
+		capsulehit.resize(sizetouse)
 		sizetouse = rand(25,200)/100 //randmization occurs after press

-	throw_impact(atom/A, speed, mob/user)
-		..()
-		if(isliving(A))
-			if(colorindex)
-				nonrandom()
-			sleep(5)
-			var/mob/living/capsulehit = A
-			capsulehit.resize(sizetouse)
-			sizetouse = rand(25,200)/100 //randmization occurs after press
-
-	attackby(obj/item/W, mob/user)
-		if(istype(W, /obj/item/weapon/pen))
-			colorindex = (colorindex + 1) % 6
-			icon_state = "mobcap[colorindex]"
-			update_icon()
-		if(istype(W, /obj/item/weapon/card/id))
-			capsuleowner = null
-		..()
+/obj/item/device/buttonofnormal/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/weapon/pen))
+		colorindex = (colorindex + 1) % 6
+		icon_state = "mobcap[colorindex]"
+		update_icon()
+	if(istype(W, /obj/item/weapon/card/id))
+		capsuleowner = null
+	..()

 /obj/item/device/buttonofnormal/proc/nonrandom() //Secret ball randmoizer rig code
 	switch(colorindex)
@@ -64,42 +64,42 @@
 	var/colorindex = 1

 	var/list/winitems = list(
-				/obj/item/weapon/reagent_containers/food/snacks/cookie,
+				/obj/item/weapon/reagent_containers/food/snacks/sugarcookie,
 				/obj/item/weapon/spacecasinocash,
 				/obj/item/weapon/reagent_containers/syringe/drugs,
 	)

-	attackby(obj/item/W, mob/user)
-		if(istype(W, /obj/item/weapon/pen))
-			colorindex += 1
-			if(colorindex >= 6)
-				colorindex = 0
-			icon_state = "mobcap[colorindex]"
-			update_icon()
-		..()
+/obj/item/device/daredevice/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/weapon/pen))
+		colorindex += 1
+		if(colorindex >= 6)
+			colorindex = 0
+		icon_state = "mobcap[colorindex]"
+		update_icon()
+	..()

-	attack_self(mob/user)
-		var/mob/living/capsuleowner = user
-		playsound(src, 'sound/effects/splat.ogg', 30, 1)
-		var/item = pick(winitems)
-		sleep(100)
-		switch(luckynumber7)
-			if(1)	capsuleowner.resize(RESIZE_TINY) //Loss Shrinking!
-			if(2)	capsuleowner.apply_damage(5, BRUTE) //Loss Damaging!
-			if(3)	capsuleowner.Weaken(5) //Loss Knee spaghetti!
-			if(4)	capsuleowner.hallucination += 66 //loss woah, dude.
-			if(5)	new	item(capsuleowner.loc) //Win!
-			if(7)
-				new	/obj/item/weapon/material/butterfly/switchblade(capsuleowner.loc)
-				capsuleowner.apply_damage(10, BRUTE) //Loss Damaging! WIN KNIVE!
-			if(9)
-				new	/obj/item/weapon/gun/energy/sizegun/not_advanced(capsuleowner.loc)
-				qdel(src)
-			if(777)	new	/obj/item/weapon/spacecash/c1000(capsuleowner.loc) //for rigging
-			else luckynumber7 = (rand(0,10))
-		luckynumber7 = rand(0,10)
-		sleep(100)
-		playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1)
+/obj/item/device/daredevice/attack_self(mob/user)
+	var/mob/living/capsuleowner = user
+	playsound(src, 'sound/effects/splat.ogg', 30, 1)
+	var/item = pick(winitems)
+	sleep(100)
+	switch(luckynumber7)
+		if(1)	capsuleowner.resize(RESIZE_TINY) //Loss Shrinking!
+		if(2)	capsuleowner.apply_damage(5, BRUTE) //Loss Damaging!
+		if(3)	capsuleowner.Weaken(5) //Loss Knee spaghetti!
+		if(4)	capsuleowner.hallucination += 66 //loss woah, dude.
+		if(5)	new	item(capsuleowner.loc) //Win!
+		if(7)
+			new	/obj/item/weapon/material/butterfly/switchblade(capsuleowner.loc)
+			capsuleowner.apply_damage(10, BRUTE) //Loss Damaging! WIN KNIVE!
+		if(9)
+			new	/obj/item/weapon/gun/energy/sizegun/not_advanced(capsuleowner.loc)
+			qdel(src)
+		if(777)	new	/obj/item/weapon/spacecash/c1000(capsuleowner.loc) //for rigging
+		else luckynumber7 = (rand(0,10))
+	luckynumber7 = rand(0,10)
+	sleep(100)
+	playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1)

 //items literally just made for the above item spawner

@@ -132,18 +132,18 @@
 					"#0F0F0F",
 					)

-	on_hit(var/atom/target)
-		light_color = pick(chaos_colors)
-		var/chaos = rand(25,200)
-		var/mob/living/M = target
-		if(ishuman(target))
-			var/mob/living/carbon/human/H = M
-			H.resize(chaos/100)
-			H.show_message("<font color='#6F6FE2'> The beam fires into your body, changing your size!</font>")
-			H.updateicon()
-		else if (istype(target, /mob/living/))
-			var/mob/living/H = M
-			H.resize(chaos/100)
-			H.updateicon()
-		else
-			return 1
+/obj/item/projectile/beam/sizelaser/chaos/on_hit(var/atom/target)
+	light_color = pick(chaos_colors)
+	var/chaos = rand(25,200)
+	var/mob/living/M = target
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = M
+		H.resize(chaos/100)
+		H.show_message("<font color='#6F6FE2'> The beam fires into your body, changing your size!</font>")
+		H.updateicon()
+	else if (istype(target, /mob/living/))
+		var/mob/living/H = M
+		H.resize(chaos/100)
+		H.updateicon()
+	else
+		return 1
@@ -12,17 +12,17 @@
 		slot_back_str = 'icons/mob/toy_worn_yw.dmi',
 		slot_head_str = 'icons/mob/toy_worn_yw.dmi')

-	rename_plushie()
-		set name = "Name Plushie"
-		set category = "Object"
-		set desc = "Give your plushie a cute name!"
-		var/mob/M = usr
-		if(!M.mind)
-			return 0
+/obj/item/toy/plushie/teshari/strix/rename_plushie()
+	set name = "Name Plushie"
+	set category = "Object"
+	set desc = "Give your plushie a cute name!"
+	var/mob/M = usr
+	if(!M.mind)
+		return 0

-		if(src && !M.stat && in_range(M,src))
-			to_chat(M, "You cannot rename Strix Hades! You hug him anyway.")
-			return 1
+	if(src && !M.stat && in_range(M,src))
+		to_chat(M, "You cannot rename Strix Hades! You hug him anyway.")
+		return 1

 /obj/item/toy/plushie/teshari/eili
 	name = "Eili"
@@ -39,17 +39,17 @@
 		slot_head_str = 'icons/vore/custom_onmob_yw.dmi')


-	rename_plushie()
-		set name = "Name Plushie"
-		set category = "Object"
-		set desc = "Give your plushie a cute name!"
-		var/mob/M = usr
-		if(!M.mind)
-			return 0
+/obj/item/toy/plushie/teshari/eili/rename_plushie()
+	set name = "Name Plushie"
+	set category = "Object"
+	set desc = "Give your plushie a cute name!"
+	var/mob/M = usr
+	if(!M.mind)
+		return 0

-		if(src && !M.stat && in_range(M,src))
-			to_chat(M, "You cannot rename Eili! You hug her anyway.")
-			return 1
+	if(src && !M.stat && in_range(M,src))
+		to_chat(M, "You cannot rename Eili! You hug her anyway.")
+		return 1

 /obj/item/toy/plushie/teshari/_yw
 	name = "lifelike teshari plush"
@@ -88,7 +88,7 @@
 			G.dust()
 			return
 		else
-			G.stun_effect_act(10 , 50,def_zone = BP_TORSO, src)
+			G.stun_effect_act(10 , 50, BP_TORSO, src)
 			G.take_organ_damage(10)
 			G.Paralyse(20)
 			playsound(src.loc, "sparks", 50, 1)
@@ -172,7 +172,8 @@
 	icon = icon_types[index] ? icon_types[index] : icon_types["def"]
 	icon_state = icon_state_types[index] ? icon_state_types[index] : icon_state_types["def"]
 	trig_proc = trig_proc_types[index] ? trig_proc_types[index] : trig_proc_types["def"]
-	trig_args = trig_args_types[index].len ? trig_args_types[index] : trig_args_types["def"]
+	var/list/trig_arg_type = trig_args_types[index]
+	trig_args = (istype(trig_arg_type) && trig_arg_type.len) ? trig_args_types[index] : trig_args_types["def"]

 /obj/kbutton/toggle/button_trigger()
 	toggled = !toggled
@@ -28,32 +28,32 @@
 	var/gammaunique = 1
 	

-	Initialize()
-		..()
-		if(prob(destroychance))
-			qdel(src)
+/obj/structure/trash_pile/sharkpile/Initialize()
+	..()
+	if(prob(destroychance))
+		qdel(src)

 //^X% chance to use our own list, otherwise default pool.
 //Here we could also add a % chance to spawn a mob for trash pandas or such,
-	produce_alpha_item()
-		if(prob(overridechancealpha))
-			var/path = pick(alphapicks)
-			var/obj/item/I = new path()
-			return I
-		return ..()
+/obj/structure/trash_pile/sharkpile/produce_alpha_item()
+	if(prob(overridechancealpha))
+		var/path = pick(alphapicks)
+		var/obj/item/I = new path()
+		return I
+	return ..()

-	produce_beta_item()
-		if(prob(overridechancebeta))
-			var/path = pick(betapicks)
-			var/obj/item/I = new path()
-			return I
-		return ..()
+/obj/structure/trash_pile/sharkpile/produce_beta_item()
+	if(prob(overridechancebeta))
+		var/path = pick(betapicks)
+		var/obj/item/I = new path()
+		return I
+	return ..()

-	produce_gamma_item()
-		if(prob(overridechancegamma)&& gammaunique!=2)
-			var/path = pick(gammapicks)
-			var/obj/item/I = new path()
-			if(gammaunique!=0)
-				gammaunique++
-			return I
-		return ..()
+/obj/structure/trash_pile/sharkpile/produce_gamma_item()
+	if(prob(overridechancegamma)&& gammaunique!=2)
+		var/path = pick(gammapicks)
+		var/obj/item/I = new path()
+		if(gammaunique!=0)
+			gammaunique++
+		return I
+	return ..()
@@ -677,7 +677,7 @@ var/failed_old_db_connections = 0
 	return .*/

 //This proc ensures that the connection to the feedback database (global variable dbcon) is established
-proc/establish_old_db_connection()
+/proc/establish_old_db_connection()
 	return SSdbcore.Connect()

 /* CHOMPedit
@@ -251,7 +251,7 @@
 	character_name = list("Coda Vanistok")

 //  D CKEYS
-
+/*CHOMP Remove this WILL cause issues if downstreams or whatever somehow have this and custom_items_yw.dm enabled, because on chomp main this file is not enabled but I commented it out in custom_items_yw.dm.
 //dameonowen
 //Dameon Owen
 /datum/gear/fluff/dameon_1
@@ -260,6 +260,8 @@
 	description = "DAS A BIG COOKIE!!!"
 	ckeywhitelist = list("dameonowen")
 	character_name = list("Dameon Owen", "Amber Owen")
+*/
+//CHOMP Remove end 

 //dawidoe
 //Melissa Krutz
@@ -1,4 +1,4 @@
-datum/preferences
+/datum/preferences
 	var/wingdings = 1
 	var/colorblind_mono = 0
 	var/colorblind_vulp = 0
@@ -7,7 +7,7 @@
 	desc = "It's a hat, it flails."
 	body_parts_covered = 0

-/obj/item/clothing/head/wiggler/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer)
+/obj/item/clothing/head/wiggler/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
 	var/image/so_far = ..()
 	so_far.pixel_y += 16
 	so_far.pixel_x += 0
@@ -10,44 +10,45 @@
 	var/lstat
 	var/mob/living/carbon/maskmaster

-	equipped()
-		..()
-		var/mob/living/carbon/human/H = loc
-		if(istype(H) && H.wear_mask == src)
-			canremove = 0
-			maskmaster = H
-			START_PROCESSING(SSprocessing, src)
+/obj/item/clothing/mask/synthfacemask/equipped()
+	..()
+	var/mob/living/carbon/human/H = loc
+	if(istype(H) && H.wear_mask == src)
+		canremove = 0
+		maskmaster = H
+		START_PROCESSING(SSprocessing, src)

-	dropped()
-		canremove = 1
-		maskmaster = null
-		STOP_PROCESSING(SSprocessing, src)
-		return ..()
+/obj/item/clothing/mask/synthfacemask/dropped()
+	canremove = 1
+	maskmaster = null
+	STOP_PROCESSING(SSprocessing, src)
+	return ..()

-	Destroy()
-		. = ..()
-		STOP_PROCESSING(SSprocessing, src)
+/obj/item/clothing/mask/synthfacemask/Destroy()
+	. = ..()
+	STOP_PROCESSING(SSprocessing, src)

-	mob_can_equip(var/mob/living/carbon/human/user, var/slot)
-		if (!..())
-			return 0
-		if(istype(user))
-			var/obj/item/organ/external/E = user.organs_by_name[BP_HEAD]
-			if(istype(E) && (E.robotic >= ORGAN_ROBOT))
-				return 1
-			user << "<span class='warning'>You must have a compatible robotic head to install this upgrade.</span>"
+/obj/item/clothing/mask/synthfacemask/mob_can_equip(var/mob/living/carbon/human/user, var/slot, var/disable_warning = FALSE)
+	if (!..())
 		return 0
-	update_icon()
-		var/mob/living/carbon/human/H = loc
-		if (maskmaster && maskmaster.stat == DEAD) icon_state = "synth_facemask_dead"
-		else icon_state = "synth_facemask"
-		if(istype(H)) H.update_inv_wear_mask()
+	if(istype(user))
+		var/obj/item/organ/external/E = user.organs_by_name[BP_HEAD]
+		if(istype(E) && (E.robotic >= ORGAN_ROBOT))
+			return 1
+		user << "<span class='warning'>You must have a compatible robotic head to install this upgrade.</span>"
+	return 0

-	process()
-		if(maskmaster && lstat != maskmaster.stat)
-			lstat = maskmaster.stat
-			update_icon()
+/obj/item/clothing/mask/synthfacemask/update_icon()
+	var/mob/living/carbon/human/H = loc
+	if (maskmaster && maskmaster.stat == DEAD) icon_state = "synth_facemask_dead"
+	else icon_state = "synth_facemask"
+	if(istype(H)) H.update_inv_wear_mask()
+
+/obj/item/clothing/mask/synthfacemask/process()
+	if(maskmaster && lstat != maskmaster.stat)
 		lstat = maskmaster.stat
+		update_icon()
+	lstat = maskmaster.stat


 //LOADOUT ITEM
@@ -115,7 +115,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO

 //Deluxe explorer suit
-	/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
+/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
 	name = "modular explorer suit"
 	desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates."

@@ -23,29 +23,29 @@
 	flags_inv = HIDEHOLSTER
 	open = 1
 	
-	toggle()
-		set name = "Toggle Coat Buttons"
-		set category = "Object"
-		set src in usr
-		if(!usr.canmove || usr.stat || usr.restrained())
-			return 0
-	
-		if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user
-			open = 0
-			icon_state = "secjacket"
-			item_state = "secjacket_s"
-			flags_inv = HIDETIE|HIDEHOLSTER
-			to_chat(usr, "You button up the coat.")
-		else if(open == 0)
-			open = 1
-			icon_state = "secjacket_open"
-			item_state = "secjacket_open_s"
-			flags_inv = HIDEHOLSTER
-			to_chat(usr, "You unbutton the coat.")
-		else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed
-			to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.")
-			return
-		update_clothing_icon()	//so our overlays update
+/obj/item/clothing/suit/storage/toggle/yw/secjacket/toggle()
+	set name = "Toggle Coat Buttons"
+	set category = "Object"
+	set src in usr
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0
+
+	if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user
+		open = 0
+		icon_state = "secjacket"
+		item_state = "secjacket_s"
+		flags_inv = HIDETIE|HIDEHOLSTER
+		to_chat(usr, "You button up the coat.")
+	else if(open == 0)
+		open = 1
+		icon_state = "secjacket_open"
+		item_state = "secjacket_open_s"
+		flags_inv = HIDEHOLSTER
+		to_chat(usr, "You unbutton the coat.")
+	else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed
+		to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.")
+		return
+	update_clothing_icon()	//so our overlays update

 /obj/item/clothing/suit/armor/yw/blueshieldcoat
 	name = "Blue Shield Security Coat"
@@ -137,7 +137,7 @@
 	desc = "It's worth 1000 credits."
 	worth = 1000

-proc/spawn_casinochips(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
+/proc/spawn_casinochips(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
 	var/obj/item/weapon/spacecasinocash/SC = new (spawnloc)

 	SC.set_worth(sum)
@@ -1,4 +1,5 @@
 /decl/emote/audible/scream/get_emote_sound(var/atom/user)
+	..()
 	var/mob/living/carbon/human/H = user
 	if(H.get_gender() == FEMALE)
 		return list(
@@ -9,5 +10,4 @@
 		return list(
 			"sound" = H.species.male_scream_sound,
 			"vol" = emote_volume
-		)
-	return ..()
+		)
@@ -15,7 +15,7 @@
 		var/in_area = get_area(temp_vent)
 		if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry))
 			continue
-		if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in using_map.station_levels)
+		if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
 			if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.
 				vents += temp_vent

@@ -97,4 +97,4 @@
 #undef LOC_HANGAR3

 #undef VERM_RATS
-#undef VERM_LIZARDS
+#undef VERM_LIZARDMEN
@@ -174,6 +174,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice
 	name = "The Chaos Cake Slice"
 	desc = "A slice from The Chaos Cake, it pulses weirdly, as if angry to be seperated from the whole"
+	icon = 'icons/obj/food_ch.dmi' //CHOMP Add to appease runtimes, I think, even thought this damn file is not enabled???
 	icon_state = "chaoscake_slice-1"

 	center_of_mass = list("x"=16, "y"=10)
@@ -112,7 +112,6 @@
 	result = /obj/item/weapon/thecake_layer/five

 /obj/structure/thecake/proc/HasSliceMissing()
-	..()
 	if(slices < maxslices)
 		if(interval >= regentime)
 			interval = 0
@@ -400,7 +399,6 @@
 	layer_stage = 8

 /obj/structure/chaoscake/proc/HasSliceMissing()
-	..()
 	if(slices < maxslices)
 		if(interval >= regentime)
 			interval = 0
@@ -6,7 +6,6 @@
 /obj/item/weapon/deck/casino
 	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/playing_cards_ch.dmi'
-	list/cards = list()
 	cooldown = 0 // to prevent spam shuffle

 /obj/item/weapon/deck/holder/casino //WIP In future do a cool holder
@@ -685,7 +685,8 @@

 					if(isnull(gene_chem[i])) gene_chem[i] = 0

-					if(chems[rid].len < i) //YW Edit: allows plants whose reagents have not been defined uniformly to splice properly
+					var/list/chems_rid = chems[rid]
+					if(istype(chems_rid) && (chems_rid.len < i)) //YW Edit: allows plants whose reagents have not been defined uniformly to splice properly
 						continue

 					if(chems[rid][i])
@@ -477,7 +477,7 @@ var/global/list/disallowed_protean_accessories = list(
 	if(istype(loc, /obj/item/weapon/rig/protean))
 		var/obj/item/weapon/rig/protean/prig = loc
 		to_chat(src, "You attempt to interface with the [prig].")
-		prig.ui_interact(src, nano_state = interactive_state)
+		prig.ui_interact(src, interactive_state)
 	else
 		to_chat(src, "You are not in RIG form.")
 //CHOMP Add end
@@ -17,7 +17,7 @@

 	flags =            NO_SCAN | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT | NO_PAIN
 	appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_UNDERWEAR | HAS_LIPS
-	spawn_flags		 = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE 
+	spawn_flags		 = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE
 	health_hud_intensity = 2
 	num_alternate_languages = 3
 	assisted_langs = list(LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
@@ -91,7 +91,7 @@
 		/mob/living/carbon/human/proc/nano_regenerate, //These verbs are hidden so you can macro them,
 		/mob/living/carbon/human/proc/nano_partswap,
 		/mob/living/carbon/human/proc/nano_metalnom,
-		/mob/living/carbon/human/proc/nano_blobform, 
+		/mob/living/carbon/human/proc/nano_blobform,
 		/mob/living/proc/set_size,
 		/mob/living/carbon/human/proc/nano_change_fitting, //These verbs are displayed normally,
 		/mob/living/carbon/human/proc/shapeshifter_select_hair,
@@ -108,7 +108,7 @@
 		/mob/living/carbon/human/proc/succubus_drain_lethal,
 		/mob/living/proc/eat_trash
 		) //CHOMP Edit - Added succ stuff that promies have too. Also changed nano_set_size to standard set_size so there is no metal cost.
-		
+
 	var/global/list/abilities = list()

 	var/monochromatic = FALSE //IGNORE ME
@@ -139,9 +139,10 @@
 	H.synth_color = TRUE

 /datum/species/protean/equip_survival_gear(var/mob/living/carbon/human/H)
-	var/boxtype = /obj/item/weapon/storage/box/survival //CHOMP Addition
-	var/obj/item/stack/material/steel/metal_stack = new(null, 5) //CHOMP Edit
-	
+	..() //CHOMP Edit this calls the parent function which should spawn the survival box.
+	var/obj/item/stack/material/steel/metal_stack = new()
+	metal_stack.set_amount(5) //CHOMP Edit
+
 	var/obj/item/clothing/accessory/permit/nanotech/permit = new()
 	permit.set_name(H.real_name)

@@ -160,7 +161,7 @@
 			new_nif.quick_implant(H)
 		else
 			H.nif.durability = rand(21,25)
-			
+
 		var/obj/item/weapon/rig/protean/prig = new /obj/item/weapon/rig/protean(H)
 		prig.myprotean = H

@@ -196,7 +197,7 @@
 	if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.maxHealth*0.5 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever)
 		return ..() //Any instakill shot runtimes since there are no organs after this. No point to not skip these checks, going to nullspace anyway.

-/*CHOMP Station removal start		
+/*CHOMP Station removal start
 	var/obj/item/organ/internal/nano/refactory/refactory = locate() in H.internal_organs
 	if(refactory && !(refactory.status & ORGAN_DEAD))

@@ -238,7 +239,7 @@ CHOMP Station removal end*/
 		stat(null, "- -- --- Abilities (Shift+LMB Examines) --- -- -")
 		for(var/obj/effect/protean_ability/A as anything in abilities)
 			stat("[A.ability_name]",A.atom_button_text())
-			
+
 // Various modifiers
 /datum/modifier/protean
 	stacks = MODIFIER_STACK_FORBID
@@ -359,7 +360,7 @@ CHOMP Removal end*/
 	. = ..()
 	. += validstring
 	. += registring
-	
+
 //CHOMP Add start
 /mob/living/carbon/human/proc/rig_transform()
 	set name = "Modify Form - Hardsuit"
@@ -7,9 +7,9 @@
 									"Maintenance Module" = /mob/living/silicon/robot/drone,
 									) //List of drone types to choose from.//Changeable in mapping.

-	create_drone(var/client/player)
-		choose_dronetype(possible_drones) //Call Drone choice before executing create_drone
-		..()
+/obj/machinery/drone_fabricator/unify/create_drone(var/client/player)
+	choose_dronetype(possible_drones) //Call Drone choice before executing create_drone
+	..()

 /obj/machinery/drone_fabricator/proc/choose_dronetype(possible_drones)
 	var/choice
@@ -385,7 +385,7 @@
 	if(voices && prob(speak_chance/2))
 		randomspeech()

-/mob/living/simple_mob/animal/synx/perform_the_nom() //Synx can only eat people if their organs are on the inside.
+/mob/living/simple_mob/animal/synx/perform_the_nom(mob/living/user, mob/living/prey, mob/living/pred, obj/belly/belly, delay) //Synx can only eat people if their organs are on the inside.
 	if(stomach_distended)
 		to_chat(src,"<span class='notice'>You can't eat people without your stomach inside of you!</span>")
 		return
@@ -701,9 +701,9 @@
 	faction = "SYN"


-	New()
-		..()
-		name = "SYN-KinC-([rand(100,999)])"
+/mob/living/simple_mob/animal/synx/ai/pet/greed/synth/New()
+	..()
+	name = "SYN-KinC-([rand(100,999)])"

 /mob/living/simple_mob/animal/synx/ai/pet/greed/synth/goodboy
 	//hostile = 0
@@ -122,7 +122,7 @@

 /mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(istype(O,/obj/item/vox/armalis_armour))
-		user.drop_item(O, src, force_drop = 1)
+		user.drop_item(O)
 		armour = O
 		movement_cooldown = 4
 		maxHealth += 200
@@ -131,7 +131,7 @@
 		regenerate_icons()
 		return
 	if(istype(O,/obj/item/vox/armalis_amp))
-		user.drop_item(O, src, force_drop = 1)
+		user.drop_item(O)
 		amp = O
 		visible_message("<span class='notice'>[src] is quickly outfitted in [O] by [user].</span>","<span class='notice'>You quickly outfit [src] in [O].</span>")
 		regenerate_icons()
@@ -981,7 +981,7 @@ I think I covered everything.
 	holder.a_intent = I_HURT
 	return 1

-/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/can_attack(atom/movable/the_target)
+/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/can_attack(atom/movable/the_target, vision_required = TRUE)
 	if(istype(holder,/mob/living/simple_mob/vore/bigdragon))
 		var/mob/living/simple_mob/vore/bigdragon/BG = holder
 		if(holder.IIsAlly(the_target))
@@ -147,7 +147,7 @@
 //Fire heals demons instead.
 //This should include all fire sources assuming they dont weirdly make their own damage handling.
 //Yes this also means that negative fire is bad for them...
-/mob/living/simple_mob/vore/demon/adjustFireLoss(amount)
+/mob/living/simple_mob/vore/demon/adjustFireLoss(amount,include_robo = TRUE)
 	amount = 0 - amount
 	src.adjustBruteLoss(amount)
 	..()
@@ -115,7 +115,9 @@
 	. = ..()

 /mob/living/simple_mob/vore/greatwolf/init_vore()
-	. = ..()
+	if(!voremob_loaded) //CHOMP add to fix runtime
+		return //CHOMP Add
+	.=..() //CHOMP Add
 	var/obj/belly/B = vore_selected
 	B.name = "stomach"
 	B.desc = "The moment the wolf gets its jaws around you, it scoops you right up off of the ground, and greedily scarfs you down with a few swift gulps. Your small frame alone is hardly enough to make him look somewhat plump as you slop wetly into that dark, hot chamber, although the dense squish is rather comfortable. The thick, humid air is tinged with the smell of digested meat, and the surrounding flesh wastes no time in clenching and massaging down over its newfound fodder."
@@ -138,7 +138,9 @@
 	verbs |= /mob/living/simple_mob/vore/leopardmander/exotic/proc/toggle_glow

 /mob/living/simple_mob/vore/leopardmander/exotic/init_vore()
-	. = ..()
+	if(!voremob_loaded) //CHOMP add to fix runtime
+		return //CHOMP Add
+	.=..() //CHOMP Add
 	var/obj/belly/B = vore_selected
 	B.name = "stomach"
 	B.desc = "The exotic leopardmander tosses its head back with you firmly clasped in its jaws, and in a few swift moments it finishes swallowing you down into its hot, brightly glowing gut. Your weight makes absolutely no impact on its form, the doughy walls giving way beneath you, with their unnatural softness. The thick, humid air is tinged with an oddly pleasant smell, and the surrounding flesh wastes no time in clenching and massaging down over its newfound fodder, smothering you in thick hot gutflesh~ You can only really sort of see outside that thick-walled gut."
@@ -276,7 +276,7 @@
 	cost = 0
 	shift_mode = SHIFTED_OR_NOT
 	ab_sound = 'sound/effects/stealthoff.ogg'
-obj/effect/rakshasa_ability/flicker/do_ability()
+/obj/effect/rakshasa_ability/flicker/do_ability()
 	if(!..())
 		return
 	my_kin.rakshasa_flicker()
@@ -58,8 +58,8 @@
 	You struggle to stay awake while floating helplessly in the goo."
 	player_msg = "You are Rakshasa. You are not to directly harm crew, only consume. You never speak a language."
 	energy_adminbuse = TRUE
-	maxHealth = 999999999999
-	health = 999999999999
+	maxHealth = 1000000000000
+	health = 1000000000000
 	eye_state = "BLUE EYES"
 	eye_icon_state = "e_rakshasa"

@@ -99,12 +99,12 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst
 			PN = null

 		// CHOMPEDIT Start, Rykka waz here. *pawstamp*
-		if(prob(1) && charge >= 32000 && can_evolve == 1 && moth_amount <= 1) //it's reading from the moth_amount global list to determine if it can evolve.
+		if(prob(1) && charge >= 32000 && can_evolve == 1 && moth_amount <= 1) //it's reading from the moth_amount global list to determine if it can evolve. There should only ever be a maxcap of 1 existing solar moth alive at any time. TODO: make the code decrease the list after 1 has spawned this shift.
 			anchored = 0
 			PN = attached.powernet
 			release_vore_contents()
 			prey_excludes.Cut()
-			moth_amount++
+			moth_amount = moth_amount + 1
 			death_star()

 /mob/living/simple_mob/vore/solargrub/proc/death_star()
@@ -1,146 +1,146 @@
 /datum/sprite_accessory/marking/ch
 	icon = 'icons/mob/human_races/markings_ch.dmi'
-	orca_head
-		name = "Orca head"
-		icon_state = "orca_head"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
-		species_allowed = list(SPECIES_AKULA)
+/datum/sprite_accessory/marking/ch/orca_head
+	name = "Orca head"
+	icon_state = "orca_head"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)
+	species_allowed = list(SPECIES_AKULA)

-	orca_body
-		name = "Orca body(female)"
-		icon_state = "orca_body"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_TORSO)
-		species_allowed = list(SPECIES_AKULA)
+/datum/sprite_accessory/marking/ch/orca_body
+	name = "Orca body(female)"
+	icon_state = "orca_body"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO)
+	species_allowed = list(SPECIES_AKULA)

-	orca_legs
-		name = "Orca legs"
-		icon_state = "orca_leg"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_LEG,BP_R_LEG)
-		species_allowed = list(SPECIES_AKULA)
+/datum/sprite_accessory/marking/ch/orca_legs
+	name = "Orca legs"
+	icon_state = "orca_leg"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG,BP_R_LEG)
+	species_allowed = list(SPECIES_AKULA)

-	orca_arms
-		name = "Orca arms"
-		icon_state = "orca_arm"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_ARM,BP_R_ARM)
-		species_allowed = list(SPECIES_AKULA)
+/datum/sprite_accessory/marking/ch/orca_arms
+	name = "Orca arms"
+	icon_state = "orca_arm"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_ARM,BP_R_ARM)
+	species_allowed = list(SPECIES_AKULA)

-	zangoose_belly
-		name = "Mongoose Cat Belly Marking"
-		icon_state = "test"
-		body_parts = list(BP_TORSO)
-		species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE) //This lets all races use the default hairstyles.
+/datum/sprite_accessory/marking/ch/zangoose_belly
+	name = "Mongoose Cat Belly Marking"
+	icon_state = "test"
+	body_parts = list(BP_TORSO)
+	species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE) //This lets all races use the default hairstyles.

-	head_paint_front
-		name = "Head Paint Front"
-		icon_state = "paintfront"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/head_paint_front
+	name = "Head Paint Front"
+	icon_state = "paintfront"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	head_paint_back
-		name = "Head Paint"
-		icon_state = "paint"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/head_paint_back
+	name = "Head Paint"
+	icon_state = "paint"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	athena_lights
-		name = "Hephaestus - Athena lights"
-		icon_state = "athena"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)
+/datum/sprite_accessory/marking/ch/athena_lights
+	name = "Hephaestus - Athena lights"
+	icon_state = "athena"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)

-	athena_panels
-		name = "Hephaestus - Athena FBP Panels"
-		icon_state = "athena_p"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+/datum/sprite_accessory/marking/ch/athena_panels
+	name = "Hephaestus - Athena FBP Panels"
+	icon_state = "athena_p"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)

-	athena_panels_body
-		name = "Hephaestus - Athena FBP Panels (body)"
-		icon_state = "athena_p"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
+/datum/sprite_accessory/marking/ch/athena_panels_body
+	name = "Hephaestus - Athena FBP Panels (body)"
+	icon_state = "athena_p"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)

-	athena_panels_head
-		name = "Hephaestus - Athena FBP Panels (head)"
-		icon_state = "athena_p"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/athena_panels_head
+	name = "Hephaestus - Athena FBP Panels (head)"
+	icon_state = "athena_p"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	rook_lights
-		name = "Bishop - Rook lights"
-		icon_state = "rook-l"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+/datum/sprite_accessory/marking/ch/rook_lights
+	name = "Bishop - Rook lights"
+	icon_state = "rook-l"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)

-	rook_lights_body
-		name = "Bishop - Rook lights (body)"
-		icon_state = "rook-l"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
+/datum/sprite_accessory/marking/ch/rook_lights_body
+	name = "Bishop - Rook lights (body)"
+	icon_state = "rook-l"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)

-	rook_lights_head
-		name = "Bishop - Rook lights (head)"
-		icon_state = "rook-l"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/rook_lights_head
+	name = "Bishop - Rook lights (head)"
+	icon_state = "rook-l"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	grointojaw
-		name = "Groin to mouth marking"
-		icon_state = "grointojaw"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_TORSO, BP_HEAD, BP_GROIN)
+/datum/sprite_accessory/marking/ch/grointojaw
+	name = "Groin to mouth marking"
+	icon_state = "grointojaw"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO, BP_HEAD, BP_GROIN)

-	vale_eyes
-		name = "VALE Eyes"
-		icon_state = "vale_eyes"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/vale_eyes
+	name = "VALE Eyes"
+	icon_state = "vale_eyes"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	vale_belly
-		name = "VALE Belly"
-		icon_state = "vale_belly"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_TORSO, BP_GROIN)
+/datum/sprite_accessory/marking/ch/vale_belly
+	name = "VALE Belly"
+	icon_state = "vale_belly"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO, BP_GROIN)

-	vale_back
-		name = "VALE Back"
-		icon_state = "vale_back"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_TORSO)
+/datum/sprite_accessory/marking/ch/vale_back
+	name = "VALE Back"
+	icon_state = "vale_back"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO)

-	vulp_skull
-		name = "Vulp Skullface"
-		icon_state = "vulpskull"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/vulp_skull
+	name = "Vulp Skullface"
+	icon_state = "vulpskull"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	manedwolf1
-		name = "Maned Wolf Primary Markings"
-		icon_state = "manedwolf1"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD,BP_TORSO,BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)
+/datum/sprite_accessory/marking/ch/manedwolf1
+	name = "Maned Wolf Primary Markings"
+	icon_state = "manedwolf1"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD,BP_TORSO,BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)

-	manedwolf2
-		name = "Maned Wolf Secondary Markings"
-		icon_state = "manedwolf2"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD,BP_TORSO,BP_GROIN)
+/datum/sprite_accessory/marking/ch/manedwolf2
+	name = "Maned Wolf Secondary Markings"
+	icon_state = "manedwolf2"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD,BP_TORSO,BP_GROIN)

-	voxbeak2
-		name = "Vox Beak (Normal)"
-		icon_state = "vox_beak"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/ch/voxbeak2
+	name = "Vox Beak (Normal)"
+	icon_state = "vox_beak"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	voxtalons
-		name = "Vox Talons"
-		icon_state = "vox_talons"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)
+/datum/sprite_accessory/marking/ch/voxtalons
+	name = "Vox Talons"
+	icon_state = "vox_talons"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)

 /datum/sprite_accessory/tail/special/orca_tail
 	name = "Orca Tail"
@@ -155,14 +155,14 @@
 /datum/sprite_accessory/hair/ch
 	icon = 'icons/mob/human_face_ch.dmi'
 	icon_add = 'icons/mob/human_face_ch_add.dmi'
-	cotton
-		name = "Cotton"
-		icon_state = "hair_cotton"
+/datum/sprite_accessory/hair/ch/cotton
+	name = "Cotton"
+	icon_state = "hair_cotton"


-	unshavenreversemohawk
-		name = "Mohawk Reverse Unshaven"
-		icon_state = "hair_unshaven_reversemohawk"
+/datum/sprite_accessory/hair/ch/unshavenreversemohawk
+	name = "Mohawk Reverse Unshaven"
+	icon_state = "hair_unshaven_reversemohawk"

 // Extra colorable options for Vox
 /datum/sprite_accessory/hair/vox_afro_color
@@ -1,80 +1,80 @@
 /datum/sprite_accessory/ears/yw
 	icon = 'icons/mob/human_races/markings_yw.dmi'

-	onehorn
-		name = "Colorable single horn"
-		desc = ""
-		icon_state = "singlehorn"
-		color_blend_mode = ICON_MULTIPLY
-		do_colouration = 1
+/datum/sprite_accessory/ears/yw/onehorn
+	name = "Colorable single horn"
+	desc = ""
+	icon_state = "singlehorn"
+	color_blend_mode = ICON_MULTIPLY
+	do_colouration = 1

-	wolf_ears
-		name = "Wolf Ears"
-		desc = ""
-		icon_state = "wolf_ears"
-		color_blend_mode = ICON_MULTIPLY
-		do_colouration = 1
+/datum/sprite_accessory/ears/yw/wolf_ears
+	name = "Wolf Ears"
+	desc = ""
+	icon_state = "wolf_ears"
+	color_blend_mode = ICON_MULTIPLY
+	do_colouration = 1

 /datum/sprite_accessory/marking/yw
 	icon = 'icons/mob/human_races/markings_yw.dmi'
-	lizardsnoutsharp
-		name = "Lizard snout (sharp)"
-		icon_state = "lizard_snout_sharp"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/yw/lizardsnoutsharp
+	name = "Lizard snout (sharp)"
+	icon_state = "lizard_snout_sharp"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	lizard_snout_sharp_light
-		name = "Lizard Snout (Sharp Light)"
-		icon_state = "lizard_snout_sharp_light"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/yw/lizard_snout_sharp_light
+	name = "Lizard Snout (Sharp Light)"
+	icon_state = "lizard_snout_sharp_light"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	lizard_snout_round
-		name = "Lizard Snout (Round)"
-		icon_state = "lizard_snout_round"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/yw/lizard_snout_round
+	name = "Lizard Snout (Round)"
+	icon_state = "lizard_snout_round"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	lizard_snout_round_light
-		name = "Lizard Snout (Round Light)"
-		icon_state = "lizard_snout_round_light"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/yw/lizard_snout_round_light
+	name = "Lizard Snout (Round Light)"
+	icon_state = "lizard_snout_round_light"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	wolf_snout_light_round
-		name = "Canine Snout (Light Round)"
-		icon_state = "wolf_snout_light_round"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/yw/wolf_snout_light_round
+	name = "Canine Snout (Light Round)"
+	icon_state = "wolf_snout_light_round"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

-	roundhumanoid
-		name = "Round (Humanoid)"
-		icon_state = "preg_tummy_humanoid"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG)
+/datum/sprite_accessory/marking/yw/roundhumanoid
+	name = "Round (Humanoid)"
+	icon_state = "preg_tummy_humanoid"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG)

-	roundteshari
-		name = "Round (Teshari)"
-		icon_state = "preg_tummy_teshari"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG)
-	teshari_pattern_female
-		name = "Teshari female pattern"
-		icon_state = "tesh-pattern-fem"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
-	teshari_pattern_male
-		name = "Teshari male pattern"
-		icon_state = "tesh-pattern-male"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
-	teshari_large_eyes
-		name = "Teshari large eyes"
-		icon_state = "teshlarge_eyes"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_HEAD)
-	teshari_coat
-		name = "Teshari coat"
-		icon_state = "tesh_coat"
-		color_blend_mode = ICON_MULTIPLY
-		body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)
+/datum/sprite_accessory/marking/yw/roundteshari
+	name = "Round (Teshari)"
+	icon_state = "preg_tummy_teshari"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG)
+/datum/sprite_accessory/marking/yw/teshari_pattern_female
+	name = "Teshari female pattern"
+	icon_state = "tesh-pattern-fem"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
+/datum/sprite_accessory/marking/yw/teshari_pattern_male
+	name = "Teshari male pattern"
+	icon_state = "tesh-pattern-male"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD)
+/datum/sprite_accessory/marking/yw/teshari_large_eyes
+	name = "Teshari large eyes"
+	icon_state = "teshlarge_eyes"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)
+/datum/sprite_accessory/marking/yw/teshari_coat
+	name = "Teshari coat"
+	icon_state = "tesh_coat"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)
@@ -31,7 +31,7 @@
 	..()
 	var/obj/item/stack/material/lead/M = I
 	if(istype(M))
-		if(M.amount>5)
+		if(M.get_amount() > 5)
 			to_chat(user,"<span class='notice'>You add a lead shell to the blitz rod.</span>")
 			qdel(src)
 			var/obj/item/weapon/fuel_assembly/blitz/shielded/rod = new(get_turf(user))
@@ -70,7 +70,7 @@
 	accuracy = 15
 	one_handed_penalty = 30

-obj/item/weapon/gun/energy/locked/phasegun/rifle/unlocked
+/obj/item/weapon/gun/energy/locked/phasegun/rifle/unlocked
 	desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife."
 	req_access = newlist() //for toggling safety
 	locked = 0
@@ -5,11 +5,12 @@
 	icon_state = "bluespace_coffee"
 	center_of_mass = list("x"=15, "y"=10)
 	volume = 50
-	Initialize()
-		..()
-		reagents.add_reagent("coffee", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee/Initialize()
+	..()
+	reagents.add_reagent("coffee", 50)

 	//Infinite Coffee
-	attack(mob/M as mob, mob/user as mob, def_zone)
-		..()
-		src.reagents.add_reagent("coffee", 50)
+/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee/attack(mob/M as mob, mob/user as mob, def_zone)
+	..()
+	src.reagents.add_reagent("coffee", 50)
@@ -95,21 +95,21 @@
 	description = "Just looking at this makes you feel odd. Whether or not this would be good to consume is likely a gamble."
 	color = "#463667"
 	data = list("count"=1)
-	on_mob_life(var/mob/living/M as mob)
-		if(!M) M = holder.my_atom
-		if(data)
-			switch(data["count"])
-				if(1 to 30)
-					if(prob(9)) M.visible_emote("blushes")
-					if(prob(9)) to_chat(M, "<span class='warning'>You feel so needy..</span>")
-				if (30 to INFINITY)
-					if(prob(3)) M.visible_emote("blushes")
-					if(prob(5)) M.audible_emote("moans out lewdly!")
-					if(prob(9)) to_chat(M, "<span class='warning'>You can't help but want to touch yourself then and now!</span>")
-			data["count"]++
-		holder.remove_reagent(src.id, 0.2)
-		//..()
-		return
+/datum/reagent/phenethylamine/on_mob_life(var/mob/living/M as mob)
+	if(!M) M = holder.my_atom
+	if(data)
+		switch(data["count"])
+			if(1 to 30)
+				if(prob(9)) M.visible_emote("blushes")
+				if(prob(9)) to_chat(M, "<span class='warning'>You feel so needy..</span>")
+			if (30 to INFINITY)
+				if(prob(3)) M.visible_emote("blushes")
+				if(prob(5)) M.audible_emote("moans out lewdly!")
+				if(prob(9)) to_chat(M, "<span class='warning'>You can't help but want to touch yourself then and now!</span>")
+		data["count"]++
+	holder.remove_reagent(src.id, 0.2)
+	//..()
+	return

 /datum/reagent/benzilate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	if(alien == IS_DIONA)
@@ -10,7 +10,7 @@
 	var/parasitic = FALSE //Digestion immunity and nutrition leeching variable


-mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T)
+/mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T)
 	if(vore_footstep_volume_cooldown++ >= 5) //updating the 'dominating' belly, the one that has most liquid and is loudest.
 		choose_vorefootstep()
 		vore_footstep_volume_cooldown = 0
@@ -229,7 +229,7 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T)
 		T = input("Choose whose belly to rub") as null| mob in view(1,src)
 		if(!T)
 			return FALSE
-	if(!T in view(1,src))
+	if(!(T in view(1,src)))
 		return FALSE
 	if(T.vore_selected)
 		var/obj/belly/B = T.vore_selected
@@ -258,7 +258,9 @@
 			selected_list["liq_interacts"]["liq_reagent_addons"] = list()
 			for(var/flag_name in selected.reagent_mode_flag_list)
 				if(selected.reagent_mode_flags & selected.reagent_mode_flag_list[flag_name])
-					selected_list["liq_interacts"]["liq_reagent_addons"].Add(flag_name)
+					var/list/selected_list_member = selected_list["liq_interacts"]["liq_reagent_addons"]
+					ASSERT(islist(selected_list_member))
+					selected_list_member.Add(flag_name)

 		selected_list["show_liq_fullness"] = selected.show_fullness_messages
 		selected_list["liq_messages"] = list()
@@ -39,7 +39,7 @@
 	..()
 	update_icon()

-/obj/item/weapon/oldtwohanded/mob_can_equip(M as mob, slot)
+/obj/item/weapon/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE)
 	//Cannot equip wielded items.
 	if(wielded)
 		to_chat(M, "<span class='warning'>Unwield the [initial(name)] first!</span>")
@@ -102,11 +102,11 @@
 	icon_state = "offhand"
 	name = "offhand"

-	unwield()
-		qdel(src)
+/obj/item/weapon/oldtwohanded/offhand/unwield()
+	qdel(src)

-	wield()
-		qdel(src)
+/obj/item/weapon/oldtwohanded/offhand/wield()
+	qdel(src)

 /obj/item/weapon/oldtwohanded/offhand/update_icon()
 	return
@@ -11,26 +11,26 @@

 	var/unbuttoned = 0

-	verb/toggle()
-		set name = "Toggle coat buttons"
-		set category = "Object"
-		set src in usr
+/obj/item/clothing/suit/storage/labcoat/fluff/eioni_1/verb/toggle()
+	set name = "Toggle coat buttons"
+	set category = "Object"
+	set src in usr

-		if(!usr.canmove || usr.stat || usr.restrained())
-			return 0
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0

-		switch(unbuttoned)
-			if(0)
-				icon_state = "[initial(icon_state)]_open"
-				item_state = "[initial(item_state)]_open"
-				unbuttoned = 1
-				usr << "You unbutton the coat."
-			if(1)
-				icon_state = "[initial(icon_state)]"
-				item_state = "[initial(item_state)]"
-				unbuttoned = 0
-				usr << "You button up the coat."
-		usr.update_inv_wear_suit()
+	switch(unbuttoned)
+		if(0)
+			icon_state = "[initial(icon_state)]_open"
+			item_state = "[initial(item_state)]_open"
+			unbuttoned = 1
+			usr << "You unbutton the coat."
+		if(1)
+			icon_state = "[initial(icon_state)]"
+			item_state = "[initial(item_state)]"
+			unbuttoned = 0
+			usr << "You button up the coat."
+	usr.update_inv_wear_suit()


 /obj/item/clothing/under/fluff/eioni_2
@@ -51,26 +51,26 @@
 	/////////////////////////////TODO//////////////////////
 	var/unbuttoned = 0

-	verb/toggle()
-		set name = "Toggle coat buttons"
-		set category = "Object"
-		set src in usr
+/obj/item/clothing/suit/storage/hoodie/fluff/redax_1/verb/toggle()
+	set name = "Toggle coat buttons"
+	set category = "Object"
+	set src in usr

-		if(!usr.canmove || usr.stat || usr.restrained())
-			return 0
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0

-		switch(unbuttoned)
-			if(0)
-				icon_state = "[initial(icon_state)]_open"
-				item_state = "[initial(item_state)]_open"
-				unbuttoned = 1
-				usr << "You unbutton the coat."
-			if(1)
-				icon_state = "[initial(icon_state)]"
-				item_state = "[initial(item_state)]"
-				unbuttoned = 0
-				usr << "You button up the coat."
-		usr.update_inv_wear_suit()
+	switch(unbuttoned)
+		if(0)
+			icon_state = "[initial(icon_state)]_open"
+			item_state = "[initial(item_state)]_open"
+			unbuttoned = 1
+			usr << "You unbutton the coat."
+		if(1)
+			icon_state = "[initial(icon_state)]"
+			item_state = "[initial(item_state)]"
+			unbuttoned = 0
+			usr << "You button up the coat."
+	usr.update_inv_wear_suit()

 /obj/item/clothing/under/fluff/redax_2
 	name = "Alarming outfit"
@@ -172,26 +172,26 @@

 	var/unbuttoned = 0

-	verb/toggle()
-		set name = "Toggle coat buttons"
-		set category = "Object"
-		set src in usr
+/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/verb/toggle()
+	set name = "Toggle coat buttons"
+	set category = "Object"
+	set src in usr

-		if(!usr.canmove || usr.stat || usr.restrained())
-			return 0
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0

-		switch(unbuttoned)
-			if(0)
-				icon_state = "[initial(icon_state)]_open"
-				item_state = "[initial(item_state)]_open"
-				unbuttoned = 1
-				usr << "You unbutton the coat."
-			if(1)
-				icon_state = "[initial(icon_state)]"
-				item_state = "[initial(item_state)]"
-				unbuttoned = 0
-				usr << "You button up the coat."
-		usr.update_inv_wear_suit()
+	switch(unbuttoned)
+		if(0)
+			icon_state = "[initial(icon_state)]_open"
+			item_state = "[initial(item_state)]_open"
+			unbuttoned = 1
+			usr << "You unbutton the coat."
+		if(1)
+			icon_state = "[initial(icon_state)]"
+			item_state = "[initial(item_state)]"
+			unbuttoned = 0
+			usr << "You button up the coat."
+	usr.update_inv_wear_suit()

 /obj/item/clothing/mask/fluff/lucerna_1 //Doesn't work for some reason
 	name =	"Mysterious mask"
@@ -853,26 +853,26 @@
 	body_parts_covered = UPPER_TORSO
 	var/hoodup = 1

-	verb/toggle()
-		set name = "Toggle Hood"
-		set category = "Object"
-		set src in usr
+/obj/item/clothing/suit/storage/fluff/ivy/verb/toggle()
+	set name = "Toggle Hood"
+	set category = "Object"
+	set src in usr

-		if(!usr.canmove || usr.stat || usr.restrained())
-			return 0
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0

-		switch(hoodup)
-			if(0)
-				icon_state = "[initial(icon_state)]"
-				item_state = "[initial(item_state)]"
-				hoodup = 1
-				usr << "You take off the hood."
-			if(1)
-				icon_state = "[initial(icon_state)]_up"
-				item_state = "[initial(item_state)]_up"
-				hoodup= 0
-				usr << "You put on the hood."
-		usr.update_inv_wear_suit()
+	switch(hoodup)
+		if(0)
+			icon_state = "[initial(icon_state)]"
+			item_state = "[initial(item_state)]"
+			hoodup = 1
+			usr << "You take off the hood."
+		if(1)
+			icon_state = "[initial(icon_state)]_up"
+			item_state = "[initial(item_state)]_up"
+			hoodup= 0
+			usr << "You put on the hood."
+	usr.update_inv_wear_suit()

 //Kita

@@ -1310,21 +1310,19 @@
 	icon_state = "kentauri_uniform"
 	item_state = "kentauri_uniform"

-/obj/item/clothing/suit/armor/vest/harpsong
-	mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
-		if(..())
-			if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse/big))
-				return ..()
-			else
-				to_chat(H,"<span class='warning'>You need to have a kentauri half to wear this.</span>")
-				return 0
+/obj/item/clothing/suit/armor/vest/harpsong/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
+	if(..())
+		if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse/big))
+			return ..()
+		else
+			to_chat(H,"<span class='warning'>You need to have a kentauri half to wear this.</span>")
+			return 0

-/obj/item/clothing/suit/armor/vest/harpsong
-    make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
-        var/image/result = ..()
-        result.pixel_x = -16
-        result.layer = BODY_LAYER + 15
-        return result
+/obj/item/clothing/suit/armor/vest/harpsong/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0, var/icon/clip_mask = null)
+	var/image/result = ..()
+	result.pixel_x = -16
+	result.layer = BODY_LAYER + 15
+	return result

 // *****
 // SASOperative
@@ -533,7 +533,7 @@
 // **************
 // DameonOwen
 // **************
-
+/*CHOMP Remove this causes runtimes
 /obj/item/weapon/reagent_containers/food/snacks/cookie/mysterious
 	name = "a mysterious cookie"
 	desc = "DAS A BIG COOKIE!!!"
@@ -548,7 +548,8 @@
 		M.resize(3)
 		M.drop_from_inventory(src)
 		qdel(src)
-
+//CHOMP Remove end
+*/

 // **************
 // NESgamer190
@@ -682,4 +683,4 @@
 		allowed += P
 		new P(src)
 	..()
-	return
+	return
@@ -29,19 +29,17 @@
    flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER|HIDESHOES
    species_restricted = null //Species restricted since all it cares about is a taur half

-/obj/item/clothing/suit/space/rig/fluff/sheri
-	mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
-		item_state = icon_state
-		pixel_x = -16
-		update_icon()
-		return 1
+/obj/item/clothing/suit/space/rig/fluff/sheri/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
+	item_state = icon_state
+	pixel_x = -16
+	update_icon()
+	return 1

-/obj/item/clothing/suit/space/rig/fluff/sheri
-    make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
-        var/image/result = ..()
-        result.pixel_x = -16
-        result.layer = BODY_LAYER + 15
-        return result
+/obj/item/clothing/suit/space/rig/fluff/sheri/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null)
+	var/image/result = ..()
+	result.pixel_x = -16
+	result.layer = BODY_LAYER + 15
+	return result

 /obj/item/clothing/head/helmet/space/rig/hazmat/fluff/sheri
    icon = 'icons/vore/rig_yw/rigs_head.dmi'
@@ -6,6 +6,8 @@
 "af" = (/obj/machinery/computer/teleporter{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/expoutpost/teleporter)
 "ag" = (/obj/machinery/vending/cola{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/pink/border{dir = 4},/turf/simulated/floor/tiled,/area/expoutpost/debriefing)
 "ah" = (/obj/machinery/vending/cigarette{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/pink/border{dir = 4},/turf/simulated/floor/tiled,/area/expoutpost/debriefing)
+"ai" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced{dir = 1},/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
+"aj" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced{dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
 "ar" = (/obj/structure/closet/walllocker_double/kitchen/south{name = "Ration Cabinet"},/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/device/radio{pixel_x = 5; pixel_y = 5},/obj/item/device/radio{pixel_x = -5; pixel_y = 5},/turf/simulated/shuttle/floor/purple,/area/shuttle/ursula)
 "as" = (/obj/machinery/computer/shuttle_control/explore/needle{dir = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/needle)
 "at" = (/obj/structure/bed/chair/bay/comfy/captain{dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/echidna)
@@ -65,7 +67,6 @@
 "bW" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/iron,/turf/simulated/floor/airless,/area/wreck/ufoship)
 "bY" = (/obj/item/clothing/head/helmet/space/deathsquad,/obj/structure/table/rack,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
 "bZ" = (/obj/machinery/compressor{dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 8},/obj/structure/window/phoronreinforced{dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
-"ca" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced{dir = 1},/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
 "cb" = (/obj/item/device/gps,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
 "cc" = (/obj/structure/ore_box,/turf/simulated/floor/airless,/area/wreck/ufoship)
 "ce" = (/obj/structure/sign/nanotrasen,/turf/simulated/shuttle/wall/voidcraft/no_join,/area/shuttle/echidna)
@@ -99,7 +100,6 @@
 "cG" = (/obj/item/stack/material/glass{amount = 50; pixel_x = -2; pixel_y = 2},/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
 "cH" = (/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/airless,/area/wreck/ufoship)
 "cI" = (/obj/machinery/compressor{dir = 4},/obj/structure/window/phoronreinforced{dir = 8},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
-"cJ" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced{dir = 1},/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
 "cK" = (/obj/item/weapon/cell/super,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
 "cL" = (/obj/structure/largecrate,/turf/simulated/floor/airless,/area/wreck/ufoship)
 "cM" = (/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/airless,/area/wreck/ufoship)
@@ -1743,7 +1743,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbLaTaTaTaSaSbMaSblblbNblblaSbMaSaSaTaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbOaTaTaSaSbnbnaSbnblblblbnbjbnbnaSaSaTaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbaaSaSbnbnbnaSaSbSbTbUbUaSbVbnbnaSaSbWaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbiaSbYbnblblblblblaSbZcaaScbbnbnbnaSccccaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbiaSbYbnblblblblblaSbZaiaScbbnbnbnaSccccaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaSaSaSaSaSaSbnblbnbnbnbnaSaSaSaSaSaSbnbnaSaSaSaSaSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaSbfcfbncgaSaSbSaSaSblchblcicjbecjaSbnbnbnckclcmaSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaRbdcncobnbnbnblbdaSblbnbnbnblbnblaSbnbnbnckcpbnaSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -1751,7 +1751,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaSbdczcAbnbnbnblbdaSblbnbnbnblbnblaSbnbnbnckbnbnaSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaZcBcgaSaSbSaSaSblblblcCcDbecEaSbnbnbnckcFbnaSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaRaScGblbnbnbnbnaSaSaSaSaSaSbnbnaSaSaSaSaSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpcHaZblblblblblaScIcJaScKbnbnbnaScLaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpcHaZblblblblblaScIajaScKbnbnbnaScLaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpcMbnbnaSaSbSaScNcNaSbnbnbnaSaScLaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaRbnbnaSbnblblblbnbjbnbnaSaScLaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpaaaaaaaaaaaaaaaaaaaaaabpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpaRaScOaSblblblblblaScPaSaSaTaTaTaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -1,7 +1,8 @@
 // You probably don't want to tick this file yet.

 #if !defined(USING_MAP_DATUM)
-
+	
+	// CHOMPStation Edits Start: Disabling specific includes as vorestation.dme has them already loading via #includes there. UPDATE THIS if that changes.
 	#include "southern_cross_areas.dm"
 	#include "southern_cross_defines.dm"
 	#include "southern_cross_elevator.dm"
@@ -18,24 +19,27 @@
 	#include "shuttles/ert.dm"

 	#include "loadout/loadout_accessories.dm"
-	#include "loadout/loadout_suit.dm"
-	#include "loadout/loadout_uniform.dm"
+	// #include "loadout/loadout_suit.dm"
+	// #include "loadout/loadout_uniform.dm"

 	#include "datums/supplypacks/munitions.dm"
-	#include "items/encryptionkey_sc.dm"
-	#include "items/headset_sc.dm"
-	#include "items/clothing/sc_suit.dm"
-	#include "items/clothing/sc_under.dm"
-	#include "items/clothing/sc_accessory.dm"
+	
+	// #include "items/encryptionkey_sc.dm"
+	// #include "items/headset_sc.dm"
+	// #include "items/clothing/sc_suit.dm"
+	// #include "items/clothing/sc_under.dm"
+	// #include "items/clothing/sc_accessory.dm"
 	#include "job/outfits.dm"
-	#include "structures/closets/engineering.dm"
-	#include "structures/closets/medical.dm"
-	#include "structures/closets/misc.dm"
-	#include "structures/closets/research.dm"
-	#include "structures/closets/security.dm"
+	// #include "structures/closets/engineering.dm"
+	// #include "structures/closets/medical.dm"
+	// #include "structures/closets/misc.dm"
+	// #include "structures/closets/research.dm"
+	// #include "structures/closets/security.dm"
 	#include "turfs/outdoors.dm"
 	#include "overmap/sectors.dm"
 	#include "events/wildlife_encounter.dm"
+	
+	// CHOMPStation Edits End - Un-disable these includes if vorestation.dme ever removes them from their #includes.

 	//CHOMPStation Edit Start TFF 25/3/20 - Station level map z-levels separated into 3 distinct files to work with MapDiffBot. All other files renamed accordingly.
 	#include "southern_cross-1.dmm" //Deck 1