more code clean up (#10330)

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

@@ -26,7 +26,7 @@
 	return bcell
 
 /obj/item/defib_kit/Initialize() //starts without a cell for rnd //ChompEDIT New --> Initialize
-	..()
+	. = ..()
 	if(ispath(paddles))
 		paddles = new paddles(src, src)
 	else

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

@@ -46,8 +46,8 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
 	if(istype(rig))
 		rig.forced_move(direction, user)
 
-/obj/item/paicard/Initialize() //ChompEDIT New --> Initialize
+/obj/item/paicard/Initialize(mapload)
-	..()
+	. = ..()
 	add_overlay("pai-off")
 
 /obj/item/paicard/Destroy()

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

@@ -217,8 +217,8 @@
 //
 // Includes normal radio uplink, multitool uplink,
 // implant uplink (not the implant tool) and a preset headset uplink.
-/obj/item/radio/uplink/Initialize()
+/obj/item/radio/uplink/Initialize(mapload)
-	..()
+	. = ..()
 	hidden_uplink = new(src)
 	icon_state = "radio"
 

code/game/objects/structures/reflectors_ch.dm

@@ -23,7 +23,7 @@
 	var/list/has_projectiles = list()
 	var/bullet_act_in_progress = FALSE
 
-/obj/structure/reflector/Initialize()
+/obj/structure/reflector/Initialize(mapload)
 	. = ..()
 	icon_state = "reflector_base"
 	allowed_projectile_typecache = typecacheof(allowed_projectile_typecache)
@@ -308,6 +308,6 @@
 /obj/machinery/portable_atmospherics/canister
 	var/dont_burst = FALSE
 
-/obj/machinery/portable_atmospherics/canister/phoron/cold/Initialize() //ChompEDIT New --> Initialize
+/obj/machinery/portable_atmospherics/canister/phoron/cold/Initialize(mapload)
+	. = ..()
 	src.air_contents.temperature = 2.72
-	..()

code/modules/assembly/holder.dm

@@ -177,8 +177,8 @@
 /obj/item/assembly_holder/timer_igniter
 	name = "timer-igniter assembly"
 
-/obj/item/assembly_holder/timer_igniter/Initialize() //ChompEDIT New --> Initialize
+/obj/item/assembly_holder/timer_igniter/Initialize(mapload)
-	..()
+	. = ..()
 
 	var/obj/item/assembly/igniter/ign = new(src)
 	ign.secured = 1

code/modules/food/food/snacks_ch.dm

@@ -8,8 +8,8 @@
 	nutriment_amt = 3
 	nutriment_desc = list("sour cabbage" = 3)
 
-/obj/item/reagent_containers/food/snacks/sauerkraut/Initialize()
+/obj/item/reagent_containers/food/snacks/sauerkraut/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/tamales
@@ -21,8 +21,8 @@
 	nutriment_amt = 9
 	nutriment_desc = list("doughy bread" = 5, "beefy" = 4, "tangy and savory vegetables" = 3)
 
-/obj/item/reagent_containers/food/snacks/tamales/Initialize()
+/obj/item/reagent_containers/food/snacks/tamales/Initialize(mapload)
-	..()
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
 	bitesize = 6
 
@@ -35,8 +35,8 @@
 	nutriment_amt = 6
 	nutriment_desc = list("sour cabbage" = 4, "sausage" = 3, "mildly sweet vegetables" = 3)
 
-/obj/item/reagent_containers/food/snacks/bigos/Initialize()
+/obj/item/reagent_containers/food/snacks/bigos/Initialize(mapload)
-	..()
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_PROTEIN, 4)
 	reagents.add_reagent(REAGENT_ID_WATER, 3)
 	bitesize = 7
@@ -49,8 +49,8 @@
 	nutriment_amt = 5
 	nutriment_desc = list("sweet bread" = 3, "strawberry" = 2)
 
-/obj/item/reagent_containers/food/snacks/concha/Initialize()
+/obj/item/reagent_containers/food/snacks/concha/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/pandenata
@@ -62,8 +62,8 @@
 	nutriment_amt = 5
 	nutriment_desc = list("creamy" = 3, "sweet bread" = 3)
 
-/obj/item/reagent_containers/food/snacks/pandenata/Initialize()
+/obj/item/reagent_containers/food/snacks/pandenata/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/tocino
@@ -75,8 +75,8 @@
 	nutriment_amt = 8
 	nutriment_desc = list("crispy sweet meat" = 3, "savory sauce" = 2, "salty" = 2)
 
