Merge branch 'master' into upstream-merge-15110

code/_helpers/global_lists_ch.dm

@@ -58,7 +58,7 @@ var/global/list/vr_mob_tf_options = list(
 	"Construct Artificer" = /mob/living/simple_mob/construct/artificer,
 	"Tech golem" = /mob/living/simple_mob/mechanical/technomancer_golem,
 	"Metroid" = /mob/living/simple_mob/metroid/juvenile/baby,
-	"Otie" = /mob/living/simple_mob/otie/cotie/chubby,
+	"Otie" = /mob/living/simple_mob/vore/otie/cotie/chubby,
 	"Shadekin" = /mob/living/simple_mob/shadekin,
 	"Slime" = /mob/living/simple_mob/slime/xenobio/metal,
 	"Corrupt hound" = /mob/living/simple_mob/vore/aggressive/corrupthound,
@@ -73,7 +73,7 @@ var/global/list/vr_mob_tf_options = list(
 	//"Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly, //Currently adds 12 bellies to the user when transformed into. Do not uncomment without fixing this.
 	"Riftwalker" = /mob/living/simple_mob/vore/demon/wendigo,
 	"Horse" = /mob/living/simple_mob/vore/horse/big,
-	"Morph" = /mob/living/simple_mob/vore/hostile/morph,
+	"Morph" = /mob/living/simple_mob/vore/morph,
 	"Leopardmander" = /mob/living/simple_mob/vore/leopardmander,
 	"Rabbit" = /mob/living/simple_mob/vore/rabbit,
 	"Red panda" = /mob/living/simple_mob/vore/redpanda,

code/_helpers/global_lists_vr.dm

@@ -728,15 +728,15 @@ var/global/list/xenobio_gold_mobs_hostile = list(
 										/mob/living/simple_mob/vore/aggressive/dino,
 										/mob/living/simple_mob/vore/aggressive/dragon,
 										/mob/living/simple_mob/vore/aggressive/frog,
-										/mob/living/simple_mob/otie,
-										/mob/living/simple_mob/otie/red,
+										/mob/living/simple_mob/vore/otie,
+										/mob/living/simple_mob/vore/otie/red,
 										/mob/living/simple_mob/vore/aggressive/panther,
 										/mob/living/simple_mob/vore/aggressive/rat,
 										/mob/living/simple_mob/vore/aggressive/giant_snake,
 										/mob/living/simple_mob/vore/sect_drone,
 										/mob/living/simple_mob/vore/sect_queen,
 										/mob/living/simple_mob/vore/weretiger,
-										/mob/living/simple_mob/animal/wolf,
+										/mob/living/simple_mob/vore/wolf,
 										/mob/living/simple_mob/vore/xeno_defanged)
 
 var/global/list/xenobio_gold_mobs_bosses = list(
@@ -783,7 +783,7 @@ var/global/list/xenobio_gold_mobs_safe = list(
 										/mob/living/simple_mob/vore/fennix,
 										/mob/living/simple_mob/vore/hippo,
 										/mob/living/simple_mob/vore/horse,
-										/mob/living/simple_mob/animal/space/jelly,
+										/mob/living/simple_mob/vore/jelly,
 										/mob/living/simple_mob/vore/oregrub,
 										/mob/living/simple_mob/vore/oregrub/lava,
 										/mob/living/simple_mob/vore/rabbit,
@@ -935,14 +935,14 @@ var/global/list/event_wildlife_roaming = list(
 										list(
 												list(/mob/living/simple_mob/vore/aggressive/frog = 1),
 												list(/mob/living/simple_mob/tomato = 1),
-												list(/mob/living/simple_mob/animal/wolf = 1),
+												list(/mob/living/simple_mob/vore/wolf = 1),
 												list(/mob/living/simple_mob/vore/aggressive/dino = 1),
 												list(/mob/living/simple_mob/animal/space/bats = 1)
 											),
 										list(
 												list(/mob/living/simple_mob/animal/space/bear = 1),
 												list(/mob/living/simple_mob/vore/aggressive/deathclaw = 1),
-												list(/mob/living/simple_mob/otie = 1),
+												list(/mob/living/simple_mob/vore/otie = 1),
 												list(/mob/living/simple_mob/vore/aggressive/panther = 1),
 												list(/mob/living/simple_mob/vore/aggressive/rat = 1),
 												list(/mob/living/simple_mob/vore/aggressive/giant_snake = 1),

code/game/objects/effects/semirandom_mobs_vr.dm

@@ -56,8 +56,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 		list(/mob/living/simple_mob/animal/passive/tindalos),
 		list(/mob/living/simple_mob/animal/passive/yithian),
 		list(
-			/mob/living/simple_mob/animal/wolf = 10,
-			/mob/living/simple_mob/animal/wolf/direwolf = 5,
+			/mob/living/simple_mob/vore/wolf = 10,
+			/mob/living/simple_mob/vore/wolf/direwolf = 5,
 			/mob/living/simple_mob/vore/greatwolf = 1,
 			/mob/living/simple_mob/vore/greatwolf/black = 1,
 			/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -75,10 +75,10 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 			/mob/living/simple_mob/animal/space/bear/brown
 			),
 		list(
-			/mob/living/simple_mob/otie/feral,
-			/mob/living/simple_mob/otie/feral/chubby,
-			/mob/living/simple_mob/otie/red,
-			/mob/living/simple_mob/otie/red/chubby
+			/mob/living/simple_mob/vore/otie/feral,
+			/mob/living/simple_mob/vore/otie/feral/chubby,
+			/mob/living/simple_mob/vore/otie/red,
+			/mob/living/simple_mob/vore/otie/red/chubby
 			),
 		list(/mob/living/simple_mob/animal/sif/diyaab),
 		list(/mob/living/simple_mob/animal/sif/duck),
@@ -144,7 +144,7 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 			/mob/living/simple_mob/animal/space/carp/large/huge = 5
 			),
 		list(/mob/living/simple_mob/animal/space/goose),
-		list(/mob/living/simple_mob/animal/space/jelly),
+		list(/mob/living/simple_mob/vore/jelly),
 		list(/mob/living/simple_mob/animal/space/tree),
 		list(
 			/mob/living/simple_mob/vore/aggressive/corrupthound = 10,
@@ -245,12 +245,12 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 		list(/mob/living/simple_mob/mechanical/wahlem),
 		list(/mob/living/simple_mob/animal/passive/fox/syndicate),
 		list(/mob/living/simple_mob/animal/passive/fox),
-		list(/mob/living/simple_mob/animal/space/jelly),
+		list(/mob/living/simple_mob/vore/jelly),
 		list(
-			/mob/living/simple_mob/otie/feral,
-			/mob/living/simple_mob/otie/feral/chubby,
-			/mob/living/simple_mob/otie/red,
-			/mob/living/simple_mob/otie/red/chubby
+			/mob/living/simple_mob/vore/otie/feral,
+			/mob/living/simple_mob/vore/otie/feral/chubby,
+			/mob/living/simple_mob/vore/otie/red,
+			/mob/living/simple_mob/vore/otie/red/chubby
 			),
 		list(
 			/mob/living/simple_mob/shadekin/blue = 100,
@@ -377,8 +377,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 		list(/mob/living/simple_mob/animal/passive/tindalos) = 10,
 		list(/mob/living/simple_mob/animal/passive/yithian) = 10,
 		list(
-			/mob/living/simple_mob/animal/wolf = 10,
-			/mob/living/simple_mob/animal/wolf/direwolf = 5,
+			/mob/living/simple_mob/vore/wolf = 10,
+			/mob/living/simple_mob/vore/wolf/direwolf = 5,
 			/mob/living/simple_mob/vore/greatwolf = 1,
 			/mob/living/simple_mob/vore/greatwolf/black = 1,
 			/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -396,10 +396,10 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 			/mob/living/simple_mob/animal/space/bear/brown
 			) = 1,
 		list(
-			/mob/living/simple_mob/otie/feral = 50,
-			/mob/living/simple_mob/otie/feral/chubby = 10,
-			/mob/living/simple_mob/otie/red = 5,
-			/mob/living/simple_mob/otie/red/chubby = 1
+			/mob/living/simple_mob/vore/otie/feral = 50,
+			/mob/living/simple_mob/vore/otie/feral/chubby = 10,
+			/mob/living/simple_mob/vore/otie/red = 5,
+			/mob/living/simple_mob/vore/otie/red/chubby = 1
 			) = 5,
 		list(/mob/living/simple_mob/vore/aggressive/rat) = 15,
 		list(/mob/living/simple_mob/animal/sif/diyaab) = 5,
@@ -467,8 +467,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 			/mob/living/simple_mob/shadekin/purple = 10
 			) = 1,
 		list(
-			/mob/living/simple_mob/animal/wolf = 10,
-			/mob/living/simple_mob/animal/wolf/direwolf = 5,
+			/mob/living/simple_mob/vore/wolf = 10,
+			/mob/living/simple_mob/vore/wolf/direwolf = 5,
 			/mob/living/simple_mob/vore/greatwolf = 1,
 			/mob/living/simple_mob/vore/greatwolf/black = 1,
 			/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -502,13 +502,13 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 			/mob/living/simple_mob/animal/space/carp/large/huge = 5
 			) = 50,
 		list(/mob/living/simple_mob/animal/space/goose) = 50,
-		list(/mob/living/simple_mob/animal/space/jelly) = 40,
+		list(/mob/living/simple_mob/vore/jelly) = 40,
 		list(/mob/living/simple_mob/animal/space/tree) = 15,
 		list(
-			/mob/living/simple_mob/otie/feral = 50,
-			/mob/living/simple_mob/otie/feral/chubby = 10,
-			/mob/living/simple_mob/otie/red = 5,
-			/mob/living/simple_mob/otie/red/chubby = 1
+			/mob/living/simple_mob/vore/otie/feral = 50,
+			/mob/living/simple_mob/vore/otie/feral/chubby = 10,
+			/mob/living/simple_mob/vore/otie/red = 5,
+			/mob/living/simple_mob/vore/otie/red/chubby = 1
 			) = 40,
 		list(
 			/mob/living/simple_mob/vore/aggressive/corrupthound = 10,
@@ -719,17 +719,17 @@ var/global/list/semirandom_mob_spawner_decisions = list()
 
 	possible_mob_types = list(
 		list(
-			/mob/living/simple_mob/animal/wolf/direwolf = 5,
+			/mob/living/simple_mob/vore/wolf/direwolf = 5,
 			/mob/living/simple_mob/vore/greatwolf = 1,
 			/mob/living/simple_mob/vore/greatwolf/black = 1,
 			/mob/living/simple_mob/vore/greatwolf/grey = 1
 			) = 100,
-		list(/mob/living/simple_mob/animal/space/jelly) = 70,
+		list(/mob/living/simple_mob/vore/jelly) = 70,
 		list(
-			/mob/living/simple_mob/otie/feral,
-			/mob/living/simple_mob/otie/feral/chubby,
-			/mob/living/simple_mob/otie/red,
-			/mob/living/simple_mob/otie/red/chubby
+			/mob/living/simple_mob/vore/otie/feral,
+			/mob/living/simple_mob/vore/otie/feral/chubby,
+			/mob/living/simple_mob/vore/otie/red,
+			/mob/living/simple_mob/vore/otie/red/chubby
 			) = 50,
 		list(
 			/mob/living/simple_mob/shadekin/blue = 100,

code/game/objects/items/devices/denecrotizer_vr.dm

@@ -29,7 +29,7 @@
 //The stuff we want to be revivable normally
 /mob/living/simple_mob/animal
 	ic_revivable = TRUE
-/mob/living/simple_mob/otie
+/mob/living/simple_mob/vore/otie
 	ic_revivable = TRUE
 /mob/living/simple_mob/vore
 	ic_revivable = TRUE

code/game/objects/items/devices/scanners/health.dm

@@ -15,12 +15,20 @@
 	var/mode = 1;
 	var/advscan = 0
 	var/showadvscan = 1
+	var/guide = FALSE
 
 /obj/item/device/healthanalyzer/New()
 	if(advscan >= 1)
 		verbs += /obj/item/device/healthanalyzer/proc/toggle_adv
 	..()
 
+/obj/item/device/healthanalyzer/examine(mob/user)
+	. = ..()
+	if(guide)
+		. += "<span class='notice'>Guidance is currently enabled.</span>"
+	else
+		. += "<span class='notice'>Guidance is currently disabled.</span>"
+
 /obj/item/device/healthanalyzer/do_surgery(mob/living/M, mob/living/user)
 	if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
 		return ..()
@@ -109,19 +117,14 @@
 				severity = "Lethal"
 			else if(M.radiation >= 600)
 				severity = "Critical"
-			else if(M.radiation >= 50)
 			else if(M.radiation >= 400)
 				severity = "Severe"
-			else if(M.radiation >= 25)
 			else if(M.radiation >= 300)
 				severity = "Moderate"
-			else if(M.radiation >= 1)
 			else if(M.radiation >= 100)
 				severity = "Low"
-			dat += "<span class='warning'>[severity] levels of radiation detected. [(severity == "Critical") ? " Immediate treatment advised." : ""]</span><br>"
 			dat += "<span class='warning'>[severity] levels of acute radiation sickness detected. [round(M.radiation/50)]Gy. [(severity == "Critical" || severity == "Lethal") ? " Immediate treatment advised." : ""]</span><br>"
 		else
-			dat += "<span class='warning'>Radiation detected.</span><br>"
 			dat += "<span class='warning'>Acute radiation sickness detected.</span><br>"
 	if(M.accumulated_rads)
 		if(advscan >= 2 && showadvscan == 1)
@@ -303,6 +306,8 @@
 				dat += "<span class='notice'>Subject is a Xenochimera. Treat accordingly.</span>"
 		// VOREStation Edit End
 	user.show_message(dat, 1)
+	if(guide)
+		guide(M, user)
 
 /obj/item/device/healthanalyzer/verb/toggle_mode()
 	set name = "Switch Verbosity"

code/game/objects/items/weapons/capture_crystal.dm

@@ -592,8 +592,8 @@
 		list(/mob/living/simple_mob/animal/passive/tindalos),
 		list(/mob/living/simple_mob/animal/passive/yithian),
 		list(
-			/mob/living/simple_mob/animal/wolf,
-			/mob/living/simple_mob/animal/wolf/direwolf
+			/mob/living/simple_mob/vore/wolf,
+			/mob/living/simple_mob/vore/wolf/direwolf
 			),
 		list(/mob/living/simple_mob/vore/rabbit),
 		list(/mob/living/simple_mob/vore/redpanda),
@@ -608,10 +608,10 @@
 			/mob/living/simple_mob/animal/space/bear/brown
 			),
 		list(
-			/mob/living/simple_mob/otie/feral,
-			/mob/living/simple_mob/otie/feral/chubby,
-			/mob/living/simple_mob/otie/red,
-			/mob/living/simple_mob/otie/red/chubby
+			/mob/living/simple_mob/vore/otie/feral,
+			/mob/living/simple_mob/vore/otie/feral/chubby,
+			/mob/living/simple_mob/vore/otie/red,
+			/mob/living/simple_mob/vore/otie/red/chubby
 			),
 		list(/mob/living/simple_mob/animal/sif/diyaab),
 		list(/mob/living/simple_mob/animal/sif/duck),
@@ -650,8 +650,8 @@
 			/mob/living/simple_mob/animal/giant_spider/webslinger = 5,
 			/mob/living/simple_mob/animal/giant_spider/broodmother = 1),
 		list(
-			/mob/living/simple_mob/animal/wolf = 10,
-			/mob/living/simple_mob/animal/wolf/direwolf = 5,
+			/mob/living/simple_mob/vore/wolf = 10,
+			/mob/living/simple_mob/vore/wolf/direwolf = 5,
 			/mob/living/simple_mob/vore/greatwolf = 1,
 			/mob/living/simple_mob/vore/greatwolf/black = 1,
 			/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -684,7 +684,7 @@
 			/mob/living/simple_mob/animal/space/carp/large/huge = 5
 			),
 		list(/mob/living/simple_mob/animal/space/goose),
-		list(/mob/living/simple_mob/animal/space/jelly),
+		list(/mob/living/simple_mob/vore/jelly),
 		list(/mob/living/simple_mob/animal/space/tree),
 		list(
 			/mob/living/simple_mob/vore/aggressive/corrupthound = 10,
@@ -785,13 +785,13 @@
 		list(/mob/living/simple_mob/mechanical/wahlem),
 		list(/mob/living/simple_mob/animal/passive/fox/syndicate),
 		list(/mob/living/simple_mob/animal/passive/fox),
-		list(/mob/living/simple_mob/animal/wolf/direwolf),
-		list(/mob/living/simple_mob/animal/space/jelly),
+		list(/mob/living/simple_mob/vore/wolf/direwolf),
+		list(/mob/living/simple_mob/vore/jelly),
 		list(
-			/mob/living/simple_mob/otie/feral,
-			/mob/living/simple_mob/otie/feral/chubby,
-			/mob/living/simple_mob/otie/red,
-			/mob/living/simple_mob/otie/red/chubby
+			/mob/living/simple_mob/vore/otie/feral,
+			/mob/living/simple_mob/vore/otie/feral/chubby,
+			/mob/living/simple_mob/vore/otie/red,
+			/mob/living/simple_mob/vore/otie/red/chubby
 			),
 		list(
 			/mob/living/simple_mob/shadekin/blue = 100,

code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm

@@ -102,17 +102,17 @@
 /obj/item/weapon/grenade/spawnergrenade/casino/otie
 	desc = "It is set to detonate in 5 seconds. It will release a otie that has been won from the golden goose casino!"
 	name = "Casino Creature Container (Otie)"
-	spawner_type = /mob/living/simple_mob/otie/friendly
+	spawner_type = /mob/living/simple_mob/vore/otie/friendly
 
 /obj/item/weapon/grenade/spawnergrenade/casino/otie/chubby
 	desc = "It is set to detonate in 5 seconds. It will release a chonker otie that has been won from the golden goose casino!"
 	name = "Casino Creature Container (Well feed Otie)"
-	spawner_type = /mob/living/simple_mob/otie/friendly/chubby
+	spawner_type = /mob/living/simple_mob/vore/otie/friendly/chubby
 
 /obj/item/weapon/grenade/spawnergrenade/casino/zorgoia
 	desc = "It is set to detonate in 5 seconds. It will release a zorgoia that has been won from the golden goose casino!"
 	name = "Casino Creature Container (Zorgoia)"
-	spawner_type = /mob/living/simple_mob/otie/zorgoia/friendly
+	spawner_type = /mob/living/simple_mob/vore/otie/zorgoia/friendly
 
 /obj/item/weapon/grenade/spawnergrenade/casino/gygax
 	desc = "You feel great power inside this small round sphere, with great powers comes great responsibilities!"

code/game/objects/micro_structures.dm

@@ -13,7 +13,7 @@
 	var/static/non_micro_types = list(
 		/mob/living/simple_mob/vore/squirrel,
 		/mob/living/simple_mob/vore/alienanimals/catslug,
-		/mob/living/simple_mob/vore/hostile/morph,
+		/mob/living/simple_mob/vore/morph,
 		/mob/living/simple_mob/protean_blob,
 		/mob/living/simple_mob/slime
 	)

code/game/objects/mob_spawner_ch.dm

@@ -13,7 +13,7 @@
 		/mob/living/simple_mob/animal/space/carp = 10,
 		/obj/structure/closet/crate/mimic = 2,
 		/mob/living/simple_mob/animal/space/bats = 70,
-		/mob/living/simple_mob/animal/space/jelly = 25,
+		/mob/living/simple_mob/vore/jelly = 25,
 		/mob/living/simple_mob/animal/space/bear = 1,
 		/mob/living/simple_mob/vore/aggressive/deathclaw = 1,
 		/mob/living/simple_mob/animal/space/goose = 60,

code/game/objects/mob_spawner_vr.dm

@@ -157,7 +157,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	invisibility = 101
 	spawn_types = list(
 	/mob/living/simple_mob/animal/passive/gaslamp = 20,
-//	/mob/living/simple_mob/otie/feral = 10,
+//	/mob/living/simple_mob/vore/otie/feral = 10,
 	/mob/living/simple_mob/vore/aggressive/dino/virgo3b = 5,
 	/mob/living/simple_mob/vore/aggressive/dragon/virgo3b = 1
 	)

code/game/objects/random/mob_vr.dm

@@ -184,7 +184,7 @@
 /obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
 	return pick(
 				prob(50);/mob/living/simple_mob/animal/passive/gaslamp,
-//				prob(50);/mob/living/simple_mob/otie/feral, // Removed until Otie code is unfucked.
+//				prob(50);/mob/living/simple_mob/vore/otie/feral, // Removed until Otie code is unfucked.
 				prob(20);/mob/living/simple_mob/vore/aggressive/dino/virgo3b,
 				prob(1);/mob/living/simple_mob/vore/aggressive/dragon/virgo3b)
 

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

@@ -47,16 +47,16 @@
 						/mob/living/simple_mob/vore/horse,
 						/mob/living/simple_mob/vore/aggressive/panther,
 						/mob/living/simple_mob/vore/aggressive/giant_snake,
-						/mob/living/simple_mob/animal/wolf,
+						/mob/living/simple_mob/vore/wolf,
 						/mob/living/simple_mob/animal/space/bear;0.5,
 						/mob/living/simple_mob/animal/space/carp,
 						/mob/living/simple_mob/vore/aggressive/mimic,
 						/mob/living/simple_mob/vore/aggressive/rat,
 						/mob/living/simple_mob/vore/aggressive/rat/tame,
-						/mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit
+						/mob/living/simple_mob/vore/otie/zorgoia, //CHOMPstation edit
 						/mob/living/simple_mob/vore/rabbit,
 						/mob/living/simple_mob/vore/weretiger;0.5,
-						/mob/living/simple_mob/otie;0.5
+//						/mob/living/simple_mob/vore/otie;0.5
 						))
 	return ..()
 
@@ -72,9 +72,9 @@
 						/mob/living/simple_mob/animal/space/alien/drone,
 						/mob/living/simple_mob/animal/space/alien/sentinel,
 						/mob/living/simple_mob/animal/space/alien/queen,
-						/mob/living/simple_mob/otie/feral,
-						/mob/living/simple_mob/otie/feral/chubby,
-						/mob/living/simple_mob/otie/red,
+						/mob/living/simple_mob/vore/otie/feral, //ChompEDIT uncomment
+						/mob/living/simple_mob/vore/otie/feral/chubby, //ChompEDIT add
+						/mob/living/simple_mob/vore/otie/red, //ChompEDIT uncomment
 						/mob/living/simple_mob/vore/aggressive/corrupthound))
 	return ..()
 
@@ -83,11 +83,11 @@
 	desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs."
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "sotiecrate"
-	starts_with = list(/mob/living/simple_mob/otie/security)
+	starts_with = list(/mob/living/simple_mob/vore/otie/security)
 
 /obj/structure/largecrate/animal/otie/guardbeast/Initialize()
-	starts_with = list(pick(/mob/living/simple_mob/otie/security,
-						/mob/living/simple_mob/otie/security/chubby))
+	starts_with = list(pick(/mob/living/simple_mob/vore/otie/security,
+						/mob/living/simple_mob/vore/otie/security/chubby))
 	return ..()
 
 /obj/structure/largecrate/animal/guardmutant
@@ -95,12 +95,12 @@
 	desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere."
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "sotiecrate"
-	starts_with = list(/mob/living/simple_mob/otie/security/phoron)
+	starts_with = list(/mob/living/simple_mob/vore/otie/security/phoron)
 
 /obj/structure/largecrate/animal/otie/guardmutant/Initialize()
-	starts_with = list(pick(/mob/living/simple_mob/otie/security/phoron;2,
-						/mob/living/simple_mob/otie/security/phoron/red;0.5,
-						/mob/living/simple_mob/otie/security/phoron/red/chubby;0.5))
+	starts_with = list(pick(/mob/living/simple_mob/vore/otie/security/phoron;2,
+						/mob/living/simple_mob/vore/otie/security/phoron/red;0.5,
+						/mob/living/simple_mob/vore/otie/security/phoron/red/chubby;0.5))
 	return ..()
 
 /obj/structure/largecrate/animal/otie
@@ -108,23 +108,23 @@
 	desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!"
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "otiecrate2"
-	starts_with = list(/mob/living/simple_mob/otie/cotie)
+	starts_with = list(/mob/living/simple_mob/vore/otie/cotie)
 	var/taped = 1
 
 /obj/structure/largecrate/animal/otie/Initialize()
-	starts_with = list(pick(/mob/living/simple_mob/otie/cotie,
-						/mob/living/simple_mob/otie/cotie/chubby))
+	starts_with = list(pick(/mob/living/simple_mob/vore/otie/cotie,
+						/mob/living/simple_mob/vore/otie/cotie/chubby))
 	return ..()
 
 /obj/structure/largecrate/animal/otie/phoron
 	name = "VARMAcorp adaptive beta subject (Experimental)"
 	desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!"
-	starts_with = list(/mob/living/simple_mob/otie/cotie/phoron)
+	starts_with = list(/mob/living/simple_mob/vore/otie/cotie/phoron)
 
 /obj/structure/largecrate/animal/otie/phoron/Initialize()
-	starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2,
-						/mob/living/simple_mob/otie/red/friendly;0.5,
-						/mob/living/simple_mob/otie/red/chubby;0.5))
+	starts_with = list(pick(/mob/living/simple_mob/vore/otie/cotie/phoron;2,
+						/mob/living/simple_mob/vore/otie/red/friendly;0.5,
+						/mob/living/simple_mob/vore/otie/red/chubby;0.5)) //ChompEDIT add
 	return ..()
 
 /obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao

code/game/objects/structures/ghost_pods/event_vr.dm

@@ -29,10 +29,10 @@
 								  "Lizardman" = /mob/living/simple_mob/vore/aggressive/lizardman,//CHOMPedit: more mobs
 								  "Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog,
 								  "Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat,
-								  "Jelly Blob" = /mob/living/simple_mob/animal/space/jelly,
-								  "Wolf" = /mob/living/simple_mob/animal/wolf,
-								  "Dire Wolf" = /mob/living/simple_mob/animal/wolf/direwolf,//CHOMPedit: more mobs
-								  "Large Dog" = /mob/living/simple_mob/animal/wolf/direwolf/dog,//CHOMPedit: more mobs
+								  "Jelly Blob" = /mob/living/simple_mob/vore/jelly,
+								  "Wolf" = /mob/living/simple_mob/vore/wolf,
+								  "Dire Wolf" = /mob/living/simple_mob/vore/wolf/direwolf,//CHOMPedit: more mobs
+								  "Large Dog" = /mob/living/simple_mob/vore/wolf/direwolf/dog,//CHOMPedit: more mobs
 								  "Hyena" = /mob/living/simple_mob/animal/hyena,//CHOMPedit: more mobs
 								  "Juvenile Solargrub" = /mob/living/simple_mob/vore/solargrub,
 								  "Sect Queen" = /mob/living/simple_mob/vore/sect_queen,
@@ -41,13 +41,13 @@
 								  "Panther" = /mob/living/simple_mob/vore/aggressive/panther,
 								  "Giant Snake" = /mob/living/simple_mob/vore/aggressive/giant_snake,
 								  "Deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw,
-								  "Otie" = /mob/living/simple_mob/otie,
-								  "Chubby Otie" = /mob/living/simple_mob/otie/friendly/chubby,//CHOMPedit: more mobs
-								  "Mutated Otie" = /mob/living/simple_mob/otie/feral,
-								  "Chubby Mutated Otie" = /mob/living/simple_mob/otie/feral/chubby,//CHOMPedit: more mobs
-								  "Red Otie" = /mob/living/simple_mob/otie/red,
-								  "Chubby Red Otie" = /mob/living/simple_mob/otie/red/chubby,//CHOMPedit: more mobs
-								  "Zorgoia" = /mob/living/simple_mob/otie/zorgoia,//CHOMPedit: more mobs
+								  "Otie" = /mob/living/simple_mob/vore/otie,
+								  "Chubby Otie" = /mob/living/simple_mob/vore/otie/friendly/chubby,//CHOMPedit: more mobs
+								  "Mutated Otie" =/mob/living/simple_mob/vore/otie/feral,
+								  "Chubby Mutated Otie" = /mob/living/simple_mob/vore/otie/feral/chubby,//CHOMPedit: more mobs
+								  "Red Otie" = /mob/living/simple_mob/vore/otie/red,
+								  "Chubby Red Otie" = /mob/living/simple_mob/vore/otie/red/chubby,//CHOMPedit: more mobs
+								  "Zorgoia" = /mob/living/simple_mob/vore/otie/zorgoia,//CHOMPedit: more mobs
 								  "Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound,
 								  "Corrupt Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi,
 								  "Hunter Giant Spider" = /mob/living/simple_mob/animal/giant_spider/hunter,
@@ -125,7 +125,7 @@
 
 /obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M)
 	..()
-	var/mob/living/simple_mob/vore/hostile/morph/newMorph = new /mob/living/simple_mob/vore/hostile/morph(get_turf(src))
+	var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src))
 	newMorph.voremob_loaded = TRUE //CHOMPedit: On-demand belly loading.
 	newMorph.init_vore() //CHOMPedit: On-demand belly loading.
 	if(M.mind)