-/obj/item/reagent_containers/food/snacks/tocino/Initialize()
+/obj/item/reagent_containers/food/snacks/tocino/Initialize(mapload)
-	..()
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
 	bitesize = 5
 
@@ -88,8 +88,8 @@
 	nutriment_amt = 5
 	nutriment_desc = list("onions and melted cheese" = 2, "bread and seasonings" = 2)
 
-/obj/item/reagent_containers/food/snacks/garlicbread/Initialize()
+/obj/item/reagent_containers/food/snacks/garlicbread/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 4
 
 /obj/item/reagent_containers/food/snacks/plumpburger
@@ -100,8 +100,8 @@
 	nutriment_amt = 5
 	nutriment_desc = list("crispy sweet mushroom" = 3, "earthy" = 2, "salty" = 2)
 
-/obj/item/reagent_containers/food/snacks/plumpburger/Initialize()
+/obj/item/reagent_containers/food/snacks/plumpburger/Initialize(mapload)
-	..()
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_PROTEIN, 5)
 	bitesize = 5
 
@@ -158,8 +158,8 @@
 	nutriment_amt = 0
 	nutriment_desc = list(REAGENT_ID_NOTHING = 1)
 
-/obj/item/reagent_containers/food/snacks/steamtealeaf/Initialize()
+/obj/item/reagent_containers/food/snacks/steamtealeaf/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/steamtealeaf/attackby(obj/item/W as obj, mob/user as mob)
@@ -176,8 +176,8 @@
 	nutriment_amt = 0
 	nutriment_desc = list(REAGENT_ID_NOTHING = 1)
 
-/obj/item/reagent_containers/food/snacks/steamrolltealeaf/Initialize()
+/obj/item/reagent_containers/food/snacks/steamrolltealeaf/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/greentealeaf
@@ -188,8 +188,8 @@
 	nutriment_amt = 0
 	nutriment_desc = list(REAGENT_ID_NOTHING = 1)
 
-/obj/item/reagent_containers/food/snacks/greentealeaf/Initialize()
+/obj/item/reagent_containers/food/snacks/greentealeaf/Initialize(mapload)
-	..()
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_TEALEAVESGREEN, 6)
 	bitesize = 1
 
@@ -202,8 +202,8 @@
 	nutriment_amt = 1
 	nutriment_desc = list("sickly sweet deliciousness" = 1)
 
-/obj/item/reagent_containers/food/snacks/butterscotch/Initialize()
+/obj/item/reagent_containers/food/snacks/butterscotch/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/slicable/buttspie
@@ -218,8 +218,8 @@
 	center_of_mass_x = 16 //CHOMPEdit
 	center_of_mass_y= 9 //CHOMPEdit
 
-/obj/item/reagent_containers/food/snacks/slicable/buttspie/Initialize()
+/obj/item/reagent_containers/food/snacks/slicable/buttspie/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/slice/buttspie
@@ -230,8 +230,8 @@
 	trash = /obj/item/trash/plate
 	whole_path = /obj/item/reagent_containers/food/snacks/slicable/buttspie
 
-/obj/item/reagent_containers/food/snacks/slice/buttspie/Initialize()
+/obj/item/reagent_containers/food/snacks/slice/buttspie/Initialize(mapload)
-	..()
+	. = ..()
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/spicy_boys //These are off-brand red hots/atomic fireballs

code/modules/food/kitchen/gibber.dm

@@ -57,8 +57,8 @@
 			M.gib()
 
 
-/obj/machinery/gibber/Initialize() //ChompEDIT New --> Initialize
+/obj/machinery/gibber/Initialize(mapload)
-	..()
+	. = ..()
 	add_overlay("grjam")
 
 /obj/machinery/gibber/update_icon()

code/modules/hydroponics/beekeeping/beehive.dm

@@ -281,8 +281,8 @@ var/global/list/datum/stack_recipe/wax_recipes = list( \
 	icon_state = "beepack"
 	var/full = 1
 
-/obj/item/bee_pack/Initialize() //ChompEDIT New --> Initialize
+/obj/item/bee_pack/Initialize(mapload)
-	..()
+	. = ..()
 	add_overlay("beepack-full")
 
 /obj/item/bee_pack/proc/empty()

code/modules/mob/dead/corpse.dm

@@ -39,9 +39,11 @@
 	var/corpsesynthtype = 0			// 0 for organic, 1 for drone, 2 for posibrain
 	var/corpsesynthbrand = "Unbranded"
 	var/corpsesensormode = 0	//CHOMPAdd - For setting the suit sensors of a corpse. Default to 0 so we don't annoy medbay.
+	delete_me = TRUE
 
-/obj/effect/landmark/mobcorpse/Initialize() //CHOMPEdit
+/obj/effect/landmark/mobcorpse/Initialize(mapload)
 	createCorpse()
+	. = ..()
 
 /obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
 	var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
@@ -183,8 +185,6 @@
 		M.equip_voidhelm_to_slot_or_del_with_refit(new src.corpsehelmet(M), slot_head, src.species)
 	if(src.corpsesuit)
 		M.equip_voidsuit_to_slot_or_del_with_refit(new src.corpsesuit(M), slot_wear_suit, src.species)
-	delete_me = 1
-	qdel(src)
 
 /obj/effect/landmark/mobcorpse/proc/generateCorpseName()
 	return name

code/modules/paperwork/clipboard.dm

@@ -12,7 +12,8 @@
 	var/obj/item/toppaper	//The topmost piece of paper.
 	slot_flags = SLOT_BELT
 
-/obj/item/clipboard/Initialize() //ChompEDIT New --> Initialize
+/obj/item/clipboard/Initialize(mapload)
+	. = ..()
 	update_icon()
 
 /obj/item/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri

code/modules/paperwork/faxmachine.dm

@@ -28,12 +28,12 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 	var/destination = null // the department we're sending to
 	var/talon = 0 // So that the talon can access their own crew roles for the request
 
-/obj/machinery/photocopier/faxmachine/Initialize() //CHOMPedit, so new fax machines can update its list mid-round
+/obj/machinery/photocopier/faxmachine/Initialize(mapload)
+	. = ..()
 	allfaxes += src
 	if(!destination) destination = "[using_map.boss_name]"
 	if( !(("[department]" in alldepartments) || ("[department]" in admin_departments)) )
 		alldepartments |= department
-	..()
 
 /obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob) // CH edit begins here; this allows borgs to use fax machines, meant for the Unity and Clerical modules.
 	user.set_machine(src)

code/modules/paperwork/folders.dm

@@ -41,7 +41,8 @@
 	desc = "A white folder with RD markings."
 	icon_state = "folder_rd"
 
-/obj/item/folder/white_rd/Initialize() //ChompEDIT New --> Initialize
+/obj/item/folder/white_rd/Initialize(mapload)
+	. = ..()
 	//add some memos
 	var/obj/item/paper/P = new()
 	P.name = "Memo RE: proper analysis procedure"

code/modules/reagents/reagent_containers/bluespacecoffee.dm

@@ -7,8 +7,8 @@
 	center_of_mass_y = 10
 	volume = 50
 
-/obj/item/reagent_containers/food/drinks/bluespace_coffee/Initialize()
+/obj/item/reagent_containers/food/drinks/bluespace_coffee/Initialize(mapload)
-	..()
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_COFFEE, 50)
 
 	//Infinite Coffee

modular_chomp/code/modules/living/carbon/human/ai_controlled/ai_controlled.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/human/ai_controlled/greytide/Initialize()
+/mob/living/carbon/human/ai_controlled/greytide/Initialize(mapload)
 	to_wear_r_hand = pick(
 		prob(20); /obj/item/storage/toolbox/electrical,
 		prob(20); /obj/item/storage/toolbox/mechanical,
@@ -20,7 +20,7 @@
 		)
 	else
 		to_wear_gloves = null
-	..()
+	. = ..()
 
 /mob/living/carbon/human/ai_controlled/greytide
 	name = "John Greytide" //theyll get a normal name on spawn

modular_chomp/code/modules/mob/living/simple_mob/subtypes/meteroid/metTypes.dm

@@ -1,5 +0,0 @@
-/mob/living/simple_mob/metroid/juvenile/gamma
-	projectiletype = /obj/item/projectile/energy/mob/electric_spider
-
-/mob/living/simple_mob/metroid/juvenile/omega
-	projectiletype	= /obj/item/projectile/energy/mob/smalllaser

modular_chomp/code/modules/mob/living/simple_mob/subtypes/meteroid/meteroid.dm