code/game/turfs/flooring/seasonal.dm

@@ -55,9 +55,9 @@ var/world_time_season
 				/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
 				/mob/living/simple_mob/vore/bee = 20,
 				/mob/living/simple_mob/vore/horse/big = 5,
-				/mob/living/simple_mob/animal/wolf = 5,
-				/mob/living/simple_mob/animal/wolf/direwolf = 1,
-				/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
+				/mob/living/simple_mob/vore/wolf = 5,
+				/mob/living/simple_mob/vore/wolf/direwolf = 1,
+				/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
 				/mob/living/simple_mob/vore/squirrel = 20
 			)
 			grass_types = list(
@@ -97,7 +97,7 @@ var/world_time_season
 				/mob/living/simple_mob/vore/horse/big = 5,
 				/mob/living/simple_mob/vore/pakkun = 2,
 				/mob/living/simple_mob/vore/fennix = 1,
-				/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
+				/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
 				/mob/living/simple_mob/animal/passive/bird/parrot = 1,
 				/mob/living/simple_mob/vore/squirrel = 20
 			)
@@ -123,9 +123,9 @@ var/world_time_season
 				/mob/living/simple_mob/vore/horse/big = 10,
 				/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
 				/mob/living/simple_mob/vore/horse/big = 1,
-				/mob/living/simple_mob/animal/wolf = 1,
-				/mob/living/simple_mob/animal/wolf/direwolf = 1,
-				/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
+				/mob/living/simple_mob/vore/wolf = 1,
+				/mob/living/simple_mob/vore/wolf/direwolf = 1,
+				/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
 				/mob/living/simple_mob/vore/squirrel = 20
 			)
 			grass_types = list(
@@ -148,13 +148,13 @@ var/world_time_season
 				/mob/living/simple_mob/vore/alienanimals/teppi = 10,
 				/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
 				/mob/living/simple_mob/vore/redpanda = 10,
-				/mob/living/simple_mob/animal/wolf = 10,
-				/mob/living/simple_mob/animal/wolf/direwolf = 1,
-				/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
-				/mob/living/simple_mob/otie/friendly = 2,
-				/mob/living/simple_mob/otie/friendly/chubby = 1,
-				/mob/living/simple_mob/otie/red/friendly = 1,
-				/mob/living/simple_mob/otie/red/chubby = 1,
+				/mob/living/simple_mob/vore/wolf = 10,
+				/mob/living/simple_mob/vore/wolf/direwolf = 1,
+				/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
+				/mob/living/simple_mob/vore/otie/friendly = 2,
+				/mob/living/simple_mob/vore/otie/friendly/chubby = 1,
+				/mob/living/simple_mob/vore/otie/red/friendly = 1,
+				/mob/living/simple_mob/vore/otie/red/chubby = 1,
 				/mob/living/simple_mob/vore/squirrel = 20
 			)
 			if(prob(snow_chance))

code/modules/casino/spawnergrenade_casino.dm

@@ -73,7 +73,7 @@
 /obj/item/weapon/grenade/spawnergrenade/casino/otie
 	desc = "It is set to detonate in 5 seconds. It will release a otie won from the casino prize vendor!"
 	name = "Casino Creature Container (Otie)"
-	spawner_type = /mob/living/simple_mob/otie/friendly
+	spawner_type = /mob/living/simple_mob/vore/otie/friendly
 
 /obj/item/weapon/grenade/spawnergrenade/casino/goldcrest
 	desc = "It is set to detonate in 5 seconds. It will release a bird won from the casino prize vendor!"
@@ -102,4 +102,4 @@
 
 /obj/item/weapon/grenade/spawnergrenade/casino/gygax/shuttlepod
 	name = "Casino Mech Container (Shuttlepod)"
-	spawner_type = /obj/mecha/working/hoverpod/shuttlepod
+	spawner_type = /obj/mecha/working/hoverpod/shuttlepod

code/modules/events/spider_infestation.dm

@@ -11,7 +11,7 @@
 		kill()
 		return
 	announceWhen = rand(announceWhen, announceWhen + 60)
-	spawncount = rand(6 * severity, 14 * severity)	//spiderlings only have a 50% chance to grow big and strong //CHOMP Edit: old: 2/4 new: 6/14
+	spawncount = rand(4 * severity, 10 * severity)	//spiderlings only have a 50% chance to grow big and strong //CHOMP Edit: old: 2/4 new: 6/14 new: 4/10
 	sent_spiders_to_station = 0
 
 /datum/event/spider_infestation/announce()
@@ -35,8 +35,9 @@
 		var/obj/vent = pick(vents)
 	//CHOMPEDIT START adding spider EGGS to the possible spawns instead of singular spiderling spawns.
 		var/spawn_spiderlings = pickweight(list(
-			/obj/effect/spider/spiderling = 90,
-			/obj/effect/spider/eggcluster = 10
+			/obj/effect/spider/spiderling = 85,
+			/obj/effect/spider/eggcluster = 10,
+			/obj/effect/spider/eggcluster/royal = 5
 			))
 		new spawn_spiderlings(vent.loc) //VOREStation Edit - No nurses //Oh my JESUS CHRIST, this slipped past me. Literally no nurses. Well guess what, nurses are back.
 	//CHOMPEDIT END