@@ -1,39 +0,0 @@
-//File unticked due to combat refactor walkback
-
-/mob/living/simple_mob/metroid/jellybrig
-	maxHealth = 200
-	health = 200
-
-/mob/living/simple_mob/metroid/juvenile/baby
-	health = 100
-	maxHealth = 100
-
-/mob/living/simple_mob/metroid/juvenile/super
-	health = 125
-	maxHealth = 125
-
-/mob/living/simple_mob/metroid/juvenile/alpha
-	health = 150
-	maxHealth = 150
-
-/mob/living/simple_mob/metroid/juvenile/gamma
-	health = 200
-	maxHealth = 200
-	melee_damage_lower = 5
-	melee_damage_upper = 10
-
-/mob/living/simple_mob/metroid/juvenile/zeta
-	health = 250
-	maxHealth = 250
-	melee_damage_lower = 7
-	melee_damage_upper = 12
-
-/mob/living/simple_mob/metroid/juvenile/omega
-	health = 300
-	maxHealth = 300
-	melee_damage_lower = 12
-	melee_damage_upper = 20
-
-/mob/living/simple_mob/metroid/juvenile/queen
-	health = 500
-	maxHealth = 500

modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm

@@ -135,9 +135,9 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 
 	is_juvenile = TRUE
 
-/mob/living/simple_mob/metroid/juvenile/baby/Initialize()
+/mob/living/simple_mob/metroid/juvenile/baby/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidsee.ogg', 100, 1)
-	..()
 
 
 
@@ -208,9 +208,9 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 
 	is_juvenile = TRUE
 
-/mob/living/simple_mob/metroid/juvenile/super/Initialize()
+/mob/living/simple_mob/metroid/juvenile/super/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidsee.ogg', 100, 1)
-	..()
 
 /mob/living/simple_mob/metroid/juvenile/super/death()
 	// playsound(src, 'sound/metroid/metroiddeath.ogg', 100, 1)
@@ -261,9 +261,9 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 	evo_limit = 1500
 	next = "/mob/living/simple_mob/metroid/juvenile/gamma"
 
-/mob/living/simple_mob/metroid/juvenile/alpha/Initialize()
+/mob/living/simple_mob/metroid/juvenile/alpha/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidsee.ogg', 100, 1)
-	..()
 
 /mob/living/simple_mob/metroid/juvenile/alpha/death()
 	// playsound(src, 'sound/metroid/metroiddeath.ogg', 100, 1)
@@ -319,7 +319,7 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 	nutrition = 0
 	ranged_cooldown_time = 5 SECOND
 	projectilesound = 'sound/weapons/taser2.ogg'
-	projectiletype = /obj/item/projectile/beam/stun/weak
+	projectiletype = /obj/item/projectile/energy/mob/electric_spider
 
 	//Not affected by atmos.
 	minbodytemp = 0
@@ -338,9 +338,9 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 	evo_limit = 1500
 	next = "/mob/living/simple_mob/metroid/juvenile/zeta"
 
-/mob/living/simple_mob/metroid/juvenile/gamma/Initialize()
+/mob/living/simple_mob/metroid/juvenile/gamma/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidgamma.ogg', 100, 1)
-	..()
 
 /mob/living/simple_mob/metroid/juvenile/gamma/death()
 	// playsound(src, 'sound/metroid/metroiddeath.ogg', 100, 1)
@@ -436,9 +436,9 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 	evo_limit = 1500
 	next = "/mob/living/simple_mob/metroid/juvenile/omega"
 
-/mob/living/simple_mob/metroid/juvenile/zeta/Initialize()
+/mob/living/simple_mob/metroid/juvenile/zeta/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidzeta.ogg', 100, 1)
-	..()
 
 /mob/living/simple_mob/metroid/juvenile/zeta/death()
 	// playsound(src, 'sound/metroid/metroiddeath.ogg', 100, 1)
@@ -507,7 +507,7 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 	max_nutrition = 2200
 	nutrition = 0
 	makes_dirt = TRUE
-	projectiletype	= /obj/item/projectile/beam/smalllaser	// The projectiles I shoot
+	projectiletype	= /obj/item/projectile/energy/mob/smalllaser
 	projectilesound = 'sound/weapons/Flamer.ogg' // The sound I make when I do it
 
 	//Unaffected by atmos.
@@ -535,9 +535,9 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 
 	death_sound_override = list('sound/metroid/metroidomegadeath.ogg') // We override the death sound to play our custom here
 