code/modules/food/food/snacks.dm

@@ -4784,8 +4784,8 @@
 	var/composition_reagent
 	var/composition_reagent_quantity
 
-/mob/living/simple_mob/adultslime
-	composition_reagent = "slimejelly"
+///mob/living/simple_mob/adultslime	//The literal only thing in the game that uses this is commented out, so I comment out this too
+//	composition_reagent = "slimejelly"
 
 /mob/living/carbon/alien/diona
 	composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -22,7 +22,7 @@
 		/obj/item/weapon/circuitboard,
 		/obj/item/weapon/smes_coil,
 		/obj/item/weapon/fuel_assembly,
-		/obj/item/weapon/ore/bluespace_crystal
+		/obj/item/weapon/bluespace_crystal //Chomp EDIT
 		) // CHOMPEdit - Buffing the gripper to allow bluespace crystal use for telesci building.
 
 	var/obj/item/wrapped = null // Item currently being held.

code/modules/mob/living/simple_mob/sd_pets.dm

@@ -104,7 +104,7 @@
 	value = CATALOGUER_REWARD_TRIVIAL	//Worth less points since it lives on the ship
 
 
-/mob/living/simple_mob/otie/red/chubby/cocoa
+/mob/living/simple_mob/vore/otie/red/chubby/cocoa
 	name = "Cocoa"
 	desc = "A good boi, eats the scraps when you're not looking."
 	devourable = 0
@@ -113,9 +113,9 @@
 	mob_bump_flag = 32
 	ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/otie/cocoa
 	catalogue_data = list(/datum/category_item/catalogue/fauna/otie/cocoa)
-	
+
 
 /datum/ai_holder/simple_mob/melee/evasive/otie/cocoa
 	hostile = 0
 	retaliate = 0
-	violent_breakthrough = 0
+	violent_breakthrough = 0

code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm

@@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 	name = "chicken"
 	desc = "Hopefully the eggs are good this season."
 	tt_desc = "E Gallus gallus"
-	icon_state = "chicken"
+	icon_state = "chicken_white"
 	icon_living = "chicken"
 	icon_dead = "chicken_dead"
 

code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/otie/zorgoia //Yes im basing the goias on oties for now, sue me....please dont sue me - Jack
+/mob/living/simple_mob/vore/otie/zorgoia //Yes im basing the goias on oties for now, sue me....please dont sue me - Jack
 	name = "zorgoia"
 	desc = "It's a a reptilian mammal hybrid, known for its voracious nature and love for fruits. By more popular terms its refered to as the furry slinky!"
 	tt_desc = "Zorgoyuh slinkus"
@@ -33,7 +33,7 @@
 	pain_emote_1p = list("yelp", "whine", "bark", "growl")
 	pain_emote_3p = list("yelps", "whines", "barks", "growls")
 
-/mob/living/simple_mob/otie/zorgoia/New()
+/mob/living/simple_mob/vore/otie/zorgoia/New()
 	..()
 	switch(rand(9))
 		if(0)
@@ -57,7 +57,7 @@
 		if(9)
 			color = "#393939"
 
-/mob/living/simple_mob/otie/zorgoia/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
+/mob/living/simple_mob/vore/otie/zorgoia/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
 	name = "agressive zorgoia"
 	desc = "It's a a reptilian mammal hybrid, known for its voracious nature and love for fruits. By more popular terms its refered to as the furry slinky! This one seems quite hungry and in a bad mood!"
 	faction = "virgo3b"
@@ -71,7 +71,7 @@
 	min_n2 = 0
 	max_n2 = 0
 
-/mob/living/simple_mob/otie/zorgoia/friendly //gets the pet2tame feature and doesn't kill you right away
+/mob/living/simple_mob/vore/otie/zorgoia/friendly //gets the pet2tame feature and doesn't kill you right away
 	name = "friendly zorgoia"
 	desc = "It's a a reptilian mammal hybrid, known for its voracious nature and love for fruits. By more popular terms its refered to as the furry slinky! This one seems harmless and friendly!"
 	faction = "neutral"

code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/animal/space/jelly
+/mob/living/simple_mob/vore/jelly
 	name = "jelly blob"
 	desc = "Some sort of undulating blob of slime!"
 
@@ -19,8 +19,17 @@
 	
 	can_be_drop_prey = FALSE //CHOMP Add
 
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+
 // Activate Noms!
-/mob/living/simple_mob/animal/space/jelly
 	vore_active = 1
 	vore_pounce_chance = 0
 	vore_icons = SA_ICON_LIVING

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mobs_monsters/clowns/big
+/mob/living/simple_mob/clowns/big
 	tt_desc = "E Homo sapiens corydon horrificus" //this clown is stronk
 	faction = "clown"
 
@@ -18,8 +18,6 @@
 
 	loot_list = list(/obj/item/weapon/bikehorn = 100)
 
-
-/mob/living/simple_mob/mobs_monsters/clowns/big
 	min_oxy = 0
 	max_oxy = 500
 	min_tox = 0
@@ -41,4 +39,4 @@
 	can_flee = FALSE
 	speak_chance = 3
 	wander = TRUE
-	base_wander_delay = 9
+	base_wander_delay = 9

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mobs_monsters/clowns/
+/mob/living/simple_mob/clowns/
 	tt_desc = "E Homo sapiens corydon" //this is a clown
 	faction = "clown"
 	movement_sound = 'sound/effects/clownstep2.ogg'

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bigclowns.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mobs_monsters/clowns/big/normal
+/mob/living/simple_mob/clowns/big/normal
 	name = "Clown"
 	desc = "A regular, every tuesday Clown."
 	tt_desc = "E Homo sapiens corydon" //this is a clown
@@ -10,7 +10,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/honkmunculus
+/mob/living/simple_mob/clowns/big/honkmunculus
 	name = "A Clown?"
 	desc = "That clown has some interesting proportions."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -28,7 +28,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/cluwne
+/mob/living/simple_mob/clowns/big/cluwne
 	name = "A Clown?"
 	desc = "Oh no not that thing."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -40,7 +40,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/tunnelclown
+/mob/living/simple_mob/clowns/big/tunnelclown
 	name = "A Clown?"
 	desc = "Have you heard about our lord and savior, Honkus Chrust?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -52,7 +52,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/sentinel
+/mob/living/simple_mob/clowns/big/sentinel
 	name = "A Clown?"
 	desc = "This guy means business..."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -64,7 +64,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/punished
+/mob/living/simple_mob/clowns/big/punished
 	name = "A Clown?"
 	desc = "A clown at peak performance."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -82,7 +82,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/thicc
+/mob/living/simple_mob/clowns/big/thicc
 	name = "A Clown..."
 	desc = "I mean, you see it don't you?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -100,7 +100,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/perm
+/mob/living/simple_mob/clowns/big/perm
 	name = "A Clown?"
 	desc = "That clown really needs to get that hair under control."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -118,7 +118,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/wide
+/mob/living/simple_mob/clowns/big/wide
 	name = "A Clown?"
 	desc = "He looks good from some angles!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -136,7 +136,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/thin
+/mob/living/simple_mob/clowns/big/thin
 	name = "A Clown?"
 	desc = "Is he eating enough?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -148,7 +148,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/hulk
+/mob/living/simple_mob/clowns/big/hulk
 	name = "A Clown?"
 	desc = "Just look at those muscles."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -168,7 +168,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/longface
+/mob/living/simple_mob/clowns/big/longface
 	name = "A Clown?"
 	desc = "Why the long face?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -186,7 +186,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/giggles
+/mob/living/simple_mob/clowns/big/giggles
 	name = "A Giggles?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -198,7 +198,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/destroyer
+/mob/living/simple_mob/clowns/big/destroyer
 	name = "A Clown?"
 	desc = "That clown looks like he means business."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -239,7 +239,7 @@
 				)
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/chlown
+/mob/living/simple_mob/clowns/big/chlown
 	name = "A Clown?"
 	desc = "No."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -257,7 +257,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/scary
+/mob/living/simple_mob/clowns/big/scary
 	name = "A Clown?"
 	desc = "Hey that clown looks familiar!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -269,7 +269,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/flesh
+/mob/living/simple_mob/clowns/big/flesh
 	name = "A Clown?"
 	desc = "WOOOOO STREAKING WOOOO!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -281,7 +281,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/clowns
+/mob/living/simple_mob/clowns/big/clowns
 	name = "Definitely a singular clown"
 	desc = "Is it one clown, or many clowns in not a trenchcoat?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -299,7 +299,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/mutant
+/mob/living/simple_mob/clowns/big/mutant
 	name = "A Clown?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -317,7 +317,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/blob
+/mob/living/simple_mob/clowns/big/blob
 	name = "A Clown?"
 	desc = "Go to a gym fatty!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -335,7 +335,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/mayor
+/mob/living/simple_mob/clowns/big/mayor
 	name = "A clown?"
 	desc = "One speaks in riddles..."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -353,7 +353,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/honkling
+/mob/living/simple_mob/clowns/big/honkling
 	name = "A Clown?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -367,7 +367,7 @@
 
 //template
 
-///mob/living/simple_mob/mobs_monsters/clowns/big/
+///mob/living/simple_mob/clowns/big/
 //	name = "A Clown?"
 //	desc = "Oh sweet space christ."
 //	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm

@@ -1,7 +1,7 @@
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift
+/mob/living/simple_mob/clowns/big/c_shift
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
 	faction = "clown"
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/New()
+/mob/living/simple_mob/clowns/big/c_shift/New()
 	..()
-	verbs += /mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/proc/phase_shift
+	verbs += /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/busclowns.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/anormal
+/mob/living/simple_mob/clowns/big/c_shift/anormal
 	name = "Clown"
 	desc = "A regular, every tuesday Clown."
 	tt_desc = "E Homo sapiens corydon" //this is a clown
@@ -10,7 +10,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkmunculus
+/mob/living/simple_mob/clowns/big/c_shift/honkmunculus
 	name = "A Clown?"
 	desc = "That clown has some interesting proportions."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -28,7 +28,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/cluwne
+/mob/living/simple_mob/clowns/big/c_shift/cluwne
 	name = "A Clown?"
 	desc = "Oh no not that thing."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -40,7 +40,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/tunnelclown
+/mob/living/simple_mob/clowns/big/c_shift/tunnelclown
 	name = "A Clown?"
 	desc = "Have you heard about our lord and savior, Honkus Chrust?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -52,7 +52,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/sentinel
+/mob/living/simple_mob/clowns/big/c_shift/sentinel
 	name = "A Clown?"
 	desc = "This guy means business..."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -64,7 +64,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/punished
+/mob/living/simple_mob/clowns/big/c_shift/punished
 	name = "A Clown?"
 	desc = "A clown at peak performance."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -82,7 +82,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/thicc
+/mob/living/simple_mob/clowns/big/c_shift/thicc
 	name = "A Clown..."
 	desc = "I mean, you see it don't you?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -100,7 +100,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/perm
+/mob/living/simple_mob/clowns/big/c_shift/perm
 	name = "A Clown?"
 	desc = "That clown really needs to get that hair under control."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -118,7 +118,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/wide
+/mob/living/simple_mob/clowns/big/c_shift/wide
 	name = "A Clown?"
 	desc = "He looks good from some angles!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -136,7 +136,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/thin
+/mob/living/simple_mob/clowns/big/c_shift/thin
 	name = "A Clown?"
 	desc = "Is he eating enough?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -148,7 +148,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/hulk
+/mob/living/simple_mob/clowns/big/c_shift/hulk
 	name = "A Clown?"
 	desc = "Just look at those muscles."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -168,7 +168,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/longface
+/mob/living/simple_mob/clowns/big/c_shift/longface
 	name = "A Clown?"
 	desc = "Why the long face?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -186,7 +186,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/giggles
+/mob/living/simple_mob/clowns/big/c_shift/giggles
 	name = "A Giggles?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -198,7 +198,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/destroyer
+/mob/living/simple_mob/clowns/big/c_shift/destroyer
 	name = "A Clown?"
 	desc = "That clown looks like he means business."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -239,7 +239,7 @@
 				)
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/chlown
+/mob/living/simple_mob/clowns/big/c_shift/chlown
 	name = "A Clown?"
 	desc = "No."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -257,7 +257,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/scary
+/mob/living/simple_mob/clowns/big/c_shift/scary
 	name = "A Clown?"
 	desc = "Hey that clown looks familiar!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -269,7 +269,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/flesh
+/mob/living/simple_mob/clowns/big/c_shift/flesh
 	name = "A Clown?"
 	desc = "WOOOOO STREAKING WOOOO!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -281,7 +281,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/clowns
+/mob/living/simple_mob/clowns/big/c_shift/clowns
 	name = "Definitely a singular clown"
 	desc = "Is it one clown, or many clowns in not a trenchcoat?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -299,7 +299,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/mutant
+/mob/living/simple_mob/clowns/big/c_shift/mutant
 	name = "A Clown?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -317,7 +317,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/blob
+/mob/living/simple_mob/clowns/big/c_shift/blob
 	name = "A Clown?"
 	desc = "Go to a gym fatty!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -335,7 +335,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/mayor
+/mob/living/simple_mob/clowns/big/c_shift/mayor
 	name = "A clown?"
 	desc = "One speaks in riddles..."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -353,7 +353,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkling
+/mob/living/simple_mob/clowns/big/c_shift/honkling
 	name = "A Clown?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm

@@ -1,8 +1,8 @@
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift
+/mob/living/simple_mob/clowns/big/c_shift
 	var/ability_flags = 0 //Flags for active abilities
 
 // Phase shifting procs (and related procs)
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/proc/phase_shift()
+/mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift()
 	var/turf/T = get_turf(src)
 	if(!T.CanPass(src,T) || loc != T)
 		to_chat(src,"<span class='warning'>You can't use that here!</span>")
@@ -73,23 +73,23 @@
 		density = FALSE
 		force_max_speed = TRUE
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/UnarmedAttack()
+/mob/living/simple_mob/clowns/big/c_shift/UnarmedAttack()
 	if(ability_flags & AB_PHASE_SHIFTED)
 		return FALSE //Nope.
 
 	. = ..()
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/can_fall()
+/mob/living/simple_mob/clowns/big/c_shift/can_fall()
 	if(ability_flags & AB_PHASE_SHIFTED)
 		return FALSE //Nope!
 
 	return ..()
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/zMove(direction)
+/mob/living/simple_mob/clowns/big/c_shift/zMove(direction)
 	if(ability_flags & AB_PHASE_SHIFTED)
 		var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
 		if(destination)
 			forceMove(destination)
 		return TRUE
 
-	return ..()
+	return ..()

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm

@@ -17,7 +17,7 @@
 
 /obj/structure/ghost_pod/manual/clegg/create_occupant(var/mob/M)
 	lightning_strike(get_turf(src), cosmetic = TRUE)
-	var/list/choices = list(/mob/living/simple_mob/mobs_monsters/clowns/normal, /mob/living/simple_mob/mobs_monsters/clowns/honkling, /mob/living/simple_mob/mobs_monsters/clowns/mayor, /mob/living/simple_mob/mobs_monsters/clowns/blob, /mob/living/simple_mob/mobs_monsters/clowns/mutant, /mob/living/simple_mob/mobs_monsters/clowns/clowns, /mob/living/simple_mob/mobs_monsters/clowns/flesh, /mob/living/simple_mob/mobs_monsters/clowns/scary, /mob/living/simple_mob/mobs_monsters/clowns/chlown, /mob/living/simple_mob/mobs_monsters/clowns/destroyer, /mob/living/simple_mob/mobs_monsters/clowns/giggles, /mob/living/simple_mob/mobs_monsters/clowns/longface, /mob/living/simple_mob/mobs_monsters/clowns/hulk, /mob/living/simple_mob/mobs_monsters/clowns/thin, /mob/living/simple_mob/mobs_monsters/clowns/wide, /mob/living/simple_mob/mobs_monsters/clowns/perm, /mob/living/simple_mob/mobs_monsters/clowns/thicc, /mob/living/simple_mob/mobs_monsters/clowns/punished, /mob/living/simple_mob/mobs_monsters/clowns/sentinel, /mob/living/simple_mob/mobs_monsters/clowns/tunnelclown, /mob/living/simple_mob/mobs_monsters/clowns/cluwne, /mob/living/simple_mob/mobs_monsters/clowns/honkmunculus)
+	var/list/choices = list(/mob/living/simple_mob/clowns/normal, /mob/living/simple_mob/clowns/honkling, /mob/living/simple_mob/clowns/mayor, /mob/living/simple_mob/clowns/blob, /mob/living/simple_mob/clowns/mutant, /mob/living/simple_mob/clowns/clowns, /mob/living/simple_mob/clowns/flesh, /mob/living/simple_mob/clowns/scary, /mob/living/simple_mob/clowns/chlown, /mob/living/simple_mob/clowns/destroyer, /mob/living/simple_mob/clowns/giggles, /mob/living/simple_mob/clowns/longface, /mob/living/simple_mob/clowns/hulk, /mob/living/simple_mob/clowns/thin, /mob/living/simple_mob/clowns/wide, /mob/living/simple_mob/clowns/perm, /mob/living/simple_mob/clowns/thicc, /mob/living/simple_mob/clowns/punished, /mob/living/simple_mob/clowns/sentinel, /mob/living/simple_mob/clowns/tunnelclown, /mob/living/simple_mob/clowns/cluwne, /mob/living/simple_mob/clowns/honkmunculus)
 	var/chosen_clown = tgui_input_list(M, "Redspace clowns like themes, what's yours?", "Theme Choice", choices)
 	density = FALSE
 	var/mob/living/simple_mob/R = new chosen_clown(get_turf(src))