-/mob/living/simple_mob/metroid/juvenile/omega/Initialize()
+/mob/living/simple_mob/metroid/juvenile/omega/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidomega.ogg', 100, 1)
-	..()
 
 /mob/living/simple_mob/metroid/juvenile/omega/death()
 	// playsound(src, 'sound/metroid/metroidomegadeath.ogg', 100, 1)
@@ -632,10 +632,10 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world.
 
 	death_sound_override = list('sound/metroid/metroidqueendeath.ogg') // We override the death sound to play our custom here
 
-/mob/living/simple_mob/metroid/juvenile/queen/Initialize()
+/mob/living/simple_mob/metroid/juvenile/queen/Initialize(mapload)
+	. = ..()
 	playsound(src, 'sound/metroid/metroidqueen.ogg', 100, 1)
 	GLOB.queen_amount++
-	..()
 
 /mob/living/simple_mob/metroid/juvenile/queen/death()
 	// playsound(src, 'sound/metroid/metroidqueendeath.ogg', 100, 1)

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/plants/pitcher.dm

@@ -135,12 +135,8 @@ GLOBAL_LIST_INIT(pitcher_plant_lure_messages, list(
 		vore_checks()
 		handle_hungry()
 
-/mob/living/simple_mob/vore/pitcher_plant/New()
+/mob/living/simple_mob/vore/pitcher_plant/Initialize(mapload)
-	..()
+	. = ..()
-	pitcher_plant_lure_messages = GLOB.pitcher_plant_lure_messages
-
-/mob/living/simple_mob/vore/pitcher_plant/Initialize()
-	..()
 	pitcher_plant_lure_messages = GLOB.pitcher_plant_lure_messages
 
 
@@ -294,7 +290,7 @@ GLOBAL_LIST_INIT(pitcher_plant_lure_messages, list(
 	var/datum/seed/seed = null
 	var/obj/item/seeds/pit = null
 
-/obj/item/reagent_containers/food/snacks/pitcher_fruit/Initialize()
+/obj/item/reagent_containers/food/snacks/pitcher_fruit/Initialize(mapload)
 	. = ..()
 	reagents.add_reagent(REAGENT_ID_PITCHERNECTAR, 5)
 	bitesize = 4

modular_chomp/code/modules/overmap/dynamic_sector.dm

@@ -50,7 +50,7 @@ GLOBAL_VAR_INIT(dynamic_sector_master, null)
 				shuttle_landmarks[i] = spawn_directions
 		generated_z = TRUE
 
-/obj/effect/overmap/visitable/dynamic/Initialize()
+/obj/effect/overmap/visitable/dynamic/Initialize(mapload)
 	if(!GLOB.dynamic_sector_master)
 		GLOB.dynamic_sector_master = src
 	. = ..()
@@ -141,7 +141,7 @@ GLOBAL_VAR_INIT(dynamic_sector_master, null)
 	var/loaded = FALSE
 	var/my_index = 0 // Tracks which z-level we're using in the parent. Corresponds to index in parent's active_pois[]
 
-/obj/effect/overmap/visitable/dynamic/poi/Initialize()
+/obj/effect/overmap/visitable/dynamic/poi/Initialize(mapload)
 	if(!global.using_map.use_overmap)
 		return INITIALIZE_HINT_QDEL
 

vorestation.dme

@@ -3615,12 +3615,6 @@
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\ripley.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\ward\monitor_ward.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\ward\ward.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\metroid\metAI.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\metroid\metBaseType.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\metroid\metConsumption.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\metroid\metJuvenile.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\metroid\metObjects.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\metroid\metTypes.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\occult\creature.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\occult\faithless.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\occult\unknown.dm"
@@ -3729,7 +3723,6 @@
 #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\honkelemental.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\regularclowns.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\morph\morph.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\plants_ch\pitcher.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_procs.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\rakshasa_abilities.dm"
@@ -5027,7 +5020,12 @@
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\combat.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\phazon.dm"
-#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\meteroid\metTypes.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\metroid\metAI.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\metroid\metBaseType.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\metroid\metConsumption.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\metroid\metJuvenile.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\metroid\metObjects.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\metroid\metTypes.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\construct.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\purity_construct.dm"
@@ -5052,6 +5050,7 @@
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\xeyakin.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\gateway\candy.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\plants\pitcher.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\shadekin\shadekin.dm"
 #include "modular_chomp\code\modules\mob\new_player\sprite_accessories.dm"
 #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_ear.dm"