@@ -27,4 +27,4 @@
 	R.ckey = M.ckey
 	visible_message("<span class='warning'>With a bright flash of light, \the [src] disappears, and in its place you see a... Clown?</span>")
 	log_and_message_admins("successfully touched \a [src] and summoned a mistake!")
-	..()
+	..()

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkelemental
+/mob/living/simple_mob/clowns/big/c_shift/honkelemental
 	name = "Honk Elemental"
 	desc = "That thing can't be real, right?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -23,7 +23,7 @@
 	speak = list("HONK", "Honk!", "Henk!")
 	emote_see = list("honks")
 
-/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkelemental/verb/spawn_egg()
+/mob/living/simple_mob/clowns/big/c_shift/honkelemental/verb/spawn_egg()
 	set category = "Abilities"
 	set name = "Spawn Clown Egg"
 	set desc = "Spawns an egg that a player can touch, which will call on ghosts to spawn as clowns."
@@ -32,4 +32,4 @@
 		return
 
 	new /obj/structure/ghost_pod/manual/clegg(get_turf(src))
-	flick("he_lay",src)
+	flick("he_lay",src)

code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mobs_monsters/clowns/
+/mob/living/simple_mob/clowns/
 	response_help = "pokes"
 	response_disarm = "gently pushes aside"
 	response_harm = "hits"
@@ -13,7 +13,7 @@
 
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/honkmunculus
+/mob/living/simple_mob/clowns/honkmunculus
 	name = "A Clown?"
 	desc = "That clown has some interesting proportions."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -31,7 +31,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/cluwne
+/mob/living/simple_mob/clowns/cluwne
 	name = "A Clown?"
 	desc = "Oh no not that thing."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -43,7 +43,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/tunnelclown
+/mob/living/simple_mob/clowns/tunnelclown
 	name = "A Clown?"
 	desc = "Have you heard about our lord and savior, Honkus Chrust?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -55,7 +55,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/sentinel
+/mob/living/simple_mob/clowns/sentinel
 	name = "A Clown?"
 	desc = "This guy means business..."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -68,7 +68,7 @@
 
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/punished
+/mob/living/simple_mob/clowns/punished
 	name = "A Clown?"
 	desc = "A clown at peak performance."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -86,7 +86,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/thicc
+/mob/living/simple_mob/clowns/thicc
 	name = "A Clown..."
 	desc = "I mean, you see it don't you?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -104,7 +104,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/perm
+/mob/living/simple_mob/clowns/perm
 	name = "A Clown?"
 	desc = "That clown really needs to get that hair under control."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -122,7 +122,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/wide
+/mob/living/simple_mob/clowns/wide
 	name = "A Clown?"
 	desc = "He looks good from some angles!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -140,7 +140,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/thin
+/mob/living/simple_mob/clowns/thin
 	name = "A Clown?"
 	desc = "Is he eating enough?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -152,7 +152,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/hulk
+/mob/living/simple_mob/clowns/hulk
 	name = "A Clown?"
 	desc = "Just look at those muscles."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -170,7 +170,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/longface
+/mob/living/simple_mob/clowns/longface
 	name = "A Clown?"
 	desc = "Why the long face?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -188,7 +188,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/giggles
+/mob/living/simple_mob/clowns/giggles
 	name = "A Giggles?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -200,7 +200,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/destroyer
+/mob/living/simple_mob/clowns/destroyer
 	name = "A Clown?"
 	desc = "That clown looks like he means business."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -218,7 +218,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/chlown
+/mob/living/simple_mob/clowns/chlown
 	name = "A Clown?"
 	desc = "No."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -236,7 +236,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/scary
+/mob/living/simple_mob/clowns/scary
 	name = "A Clown?"
 	desc = "Hey that clown looks familiar!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -248,7 +248,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/flesh
+/mob/living/simple_mob/clowns/flesh
 	name = "A Clown?"
 	desc = "WOOOOO STREAKING WOOOO!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -260,7 +260,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/clowns
+/mob/living/simple_mob/clowns/clowns
 	name = "Definitely a singular clown"
 	desc = "Is it one clown, or many clowns in not a trenchcoat?"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -278,7 +278,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/mutant
+/mob/living/simple_mob/clowns/mutant
 	name = "A Clown?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -296,7 +296,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/blob
+/mob/living/simple_mob/clowns/blob
 	name = "A Clown?"
 	desc = "Go to a gym fatty!"
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -314,7 +314,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/mayor
+/mob/living/simple_mob/clowns/mayor
 	name = "A clown?"
 	desc = "One speaks in riddles..."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -332,7 +332,7 @@
 	pixel_y = 0
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/honkling
+/mob/living/simple_mob/clowns/honkling
 	name = "A Clown?"
 	desc = "Oh sweet space christ."
 	tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -344,7 +344,7 @@
 	vis_height = 32
 
 
-/mob/living/simple_mob/mobs_monsters/clowns/normal
+/mob/living/simple_mob/clowns/normal
 	name = "Clown"
 	desc = "A regular, every tuesday Clown."
 	tt_desc = "E Homo sapiens corydon" //this is a clown
@@ -361,4 +361,4 @@
 
 	response_help = "pokes"
 	response_disarm = "gently pushes aside"
-	response_harm = "hits"
+	response_harm = "hits"

code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm

@@ -1,6 +1,6 @@
 #define MORPH_COOLDOWN 50
 
-/mob/living/simple_mob/vore/hostile/morph
+/mob/living/simple_mob/vore/morph
 	name = "morph"
 	real_name = "morph"
 	desc = "A revolting, pulsating pile of flesh."
@@ -58,25 +58,25 @@
 	var/static/list/blacklist_typecache = typecacheof(list(
 	/obj/screen,
 	/obj/singularity,
-	/mob/living/simple_mob/vore/hostile/morph,
+	/mob/living/simple_mob/vore/morph,
 	/obj/effect))
 
-/mob/living/simple_mob/vore/hostile/morph/Initialize()
+/mob/living/simple_mob/vore/morph/Initialize()
 	verbs += /mob/living/proc/ventcrawl
-	verbs += /mob/living/simple_mob/vore/hostile/morph/proc/take_over_prey
-	if(!istype(src, /mob/living/simple_mob/vore/hostile/morph/dominated_prey))
-		verbs += /mob/living/simple_mob/vore/hostile/morph/proc/morph_color
+	verbs += /mob/living/simple_mob/vore/morph/proc/take_over_prey
+	if(!istype(src, /mob/living/simple_mob/vore/morph/dominated_prey))
+		verbs += /mob/living/simple_mob/vore/morph/proc/morph_color
 
 	return ..()
 
-/mob/living/simple_mob/vore/hostile/morph/Destroy()
+/mob/living/simple_mob/vore/morph/Destroy()
 	form = null
 	return ..()
 
-/mob/living/simple_mob/vore/hostile/morph/proc/allowed(atom/movable/A)
+/mob/living/simple_mob/vore/morph/proc/allowed(atom/movable/A)
 	return !is_type_in_typecache(A, blacklist_typecache) && (isobj(A) || ismob(A))
 
-/mob/living/simple_mob/vore/hostile/morph/examine(mob/user)
+/mob/living/simple_mob/vore/morph/examine(mob/user)
 	if(morphed)
 		. = form.examine(user)
 		if(get_dist(user, src) <= 3 && !resting)
@@ -84,7 +84,7 @@
 	else
 		. = ..()
 
-/mob/living/simple_mob/vore/hostile/morph/ShiftClickOn(atom/movable/A)
+/mob/living/simple_mob/vore/morph/ShiftClickOn(atom/movable/A)
 	if(Adjacent(A))
 		if(morph_time <= world.time && !stat)
 			if(A == src)
@@ -97,7 +97,7 @@
 	else
 		..()
 
-/mob/living/simple_mob/vore/hostile/morph/proc/assume(atom/movable/target)
+/mob/living/simple_mob/vore/morph/proc/assume(atom/movable/target)
 	var/mob/living/carbon/human/humantarget = target
 	if(istype(humantarget) && humantarget.resleeve_lock && ckey != humantarget.resleeve_lock)
 		to_chat(src, "<span class='warning'>[target] cannot be impersonated!</span>")
@@ -142,7 +142,7 @@
 
 	return
 
-/mob/living/simple_mob/vore/hostile/morph/proc/restore(var/silent = FALSE)
+/mob/living/simple_mob/vore/morph/proc/restore(var/silent = FALSE)
 	if(!morphed)
 		to_chat(src, "<span class='warning'>You're already in your normal form!</span>")
 		return
@@ -187,21 +187,21 @@
 
 	morph_time = world.time + MORPH_COOLDOWN
 
-/mob/living/simple_mob/vore/hostile/morph/death(gibbed)
+/mob/living/simple_mob/vore/morph/death(gibbed)
 	if(morphed)
 		visible_message("<span class='warning'>[src] twists and dissolves into a pile of flesh!</span>")
 		restore(TRUE)
 	..()
 
-/mob/living/simple_mob/vore/hostile/morph/will_show_tooltip()
+/mob/living/simple_mob/vore/morph/will_show_tooltip()
 	return (!morphed)
 
-/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE)
+/mob/living/simple_mob/vore/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE)
 	if(morphed && !ismob(form))
 		return
 	return ..()
 
-/mob/living/simple_mob/vore/hostile/morph/lay_down()
+/mob/living/simple_mob/vore/morph/lay_down()
 	if(morphed)
 		var/temp_state = icon_state
 		..()
@@ -225,18 +225,18 @@
 	else
 		..()
 
-/mob/living/simple_mob/vore/hostile/morph/update_icon()
+/mob/living/simple_mob/vore/morph/update_icon()
 	if(morphed)
 		return
 	return ..()
 
 
-/mob/living/simple_mob/vore/hostile/morph/update_icons()
+/mob/living/simple_mob/vore/morph/update_icons()
 	if(morphed)
 		return
 	return ..()
 
-/mob/living/simple_mob/vore/hostile/morph/update_transform()
+/mob/living/simple_mob/vore/morph/update_transform()
 	if(morphed)
 		var/matrix/M = matrix()
 		M.Scale(icon_scale_x, icon_scale_y)
@@ -245,7 +245,7 @@
 	else
 		..()
 
-/mob/living/simple_mob/vore/hostile/morph/proc/morph_color()
+/mob/living/simple_mob/vore/morph/proc/morph_color()
 	set name = "Pick Color"
 	set category = "Abilities"
 	set desc = "You can set your color!"
@@ -255,7 +255,7 @@
 		chosen_color = newcolor
 
 
-/mob/living/simple_mob/vore/hostile/morph/proc/take_over_prey()
+/mob/living/simple_mob/vore/morph/proc/take_over_prey()
 	set name = "Take Over Prey"
 	set category = "Abilities"
 	set desc = "Take command of your prey's body."
@@ -302,23 +302,23 @@
 					stop_pulling()
 					original_ckey = ckey
 					log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(M)] as a morph at [get_area(src)] - [COORD(src)].")
-					new /mob/living/simple_mob/vore/hostile/morph/dominated_prey(M.vore_selected, M.ckey, src, M)
+					new /mob/living/simple_mob/vore/morph/dominated_prey(M.vore_selected, M.ckey, src, M)
 				else
 					to_chat(src, "<span class='warning'>\The [M] declined your request for control.</span>")
 			else
 				to_chat(src, "<span class='warning'>\The [M] declined your request for control.</span>")
 
-/mob/living/simple_mob/vore/hostile/morph/dominated_prey
+/mob/living/simple_mob/vore/morph/dominated_prey
 	name = "subservient node"
 	color = "#171717"
 	digestable = 0
 	devourable = 0
-	var/mob/living/simple_mob/vore/hostile/morph/parent_morph
+	var/mob/living/simple_mob/vore/morph/parent_morph
 	var/mob/living/carbon/human/prey_body
 	var/prey_ckey
 
 
-/mob/living/simple_mob/vore/hostile/morph/dominated_prey/New(loc, pckey, parent, prey)
+/mob/living/simple_mob/vore/morph/dominated_prey/New(loc, pckey, parent, prey)
 	. = ..()
 	if(pckey)
 		prey_ckey = pckey
@@ -336,17 +336,17 @@
 	else
 		qdel(src)
 
-/mob/living/simple_mob/vore/hostile/morph/dominated_prey/death(gibbed)
+/mob/living/simple_mob/vore/morph/dominated_prey/death(gibbed)
 	. = ..()
 	undo_prey_takeover(FALSE)
 
 
-/mob/living/simple_mob/vore/hostile/morph/dominated_prey/Destroy()
+/mob/living/simple_mob/vore/morph/dominated_prey/Destroy()
 	. = ..()
 	parent_morph = null
 	prey_body = null
 
-/mob/living/simple_mob/vore/hostile/morph/dominated_prey/proc/undo_prey_takeover(ooc_escape)
+/mob/living/simple_mob/vore/morph/dominated_prey/proc/undo_prey_takeover(ooc_escape)
 	if(buckled)
 		buckled.unbuckle_mob()
 	if(prey_body.buckled)

code/modules/mob/living/simple_mob/subtypes/vore/otie.dm

@@ -6,7 +6,7 @@
 	**the catalogue entry ends here.**"
 	value = CATALOGUER_REWARD_MEDIUM
 
-/mob/living/simple_mob/otie //Spawn this one only if you're looking for a bad time. Not friendly.
+/mob/living/simple_mob/vore/otie //Spawn this one only if you're looking for a bad time. Not friendly.
 	name = "otie"
 	desc = "The classic bioengineered longdog."
 	tt_desc = "Otus robustus"
@@ -57,7 +57,7 @@
 
 // Activate Noms!
 
-/mob/living/simple_mob/otie
+/mob/living/simple_mob/vore/otie
 	vore_active = 1
 	vore_capacity = 1
 	vore_pounce_chance = 20
@@ -68,7 +68,7 @@
 	vore_default_contamination_color = "black"
 	vore_default_item_mode = IM_DIGEST
 
-/mob/living/simple_mob/otie/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
+/mob/living/simple_mob/vore/otie/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
 	name = "mutated feral otie"
 	desc = "The classic bioengineered longdog. No pets. Only bite. This one seems to have developed a mutation from an abnormally phoron-rich diet." //CHOMPedit
 	tt_desc = "Otus phoronis"
@@ -89,14 +89,14 @@
 	max_n2 = 0
 	has_eye_glow = TRUE
 
-/mob/living/simple_mob/otie/feral/chubby
+/mob/living/simple_mob/vore/otie/feral/chubby
 	name = "chubby mutated feral otie"
 	desc = "The classic bioengineered longdog. No pets. Only bite. This one seems to have developed a mutation from an abnormally phoron-rich diet. What an absolute unit." //CHOMPedit
 	icon_state = "photiec"
 	icon_living = "photiec"
 	icon_rest = "photiec_rest"
 
-/mob/living/simple_mob/otie/red
+/mob/living/simple_mob/vore/otie/red
 	name = "feral red otie"
 	desc = "Seems this ominous looking longdog has been infused with wicked infernal forces."
 	tt_desc = "Otus infernalis"
@@ -118,13 +118,13 @@
 	maxbodytemp = 1000
 	has_eye_glow = TRUE
 
-/mob/living/simple_mob/otie/red/friendly //gets the pet2tame feature and doesn't kill you right away
+/mob/living/simple_mob/vore/otie/red/friendly //gets the pet2tame feature and doesn't kill you right away
 	name = "red otie"
 	desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. This one seems rather peaceful though."
 	faction = "neutral"
 	tamed = 1
 
-/mob/living/simple_mob/otie/red/chubby //gets the pet2tame feature and doesn't kill you right away
+/mob/living/simple_mob/vore/otie/red/chubby //gets the pet2tame feature and doesn't kill you right away
 	name = "chubby red otie"
 	desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit."
 	icon_state = "hotiec"
@@ -133,20 +133,20 @@
 	faction = "neutral"
 	tamed = 1
 
-/mob/living/simple_mob/otie/friendly //gets the pet2tame feature and doesn't kill you right away
+/mob/living/simple_mob/vore/otie/friendly //gets the pet2tame feature and doesn't kill you right away
 	name = "otie"
 	desc = "The classic bioengineered longdog. This one might even tolerate you!"
 	faction = "neutral"
 	tamed = 1
 
-/mob/living/simple_mob/otie/friendly/chubby
+/mob/living/simple_mob/vore/otie/friendly/chubby
 	name = "chubby otie"
 	desc = "The classic bioengineered longdog. This one might even tolerate you! What an absolute unit"
 	icon_state = "fotie"
 	icon_living = "fotie"
 	icon_rest = "fotie_rest"
 
-/mob/living/simple_mob/otie/cotie //same as above but has a little collar :v
+/mob/living/simple_mob/vore/otie/cotie //same as above but has a little collar :v
 	name = "tamed otie"
 	desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. However a proper domesticated otie is an oxymoron and the collar is likely just a decoration."
 	icon_state = "cotie"
@@ -155,14 +155,14 @@
 	faction = "neutral"
 	tamed = 1
 
-/mob/living/simple_mob/otie/cotie/chubby
+/mob/living/simple_mob/vore/otie/cotie/chubby
 	name = "chubby tamed otie"
 	desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. What an absolute unit."
 	icon_state = "fcotie"
 	icon_living = "fcotie"
 	icon_rest = "fcotie_rest"
 
-/mob/living/simple_mob/otie/cotie/phoron //friendly phoron pup with collar
+/mob/living/simple_mob/vore/otie/cotie/phoron //friendly phoron pup with collar
 	name = "mutated otie"
 	desc = "Looks like someone did manage to domesticate one of those wild phoron mutants. What a badass."
 	tt_desc = "Otus phoronis"
@@ -180,7 +180,7 @@
 	max_n2 = 0
 	has_eye_glow = TRUE
 
-/mob/living/simple_mob/otie/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho.
+/mob/living/simple_mob/vore/otie/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho.
 	name = "guard otie"
 	desc = "The VARMAcorp bioengineering division flagship product on big mean guard dogs."
 	icon_state = "sotie"
@@ -198,7 +198,7 @@
 	var/check_records = 0 // If true, arrests people without a record.
 	var/check_arrest = 1 // If true, arrests people who are set to arrest.
 
-/mob/living/simple_mob/otie/security/chubby
+/mob/living/simple_mob/vore/otie/security/chubby
 	name = "chubby guard otie"
 	desc = "The VARMAcorp bioengineering division flagship product on big mean guard dogs. What an absolute unit."
 	icon_state = "fsotie"
@@ -206,7 +206,7 @@
 	icon_rest = "fsotie_rest"
 	icon_dead = "fsotie-dead"
 
-/mob/living/simple_mob/otie/security/phoron
+/mob/living/simple_mob/vore/otie/security/phoron
 	name = "mutated guard otie"
 	desc = "An extra rare phoron resistant version of the VARMAcorp trained guard dogs adapted for hostile environments."
 	tt_desc = "Otus phoronis"
@@ -223,7 +223,7 @@
 	min_n2 = 0
 	max_n2 = 0
 
-/mob/living/simple_mob/otie/security/phoron/red
+/mob/living/simple_mob/vore/otie/security/phoron/red
 	name = "red guard otie"
 	desc = "An ominous looking version of the big mean VARMAcorp guard dogs."
 	tt_desc = "Otus infernalis"
@@ -233,20 +233,20 @@
 	icon_dead = "sechotie-dead"
 	maxbodytemp = 1000
 
-/mob/living/simple_mob/otie/security/phoron/red/chubby
+/mob/living/simple_mob/vore/otie/security/phoron/red/chubby
 	name = "chubby red guard otie"
 	desc = "An ominous looking version of the big mean VARMAcorp guard dogs. What an absolute unit."
 	icon_state = "hotiesc"
 	icon_living = "hotiesc"
 	icon_rest = "hotiesc_rest"
 
-/mob/living/simple_mob/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
+/mob/living/simple_mob/vore/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
 	if(istype(O, /obj/item/weapon/reagent_containers/food))
 		qdel(O)
 		playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
 		if(!has_AI())//No autobarf on player control.
 			return
-		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/otie/security))
+		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/otie/security))
 			to_chat(user,"<span class='notice'>The guard pup accepts your offer for their catch.</span>")
 			release_vore_contents()
 		else if(prob(2)) //Small chance to get prey out from non-sec oties.
@@ -255,7 +255,7 @@
 		return
 	. = ..()
 
-/mob/living/simple_mob/otie/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging.
+/mob/living/simple_mob/vore/otie/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging.
 	if(ishuman(prey))
 		vore_selected.digest_mode = DM_HOLD
 		if(check_threat(prey) >= 4)
@@ -264,12 +264,12 @@
 		vore_selected.digest_mode = DM_DIGEST
 	. = ..()
 
-/mob/living/simple_mob/otie/security/proc/check_threat(var/mob/living/M)
+/mob/living/simple_mob/vore/otie/security/proc/check_threat(var/mob/living/M)
 	if(!M || !ishuman(M) || M.stat == DEAD || src == M)
 		return 0
 	return M.assess_perp(0, 0, 0, check_records, check_arrest)
 
-/mob/living/simple_mob/otie/security/proc/target_name(mob/living/T)
+/mob/living/simple_mob/vore/otie/security/proc/target_name(mob/living/T)
 	if(ishuman(T))
 		var/mob/living/carbon/human/H = T
 		return H.get_id_name("unidentified person")
@@ -277,7 +277,7 @@
 
 //Pet 4 friendly
 
-/mob/living/simple_mob/otie/attack_hand(mob/living/carbon/human/M as mob)
+/mob/living/simple_mob/vore/otie/attack_hand(mob/living/carbon/human/M as mob)
 
 	switch(M.a_intent)
 		if(I_HELP)
@@ -314,12 +314,12 @@
 		else
 			..()
 
-/mob/living/simple_mob/otie/death(gibbed, deathmessage = "dies!")
+/mob/living/simple_mob/vore/otie/death(gibbed, deathmessage = "dies!")
 	.=..()
 	resting = 0
 	icon_state = icon_dead
 
-/mob/living/simple_mob/otie/Login()
+/mob/living/simple_mob/vore/otie/Login()
 	. = ..()
 	if(!riding_datum)
 		riding_datum = new /datum/riding/simple_mob(src)
@@ -327,7 +327,7 @@
 	verbs |= /mob/living/proc/toggle_rider_reins
 	movement_cooldown = 0
 
-/mob/living/simple_mob/otie/MouseDrop_T(mob/living/M, mob/living/user)
+/mob/living/simple_mob/vore/otie/MouseDrop_T(mob/living/M, mob/living/user)
 	return
 
 /datum/say_list/otie
@@ -339,7 +339,7 @@
 
 /datum/ai_holder/simple_mob/melee/evasive/otie
 
-/datum/ai_holder/simple_mob/melee/evasive/otie/New(var/mob/living/simple_mob/otie/new_holder)
+/datum/ai_holder/simple_mob/melee/evasive/otie/New(var/mob/living/simple_mob/vore/otie/new_holder)
 	.=..()
 	if(new_holder.tamed)
 		hostile = FALSE

code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm

@@ -5,7 +5,7 @@
 	love to nip and bite at things, as well as sniffing around. They seem to mark their territory by way of scent-marking/urinating on things."
 	value = CATALOGUER_REWARD_EASY
 
-/mob/living/simple_mob/animal/wolf
+/mob/living/simple_mob/vore/wolf
 	name = "grey wolf"
 	desc = "My, what big jaws it has!"
 	tt_desc = "Canis lupus"
@@ -42,7 +42,7 @@
 
 
 // Activate Noms!
-/mob/living/simple_mob/animal/wolf
+/mob/living/simple_mob/vore/wolf
 	vore_active = 1
 	vore_icons = SA_ICON_LIVING
 
@@ -59,7 +59,7 @@
 	B.belly_fullscreen = "anim_belly" 			// CHOMPedit - Belly Fullscreen
 
 // Space edition, stronger and bitier
-/mob/living/simple_mob/animal/wolf/space
+/mob/living/simple_mob/vore/wolf/space
 	name = "space wolf"
 	tt_desc = "Canis lupus aetherius"
 
@@ -83,10 +83,10 @@
 	minbodytemp = 0
 	maxbodytemp = 700
 
-/mob/living/simple_mob/animal/wolf/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/wolf/space/Process_Spacemove(var/check_drift = 0)
 	return TRUE
 
-/mob/living/simple_mob/animal/wolf/direwolf
+/mob/living/simple_mob/vore/wolf/direwolf
 	name = "dire wolf"
 	desc = "The biggest and baddest wolf around."
 	tt_desc = "Canis maxdirus"
@@ -116,7 +116,7 @@
 	buckle_lying = FALSE
 	vore_icons = SA_ICON_LIVING | SA_ICON_REST
 
-/mob/living/simple_mob/animal/wolf/direwolf/Login()
+/mob/living/simple_mob/vore/wolf/direwolf/Login()
 	. = ..()
 	if(!riding_datum)
 		riding_datum = new /datum/riding/simple_mob(src)
@@ -124,10 +124,10 @@
 	verbs |= /mob/living/proc/toggle_rider_reins
 	movement_cooldown = -1
 
-/mob/living/simple_mob/animal/wolf/direwolf/MouseDrop_T(mob/living/M, mob/living/user)
+/mob/living/simple_mob/vore/wolf/direwolf/MouseDrop_T(mob/living/M, mob/living/user)
 	return
 
-/mob/living/simple_mob/animal/wolf/direwolf/dog
+/mob/living/simple_mob/vore/wolf/direwolf/dog
 	name = "large dog"
 	desc = "The biggest and goodest dog around."
 	tt_desc = "Canis maxdirus familiaris"
@@ -136,7 +136,7 @@
 	icon_state = "diredog"
 	icon_rest = "diredog_rest"
 
-/mob/living/simple_mob/animal/wolf/direwolf/dog/sec
+/mob/living/simple_mob/vore/wolf/direwolf/dog/sec
 	name = "large guard dog"
 	desc = "The biggest and goodest guard dog around."
 	icon_dead = "diredogs-dead"
@@ -144,7 +144,7 @@
 	icon_state = "diredogs"
 	icon_rest = "diredogs_rest"
 
-/mob/living/simple_mob/animal/wolf/direwolf/sec
+/mob/living/simple_mob/vore/wolf/direwolf/sec
 	name = "dire guard wolf"
 	desc = "The biggest and baddest guard wolf around."
 	icon_dead = "direwolfs-dead"
@@ -152,7 +152,7 @@
 	icon_state = "direwolfs"
 	icon_rest = "direwolfs_rest"
 
-/mob/living/simple_mob/animal/wolf/direwolf/rykka
+/mob/living/simple_mob/vore/wolf/direwolf/rykka
 	name = "Rykka"
 	desc = "This big canine looks like a GSD. It has a collar tagged, 'Bitch'"
 	tt_desc = "Canidae"
@@ -186,7 +186,7 @@
 	vore_stomach_name = "Gut"
 	vore_stomach_flavor = "A black-and-purple veined gut, pulsing warmly around you. Loud gurgles sound around you as the gut squishes inwards and attempts to crush you - Rykka seems intent on digesting you, like the meat you are."
 
-/mob/living/simple_mob/animal/wolf/direwolf/andrews
+/mob/living/simple_mob/vore/wolf/direwolf/andrews
 	name = "andrewsarchus"
 	desc = "That's one massive mean-looking piece of long extinct megafauna."
 	tt_desc = "Andrewsarchus mongoliensis"

code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm

@@ -223,10 +223,11 @@
 	response_disarm = "gently pushes aside"
 	response_harm = "hits"
 
-
+// Chomp EDIT
 /mob/living/simple_mob/hostile/carp/pike
 	vore_active = 1
 	// NO VORE SPRITES
+// Chomp EDIT END
 
 /mob/living/simple_mob/animal/space/carp/holographic
 	vore_icons = 0 // NO VORE SPRITES

code/modules/mob/theme_lists.dm

@@ -0,0 +1,10 @@
+//For use with various spawners! Put your selections inside of a list!
+/var/global/list/theme_animal = list()
+/var/global/list/theme_monster = list()
+/var/global/list/theme_alien = list()
+/var/global/list/theme_cold = list()
+/var/global/list/theme_hot = list()
+/var/global/list/theme_aquatic = list()
+/var/global/list/theme_dark = list()
+/var/global/list/theme_forest = list()
+/var/global/list/theme_humanoid = list()

code/modules/rogueminer_vr/controller.dm

@@ -75,17 +75,17 @@ var/datum/controller/rogue/rm_controller
 						/mob/living/simple_mob/animal/space/bats/roguemines = 1,
 						/mob/living/simple_mob/animal/space/carp/roguemines = 2,
 						/mob/living/simple_mob/animal/space/goose/roguemines = 2,
-						/mob/living/simple_mob/animal/wolf/space/roguemines = 1),
+						/mob/living/simple_mob/vore/wolf/space/roguemines = 1),
 
 		"tier3" = list(
 						/mob/living/simple_mob/animal/space/carp/roguemines = 1,
 						/mob/living/simple_mob/animal/space/goose/roguemines = 1,
-						/mob/living/simple_mob/animal/wolf/space/roguemines = 3,
+						/mob/living/simple_mob/vore/wolf/space/roguemines = 3,
 						/mob/living/simple_mob/animal/space/carp/large/roguemines = 2,
 						/mob/living/simple_mob/animal/space/bear/roguemines = 1),
 
 		"tier4" = list(
-						/mob/living/simple_mob/animal/wolf/space/roguemines = 1,
+						/mob/living/simple_mob/vore/wolf/space/roguemines = 1,
 						/mob/living/simple_mob/animal/space/carp/large/roguemines = 4,
 						/mob/living/simple_mob/animal/space/bear/roguemines = 2),
 
@@ -199,4 +199,4 @@ var/datum/controller/rogue/rm_controller
 			var/datum/rogue/zonemaster/ZM_oldest = get_oldest_zone()
 			if(ZM_oldest) ZM_oldest.clean_zone()
 
-	return ZM_target
+	return ZM_target

code/modules/rogueminer_vr/roguemines_mobs.dm

@@ -7,7 +7,7 @@
 /mob/living/simple_mob/animal/space/goose/roguemines
 	faction = "roguemines"
 
-/mob/living/simple_mob/animal/wolf/space/roguemines
+/mob/living/simple_mob/vore/wolf/space/roguemines
 	faction = "roguemines"
 
 /mob/living/simple_mob/animal/space/carp/large/roguemines
@@ -20,4 +20,4 @@
 	faction = "roguemines"
 
 /mob/living/simple_mob/animal/space/carp/large/huge/roguemines
-	faction = "roguemines"
+	faction = "roguemines"

code/modules/telesci/telesci_computer.dm

@@ -207,12 +207,14 @@
 			sparks()
 			if(telepad)
 				var/L = get_turf(telepad)
-				var/blocked = list(/mob/living/simple_mob/hostile)
-				var/list/hostiles = typesof(/mob/living/simple_mob/hostile) - blocked
+				var/blocked = list(/mob/living/simple_mob/vore)
+				var/list/hostiles = typesof(/mob/living/simple_mob/vore) - blocked
 				playsound(L, 'sound/effects/phasein.ogg', 100, 1, extrarange = 3, falloff = 5)
 				for(var/i in 1 to rand(1,4))
 					var/chosen = pick(hostiles)
-					var/mob/living/simple_mob/hostile/H = new chosen
+					var/mob/living/simple_mob/vore/H = new chosen
+					if(H.ai_holder)
+						H.ai_holder.hostile = TRUE
 					H.forceMove(L)
 			return
 		if(99)

code/modules/vore/eating/belly_obj_vr.dm

@@ -700,8 +700,8 @@
 	if (!(M in contents))
 		return 0 // They weren't in this belly anyway
 
-	if(istype(M, /mob/living/simple_mob/vore/hostile/morph/dominated_prey))
-		var/mob/living/simple_mob/vore/hostile/morph/dominated_prey/p = M
+	if(istype(M, /mob/living/simple_mob/vore/morph/dominated_prey))
+		var/mob/living/simple_mob/vore/morph/dominated_prey/p = M
 		p.undo_prey_takeover(FALSE)
 		return 0
 	for(var/mob/living/L in M.contents)

code/modules/vore/eating/living_vr.dm

@@ -501,8 +501,8 @@
 	//You're in a belly!
 	if(isbelly(loc))
 		//You've been taken over by a morph
-		if(istype(src, /mob/living/simple_mob/vore/hostile/morph/dominated_prey))
-			var/mob/living/simple_mob/vore/hostile/morph/dominated_prey/s = src
+		if(istype(src, /mob/living/simple_mob/vore/morph/dominated_prey))
+			var/mob/living/simple_mob/vore/morph/dominated_prey/s = src
 			s.undo_prey_takeover(TRUE)
 			return
 		var/obj/belly/B = loc

code/modules/vore/mouseray.dm

@@ -393,18 +393,18 @@
 		"space bear" = /mob/living/simple_mob/animal/space/bear,
 		"voracious lizard" = /mob/living/simple_mob/vore/aggressive/dino,
 		"giant frog" = /mob/living/simple_mob/vore/aggressive/frog,
-		"jelly blob" = /mob/living/simple_mob/animal/space/jelly,
-		"wolf" = /mob/living/simple_mob/animal/wolf,
-		"direwolf" = /mob/living/simple_mob/animal/wolf/direwolf,
+		"jelly blob" = /mob/living/simple_mob/vore/jelly,
+		"wolf" = /mob/living/simple_mob/vore/wolf,
+		"direwolf" = /mob/living/simple_mob/vore/wolf/direwolf,
 		"great wolf" = /mob/living/simple_mob/vore/greatwolf,
 		"sect queen" = /mob/living/simple_mob/vore/sect_queen,
 		"sect drone" = /mob/living/simple_mob/vore/sect_drone,
 		"panther" = /mob/living/simple_mob/vore/aggressive/panther,
 		"giant snake" = /mob/living/simple_mob/vore/aggressive/giant_snake,
 		"deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw,
-		"otie" = /mob/living/simple_mob/otie,
-		"mutated otie" =/mob/living/simple_mob/otie/feral,
-		"red otie" = /mob/living/simple_mob/otie/red,
+		"otie" = /mob/living/simple_mob/vore/otie,
+		"mutated otie" =/mob/living/simple_mob/vore/otie/feral,
+		"red otie" = /mob/living/simple_mob/vore/otie/red,
 		"defanged xenomorph" = /mob/living/simple_mob/vore/xeno_defanged,
 		"catslug" = /mob/living/simple_mob/vore/alienanimals/catslug,
 		"teppi" = /mob/living/simple_mob/vore/alienanimals/teppi,
@@ -471,11 +471,11 @@
 
 /obj/item/weapon/gun/energy/mouseray/otie
 	name = "otie ray"
-	tf_type = /mob/living/simple_mob/otie
+	tf_type = /mob/living/simple_mob/vore/otie
 
 /obj/item/weapon/gun/energy/mouseray/direwolf
 	name = "dire wolf ray"
-	tf_type = /mob/living/simple_mob/animal/wolf/direwolf
+	tf_type = /mob/living/simple_mob/vore/wolf/direwolf
 
 /obj/item/weapon/gun/energy/mouseray/giantrat
 	name = "giant rat ray"

code/modules/xenoarcheaology/artifacts/replicator_vr.dm

@@ -19,8 +19,8 @@
 	/mob/living/simple_mob/vore/rabbit,
 	/mob/living/simple_mob/animal/goat,
 	/mob/living/simple_mob/animal/sif/tymisian,
-	/mob/living/simple_mob/animal/wolf/direwolf,
-	/mob/living/simple_mob/otie/friendly,
+	/mob/living/simple_mob/vore/wolf/direwolf,
+	/mob/living/simple_mob/vore/otie/friendly,
 	/mob/living/simple_mob/vore/alienanimals/catslug,
 	/mob/living/simple_mob/vore/alienanimals/teppi,
 	/mob/living/simple_mob/vore/fennec,
@@ -595,4 +595,4 @@
 					update_use_power(USE_POWER_ACTIVE)
 					icon_state = "borgcharger1(old)"
 				else
-					visible_message(fail_message)
+					visible_message(fail_message)

maps/expedition_vr/aerostat/_aerostat.dm

@@ -139,9 +139,11 @@
 	prob_fall = 30
 	//guard = 20
 	mobs_to_pick_from = list(
-		/mob/living/simple_mob/animal/space/jelly = 1,
-		/mob/living/simple_mob/mechanical/viscerator = 1,
-		/mob/living/simple_mob/vore/aggressive/corrupthound = 1
+		/mob/living/simple_mob/vore/jelly = 6,
+		/mob/living/simple_mob/mechanical/viscerator = 6,
+		/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
+		/mob/living/simple_mob/vore/oregrub = 2,
+		/mob/living/simple_mob/vore/oregrub/lava = 1
 	)
 
 /obj/structure/old_roboprinter

maps/expedition_vr/aerostat/_aerostat_science_outpost.dm

@@ -72,7 +72,7 @@
 	prob_fall = 50
 	//guard = 20
 	mobs_to_pick_from = list(
-		/mob/living/simple_mob/animal/space/jelly = 6,
+		/mob/living/simple_mob/vore/jelly = 6,
 		/mob/living/simple_mob/mechanical/viscerator = 6,
 		/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
 		/mob/living/simple_mob/vore/oregrub = 2,

maps/gateway_archive_vr/snow_outpost.dm

@@ -17,7 +17,7 @@
 	power_environ = 0
 	mobcountmax = 100
 	floracountmax = 7000
-	valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak,
+	valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/vore/wolf, /mob/living/simple_mob/animal/sif/shantak,
 					  /mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly)
 	valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
 					/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,

maps/gateway_vr/snow_outpost.dm

@@ -23,7 +23,7 @@
 	dynamic_lighting = 0
 	mobcountmax = 50
 	floracountmax = 300
-	valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak,
+	valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/vore/wolf, /mob/living/simple_mob/animal/sif/shantak,
 					  /mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly)
 	valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
 					/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,

maps/gateway_vr/snowfield.dm

@@ -32,7 +32,7 @@
 
 	valid_mobs = list(/mob/living/simple_mob/animal/sif/sakimm/polar, /mob/living/simple_mob/animal/sif/diyaab/polar,
 					/mob/living/simple_mob/animal/sif/shantak/polar, /mob/living/simple_mob/animal/space/bear/polar,
-					/mob/living/simple_mob/animal/wolf)
+					/mob/living/simple_mob/vore/wolf)
 	valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
 					/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
 					/obj/structure/flora/grass/both, /obj/structure/flora/bush, /obj/structure/flora/ausbushes/grassybush,
@@ -180,4 +180,4 @@
 
 /obj/effect/floor_decal/derelict/d16
 	name = "derelict16"
-	icon_state = "derelict16"
+	icon_state = "derelict16"

maps/gateway_vr/wildwest.dm

@@ -208,8 +208,8 @@
 			/mob/living/simple_mob/humanoid/merc/melee = 100,
 			/mob/living/simple_mob/humanoid/merc/ranged = 50,
 			/mob/living/simple_mob/humanoid/merc/ranged/space = 5,
-			/mob/living/simple_mob/otie/feral = 10,
-			/mob/living/simple_mob/otie/feral/chubby = 5
+			/mob/living/simple_mob/vore/otie/feral = 10,
+			/mob/living/simple_mob/vore/otie/feral/chubby = 5
 			),
 
 		list(
@@ -224,8 +224,8 @@
 		list(
 			/mob/living/simple_mob/humanoid/pirate = 100,
 			/mob/living/simple_mob/humanoid/pirate/ranged = 50,
-			/mob/living/simple_mob/animal/wolf = 10,
-			/mob/living/simple_mob/animal/wolf/direwolf = 5
+			/mob/living/simple_mob/vore/wolf = 10,
+			/mob/living/simple_mob/vore/wolf/direwolf = 5
 			)
 
 	)

maps/gateway_vr/zoo.dmm

@@ -7806,7 +7806,7 @@
 /turf/simulated/floor/wood,
 /area/awaymission/zoo)
 "un" = (
-/mob/living/simple_mob/animal/wolf{
+/mob/living/simple_mob/vore/wolf{
 	faction = "zoo"
 	},
 /turf/simulated/floor/holofloor/snow,

maps/groundbase/gb-z2.dmm

@@ -14730,6 +14730,9 @@
 	departmentType = 2;
 	pixel_y = 30
 	},
+/obj/item/device/healthanalyzer/guide,
+/obj/item/device/healthanalyzer/guide,
+/obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
 "Po" = (

maps/submaps/surface_submaps/plains/emptycabin.dmm

@@ -0,0 +1,328 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/effect/decal/cleanable/filth,
+/obj/item/weapon/bone/arm,
+/obj/item/weapon/bone/skull/unathi,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"c" = (
+/obj/structure/curtain/black,
+/obj/structure/simple_door/sifwood,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"d" = (
+/obj/structure/closet/wardrobe,
+/obj/item/weapon/material/fishing_rod/modern,
+/obj/item/weapon/storage/toolbox/mechanical,
+/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"e" = (
+/turf/simulated/wall/sifwood,
+/area/submap/EmptyCabin)
+"f" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"g" = (
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/purpledouble,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"h" = (
+/obj/structure/loot_pile/surface/bones,
+/turf/template_noop,
+/area/template_noop)
+"i" = (
+/obj/structure/bed/chair/sofa/left/blue{
+	dir = 1
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"j" = (
+/obj/effect/decal/cleanable/blood,
+/mob/living/simple_mob/vore/otie/friendly/chubby{
+	desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit";
+	faction = "spiders";
+	max_co2 = 0;
+	max_tox = 0
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"k" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/obj/structure/bed/chair/sofa/left{
+	dir = 8
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"l" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/obj/structure/bed/chair/sofa{
+	dir = 8
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"n" = (
+/obj/structure/table/sifwoodentable,
+/obj/item/weapon/storage/fancy/candle_box,
+/obj/item/weapon/paper/crumpled/bloody{
+	info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..."
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"q" = (
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/template_noop,
+/area/submap/EmptyCabin)
+"r" = (
+/obj/effect/landmark/loot_spawn/low,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"t" = (
+/obj/structure/railing/grey,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"y" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/curtain/black,
+/obj/structure/grille/rustic,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"z" = (
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "4"
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"A" = (
+/obj/structure/bonfire/permanent/sifwood,
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/virgo3b_indoors,
+/area/submap/EmptyCabin)
+"B" = (
+/turf/template_noop,
+/area/submap/EmptyCabin)
+"C" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"D" = (
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"G" = (
+/obj/structure/bed/chair/sofa/blue{
+	dir = 1
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"I" = (
+/obj/structure/table/sifwoodentable,
+/obj/item/pizzabox/meat,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"J" = (
+/obj/structure/bed/chair/sofa/right/blue{
+	dir = 1
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"L" = (
+/obj/structure/table/sifwoodentable,
+/obj/item/weapon/flame/candle/candelabra,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"M" = (
+/obj/item/weapon/bone/leg,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"O" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/obj/structure/bed/chair/sofa/right{
+	dir = 8
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"Q" = (
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "5"
+	},
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "2"
+	},
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "3"
+	},
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"T" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/template_noop,
+/area/submap/EmptyCabin)
+"V" = (
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "5"
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"W" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "2"
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"X" = (
+/obj/item/weapon/bone,
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+"Z" = (
+/obj/effect/decal/cleanable/blood/drip{
+	icon_state = "3"
+	},
+/turf/simulated/floor/wood/sif/virgo3b,
+/area/submap/EmptyCabin)
+
+(1,1,1) = {"
+a
+q
+e
+O
+l
+l
+k
+C
+e
+a
+"}
+(2,1,1) = {"
+a
+B
+D
+D
+D
+D
+D
+D
+t
+a
+"}
+(3,1,1) = {"
+a
+T
+f
+e
+e
+c
+e
+e
+t
+a
+"}
+(4,1,1) = {"
+a
+a
+e
+e
+b
+M
+D
+e
+e
+a
+"}
+(5,1,1) = {"
+a
+a
+e
+g
+j
+X
+L
+i
+e
+a
+"}
+(6,1,1) = {"
+a
+a
+y
+n
+W
+D
+I
+G
+e
+a
+"}
+(7,1,1) = {"
+a
+a
+e
+d
+Z
+r
+D
+J
+e
+a
+"}
+(8,1,1) = {"
+a
+a
+e
+e
+z
+V
+Q
+e
+e
+a
+"}
+(9,1,1) = {"
+a
+a
+h
+e
+e
+A
+e
+e
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+h
+e
+e
+e
+a
+a
+a
+"}

maps/submaps/surface_submaps/plains/plains.dm

@@ -2,17 +2,17 @@
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
 #if MAP_TEST
-#include "boathouse.dmm"
+#include "Boathouse.dmm"
 #include "bonfire.dmm"
-#include "buriedtreasure.dmm"
-#include "buriedtreasure2.dmm"
-#include "buriedtreasure3.dmm"
+#include "Buriedtreasure.dmm"
+#include "Buriedtreasure2.dmm"
+#include "Buriedtreasure3.dmm"
 #include "camp.dmm"
 #include "chemspill1.dmm"
 #include "construction.dmm"
-#include "diner.dmm"
-#include "epod.dmm"
-#include "epod2.dmm"
+#include "Diner.dmm"
+#include "Epod.dmm"
+#include "Epod2.dmm"
 #include "explorerhouse.dmm"
 #include "farm.dmm"
 #include "field.dmm"
@@ -24,12 +24,12 @@
 #include "methlab.dmm"
 #include "oldhotel.dmm"
 #include "oldlibrary.dmm"
-#include "pascalb.dmm"
+#include "Pascalb.dmm"
 #include "pooledrocks.dmm"
 #include "priderock.dmm"
-#include "rationcache.dmm"
+#include "Rationcache.dmm"
 #include "rockyoutcrop.dmm"
-#include "shakden.dmm"
+#include "Shakden.dmm"
 #include "snow1.dmm"
 #include "snow2.dmm"
 #include "snow3.dmm"

maps/submaps/surface_submaps/wilderness/bountyhunters.dmm

@@ -100,7 +100,7 @@
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)
 "mi" = (
-/mob/living/simple_mob/mobs_monsters/clowns/destroyer,
+/mob/living/simple_mob/clowns/destroyer,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)

maps/submaps/surface_submaps/wilderness/chasm.dmm

@@ -110,7 +110,7 @@
 /area/submap/Chasm)
 "kR" = (
 /obj/effect/floor_decal/rust,
-/mob/living/simple_mob/animal/space/jelly{
+/mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
 	name = "Cavern jelly blob"
@@ -363,7 +363,7 @@
 /turf/simulated/floor/plating,
 /area/submap/Chasm)
 "DH" = (
-/mob/living/simple_mob/animal/space/jelly,
+/mob/living/simple_mob/vore/jelly,
 /turf/simulated/floor/outdoors/rocks{
 	outdoors = 0
 	},
@@ -606,7 +606,7 @@
 /obj/structure/cliff/automatic/corner{
 	dir = 10
 	},
-/mob/living/simple_mob/animal/space/jelly{
+/mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
 	name = "Cavern jelly blob"
@@ -661,7 +661,7 @@
 	},
 /area/submap/Chasm)
 "Zn" = (
-/mob/living/simple_mob/animal/space/jelly{
+/mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
 	name = "Cavern jelly blob"
@@ -672,7 +672,7 @@
 	},
 /area/submap/Chasm)
 "ZS" = (
-/mob/living/simple_mob/animal/space/jelly{
+/mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
 	name = "Cavern jelly blob"

maps/submaps/surface_submaps/wilderness/emptycabin.dmm

@@ -117,7 +117,7 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/EmptyCabin)
 "F" = (
-/mob/living/simple_mob/otie/friendly/chubby{
+/mob/living/simple_mob/vore/otie/friendly/chubby{
 	desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit";
 	faction = "spiders"
 	},

maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm

@@ -242,7 +242,7 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/template_noop)
 "sN" = (
-/mob/living/simple_mob/otie/red/chubby{
+/mob/living/simple_mob/vore/otie/red/chubby{
 	desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit. It has a collar around one of its ankles that reads 'Tawny'.";
 	name = "Tawny"
 	},

maps/submaps/surface_submaps/wilderness/wolfden.dmm

@@ -19,7 +19,7 @@
 	},
 /area/submap/WolfDen)
 "d" = (
-/mob/living/simple_mob/animal/wolf/direwolf{
+/mob/living/simple_mob/vore/wolf/direwolf{
 	faction = "wilderness"
 	},
 /turf/simulated/floor/outdoors/dirt{
@@ -59,7 +59,7 @@
 /turf/simulated/mineral/ignore_mapgen,
 /area/submap/WolfDen)
 "p" = (
-/mob/living/simple_mob/animal/wolf/direwolf/dog{
+/mob/living/simple_mob/vore/wolf/direwolf/dog{
 	faction = "wilderness";
 	maxHealth = 350;
 	melee_damage_lower = 15;
@@ -109,7 +109,7 @@
 	},
 /area/submap/WolfDen)
 "y" = (
-/mob/living/simple_mob/animal/wolf/direwolf{
+/mob/living/simple_mob/vore/wolf/direwolf{
 	faction = "wilderness"
 	},
 /obj/random/maintenance/security,

maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm

@@ -7,7 +7,7 @@
 /area/mine/explored/underdark)
 "c" = (
 /obj/structure/dogbed,
-/mob/living/simple_mob/animal/wolf/direwolf/rykka{
+/mob/living/simple_mob/vore/wolf/direwolf/rykka{
 	attacktext = list("attacked, bites, gnaws");
 	friendly = list("nuzzles, cuddles, rubs against")
 	},

maps/tether/submaps/underdark_pois/underdark_things.dm

@@ -15,7 +15,7 @@
 	poison_chance = 20
 
 // Adds Phoron Wolf
-/mob/living/simple_mob/animal/wolf/phoron
+/mob/living/simple_mob/vore/wolf/phoron
 
 	faction = "underdark"
 	movement_cooldown = -1.5

maps/tether/submaps/underdark_pois/wolf_den.dmm

@@ -23,7 +23,7 @@
 /turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
 /area/mine/explored/underdark)
 "g" = (
-/mob/living/simple_mob/animal/wolf/phoron,
+/mob/living/simple_mob/vore/wolf/phoron,
 /turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
 /area/mine/explored/underdark)
 "h" = (
@@ -36,7 +36,7 @@
 /turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
 /area/mine/explored/underdark)
 "j" = (
-/mob/living/simple_mob/otie/feral{
+/mob/living/simple_mob/vore/otie/feral{
 	faction = "underdark"
 	},
 /turf/simulated/mineral/floor/ignore_cavegen/virgo3b,

maps/tether/tether-03-surface3.dmm

@@ -19765,6 +19765,8 @@
 /obj/effect/floor_decal/corner/paleblue/border,
 /obj/effect/floor_decal/borderfloorwhite/corner2,
 /obj/effect/floor_decal/corner/paleblue/bordercorner2,
+/obj/structure/table/glass,
+/obj/item/device/healthanalyzer/guide,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "aFD" = (
@@ -20239,6 +20241,8 @@
 /obj/machinery/camera/network/medbay{
 	dir = 1
 	},
+/obj/item/device/healthanalyzer/guide,
+/obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "aGn" = (

maps/yw/submaps/gateway/snowfield.dm

@@ -28,7 +28,7 @@
 
 	valid_mobs = list(/mob/living/simple_mob/animal/sif/sakimm/polar, /mob/living/simple_mob/animal/sif/diyaab/polar,
 					/mob/living/simple_mob/animal/sif/shantak/polar, /mob/living/simple_mob/animal/space/bear/polar,
-					/mob/living/simple_mob/animal/wolf)
+					/mob/living/simple_mob/vore/wolf)
 	valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
 					/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
 					/obj/structure/flora/grass/both, /obj/structure/flora/bush, /obj/structure/flora/ausbushes/grassybush,
@@ -176,4 +176,4 @@
 
 /obj/effect/floor_decal/derelict/d16
 	name = "derelict16"
-	icon_state = "derelict16"
+	icon_state = "derelict16"

maps/yw/submaps/underdark_pois/goldhall.dmm

@@ -23,7 +23,7 @@
 /area/mine/explored/underdark)
 "g" = (
 /obj/effect/decal/remains,
-/obj/item/weapon/ore/bluespace_crystal,
+/obj/item/weapon/bluespace_crystal,
 /turf/simulated/floor/tiled/kafel_full/yellow/virgo3b,
 /area/mine/explored/underdark)
 

modular_chomp/code/datums/supplypacks/contraband.dm

@@ -0,0 +1,99 @@
+/*
+*	Here is where any supply packs that may or may not be legal
+*	  and require modification of the supply controller live.
+*/
+
+
+/datum/supply_pack/randomised/contraband
+	num_contained = 5
+	contains = list(
+			/obj/item/seeds/bloodtomatoseed,
+			/obj/item/weapon/storage/pill_bottle/zoom,
+			/obj/item/weapon/storage/pill_bottle/happy,
+			/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
+			)
+
+	name = "Contraband crate"
+	cost = 25
+	containertype = /obj/structure/closet/crate
+	containername = "Unlabeled crate"
+	contraband = 1
+	group = "Supplies"
+
+/datum/supply_pack/security/specialops
+	name = "Special Ops supplies"
+	contains = list(
+			/obj/item/weapon/storage/box/emps,
+			/obj/item/weapon/grenade/smokebomb = 4,
+			/obj/item/weapon/grenade/chem_grenade/incendiary
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate/weapon
+	containername = "Special Ops crate"
+	contraband = 1
+
+/datum/supply_pack/supply/moghes
+	name = "Moghes imports"
+	contains = list(
+			/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 2,
+			/obj/item/weapon/reagent_containers/food/snacks/unajerky = 4
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate/unathi
+	containername = "Moghes imports crate"
+	contraband = 1
+
+/datum/supply_pack/munitions/bolt_rifles_militia
+ 	name = "Weapon - Surplus militia rifles"
+ 	contains = list(
+ 			/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 3,
+ 			/obj/item/ammo_magazine/clip/c762 = 6
+ 			)
+ 	cost = 1000
+ 	contraband = 1
+ 	containertype = /obj/structure/closet/crate/hedberg
+ 	containername = "Ballistic weapons crate"
+
+/datum/supply_pack/randomised/misc/telecrate
+	name = "Confiscated equipment"
+	num_contained = 1
+	contains = list(
+			list( //the operator,
+					/obj/item/clothing/suit/storage/vest/heavy/merc,
+					/obj/item/clothing/glasses/night,
+					/obj/item/weapon/storage/box/anti_photons
+					),
+			list( //the indian,
+					/obj/item/weapon/gun/projectile/dartgun,
+					/obj/item/ammo_magazine/chemdart
+					),
+
+			list( //the doc,
+					/obj/item/weapon/storage/firstaid/combat,
+					/obj/item/weapon/reagent_containers/hypospray
+					),
+
+			list( //the sapper,
+					/obj/item/weapon/melee/energy/sword/ionic_rapier,
+					/obj/item/weapon/storage/box/syndie_kit/space, //doesn't matter what species you are,
+					/obj/item/device/multitool/ai_detector,
+					/obj/item/weapon/storage/toolbox/syndicate/powertools
+					),
+			list( //the infiltrator,
+					/obj/item/device/chameleon,
+					/obj/item/weapon/storage/box/syndie_kit/chameleon,
+					/obj/item/device/encryptionkey/syndicate,
+					/obj/item/weapon/card/id/syndicate,
+					/obj/item/clothing/mask/gas/voice,
+					/obj/item/weapon/makeover
+					),
+			list( //the professional,
+					/obj/item/weapon/gun/energy/ionrifle/pistol,
+					/obj/item/weapon/material/knife/tacknife/combatknife,
+					/obj/item/clothing/mask/balaclava
+					)
+			)
+	cost = 400 //price,
+	contraband = 1
+	containertype = /obj/structure/closet/crate/large
+	containername = "Suspicious crate"

modular_chomp/code/game/objects/structures/crate_lockers/closets/secure/security.dm

@@ -0,0 +1,339 @@
+/obj/structure/closet/secure_closet/captains
+	name = "site manager's locker"
+	req_access = list(access_captain)
+	closet_appearance = /decl/closet_appearance/secure_closet/command
+
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/dufflebag/captain,
+		/obj/item/clothing/head/helmet,
+		/obj/item/clothing/suit/storage/vest,
+		/obj/item/weapon/cartridge/captain,
+		/obj/item/weapon/storage/lockbox/medal,
+		/obj/item/device/radio/headset/heads/captain,
+		/obj/item/device/radio/headset/heads/captain/alt,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/device/flash,
+		/obj/item/weapon/storage/box/ids)
+
+
+/obj/structure/closet/secure_closet/hop
+	name = "head of personnel's locker"
+	req_access = list(access_hop)
+	closet_appearance = /decl/closet_appearance/secure_closet/command/hop
+
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest,
+		/obj/item/clothing/head/helmet,
+		/obj/item/weapon/cartridge/hop,
+		/obj/item/device/radio/headset/heads/hop,
+		/obj/item/device/radio/headset/heads/hop/alt,
+		/obj/item/weapon/storage/box/ids = 2,
+		/obj/item/weapon/gun/energy/gun/compact,
+		/obj/item/weapon/storage/box/commandkeys,
+		/obj/item/weapon/storage/box/servicekeys,
+		/obj/item/device/flash)
+
+/obj/structure/closet/secure_closet/hop2
+	name = "head of personnel's attire"
+	req_access = list(access_hop)
+	closet_appearance = /decl/closet_appearance/secure_closet/command/hop
+
+	starts_with = list(
+		/obj/item/clothing/under/rank/head_of_personnel,
+		/obj/item/clothing/under/dress/dress_hop,
+		/obj/item/clothing/under/dress/dress_hr,
+		/obj/item/clothing/under/lawyer/female,
+		/obj/item/clothing/under/lawyer/black,
+		/obj/item/clothing/under/lawyer/black/skirt,
+		/obj/item/clothing/under/lawyer/red,
+		/obj/item/clothing/under/lawyer/red/skirt,
+		/obj/item/clothing/under/lawyer/oldman,
+		/obj/item/clothing/under/rank/neo_hop,
+		/obj/item/clothing/under/rank/neo_hop_skirt,
+		/obj/item/clothing/under/rank/neo_hop_parade_masc,
+		/obj/item/clothing/under/rank/neo_hop_parade_fem,
+		/obj/item/clothing/under/rank/neo_hop_turtle,
+		/obj/item/clothing/under/rank/neo_hop_turtle_skirt,
+		/obj/item/clothing/under/rank/neo_cmd_gorka,
+		/obj/item/clothing/suit/storage/toggle/labcoat/neo_hopformal,
+		/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep,
+		/obj/item/clothing/shoes/brown,
+		/obj/item/clothing/shoes/black,
+		/obj/item/clothing/shoes/laceup,
+		/obj/item/clothing/shoes/laceup/brown,
+		/obj/item/clothing/shoes/white,
+		/obj/item/clothing/under/rank/head_of_personnel_whimsy,
+		/obj/item/clothing/head/caphat/hop,
+		/obj/item/clothing/under/suit_jacket/teal,
+		/obj/item/clothing/under/suit_jacket/teal/skirt,
+		/obj/item/clothing/glasses/sunglasses,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/hop,
+		/obj/item/clothing/head/caphat/hop/beret,
+		/obj/item/clothing/head/caphat/hop/beret/white)
+
+
+/obj/structure/closet/secure_closet/hos
+	name = "head of security's locker"
+	req_access = list(access_hos)
+	storage_capacity = 2.5 * MOB_MEDIUM
+	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+
+	starts_with = list(
+		/obj/item/clothing/head/helmet/HoS,
+		/obj/item/clothing/head/helmet/HoS/hat,
+		/obj/item/clothing/suit/storage/vest/hos,
+		/obj/item/clothing/under/rank/head_of_security/jensen,
+		/obj/item/clothing/under/rank/head_of_security/corp,
+		/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
+		/obj/item/clothing/suit/storage/vest/hoscoat,
+		/obj/item/clothing/head/helmet/dermal,
+		/obj/item/weapon/cartridge/hos,
+		/obj/item/device/radio/headset/heads/hos,
+		/obj/item/device/radio/headset/heads/hos/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/weapon/shield/riot,
+		/obj/item/weapon/shield/riot/tele,
+		/obj/item/weapon/storage/box/holobadge/hos,
+		/obj/item/clothing/accessory/badge/holo/hos,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/tool/crowbar/red,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/device/flash,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos,
+		/obj/item/weapon/rcd_ammo/large,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/clothing/accessory/holster/waist,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/clothing/head/beret/sec/corporate/hos,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/mask/gas/sechailer/swat/hos)
+
+/obj/structure/closet/secure_closet/hos/Initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
+
+
+/obj/structure/closet/secure_closet/warden
+	name = "warden's locker"
+	storage_capacity = 42
+	req_access = list(access_armory)
+	closet_appearance = /decl/closet_appearance/secure_closet/security/warden
+
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest/warden,
+		/obj/item/clothing/under/rank/warden,
+		/obj/item/clothing/under/rank/warden/corp,
+		/obj/item/clothing/suit/storage/vest/wardencoat,
+		/obj/item/clothing/suit/storage/vest/wardencoat/alt,
+		/obj/item/clothing/suit/storage/vest/wardencoat/alt2, //VOREStation Add,
+		/obj/item/clothing/head/helmet/dermal,
+		/obj/item/clothing/head/helmet/warden,
+		/obj/item/clothing/head/helmet/warden/hat,
+		/obj/item/clothing/under/rank/neo_warden_red,
+		/obj/item/clothing/under/rank/neo_warden_red_skirt,
+		/obj/item/clothing/under/rank/neo_warden_blue,
+		/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
+		/obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden,
+		/obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy,
+		/obj/item/clothing/under/rank/neo_sec_gorka,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/clothing/accessory/badge/holo/warden,
+		/obj/item/weapon/storage/box/flashbangs,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/weapon/storage/box/holobadge,
+		/obj/item/clothing/head/beret/sec/corporate/warden,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/device/megaphone,
+		/obj/item/clothing/mask/gas/sechailer/swat/warden,
+		/obj/item/weapon/gun/projectile/revolvershotgun,
+		/obj/item/ammo_magazine/m12gdrumjack/beanbag,
+		/obj/item/ammo_magazine/m12gdrumjack/beanbag,
+		/obj/item/device/ticket_printer,		//CHOMPStation addition
+		/obj/item/device/retail_scanner/security	//CHOMPStation addition
+		)
+
+/obj/structure/closet/secure_closet/warden/Initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	return ..()
+
+/obj/structure/closet/secure_closet/security
+	name = "security officer's locker"
+	req_access = list(access_brig)
+	closet_appearance = /decl/closet_appearance/secure_closet/security
+
+	starts_with = list(
+		/obj/item/clothing/suit/storage/vest/officer,
+		/obj/item/clothing/head/helmet,
+		/obj/item/clothing/mask/gas/sechailer/swat/officer,
+		/obj/item/weapon/cartridge/security,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/weapon/storage/belt/security,
+		/obj/item/device/flash,
+		/obj/item/weapon/reagent_containers/spray/pepper,
+		/obj/item/weapon/grenade/flashbang,
+		/obj/item/weapon/melee/baton/loaded,
+		/obj/item/clothing/glasses/sunglasses/sechud,
+		/obj/item/taperoll/police,
+		/obj/item/device/hailer,
+		/obj/item/device/flashlight/flare,
+		/obj/item/clothing/accessory/storage/black_vest,
+		/obj/item/clothing/head/soft/sec/corp,
+		/obj/item/clothing/under/rank/security/corp,
+		/obj/item/ammo_magazine/m45/rubber,
+		/obj/item/weapon/gun/energy/taser,
+		/obj/item/weapon/cell/device/weapon,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
+		/obj/item/clothing/shoes/boots/winter/security,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/device/holowarrant,				//CHOMPStation addition
+		/obj/item/device/retail_scanner/security,	//CHOMPStation addition
+		/obj/item/clothing/glasses/hud/security,	//CHOMPStation addition
+		/obj/item/device/ticket_printer			//CHOMPStation addition
+		)
+
+/obj/structure/closet/secure_closet/security/Initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/security
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+	if(prob(30))
+		starts_with += /obj/item/poster/nanotrasen
+	return ..()
+
+/obj/structure/closet/secure_closet/security/cargo/Initialize()
+	starts_with += /obj/item/clothing/accessory/armband/cargo
+	starts_with += /obj/item/device/encryptionkey/headset_cargo
+	return ..()
+
+/obj/structure/closet/secure_closet/security/engine/Initialize()
+	starts_with += /obj/item/clothing/accessory/armband/engine
+	starts_with += /obj/item/device/encryptionkey/headset_eng
+	return ..()
+
+/obj/structure/closet/secure_closet/security/science/Initialize()
+	starts_with += /obj/item/clothing/accessory/armband/science
+	starts_with += /obj/item/device/encryptionkey/headset_sci
+	return ..()
+
+/obj/structure/closet/secure_closet/security/med/Initialize()
+	starts_with += /obj/item/clothing/accessory/armband/medblue
+	starts_with += /obj/item/device/encryptionkey/headset_med
+	return ..()
+
+
+/obj/structure/closet/secure_closet/detective
+	name = "detective's cabinet"
+	req_access = list(access_forensics_lockers)
+	closet_appearance = /decl/closet_appearance/cabinet/secure
+
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
+	starts_with = list(
+		/obj/item/clothing/accessory/badge/holo/detective,
+		/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves
+		/obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox
+		/obj/item/gunbox/stun,
+		/obj/item/weapon/storage/belt/detective,
+		/obj/item/weapon/storage/box/evidence,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/device/radio/headset/headset_sec/alt,
+		/obj/item/clothing/suit/storage/vest/detective,
+		/obj/item/taperoll/police,
+		/obj/item/clothing/accessory/holster/armpit,
+		/obj/item/device/flashlight/maglight,
+		/obj/item/weapon/reagent_containers/food/drinks/flask/detflask,
+		/obj/item/weapon/storage/briefcase/crimekit,
+		/obj/item/device/taperecorder,
+		/obj/item/weapon/storage/bag/detective,
+		/obj/item/device/tape/random = 3,
+		/obj/item/device/retail_scanner/security,	//CHOMPStation addition
+		/obj/item/clothing/glasses/hud/security		//CHOMPStation addition
+		)
+
+/obj/structure/closet/secure_closet/injection
+	name = "lethal injections locker"
+	req_access = list(access_captain)
+	closet_appearance = /decl/closet_appearance/secure_closet/courtroom
+
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2)
+
+GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig)
+
+/obj/structure/closet/secure_closet/brig
+	name = "brig locker"
+	req_access = list(access_brig)
+	closet_appearance = /decl/closet_appearance/secure_closet/brig
+	anchored = TRUE
+	var/id = null
+
+	starts_with = list(
+		/obj/item/clothing/under/color/prison,
+		/obj/item/clothing/shoes/orange)
+
+/obj/structure/closet/secure_closet/posters
+	name = "morale storage"
+	req_access = list(access_security)
+	anchored = TRUE
+
+	starts_with = list(
+		/obj/item/poster/nanotrasen,
+		/obj/item/poster/nanotrasen,
+		/obj/item/poster/nanotrasen,
+		/obj/item/poster/nanotrasen,
+		/obj/item/poster/nanotrasen)
+
+/obj/structure/closet/secure_closet/courtroom
+	name = "courtroom locker"
+	req_access = list(access_lawyer)
+	closet_appearance = /decl/closet_appearance/secure_closet/courtroom
+
+	starts_with = list(
+		/obj/item/clothing/shoes/brown,
+		/obj/item/weapon/paper/Court = 3,
+		/obj/item/weapon/pen,
+		/obj/item/clothing/suit/judgerobe,
+		/obj/item/clothing/head/powdered_wig,
+		/obj/item/weapon/storage/briefcase)
+
+
+/obj/structure/closet/secure_closet/wall
+	name = "wall locker"
+	req_access = list(access_security)
+	closet_appearance = /decl/closet_appearance/wall
+	density = TRUE
+
+	//too small to put a man in
+	large = 0

modular_chomp/code/modules/clothing/masks/hailer.dm

@@ -0,0 +1,169 @@
+/obj/item/clothing/mask/gas/sechailer
+	name = "hailer face mask"
+	desc = "A compact, durable gas mask that can be connected to an air supply. This one possesses a security hailer."
+	description_info = "This mask has a hailer attached, you can activate it on the button or use the Halt! verb, for switching phrases you can alt+click it or change it using the change phrase verb."
+	icon_state = "halfgas"
+	armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 55, rad = 0)
+	action_button_name = "HALT!"
+	body_parts_covered = FACE
+	var/obj/item/device/hailer/hailer
+	var/cooldown = 0
+	var/phrase = 1
+	var/aggressiveness = 1
+	var/safety = 1
+	var/list/phrase_list = list(
+		"halt" 			= "HALT! HALT! HALT! HALT!",
+		"bobby" 		= "Stop in the name of the Law.",
+		"compliance" 	= "Compliance is in your best interest.",
+		"justice"		= "Prepare for justice!",
+		"running"		= "Running will only increase your sentence.",
+		"dontmove"		= "Don't move, Creep!",
+		"floor"			= "Down on the floor, Creep!",
+		"robocop"		= "Dead or alive you're coming with me.",
+		"god"			= "God made today for the crooks we could not catch yesterday.",
+		"freeze"		= "Freeze, Scum Bag!",
+		"imperial"		= "Stop right there, criminal scum!",
+		"bash"			= "Stop or I'll bash you.",
+		"harry"			= "Go ahead, make my day.",
+		"asshole"		= "Stop breaking the law, asshole.",
+		"stfu"			= "You have the right to shut the fuck up",
+		"shutup"		= "Shut up crime!",
+		"super"			= "Face the wrath of the golden bolt.",
+		"dredd"			= "I am, the LAW!"
+		)
+
+/obj/item/clothing/mask/gas/sechailer/swat/hos
+	name = "\improper HOS SWAT mask"
+	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe."
+	icon_state = "hosmask"
+
+
+/obj/item/clothing/mask/gas/sechailer/swat/warden
+	name = "\improper Warden SWAT mask"
+	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe."
+	icon_state = "wardenmask"
+
+/obj/item/clothing/mask/gas/sechailer/swat/officer //Just a little nicer to begin with. Can always up the anger with a screwdriver!
+	aggressiveness = 1
+	phrase = 1
+
+/obj/item/clothing/mask/gas/sechailer/swat
+	name = "\improper SWAT mask"
+	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000."
+	icon_state = "officermask"
+	body_parts_covered = HEAD|FACE|EYES
+	flags_inv = HIDEFACE|BLOCKHAIR
+	aggressiveness = 3
+	phrase = 12
+
+
+/obj/item/clothing/mask/gas/sechailer/ui_action_click()
+	halt()
+
+/obj/item/clothing/mask/gas/sechailer/AltClick(mob/user)
+	selectphrase()
+
+/obj/item/clothing/mask/gas/sechailer/verb/selectphrase()
+	set name = "Select gas mask phrase"
+	set category = "Object"
+	set desc = "Alter the message shouted by your complionator gas mask."
+
+	var/key = phrase_list[phrase]
+	var/message = phrase_list[key]
+
+	if (!safety)
+		to_chat(usr, "<span class='notice'>You set the restrictor to: FUCK YOUR CUNT YOU SHIT EATING COCKSUCKER MAN EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND DO SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT.</span>")
+		return
+	switch(aggressiveness)
+		if(1)
+			phrase = (phrase < 6) ? (phrase + 1) : 1
+			key = phrase_list[phrase]
+			message = phrase_list[key]
+			to_chat(usr,"<span class='notice'>You set the restrictor to: [message]</span>")
+		if(2)
+			phrase = (phrase < 11 && phrase >= 7) ? (phrase + 1) : 7
+			key = phrase_list[phrase]
+			message = phrase_list[key]
+			to_chat(usr,"<span class='notice'>You set the restrictor to: [message]</span>")
+		if(3)
+			phrase = (phrase < 18 && phrase >= 12 ) ? (phrase + 1) : 12
+			key = phrase_list[phrase]
+			message = phrase_list[key]
+			to_chat(usr,"<span class='notice'>You set the restrictor to: [message]</span>")
+		if(4)
+			phrase = (phrase < 18 && phrase >= 1 ) ? (phrase + 1) : 1
+			key = phrase_list[phrase]
+			message = phrase_list[key]
+			to_chat(usr,"<span class='notice'>You set the restrictor to: [message]</span>")
+		else
+			to_chat(usr, "<span class='notice'>It's broken.</span>")
+
+/obj/item/clothing/mask/gas/sechailer/emag_act(mob/user)
+	if(safety)
+		safety = 0
+		to_chat(user, "<span class='warning'>You silently fry [src]'s vocal circuit with the cryptographic sequencer.</span>")
+	else
+		return
+
+/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/I, mob/user)
+	if(I.is_screwdriver())
+		switch(aggressiveness)
+			if(1)
+				to_chat(user, "<span class='notice'>You set the aggressiveness restrictor to the second position.</span>")
+				aggressiveness = 2
+				phrase = 7
+			if(2)
+				to_chat(user, "<span class='notice'>You set the aggressiveness restrictor to the third position.</span>")
+				aggressiveness = 3
+				phrase = 13
+			if(3)
+				to_chat(user, "<span class='notice'>You set the aggressiveness restrictor to the fourth position.</span>")
+				aggressiveness = 4
+				phrase = 1
+			if(4)
+				to_chat(user, "<span class='notice'>You set the aggressiveness restrictor to the first position.</span>")
+				aggressiveness = 1
+				phrase = 1
+			if(5)
+				to_chat(user, "<span class='warning'>You adjust the restrictor but nothing happens, probably because its broken.</span>")
+	if(I.is_wirecutter())
+		if(aggressiveness != 5)
+			to_chat(user, "<span class='warning'>You broke it!</span>")
+			aggressiveness = 5
+	if(I.is_crowbar())
+		if(!hailer)
+			to_chat(user, "<span class='warning'>This mask has an integrated hailer, you can't remove it!</span>")
+		else
+			var/obj/N = new /obj/item/clothing/mask/gas/half(src.loc)
+			playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
+			N.fingerprints = src.fingerprints
+			N.fingerprintshidden = src.fingerprintshidden
+			N.fingerprintslast = src.fingerprintslast
+			N.suit_fibers = src.suit_fibers
+			if(!isturf(N.loc))
+				user.put_in_hands(hailer)
+				user.put_in_hands(N)
+			else
+				hailer.loc = N.loc
+			qdel(src)
+			return
+	..()
+
+/obj/item/clothing/mask/gas/sechailer/verb/halt()
+	set name = "HALT!"
+	set category = "Objects"
+	set desc = "Activate your face mask hailer."
+	var/key = phrase_list[phrase]
+	var/message = phrase_list[key]
+
+	if(cooldown < world.time - 35) // A cooldown, to stop people being jerks
+		if(!safety)
+			message = "FUCK YOUR CUNT YOU SHIT EATING COCKSUCKER MAN EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND DO SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT."
+			usr.visible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[message]</b></font>")
+			playsound(src, 'sound/voice/binsult.ogg', 50, 0, 4) //Future sound channel = something like SFX
+			cooldown = world.time
+			return
+
+		usr.visible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[message]</b></font>")
+		playsound(src, "sound/voice/complionator/[key].ogg", 50, 0, 4) //future sound channel = something like SFX
+		cooldown = world.time

modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm

@@ -1,45 +1,52 @@
 //Unfiying spider health, into two catagories. Disrupters and tanks.
 /mob/living/simple_mob/animal/giant_spider/carrier //Disrupter, old 100
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/electric //disrupter, old 210
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 	projectiletype = /obj/item/projectile/energy/mob/electric_spider
 
 /mob/living/simple_mob/animal/giant_spider/frost //tank, old 175
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
+
+/mob/living/simple_mob/animal/giant_spider //tank, old 200
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/ion //disrupter, old 90
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/hunter //disrupter, old 120
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/lurker //disrupter, old 100
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/pepper //tank, old 210
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/phorogenic //tank, old 225
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/thermic //tank, old 175
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/tunneler_spider //disrupter, old 120
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/webslinger //disrupter, old 90
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
+
+/obj/effect/spider/eggcluster
+	spider_type = /obj/effect/spider/spiderling/varied

modular_chomp/maps/overmap/space_pois/deepstorage_85x67.dmm

@@ -35,7 +35,7 @@
 "aO" = (/obj/structure/closet/radiation,/obj/machinery/light{dir = 8},/obj/item/stack/material/phoron{amount = 10},/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/deepstorage)
 "aP" = (/obj/machinery/light{dir = 4},/obj/structure/closet/crate/secure/large,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind,/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer,/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/deepstorage)
 "aQ" = (/obj/structure/closet/wardrobe/pink,/obj/item/ammo_magazine/ammo_box/b12g,/turf/simulated/floor/wood,/area/submap/deepstorage)
-"aR" = (/mob/living/simple_mob/otie/security/phoron/red/chubby{faction = "sydicate"; health = 350; name = "rabid chubby red guard otie"},/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood/broken,/area/submap/deepstorage)
+"aR" = (/mob/living/simple_mob/vore/otie/security/phoron/red/chubby{faction = "sydicate"; health = 350; name = "rabid chubby red guard otie"},/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood/broken,/area/submap/deepstorage)
 "aT" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor/tiled/freezer,/area/submap/deepstorage)
 "aU" = (/obj/machinery/shower{dir = 8},/obj/effect/decal/cleanable/blood/tracks{color = "red"; desc = "Your instincts say you shouldn't be following these."; icon = 'icons/effects/blood.dmi'; icon_state = "tracks"},/turf/simulated/floor/tiled/freezer,/area/submap/deepstorage)
 "aV" = (/obj/machinery/light/small{dir = 8},/obj/structure/table/standard,/obj/item/ammo_magazine/ammo_box/b12g{pixel_y = -4},/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet{pixel_y = 4},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/deepstorage)

modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm

@@ -79,7 +79,7 @@
 "um" = (/obj/structure/closet/cabinet{pixel_y = 20},/obj/item/toy/plushie/kitten,/obj/item/toy/plushie/grey_cat,/obj/item/toy/plushie/orange_cat,/obj/item/toy/plushie/borgplushie/scrubpuppy,/obj/item/toy/plushie/black_fox,/obj/item/toy/plushie,/obj/item/toy/plushie/corgi,/obj/item/toy/plushie/crimson_fox,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = -32},/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/turf/simulated/floor/carpet/turcarpet,/area/survivalpod/superpose/ScienceShip)
 "uu" = (/obj/machinery/door/airlock/multi_tile/metal/mait,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/survivalpod/superpose/ScienceShip)
 "uX" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 10},/obj/structure/closet/walllocker/emerglocker{pixel_x = -25; pixel_y = 32},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip)
-"vl" = (/obj/structure/closet/cabinet{pixel_y = 20},/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/bluespace_crystal,/obj/item/clothing/head/sombrero,/obj/item/clothing/head/sombrero,/obj/item/clothing/suit/poncho,/obj/item/clothing/accessory/poncho/thermal/red,/obj/item/clothing/accessory/poncho/thermal/security,/obj/item/clothing/accessory/poncho/thermal/green,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/toy/bosunwhistle/fluff/strix,/obj/item/weapon/blobcore_chunk,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip)
+"vl" = (/obj/structure/closet/cabinet{pixel_y = 20},/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/uranium,/obj/item/weapon/bluespace_crystal,/obj/item/clothing/head/sombrero,/obj/item/clothing/head/sombrero,/obj/item/clothing/suit/poncho,/obj/item/clothing/accessory/poncho/thermal/red,/obj/item/clothing/accessory/poncho/thermal/security,/obj/item/clothing/accessory/poncho/thermal/green,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/toy/bosunwhistle/fluff/strix,/obj/item/weapon/blobcore_chunk,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip)
 "wp" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/survivalpod/superpose/ScienceShip)
 "xk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/wood,/area/survivalpod/superpose/ScienceShip)
 "xw" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/ScienceShip)

vorestation.dme

@@ -480,7 +480,6 @@
 #include "code\datums\roundstats\departmentgoal.dm"
 #include "code\datums\roundstats\roundstats.dm"
 #include "code\datums\supplypacks\atmospherics.dm"
-#include "code\datums\supplypacks\contraband.dm"
 #include "code\datums\supplypacks\contraband_vr.dm"
 #include "code\datums\supplypacks\costumes.dm"
 #include "code\datums\supplypacks\costumes_vr.dm"
@@ -1319,6 +1318,7 @@
 #include "code\game\objects\items\devices\radio\radio_yw.dm"
 #include "code\game\objects\items\devices\radio\radiopack.dm"
 #include "code\game\objects\items\devices\scanners\gas.dm"
+#include "code\game\objects\items\devices\scanners\guide.dm"
 #include "code\game\objects\items\devices\scanners\halogen.dm"
 #include "code\game\objects\items\devices\scanners\health.dm"
 #include "code\game\objects\items\devices\scanners\mass_spectrometer.dm"
@@ -1669,7 +1669,6 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm"
-#include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\security_vr.dm"
 #include "code\game\objects\structures\flora\flora.dm"
 #include "code\game\objects\structures\flora\flora_vr.dm"
@@ -2138,7 +2137,6 @@
 #include "code\modules\clothing\masks\breath_vr.dm"
 #include "code\modules\clothing\masks\gasmask.dm"
 #include "code\modules\clothing\masks\gasmask_vr.dm"
-#include "code\modules\clothing\masks\hailer.dm"
 #include "code\modules\clothing\masks\miscellaneous.dm"
 #include "code\modules\clothing\masks\miscellaneous_vr.dm"
 #include "code\modules\clothing\masks\shiny_vr.dm"
@@ -2894,6 +2892,7 @@
 #include "code\modules\mob\say_ch.dm"
 #include "code\modules\mob\say_vr.dm"
 #include "code\modules\mob\skillset.dm"
+#include "code\modules\mob\theme_lists.dm"
 #include "code\modules\mob\transform_procs.dm"
 #include "code\modules\mob\typing_indicator.dm"
 #include "code\modules\mob\update_icons.dm"
@@ -4556,6 +4555,7 @@
 #include "modular_chomp\code\datums\components\gargoyle.dm"
 #include "modular_chomp\code\datums\interfaces\appearance.dm"
 #include "modular_chomp\code\datums\outfits\jobs\noncrew.dm"
+#include "modular_chomp\code\datums\supplypacks\contraband.dm"
 #include "modular_chomp\code\datums\supplypacks\medical.dm"
 #include "modular_chomp\code\datums\supplypacks\science.dm"
 #include "modular_chomp\code\datums\supplypacks\security.dm"
@@ -4583,6 +4583,7 @@
 #include "modular_chomp\code\game\objects\structures\loot_pile.dm"
 #include "modular_chomp\code\game\objects\structures\watercloset_ch.dm"
 #include "modular_chomp\code\game\objects\structures\crate_lockers\largecrate.dm"
+#include "modular_chomp\code\game\objects\structures\crate_lockers\closets\secure\security.dm"
 #include "modular_chomp\code\game\turfs\turf.dm"
 #include "modular_chomp\code\game\turfs\simulated\outdoors\desert_planet.dm"
 #include "modular_chomp\code\matrices\color_matrix.dm"
@@ -4599,6 +4600,7 @@
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_xeno.dm"
 #include "modular_chomp\code\modules\clothing\clothing.dm"
 #include "modular_chomp\code\modules\clothing\clothing_icons.dm"
+#include "modular_chomp\code\modules\clothing\masks\hailer.dm"
 #include "modular_chomp\code\modules\clothing\spacesuits\rig\.behemoth.dm"
 #include "modular_chomp\code\modules\clothing\spacesuits\rig\clockwork_ch.dm"
 #include "modular_chomp\code\modules\clothing\spacesuits\rig\precursor.dm"