From 5853b61b55ecd78354e4c5792c52489b7810d8ed Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Thu, 17 Apr 2025 04:52:07 -0700
Subject: [PATCH] [MIRROR] New to init final (#10649)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 .../old_yw/tether_better/tether_things.dm     |  36 +-
 archive/maps/old_yw/yw/cryogaia_things.dm     |  20 +-
 archive/maps/old_yw/yw/cryogaia_turfs.dm      |   7 +-
 .../old_yw/yw/residential/_residential.dm     |   4 +-
 .../maps/old_yw/yw/submaps/beach/_beach.dm    |  12 +-
 .../yw/submaps/engine_submaps_yw/engine_yw.dm |   8 +-
 .../old_yw/yw/submaps/space/_debrisfield.dm   |  16 +-
 code/__defines/materials.dm                   |   1 +
 code/__defines/species_languages.dm           |   2 +
 code/__defines/species_languages_vr.dm        |   2 +-
 code/__defines/subsystems.dm                  |   1 +
 code/_helpers/turfs.dm                        |   2 +-
 code/_helpers/unsorted.dm                     |   2 +-
 code/controllers/subsystems/air_traffic.dm    |   1 +
 code/controllers/subsystems/ticker.dm         |   2 +-
 code/game/atoms.dm                            |   1 +
 code/game/atoms_movable_ch.dm                 |   2 +-
 code/game/jobs/job_controller.dm              |   6 +-
 code/game/machinery/computer/ai_core.dm       |   2 +-
 .../machinery/computer3/computers/card.dm     |   2 +-
 code/game/machinery/event/christmas_ch.dm     |   5 +-
 code/game/machinery/hologram.dm               |   2 +-
 code/game/machinery/upgrade_machinery.dm      |  39 --
 code/game/machinery/vending_yw.dm             |   4 +-
 code/game/mecha/mecha_parts_ch.dm             |   4 +-
 .../objects/effects/decals/Cleanable/vore.dm  |   3 +-
 .../game/objects/effects/decals/contraband.dm |  20 +-
 code/game/objects/effects/effect_system_ch.dm |   8 +-
 code/game/objects/effects/landmarks.dm        |   6 +-
 .../objects/effects/spawners/bombspawner.dm   |  18 +-
 code/game/objects/effects/step_triggers.dm    |   3 +-
 .../items/devices/communicator/cartridge.dm   |  82 ++---
 code/game/objects/items/devices/e_beacon.dm   |   3 +-
 .../objects/items/devices/radio/headset.dm    |   4 +-
 code/game/objects/items/devices/tvcamera.dm   |   4 +-
 .../objects/items/falling_object_attack_vr.dm |   3 +-
 code/game/objects/items/robot/robot_parts.dm  |   2 +-
 .../items/stacks/tiles/tile_types_ch.dm       |   8 +-
 .../circuitboards/computer/camera_monitor.dm  |   4 +-
 .../items/weapons/gift_wrappaper_ch.dm        |   5 +-
 code/game/objects/items/weapons/manuals_ch.dm |   3 -
 code/game/objects/items/weapons/syndie.dm     |  10 +-
 code/game/objects/mob_spawner_vr.dm           |   4 +-
 code/game/objects/structures/barricades.dm    |  16 +-
 .../closets/secure/guncabinet.dm              |   6 +-
 .../closets/secure/secure_closets.dm          |   4 +-
 .../crates_lockers/closets/statue.dm          |   7 +-
 code/game/objects/structures/droppod.dm       |  32 +-
 code/game/objects/structures/flora/trees.dm   |   8 +-
 code/game/objects/structures/girders.dm       |  21 +-
 code/game/objects/structures/gravemarker.dm   |   7 +-
 code/game/objects/structures/janicart.dm      |   5 +-
 code/game/objects/structures/railing.dm       |   4 +-
 .../objects/structures/simple_doors_vr.dm     |   6 +-
 .../structures/stool_bed_chair_nest/stools.dm |  11 +-
 .../stool_bed_chair_nest/stools_vr.dm         |   4 +-
 .../objects/structures/windoor_assembly.dm    |   4 +-
 code/game/objects/structures/window.dm        |   4 +-
 code/game/turfs/flooring/flooring_decals.dm   |  14 +-
 code/game/turfs/simulated/fancy_shuttles.dm   |   3 +-
 code/game/turfs/simulated/floor_types.dm      |   8 +-
 code/game/turfs/simulated/wall_types.dm       |   9 +-
 code/modules/Phorochemistry/Phorochemputer.dm |   3 +-
 code/modules/Phorochemistry/misc_phoronics.dm |   4 +-
 code/modules/admin/verbs/adminhelp.dm         |  12 +-
 code/modules/admin/verbs/mapping.dm           |   3 +-
 code/modules/awaymissions/loot_vr.dm          |   5 +-
 code/modules/blob2/blobs/node.dm              |   4 +-
 code/modules/blob2/core_chunk.dm              |   4 +-
 code/modules/blob2/mobs/spore.dm              |   4 +-
 code/modules/casino/casino_cards.dm           |   3 +-
 .../clothing/accessories/accessory_vr.dm      |   4 +-
 code/modules/clothing/accessories/clothing.dm |  40 ++-
 code/modules/clothing/chameleon.dm            |  41 ++-
 code/modules/clothing/clothing.dm             |  22 +-
 code/modules/clothing/clothing_vr.dm          |  12 +-
 code/modules/clothing/suits/storage.dm        |   8 +-
 code/modules/economy/cash_register.dm         |   3 +
 code/modules/economy/money_bag.dm             |   4 +-
 code/modules/economy/retail_scanner.dm        |   7 +-
 code/modules/entopics_vr/entopics.dm          |   4 +-
 code/modules/events/meteor_strike_vr.dm       |   8 +-
 code/modules/flufftext/Hallucination.dm       |  66 ++--
 code/modules/food/food/snacks_ch.dm           |   6 +-
 code/modules/food/kitchen/icecream.dm         |   3 +-
 code/modules/games/cah.dm                     |   4 +-
 code/modules/games/cards_ch.dm                |   3 +-
 code/modules/games/spaceball_cards.dm         |   4 +-
 code/modules/games/tarot.dm                   |   8 +-
 code/modules/games/wizoff.dm                  |   7 +-
 code/modules/hydroponics/seed_machines.dm     |   8 +-
 .../core/assemblies/device.dm                 |   8 +-
 .../core/integrated_circuit.dm                |   4 +-
 .../integrated_electronics/passive/power.dm   |   4 +-
 .../subtypes/data_transfer.dm                 |  12 +-
 .../integrated_electronics/subtypes/input.dm  |   6 +-
 .../subtypes/manipulation.dm                  |   4 +-
 .../integrated_electronics/subtypes/memory.dm |   4 +-
 .../subtypes/reagents.dm                      |   4 +-
 .../interserver shipping/shipping_hooks.dm    |   3 +-
 code/modules/library/lib_items.dm             |  15 +-
 code/modules/lighting/lighting_area.dm        |   6 -
 code/modules/lighting/sunlight_handler.dm     |  10 +-
 .../modules/materials/materials/_materials.dm |   2 -
 code/modules/mining/mine_items.dm             |   4 +-
 code/modules/mob/dead/observer/observer.dm    |  33 +-
 code/modules/mob/freelook/ai/eye.dm           |  15 +-
 code/modules/mob/freelook/mask/eye.dm         |   4 +-
 .../mob/freelook/mask/update_triggers.dm      |   4 +-
 code/modules/mob/language/outsider.dm         |   2 +-
 code/modules/mob/language/synthetic.dm        |   4 +-
 code/modules/mob/living/bot/farmbot.dm        |   4 +-
 code/modules/mob/living/carbon/alien/alien.dm |   2 +-
 .../mob/living/carbon/alien/larva/larva.dm    |   4 +-
 code/modules/mob/living/carbon/brain/MMI.dm   |  17 +-
 .../living/carbon/human/human_species_vr.dm   |  52 +--
 .../human/species/shadekin/dark_portal_ch.dm  |   4 +-
 .../carbon/human/species/station/greyYW.dm    |   4 +-
 .../human/species/station/prommie_blob.dm     |  13 +-
 .../species/station/protean/protean_blob.dm   |   2 +-
 .../human/species/xenomorphs/alien_species.dm |   4 +-
 .../human/species/xenomorphs/xenomorphs.dm    |  16 +-
 .../mob/living/carbon/metroid/items.dm        |   8 +-
 code/modules/mob/living/living.dm             |   4 +-
 code/modules/mob/living/silicon/ai/ai.dm      |  32 +-
 .../living/silicon/ai/ai_remote_control.dm    |   5 -
 code/modules/mob/living/silicon/ai/ai_vr.dm   |   4 +-
 .../modules/mob/living/silicon/decoy/decoy.dm |   7 +-
 code/modules/mob/living/silicon/pai/pai.dm    |  25 +-
 .../silicon/robot/dogborg/dog_modules.dm      |  20 +-
 .../silicon/robot/dogborg/dog_sleeper.dm      |   6 +-
 .../mob/living/silicon/robot/drone/drone.dm   |  13 +-
 .../living/silicon/robot/drone/drone_say.dm   |   2 +-
 .../modules/mob/living/silicon/robot/robot.dm |   8 +-
 .../mob/living/silicon/robot/robot_items.dm   |  12 +-
 .../living/silicon/robot/robot_modules_yw.dm  |  21 +-
 .../living/silicon/robot/sprites/standard.dm  |   3 +-
 .../silicon/robot/subtypes/boozeborg.dm       |   4 +-
 .../silicon/robot/subtypes/boozeborg_ch.dm    |   7 +-
 .../exploration/exploration-modules.dm        |   5 +-
 code/modules/mob/living/silicon/silicon.dm    |  15 +-
 .../mob/living/simple_animal/aliens/synx.dm   |  11 +-
 .../mob/living/simple_mob/overmap_mob_vr.dm   |  24 +-
 code/modules/mob/living/simple_mob/sd_pets.dm |  12 +-
 .../animal/alien animals/jellyfish.dm         |  12 +-
 .../subtypes/animal/alien animals/teppi.dm    |  21 +-
 .../subtypes/animal/farm animals/chicken.dm   |   8 +-
 .../subtypes/animal/farm animals/cow.dm       |   5 +-
 .../subtypes/animal/farm animals/goat.dm      |   4 +-
 .../subtypes/animal/passive/mouse.dm          |  35 +-
 .../subtypes/animal/passive/mouse_vr.dm       |   7 +-
 .../subtypes/animal/space/animals_yw.dm       |   4 +-
 .../subtypes/animal/space/mouse_army_ch.dm    |   4 +-
 .../subtypes/animal/space/snake_vr.dm         |   4 +-
 .../subtypes/vore/dominated_brain.dm          |   8 +-
 .../living/simple_mob/subtypes/vore/lamia.dm  |   3 +-
 .../subtypes/vore/leopardmander_ch.dm         |   4 +-
 .../simple_mob/subtypes/vore/morph/morph.dm   |  31 +-
 .../vore/shadekin/rakshasa_abilities.dm       |   8 +-
 .../subtypes/vore/shadekin/rakshasa_trap.dm   |   5 +-
 .../simple_mob/subtypes/vore/slug_ch.dm       |  19 +-
 .../simple_mob/subtypes/vore/succubi.dm       |   4 +-
 .../simple_mob/subtypes/vore/wolftaur.dm      |   4 +-
 code/modules/mob/mob_grab.dm                  |  12 +-
 code/modules/mob/mob_planes.dm                |   4 +-
 code/modules/mob/mob_planes_vr.dm             |  10 +-
 code/modules/mob/new_player/new_player.dm     |  19 +-
 code/modules/mob/transform_procs.dm           |   4 +-
 .../modular_computers/hardware/_hardware.dm   |   9 +-
 .../hardware/battery_module.dm                |  14 +-
 .../modular_computers/hardware/hard_drive.dm  |   4 +-
 .../hardware/network_card.dm                  |   4 +-
 .../hardware/portable_hard_drive.dm           |   4 +-
 code/modules/multiz/basic.dm                  |   5 +-
 .../nifsoft/software/13_soulcatcher.dm        |  19 +-
 .../overmap/ships/engines/gas_thruster.dm     |   8 +-
 code/modules/paperwork/adminpaper.dm          |   2 +-
 code/modules/paperwork/paperplane.dm          |   2 +-
 code/modules/paperwork/pen.dm                 |  23 +-
 code/modules/pda/cart.dm                      |   3 +-
 code/modules/pda/pda.dm                       |  12 +-
 code/modules/pda/pda_subtypes.dm              |  36 +-
 code/modules/pda/radio.dm                     |   2 +-
 code/modules/persistence/noticeboard.dm       |   4 +-
 code/modules/planet/sun.dm                    |   8 +-
 code/modules/planet/thor.dm                   |   4 +-
 code/modules/power/fusion/core/core_field.dm  |   6 +-
 .../fusion/fuel_assembly/fuel_assembly_ch.dm  |   4 +-
 .../particle_accelerator/particle.dm          |   6 +-
 code/modules/power/singularity/singularity.dm |   5 +-
 code/modules/power/smes.dm                    |  29 ++
 code/modules/power/tesla/energy_ball.dm       |   7 +-
 .../guns/energy/cell_loaded_vr/nerd.dm        |   8 +-
 .../modules/projectiles/guns/projectile_ch.dm |   4 +-
 code/modules/reagents/reagents/other_ch.dm    |   8 +-
 code/modules/resleeving/implant_ch.dm         |   3 -
 code/modules/tables/update_triggers.dm        |   2 +-
 code/modules/vore/eating/belly_obj_vr.dm      |   2 +-
 code/modules/vore/eating/living_vr.dm         |   7 +-
 code/modules/vore/eating/vorepanel_vr.dm      |   2 +-
 code/modules/vore/fluffstuff/MadokaSpear.dm   |   4 +-
 .../vore/fluffstuff/custom_boxes_vr.dm        |   5 +-
 .../vore/fluffstuff/custom_clothes_yw.dm      |   4 +-
 .../vore/fluffstuff/custom_items_yw.dm        |   5 +-
 code/modules/xenobio2/mob/xeno.dm             |   4 +-
 maps/expedition_vr/beach/_beach.dm            |  13 -
 maps/expedition_vr/space/_debrisfield.dm      |   5 +-
 maps/groundbase/groundbase_shuttles.dm        |   3 +
 .../stellar_delight_shuttles.dm               |  68 ++++
 .../stellar_delight/stellar_delight_things.dm |   3 -
 .../mob/living/simple_animal/aliens/synx.dm   |   6 +-
 .../surface_submaps/wilderness/CaveS.dmm      |   2 +-
 tgui/packages/tgui-panel/reconnect.tsx        |  64 ++--
 .../AppearanceChangerColors.tsx               | 220 ++++++++++++
 .../AppearanceChangerDetails.tsx              | 340 ------------------
 .../AppearanceChangerMarkings.tsx             | 148 ++++++++
 .../AppearanceChangerParts.tsx                |  78 ++--
 .../interfaces/AppearanceChanger/index.tsx    |   6 +-
 tgui/packages/tgui/styles/main.scss           |   3 +
 tools/ci/validate_files.sh                    |  34 +-
 vorestation.dme                               |   1 -
 221 files changed, 1452 insertions(+), 1427 deletions(-)
 delete mode 100644 code/game/machinery/upgrade_machinery.dm
 create mode 100644 maps/stellar_delight/stellar_delight_shuttles.dm
 create mode 100644 tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerColors.tsx
 delete mode 100644 tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerDetails.tsx
 create mode 100644 tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerMarkings.tsx

diff --git a/archive/maps/old_yw/tether_better/tether_things.dm b/archive/maps/old_yw/tether_better/tether_things.dm
index 0a628f913c..da689942ce 100644
--- a/archive/maps/old_yw/tether_better/tether_things.dm
+++ b/archive/maps/old_yw/tether_better/tether_things.dm
@@ -29,32 +29,32 @@
 	external_pressure_bound = ONE_ATMOSPHERE * 1.1
 
 
-/obj/effect/step_trigger/teleporter/to_mining/New()
-	..()
+/obj/effect/step_trigger/teleporter/to_mining/Initialize(mapload)
+	. = ..()
 	teleport_x = src.x
 	teleport_y = 2
 	teleport_z = Z_LEVEL_SURFACE_MINE
 
-/obj/effect/step_trigger/teleporter/from_mining/New()
-	..()
+/obj/effect/step_trigger/teleporter/from_mining/Initialize(mapload)
+	. = ..()
 	teleport_x = src.x
 	teleport_y = world.maxy - 1
 	teleport_z = Z_LEVEL_SURFACE_LOW
 
-/obj/effect/step_trigger/teleporter/to_solars/New()
-	..()
+/obj/effect/step_trigger/teleporter/to_solars/Initialize(mapload)
+	. = ..()
 	teleport_x = world.maxx - 1
 	teleport_y = src.y
 	teleport_z = Z_LEVEL_SOLARS
 
-/obj/effect/step_trigger/teleporter/from_solars/New()
-	..()
+/obj/effect/step_trigger/teleporter/from_solars/Initialize(mapload)
+	. = ..()
 	teleport_x = 2
 	teleport_y = src.y
 	teleport_z = Z_LEVEL_SURFACE_LOW
 
-/obj/effect/step_trigger/teleporter/wild/New()
-	..()
+/obj/effect/step_trigger/teleporter/wild/Initialize(mapload)
+	. = ..()
 
 	//If starting on east/west edges.
 	if (src.x == 1)
@@ -99,14 +99,14 @@
 		if(Z.name == "Mining Outpost")
 			teleport_z = Z.z
 
-/obj/effect/step_trigger/teleporter/to_plains/New()
-	..()
+/obj/effect/step_trigger/teleporter/to_plains/Initialize(mapload)
+	. = ..()
 	teleport_x = src.x
 	teleport_y = world.maxy - 1
 	teleport_z = Z_LEVEL_PLAINS
 
-/obj/effect/step_trigger/teleporter/from_plains/New()
-	..()
+/obj/effect/step_trigger/teleporter/from_plains/Initialize(mapload)
+	. = ..()
 	teleport_x = src.x
 	teleport_y = 2
 	teleport_z = Z_LEVEL_SURFACE_LOW
@@ -346,8 +346,8 @@ var/global/list/latejoin_tram   = list()
 	desc = "Neutralizes toxins and provides a mild analgesic effect."
 	icon_state = "pill2"
 
-/obj/item/reagent_containers/pill/airlock/New()
-	..()
+/obj/item/reagent_containers/pill/airlock/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
 	reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
 
@@ -366,8 +366,8 @@ var/global/list/latejoin_tram   = list()
 	name = "expedition weaponry cabinet"
 	req_one_access = list(access_explorer,access_armory)
 
-/obj/structure/closet/secure_closet/guncabinet/excursion/New()
-	..()
+/obj/structure/closet/secure_closet/guncabinet/excursion/Initialize(mapload)
+	. = ..()
 	for(var/i = 1 to 2)
 		new /obj/item/gun/energy/locked/frontier(src)
 	for(var/i = 1 to 2)
diff --git a/archive/maps/old_yw/yw/cryogaia_things.dm b/archive/maps/old_yw/yw/cryogaia_things.dm
index 3def925f78..3d9b95495f 100644
--- a/archive/maps/old_yw/yw/cryogaia_things.dm
+++ b/archive/maps/old_yw/yw/cryogaia_things.dm
@@ -321,8 +321,8 @@ var/global/list/latejoin_tram   = list()
 	desc = "Neutralizes toxins and provides a mild analgesic effect."
 	icon_state = "pill2"
 
-/obj/item/reagent_containers/pill/airlock/New()
-	..()
+/obj/item/reagent_containers/pill/airlock/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
 	reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
 
@@ -356,7 +356,7 @@ var/global/list/latejoin_tram   = list()
 	var/deiceTools[0]
 	var/nextWeatherCheck
 
-/obj/machinery/door/airlock/glass_external/freezable/New()
+/obj/machinery/door/airlock/glass_external/freezable/Initialize(mapload)
 	//Associate objects with the number of seconds it would take to de-ice a door.
 	//Most items are either more or less effecient at it.
 	//For items with very specific cases (like welders using fuel, or needing to be on) see attackby().
@@ -369,7 +369,7 @@ var/global/list/latejoin_tram   = list()
 	//This is for preventing "Sierra" syndrome that could result from needing very specific objects.
 	deiceTools[/obj/item/tool] = 10
 	deiceTools[/obj/item] = 12
-	..()
+	. = ..()
 
 /obj/machinery/door/airlock/glass_external/freezable/attackby(obj/item/I, mob/user as mob)
 	//Special cases for tools that need more then just a type check.
@@ -479,8 +479,8 @@ var/global/list/latejoin_tram   = list()
 	name = "expedition weaponry cabinet"
 	req_one_access = list(access_explorer,access_brig)
 
-/obj/structure/closet/secure_closet/guncabinet/excursion/New()
-	..()
+/obj/structure/closet/secure_closet/guncabinet/excursion/Initialize(mapload)
+	. = ..()
 	for(var/i = 1 to 4)
 		new /obj/item/gun/energy/locked/frontier(src)
 	for(var/i = 1 to 4)
@@ -683,14 +683,14 @@ obj/machinery/trailblazer/Initialize(mapload)
 	req_access = null
 	req_one_access = list(access_pilot,access_explorer)
 
-/obj/effect/step_trigger/teleporter/from_plains/New()
-	..()
+/obj/effect/step_trigger/teleporter/from_plains/Initialize(mapload)
+	. = ..()
 	teleport_x = world.maxx - 1
 	teleport_y = src.y
 	teleport_z = Z_LEVEL_CRYOGAIA_MAIN
 
-/obj/effect/step_trigger/teleporter/to_plains/New()
-	..()
+/obj/effect/step_trigger/teleporter/to_plains/Initialize(mapload)
+	. = ..()
 	teleport_x = 2
 	teleport_y = src.y
 	teleport_z = Z_LEVEL_PLAINS
diff --git a/archive/maps/old_yw/yw/cryogaia_turfs.dm b/archive/maps/old_yw/yw/cryogaia_turfs.dm
index 6181082aec..f00a06ff23 100644
--- a/archive/maps/old_yw/yw/cryogaia_turfs.dm
+++ b/archive/maps/old_yw/yw/cryogaia_turfs.dm
@@ -2,8 +2,8 @@
 CRYOGAIA_TURF_CREATE(/turf/simulated/open)
 /turf/simulated/open/cryogaia
 	edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf
-/turf/simulated/open/cryogaia/New()
-	..()
+/turf/simulated/open/cryogaia/Initialize(mapload)
+	. = ..()
 	if(outdoors)
 		SSplanets.addTurf(src)
 
@@ -205,9 +205,6 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/mineral/floor)
 	name = "sand transit"
 	icon = 'icons/turf/transit_vr.dmi'
 	icon_state = "desert_ns"
-/turf/space/sandyscroll/New()
-	..()
-	icon_state = "desert_ns"
 
 //Sky stuff!
 // A simple turf to fake the appearance of flying.
diff --git a/archive/maps/old_yw/yw/residential/_residential.dm b/archive/maps/old_yw/yw/residential/_residential.dm
index a327f9da09..557c3e9650 100644
--- a/archive/maps/old_yw/yw/residential/_residential.dm
+++ b/archive/maps/old_yw/yw/residential/_residential.dm
@@ -51,10 +51,10 @@
 	icon_state = "reinf_preview"
 
 
-/obj/structure/table/leadreinforcedwood/New()
+/obj/structure/table/leadreinforcedwood/Initialize(mapload)
 	material = get_material_by_name(MAT_LEAD)
 	reinforced = get_material_by_name(MAT_WOOD)
-	..()
+	. = ..()
 
 // Spawn points
 
diff --git a/archive/maps/old_yw/yw/submaps/beach/_beach.dm b/archive/maps/old_yw/yw/submaps/beach/_beach.dm
index 89df0e2018..364b85b397 100644
--- a/archive/maps/old_yw/yw/submaps/beach/_beach.dm
+++ b/archive/maps/old_yw/yw/submaps/beach/_beach.dm
@@ -94,15 +94,15 @@
 
 // These are step-teleporters, for map edge transitions
 // This top one goes INTO the cave
-/obj/effect/step_trigger/teleporter/away_beach_tocave/New()
-	..()
+/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize(mapload)
+	. = ..()
 	teleport_x = src.x //X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach
 	teleport_y = 2 //2 is because it's putting you on row 2 of the map to the north
 	teleport_z = z+1 //The cave is always our Z-level plus 1, because it's loaded after us
 
 //This one goes OUT OF the cave
-/obj/effect/step_trigger/teleporter/away_beach_tobeach/New()
-	..()
+/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize(mapload)
+	. = ..()
 	teleport_x = src.x //Same reason as bove
 	teleport_y = world.maxy - 1 //This means "1 space from the top of the map"
 	teleport_z = z-1 //Opposite of 'tocave', beach is always loaded as the map before us
@@ -114,8 +114,8 @@
 	name = "Water"
 	icon_state = "water"
 
-/turf/simulated/floor/beach/coastwater/New()
-	..()
+/turf/simulated/floor/beach/coastwater/Initialize(mapload)
+	. = ..()
 	add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1))
 
 // -- Areas -- //
diff --git a/archive/maps/old_yw/yw/submaps/engine_submaps_yw/engine_yw.dm b/archive/maps/old_yw/yw/submaps/engine_submaps_yw/engine_yw.dm
index 845ec44d8e..b7ab4be7b1 100644
--- a/archive/maps/old_yw/yw/submaps/engine_submaps_yw/engine_yw.dm
+++ b/archive/maps/old_yw/yw/submaps/engine_submaps_yw/engine_yw.dm
@@ -8,12 +8,12 @@
 	var/clean_turfs // A list of lists, where each list is (x, )
 
 //check for duplicte loaders. TODO: Make referance a subsystem that isnt upstream. See /controllers/subsystems/mapping_yw.dm and mapping_vr.dm
-/obj/effect/landmark/engine_loader_pickable/New()
+/obj/effect/landmark/engine_loader_pickable/Initialize(mapload)
 	if(SSmapping.engine_loader_pickable)
 		warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]")
 		delete_me = TRUE
 	SSmapping.engine_loader_pickable = src
-	return ..()
+	. = ..()
 
 /obj/effect/landmark/engine_loader_pickable/proc/get_turfs_to_clean()
 	. = list()
@@ -93,9 +93,9 @@
 	var/destroy = 0 //killmepls
 	var/building = 0
 
-/obj/machinery/computer/pickengine/New()
+/obj/machinery/computer/pickengine/Initialize(mapload)
+	. = ..()
 	message_admins("Engine select console placed at [src.x] [src.y] [src.z]")
-	..()
 
 /obj/machinery/computer/pickengine/attack_ai(var/mob/user as mob)
 	if(istype(user, /mob/living/silicon/robot))
diff --git a/archive/maps/old_yw/yw/submaps/space/_debrisfield.dm b/archive/maps/old_yw/yw/submaps/space/_debrisfield.dm
index 9a8b5b4a0c..9348d0013e 100644
--- a/archive/maps/old_yw/yw/submaps/space/_debrisfield.dm
+++ b/archive/maps/old_yw/yw/submaps/space/_debrisfield.dm
@@ -13,26 +13,26 @@
 // -- Objs -- //
 
 
-/obj/effect/step_trigger/teleporter/debrisfield_loop/north/New()
-	..()
+/obj/effect/step_trigger/teleporter/debrisfield_loop/north/Initialize(mapload)
+	. = ..()
 	teleport_x = x
 	teleport_y = 2
 	teleport_z = z
 
-/obj/effect/step_trigger/teleporter/debrisfield_loop/south/New()
-	..()
+/obj/effect/step_trigger/teleporter/debrisfield_loop/south/Initialize(mapload)
+	. = ..()
 	teleport_x = x
 	teleport_y = world.maxy - 1
 	teleport_z = z
 
-/obj/effect/step_trigger/teleporter/debrisfield_loop/west/New()
-	..()
+/obj/effect/step_trigger/teleporter/debrisfield_loop/west/Initialize(mapload)
+	. = ..()
 	teleport_x = world.maxx - 1
 	teleport_y = y
 	teleport_z = z
 
-/obj/effect/step_trigger/teleporter/debrisfield_loop/east/New()
-	..()
+/obj/effect/step_trigger/teleporter/debrisfield_loop/east/Initialize(mapload)
+	. = ..()
 	teleport_x = 2
 	teleport_y = y
 	teleport_z = z
diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm
index ca1a22ca43..0ecda77ba3 100644
--- a/code/__defines/materials.dm
+++ b/code/__defines/materials.dm
@@ -68,6 +68,7 @@
 #define MAT_FLESH			"flesh"
 #define MAT_FANCYBLACK		"fancyblack"
 #define MAT_FOAM			"foam"
+#define MAT_FLOKIUM			"flockium"
 
 // cloth materials
 #define MAT_WOOL			"wool"
diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm
index 9b7647917c..1480bf3d39 100644
--- a/code/__defines/species_languages.dm
+++ b/code/__defines/species_languages.dm
@@ -99,6 +99,8 @@
 #define LANGUAGE_ZADDAT "Vedahq"
 #define LANGUAGE_PROMETHEAN "Promethean Biolinguistics"
 #define LANGUAGE_GIBBERISH "Babel"
+#define LANGUAGE_ROBOT_TALK "Robot Talk"
+#define LANGUAGE_DRONE_TALK "Drone Talk"
 
 // Language flags.
 #define WHITELISTED  1   // Language is available if the speaker is whitelisted.
diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm
index cc2d064bf3..eab86fb8dd 100644
--- a/code/__defines/species_languages_vr.dm
+++ b/code/__defines/species_languages_vr.dm
@@ -25,8 +25,8 @@
 
 // CHOMPAdd Start
 #define LANGUAGE_MARISH "Marish"
+// CHOMPAdd End
 
 // Xeno languages selectable
 #define LANGUAGE_XENOLINGUA "Xenolingua"
 #define LANGUAGE_HIVEMIND "Hivemind"
-// CHOMPAdd End
diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm
index 3a24555e96..0e8272fa9f 100644
--- a/code/__defines/subsystems.dm
+++ b/code/__defines/subsystems.dm
@@ -158,6 +158,7 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
 #define INIT_ORDER_TICKER			-50
 #define INIT_ORDER_MAPRENAME		-60 //Initiating after Ticker to ensure everything is loaded and everything we rely on us working
 #define INIT_ORDER_WIKI				-61
+#define INIT_ORDER_ATC				-70
 #define INIT_ORDER_STATPANELS		-98
 #define INIT_ORDER_CHAT				-100 //Should be last to ensure chat remains smooth during init.
 
diff --git a/code/_helpers/turfs.dm b/code/_helpers/turfs.dm
index 515370c50d..47d6995e4d 100644
--- a/code/_helpers/turfs.dm
+++ b/code/_helpers/turfs.dm
@@ -121,7 +121,7 @@
 	if(istype(T,/turf/simulated/shuttle))
 		shuttlework = 1
 		var/turf/simulated/shuttle/SS = T
-		if(!SS.landed_holder) SS.landed_holder = new(turf = SS)
+		if(!SS.landed_holder) SS.landed_holder = new(SS)
 		X = SS.landed_holder.land_on(B)
 
 	//Generic non-shuttle turf move.
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 4018dc27ce..89ca64ff50 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -787,7 +787,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 					if(istype(T,/turf/simulated/shuttle))
 						shuttlework = 1
 						var/turf/simulated/shuttle/SS = T
-						if(!SS.landed_holder) SS.landed_holder = new(turf = SS)
+						if(!SS.landed_holder) SS.landed_holder = new(SS)
 						X = SS.landed_holder.land_on(B)
 
 					//Generic non-shuttle turf move.
diff --git a/code/controllers/subsystems/air_traffic.dm b/code/controllers/subsystems/air_traffic.dm
index d39362a38d..a4e094eece 100644
--- a/code/controllers/subsystems/air_traffic.dm
+++ b/code/controllers/subsystems/air_traffic.dm
@@ -6,6 +6,7 @@ SUBSYSTEM_DEF(atc)
 	priority = FIRE_PRIORITY_ATC
 	runlevels = RUNLEVEL_GAME
 	wait = 2 SECONDS
+	init_order = INIT_ORDER_ATC
 	flags = SS_BACKGROUND
 
 	VAR_PRIVATE/next_tick = 0
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 8e5798cc37..89d686d90d 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -60,7 +60,7 @@ var/global/datum/controller/subsystem/ticker/ticker
 			"url" = get_world_url()
 		)
 	)
-	GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer
+	GLOB.autospeaker = new (null, FALSE, null, null, TRUE) //Set up Global Announcer
 	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/ticker/fire(resumed = FALSE)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 374c169a73..710ea14253 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -92,6 +92,7 @@
 // Other parameters are passed from New (excluding loc), this does not happen if mapload is TRUE
 // Must return an Initialize hint. Defined in code/__defines/subsystems.dm
 /atom/proc/Initialize(mapload, ...)
+	SHOULD_CALL_PARENT(TRUE)
 	if(QDELETED(src))
 		stack_trace("GC: -- [type] had initialize() called after qdel() --")
 	if(flags & ATOM_INITIALIZED)
diff --git a/code/game/atoms_movable_ch.dm b/code/game/atoms_movable_ch.dm
index c06ca53000..9cca867bd5 100644
--- a/code/game/atoms_movable_ch.dm
+++ b/code/game/atoms_movable_ch.dm
@@ -3,7 +3,7 @@
 	var/recursive_listeners
 	var/listening_recursive = NON_LISTENING_ATOM
 
-/atom/movable/New()
+/atom/movable/Initialize(mapload)
 	. = ..()
 	if (listening_recursive)
 		set_listening(listening_recursive)
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 3a5e7adf46..6824014d3b 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -747,7 +747,7 @@ var/global/datum/controller/occupations/job_master
 						confirm = tgui_alert(pred, "[C.prefs.real_name] is attempting to spawn into your [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
 				if(confirm != "Yes")
 					to_chat(C, span_warning("[pred] has declined your spawn request."))
-					var/message = sanitizeSafe(input(pred,"Do you want to leave them a message?")as text|null)
+					var/message = sanitizeSafe(tgui_input_text(pred,"Do you want to leave them a message?", "Notify Prey"))
 					if(message)
 						to_chat(C, span_notice("[pred] message : [message]"))
 					return
@@ -824,7 +824,7 @@ var/global/datum/controller/occupations/job_master
 						confirm = tgui_alert(prey, "[C.prefs.real_name] is attempting to televore you into their [vore_spawn_gut]. Let them?", "Confirm", list("No", "Yes"))
 				if(confirm != "Yes")
 					to_chat(C, span_warning("[prey] has declined your spawn request."))
-					var/message = sanitizeSafe(input(prey,"Do you want to leave them a message?")as text|null)
+					var/message = sanitizeSafe(tgui_input_text(prey,"Do you want to leave them a message?", "Notify Pred"))
 					if(message)
 						to_chat(C, span_notice("[prey] message : [message]"))
 					return
@@ -908,7 +908,7 @@ var/global/datum/controller/occupations/job_master
 					var/confirm = tgui_alert(carrier, "[C.prefs.real_name] is attempting to join as the [item_name] in your possession.", "Confirm", list("No", "Yes"))
 					if(confirm != "Yes")
 						to_chat(C, span_warning("[carrier] has declined your spawn request."))
-						var/message = sanitizeSafe(input(carrier,"Do you want to leave them a message?")as text|null)
+						var/message = sanitizeSafe(tgui_input_text(carrier,"Do you want to leave them a message?", "Notify Spawner"))
 						if(message)
 							to_chat(C, span_notice("[carrier] message : [message]"))
 						return
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 220c516e6e..6bf137a670 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -179,7 +179,7 @@
 					if(open_for_latejoin)
 						empty_playable_ai_cores += D
 				else
-					var/mob/living/silicon/ai/A = new /mob/living/silicon/ai ( loc, laws, brain )
+					var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, FALSE, laws, brain)
 					if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created
 						A.rename_self("ai", 1)
 						for(var/datum/language/L in brain.brainmob.languages)
diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm
index 55c5d751d9..a3c6d9c827 100644
--- a/code/game/machinery/computer3/computers/card.dm
+++ b/code/game/machinery/computer3/computers/card.dm
@@ -191,7 +191,7 @@
 /datum/file/program/card_comp/proc/authenticate()
 	if(access_change_ids in reader.GetAccess())
 		return 1
-	if(istype(usr,/mob/living/silicon/ai))
+	if(isAI(usr))
 		return 1
 	return 0
 
diff --git a/code/game/machinery/event/christmas_ch.dm b/code/game/machinery/event/christmas_ch.dm
index 184706c4f2..850346b063 100644
--- a/code/game/machinery/event/christmas_ch.dm
+++ b/code/game/machinery/event/christmas_ch.dm
@@ -8,12 +8,11 @@
 	anchored = 1.0
 	density = 0
 
-/obj/structure/event/present/New()
-	..()
+/obj/structure/event/present/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(-10,10)
 	pixel_y = rand(-10,10)
 	icon_state = "gift[pick("1", "2", "3")]_[pick("g", "r", "b", "y", "p")]"
-	return
 
 /obj/structure/event/santa_sack
 
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index e3031bffcf..3a1f6a08ca 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -40,7 +40,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED
 	var/power_per_hologram = 500 //per usage per hologram
 	idle_power_usage = 5
 	use_power = USE_POWER_IDLE
-	var/list/mob/living/silicon/ai/masters = new() //List of AIs that use the holopad
+	var/list/mob/living/silicon/ai/masters = list() //List of AIs that use the holopad
 	var/last_request = 0 //to prevent request spam. ~Carn
 	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
 
diff --git a/code/game/machinery/upgrade_machinery.dm b/code/game/machinery/upgrade_machinery.dm
deleted file mode 100644
index 110832244d..0000000000
--- a/code/game/machinery/upgrade_machinery.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-// Handles automagically upgrades to machines based on components placed on a machine during map init
-/obj/machinery/Initialize(mapload)
-	. = ..()
-	// Handles automagically upgrades to machines based on components placed on a machine during map init
-	if(mapload)
-		spawn(100)
-			// Sanity checks
-			if(!QDELETED(src) && isturf(loc))
-				handle_mapped_upgrades()
-// This is meant to be overridden per machine
-/obj/machinery/proc/handle_mapped_upgrades()
-	return
-// Each machine is a special snowflake... sadly.
-/obj/machinery/power/smes/buildable/handle_mapped_upgrades()
-	// Detect new coils placed by mappers
-	var/list/parts_found = list()
-	for(var/i = 1, i <= loc.contents.len, i++)
-		var/obj/item/W = loc.contents[i]
-		if(istype(W, /obj/item/smes_coil))
-			parts_found.Add(W)
-	// If any coils are on us, clear base coils and rebuild using these ones
-	if(parts_found.len == 0)
-		return
-	while(TRUE)
-		var/obj/item/smes_coil/C = locate(/obj/item/smes_coil) in component_parts
-		if(isnull(C))
-			break
-		component_parts.Remove(C)
-		C.forceMove(src.loc)
-		qdel(C)
-		cur_coils--
-	// Rebuild from mapper's coils
-	for(var/i = 1, i <= parts_found.len, i++)
-		if (cur_coils < max_coils)
-			var/obj/item/W = parts_found[i]
-			cur_coils++
-			component_parts.Add(W)
-			W.forceMove(src)
-	RefreshParts()
diff --git a/code/game/machinery/vending_yw.dm b/code/game/machinery/vending_yw.dm
index 7ef45112d2..4feb714428 100644
--- a/code/game/machinery/vending_yw.dm
+++ b/code/game/machinery/vending_yw.dm
@@ -1,7 +1,7 @@
-/obj/machinery/vending/cigarette/New()
+/obj/machinery/vending/cigarette/Initialize(mapload)
 	products += list(/obj/item/storage/fancy/cigarettes/yw/mauser = 5)
 	prices += list(/obj/item/storage/fancy/cigarettes/yw/mauser = 18)
-	..()
+	. = ..()
 
 /obj/machinery/vending/food/prison
 	name = "Prison Nutriment Vendor"
diff --git a/code/game/mecha/mecha_parts_ch.dm b/code/game/mecha/mecha_parts_ch.dm
index 27367c6493..90b5418221 100644
--- a/code/game/mecha/mecha_parts_ch.dm
+++ b/code/game/mecha/mecha_parts_ch.dm
@@ -3,8 +3,8 @@
 	icon = 'icons/mecha/mech_construct_ch.dmi'
 	icon_state = "scarab_chassis"
 
-/obj/item/mecha_parts/chassis/scarab/New()
-	..()
+/obj/item/mecha_parts/chassis/scarab/Initialize(mapload)
+	. = ..()
 	construct = new /datum/construction/mecha/scarab_chassis(src)
 
 /obj/item/mecha_parts/part/scarab_torso
diff --git a/code/game/objects/effects/decals/Cleanable/vore.dm b/code/game/objects/effects/decals/Cleanable/vore.dm
index 904eed546c..6378cfb4b5 100644
--- a/code/game/objects/effects/decals/Cleanable/vore.dm
+++ b/code/game/objects/effects/decals/Cleanable/vore.dm
@@ -13,7 +13,8 @@
 	var/custombasedesc = null
 	var/custombasecolor = null
 
-/obj/effect/decal/cleanable/blood/reagent/New(var/spill_name, var/spill_color, var/spill_reagentid, var/new_amount, var/ckey_user, var/ckey_spawn)
+/obj/effect/decal/cleanable/blood/reagent/Initialize(mapload, var/spill_name, var/spill_color, var/spill_reagentid, var/new_amount, var/ckey_user, var/ckey_spawn)
+	. = ..()
 	switch(spill_reagentid)	//To ensure that if people spill some liquids, it wont cause issues with spawning, like spilling blood. Also allow for spilling of certain things to
 		if("blood")
 			return
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 2f0afcffca..e76574afe6 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -18,14 +18,14 @@
 
 	var/poster_type = /obj/structure/sign/poster
 
-/obj/item/contraband/poster/New(turf/loc, var/given_serial = 0)
+/obj/item/contraband/poster/Initialize(mapload, var/given_serial = 0)
 	if(!serial_number)
 		if(given_serial == 0)
 			serial_number = rand(1, poster_designs.len)
 		else
 			serial_number = given_serial
 	name += " - No. [serial_number]"
-	..(loc)
+	. = ..()
 
 //Places the poster on a wall
 /obj/item/contraband/poster/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
@@ -83,12 +83,12 @@
 	icon_state = "rolled_poster_nt"
 	poster_type = /obj/structure/sign/poster/nanotrasen
 
-/obj/item/contraband/poster/nanotrasen/New(turf/loc, var/given_serial = 0)
+/obj/item/contraband/poster/nanotrasen/Initialize(mapload, var/given_serial = 0)
 	if(given_serial == 0)
 		serial_number = rand(1, NT_poster_designs.len)
 	else
 		serial_number = given_serial
-	..(loc)
+	. = ..()
 
 //Selectable subtype
 /obj/item/contraband/poster/custom
@@ -96,12 +96,12 @@
 	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. This one is made from some kind of e-paper, and could display almost anything!"
 	poster_type = /obj/structure/sign/poster/custom
 
-/obj/item/contraband/poster/custom/New(turf/loc, var/given_serial = 0)
+/obj/item/contraband/poster/custom/Initialize(mapload, var/given_serial = 0)
 	if(given_serial == 0)
 		serial_number = 1 //Decidedly unrandom
 	else
 		serial_number = given_serial
-	..(loc)
+	. = ..()
 
 /obj/item/contraband/poster/custom/verb/select_poster()
 	set name = "Set Poster type"
@@ -137,8 +137,8 @@
 	var/roll_type
 	var/poster_set = FALSE
 
-/obj/structure/sign/poster/New(var/newloc, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster)
-	..(newloc)
+/obj/structure/sign/poster/Initialize(mapload, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster)
+	. = ..()
 
 	if(!serial)
 		serial = rand(1, poster_designs.len) //use a random serial if none is given
@@ -226,7 +226,7 @@
 /obj/structure/sign/poster/nanotrasen
 	roll_type = /obj/item/contraband/poster/nanotrasen
 
-/obj/structure/sign/poster/nanotrasen/New(var/newloc, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster/nanotrasen)
+/obj/structure/sign/poster/nanotrasen/Initialize(mapload, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster/nanotrasen)
 	if(!serial)
 		serial = rand(1, NT_poster_designs.len)
 
@@ -234,7 +234,7 @@
 	var/datum/poster/design = NT_poster_designs[serial_number]
 	set_poster(design)
 
-	..(newloc, placement_dir, serial, itemtype)
+	. = ..(mapload, placement_dir, serial, itemtype)
 
 //Non-Random Posters
 
diff --git a/code/game/objects/effects/effect_system_ch.dm b/code/game/objects/effects/effect_system_ch.dm
index b110e1dd9c..1378498748 100644
--- a/code/game/objects/effects/effect_system_ch.dm
+++ b/code/game/objects/effects/effect_system_ch.dm
@@ -14,12 +14,10 @@
 	var/amount = 6.0
 	var/time_to_live = 500
 
-/obj/effect/effect/confetti/New()
-	..()
+/obj/effect/effect/confetti/Initialize(mapload)
+	. = ..()
 	if(time_to_live)
-		spawn (time_to_live)
-			if(!QDELETED(src))
-				qdel(src)
+		QDEL_IN(src, time_to_live)
 				//make confetti on ground cleanable decal to spawn
 
 /datum/effect/effect/system/confetti_spread
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 0610357033..735587bd37 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -88,13 +88,13 @@
 			delete_me = TRUE
 		//VORE Station Add End
 
-	landmarks_list += src
-
 	if(delete_me)
 		return INITIALIZE_HINT_QDEL
+	else
+		landmarks_list += src
 
 /obj/effect/landmark/Destroy(var/force = FALSE)
-	if(delete_me || force)
+	if(force)
 		landmarks_list -= src
 		return ..()
 	return QDEL_HINT_LETMELIVE
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 14fd9fe349..9f40bbca89 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -44,14 +44,14 @@
 	name = "TTV bomb - proximity"
 	assembly_type = /obj/item/assembly/prox_sensor
 
-/obj/effect/spawner/newbomb/radio/custom/New(var/newloc, ph, ox, co)
+/obj/effect/spawner/newbomb/radio/custom/Initialize(mapload, ph, ox, co)
 	if(ph != null) phoron_amt = ph
 	if(ox != null) oxygen_amt = ox
 	if(co != null) carbon_amt = co
-	..()
+	. = ..()
 
 /obj/effect/spawner/newbomb/Initialize(mapload)
-	..()
+	. = ..()
 	var/obj/item/transfer_valve/V = new(src.loc)
 	var/obj/item/tank/phoron/PT = new(V)
 	var/obj/item/tank/oxygen/OT = new(V)
@@ -100,8 +100,8 @@
 	var/phoron_amt = 0
 	var/oxygen_amt = 0
 
-/obj/effect/spawner/onetankbomb/New(newloc) //just needs an assembly.
-	..(newloc)
+/obj/effect/spawner/onetankbomb/Initialize(mapload) //just needs an assembly.
+	. = ..()
 
 	var/type = pick(/obj/item/tank/phoron/onetankbomb, /obj/item/tank/oxygen/onetankbomb)
 	new type(src.loc)
@@ -116,8 +116,8 @@
 //	var/assembly_type = /obj/item/assembly/signaler
 
 	//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
-/obj/effect/spawner/onetankbomb/full/New(newloc) //just needs an assembly.
-	..(newloc)
+/obj/effect/spawner/onetankbomb/full/Initialize(mapload) //just needs an assembly.
+	. = ..()
 
 	var/type = pick(/obj/item/tank/phoron/onetankbomb/full, /obj/item/tank/oxygen/onetankbomb/full)
 	new type(src.loc)
@@ -132,8 +132,8 @@
 //	var/assembly_type = /obj/item/assembly/signaler
 
 	//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
-/obj/effect/spawner/onetankbomb/full/New(newloc) //just needs an assembly.
-	..(newloc)
+/obj/effect/spawner/onetankbomb/full/Initialize(mapload) //just needs an assembly.
+	. = ..()
 
 	var/type = pick(/obj/item/tank/phoron/onetankbomb/full, /obj/item/tank/oxygen/onetankbomb/full)
 	new type(src.loc)
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 25a6bba618..dc6a141bf9 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -285,7 +285,7 @@ But for now, for what it's been used for, it works.
 			return
 	if(Mtarget)
 		H.forceMove(Mtarget.loc)
-	var/obj/locker = new /obj/structure/closet/secure_closet/mind(target.loc, mind_target = H.mind)
+	var/obj/locker = new /obj/structure/closet/secure_closet/mind(target.loc, H.mind)
 	for(var/obj/item/W in H)
 		if(istype(W, /obj/item/implant/backup || istype(W, /obj/item/nif)))
 			continue
@@ -343,5 +343,6 @@ But for now, for what it's been used for, it works.
 	name = "Autostrip target to send mobs to."
 
 /obj/effect/autostriptarget/mob/Initialize(mapload)
+	. = ..()
 	if(targetid)
 		GLOB.mapped_autostrips_mob[targetid] = src
diff --git a/code/game/objects/items/devices/communicator/cartridge.dm b/code/game/objects/items/devices/communicator/cartridge.dm
index 5910b76849..e4e767ca1a 100644
--- a/code/game/objects/items/devices/communicator/cartridge.dm
+++ b/code/game/objects/items/devices/communicator/cartridge.dm
@@ -398,9 +398,9 @@
 	name = "\improper BreatheDeep cartridge"
 	icon_state = "cart-a"
 
-/obj/item/commcard/atmos/New()
-	..()
-	internal_devices |= new /obj/item/analyzer(src)
+/obj/item/commcard/atmos/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/analyzer(src)
 
 
 // Medical Cartridge:
@@ -414,10 +414,10 @@
 	icon_state = "cart-m"
 	ui_templates = list(list("name" = "Medical Records", "template" = "med_records.tmpl"))
 
-/obj/item/commcard/medical/New()
-	..()
-	internal_devices |= new /obj/item/healthanalyzer(src)
-	internal_devices |= new /obj/item/halogen_counter(src)
+/obj/item/commcard/medical/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/healthanalyzer(src)
+	internal_devices += new /obj/item/halogen_counter(src)
 
 /obj/item/commcard/medical/get_data()
 	return list(list("field" = "med_records", "value" = get_med_records()))
@@ -434,9 +434,9 @@
 	name = "\improper ChemWhiz cartridge"
 	icon_state = "cart-chem"
 
-/obj/item/commcard/medical/chemistry/New()
-	..()
-	internal_devices |= new /obj/item/reagent_scanner(src)
+/obj/item/commcard/medical/chemistry/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/reagent_scanner(src)
 
 
 // Detective Cartridge:
@@ -526,9 +526,9 @@
 			list("name" = "Integrated Signaler Control", "template" = "signaler_access.tmpl")
 		)
 
-/obj/item/commcard/signal/New()
-	..()
-	internal_devices |= new /obj/item/assembly/signaler(src)
+/obj/item/commcard/signal/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/assembly/signaler(src)
 
 /obj/item/commcard/signal/get_data()
 	return list(
@@ -549,10 +549,10 @@
 	icon_state = "cart-tox"
 	// UI templates inherited
 
-/obj/item/commcard/signal/science/New()
-	..()
-	internal_devices |= new /obj/item/reagent_scanner(src)
-	internal_devices |= new /obj/item/analyzer(src)
+/obj/item/commcard/signal/science/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/reagent_scanner(src)
+	internal_devices += new /obj/item/analyzer(src)
 
 
 // Supply Cartridge:
@@ -566,8 +566,8 @@
 			list("name" = "Supply Records", "template" = "supply_records.tmpl")
 		)
 
-/obj/item/commcard/supply/New()
-	..()
+/obj/item/commcard/supply/Initialize(mapload)
+	. = ..()
 	internal_data["supply_category"] = null
 	internal_data["supply_controls"] = FALSE // Cannot control the supply shuttle, cannot accept orders
 	internal_data["supply_pack_expanded"] = list()
@@ -610,8 +610,8 @@
 			list("name" = "Employment Records", "template" = "emp_records.tmpl")
 		)
 
-/obj/item/commcard/head/New()
-	..()
+/obj/item/commcard/head/Initialize(mapload)
+	. = ..()
 	internal_data["stat_display_line1"] = null
 	internal_data["stat_display_line2"] = null
 	internal_data["stat_display_active1"] = null
@@ -730,11 +730,11 @@
 			list("name" = "Integrated Signaler Control", "template" = "signaler_access.tmpl")
 		)
 
-/obj/item/commcard/head/rd/New()
-	..()
-	internal_devices |= new /obj/item/analyzer(src)
-	internal_devices |= new /obj/item/reagent_scanner(src)
-	internal_devices |= new /obj/item/assembly/signaler(src)
+/obj/item/commcard/head/rd/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/analyzer(src)
+	internal_devices += new /obj/item/reagent_scanner(src)
+	internal_devices += new /obj/item/assembly/signaler(src)
 
 /obj/item/commcard/head/rd/get_data()
 	var/list/data = ..()
@@ -761,11 +761,11 @@
 			list("name" = "Medical Records", "template" = "med_records.tmpl")
 		)
 
-/obj/item/commcard/head/cmo/New()
-	..()
-	internal_devices |= new /obj/item/healthanalyzer(src)
-	internal_devices |= new /obj/item/reagent_scanner(src)
-	internal_devices |= new /obj/item/halogen_counter(src)
+/obj/item/commcard/head/cmo/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/healthanalyzer(src)
+	internal_devices += new /obj/item/reagent_scanner(src)
+	internal_devices += new /obj/item/halogen_counter(src)
 
 /obj/item/commcard/head/cmo/get_data()
 	var/list/data = ..()
@@ -845,13 +845,13 @@
 			list("name" = "Integrated Signaler Control", "template" = "signaler_access.tmpl")
 		)
 
-/obj/item/commcard/head/captain/New()
-	..()
-	internal_devices |= new /obj.item/analyzer(src)
-	internal_devices |= new /obj/item/healthanalyzer(src)
-	internal_devices |= new /obj/item/reagent_scanner(src)
-	internal_devices |= new /obj/item/halogen_counter(src)
-	internal_devices |= new /obj/item/assembly/signaler(src)
+/obj/item/commcard/head/captain/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj.item/analyzer(src)
+	internal_devices += new /obj/item/healthanalyzer(src)
+	internal_devices += new /obj/item/reagent_scanner(src)
+	internal_devices += new /obj/item/halogen_counter(src)
+	internal_devices += new /obj/item/assembly/signaler(src)
 
 /obj/item/commcard/head/captain/get_data()
 	var/list/data = ..()
@@ -943,9 +943,9 @@
 			list("name" = "Integrated GPS", "template" = "gps_access.tmpl")
 		)
 
-/obj/item/commcard/explorer/New()
-	..()
-	internal_devices |= new /obj/item/gps/explorer(src)
+/obj/item/commcard/explorer/Initialize(mapload)
+	. = ..()
+	internal_devices += new /obj/item/gps/explorer(src)
 
 /obj/item/commcard/explorer/get_data()
 	var/list/GPS = get_GPS_lists()
diff --git a/code/game/objects/items/devices/e_beacon.dm b/code/game/objects/items/devices/e_beacon.dm
index 54fc2ed305..9cf9c06a23 100644
--- a/code/game/objects/items/devices/e_beacon.dm
+++ b/code/game/objects/items/devices/e_beacon.dm
@@ -9,7 +9,8 @@
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'
 
-/obj/item/emergency_beacon/New()
+/obj/item/emergency_beacon/Initialize(mapload)
+	. = ..()
 	gps = new/obj/item/gps/emergency_beacon(src)
 
 /obj/item/gps/emergency_beacon
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 5d54a5c10c..d64c4880b1 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -50,11 +50,11 @@
 /obj/item/radio/headset/handle_message_mode(mob/living/M as mob, list/message_pieces, channel)
 	if(channel == "special")
 		if(translate_binary)
-			var/datum/language/binary = GLOB.all_languages["Robot Talk"]
+			var/datum/language/binary = GLOB.all_languages[LANGUAGE_ROBOT_TALK]
 			binary.broadcast(M, M.strip_prefixes(multilingual_to_message(message_pieces)))
 			return RADIO_CONNECTION_NON_SUBSPACE
 		if(translate_hive)
-			var/datum/language/hivemind = GLOB.all_languages["Hivemind"]
+			var/datum/language/hivemind = GLOB.all_languages[LANGUAGE_HIVEMIND]
 			hivemind.broadcast(M, M.strip_prefixes(multilingual_to_message(message_pieces)))
 			return RADIO_CONNECTION_NON_SUBSPACE
 		return RADIO_CONNECTION_FAIL
diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm
index 30aa888cfa..46059b082f 100644
--- a/code/game/objects/items/devices/tvcamera.dm
+++ b/code/game/objects/items/devices/tvcamera.dm
@@ -178,8 +178,8 @@
 	var/datum/weakref/showing
 	var/showing_name
 
-/obj/item/clothing/accessory/bodycam/New()
-	..()
+/obj/item/clothing/accessory/bodycam/Initialize(mapload)
+	. = ..()
 	listening_objects += src
 
 /obj/item/clothing/accessory/bodycam/Destroy()
diff --git a/code/game/objects/items/falling_object_attack_vr.dm b/code/game/objects/items/falling_object_attack_vr.dm
index bfd9dc22dd..b9537f7ca0 100644
--- a/code/game/objects/items/falling_object_attack_vr.dm
+++ b/code/game/objects/items/falling_object_attack_vr.dm
@@ -7,6 +7,7 @@
 	icon_state = "drop_marker"
 
 /obj/effect/calldown_attack/Initialize(mapload)
+	. = ..()
 	var/delay = rand(25, 30)
 	addtimer(CALLBACK(src, PROC_REF(spawn_object)), delay-7)
 
@@ -26,7 +27,7 @@
 	icon = 'icons/effects/random_stuff_vr.dmi'
 
 /obj/effect/illusionary_fall/Initialize(mapload)
-	.=..()
+	. = ..()
 	icon_state = "[rand(1,33)]"
 
 /obj/effect/illusionary_fall/end_fall(var/crushing = FALSE)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 77a550ee3d..7c5d4bc617 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -192,7 +192,7 @@
 					to_chat(user, span_warning("This [W] does not seem to fit."))
 					return
 
-			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1)
+			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), FALSE, TRUE)
 			if(!O)	return
 
 			user.drop_item()
diff --git a/code/game/objects/items/stacks/tiles/tile_types_ch.dm b/code/game/objects/items/stacks/tiles/tile_types_ch.dm
index ccc0d06e0c..963cfcc53f 100644
--- a/code/game/objects/items/stacks/tiles/tile_types_ch.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types_ch.dm
@@ -3,15 +3,14 @@
 
 //^Does the bug this comment refers to even exist anymore. idk.
 
-/obj/item/stack/tile/New()
-	..()
+/obj/item/stack/tile/Initialize(mapload)
+	. = ..()
 
 	if(!default_type)
 		default_type = DEFAULT_WALL_MATERIAL
 	material = get_material_by_name("[default_type]")
 	if(!material)
-		qdel(src)
-		return 0
+		return INITIALIZE_HINT_QDEL
 
 	//recipes = material.get_recipes()	No.
 	stacktype = material.stack_type
@@ -25,7 +24,6 @@
 		flags |= NOCONDUCT
 
 	//matter = material.get_matter()	Bad.
-	return 1
 
 
 /obj/item/stack/material/get_material()
diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
index fdaf446bf2..dddc51b85e 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
@@ -50,8 +50,8 @@
 	board_type = new /datum/frame/frame_types/display
 	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
 
-/obj/item/circuitboard/security/telescreen/bodycamera/New()
-	..()
+/obj/item/circuitboard/security/telescreen/bodycamera/Initialize(mapload)
+	. = ..()
 	network = NETWORK_BODYCAM
 // CHOMPEdit End
 
diff --git a/code/game/objects/items/weapons/gift_wrappaper_ch.dm b/code/game/objects/items/weapons/gift_wrappaper_ch.dm
index a3d2373e02..3fb9031b90 100644
--- a/code/game/objects/items/weapons/gift_wrappaper_ch.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper_ch.dm
@@ -11,15 +11,14 @@
 	plane = ABOVE_MOB_PLANE
 	var/chaos
 
-/obj/item/a_gift/advanced/New()
-	..()
+/obj/item/a_gift/advanced/Initialize(mapload)
+	. = ..()
 	icon_state += "_[pick("g","r","b","y","p")]"
 	if(prob(1))
 		icon_state = "chomp_present_chaos"
 		chaos = TRUE
 		name = "chaotic present"
 		desc = "The casino dev messed up and gave you the wrong present! This one pulses with potential for good or evil!"
-	return
 
 /obj/item/a_gift/advanced/attack_self(mob/M as mob) //WIP - ALWAYS add more items to list! - Jack
 	var/gift_type_advanced = pick(
diff --git a/code/game/objects/items/weapons/manuals_ch.dm b/code/game/objects/items/weapons/manuals_ch.dm
index 0c6f7d4921..da885d4120 100644
--- a/code/game/objects/items/weapons/manuals_ch.dm
+++ b/code/game/objects/items/weapons/manuals_ch.dm
@@ -5,9 +5,6 @@
 	icon = 'icons/obj/library.dmi'
 	author = "NanoTrasen"
 	title = "Chemical Recipes and Refreshers"
-
-/obj/item/book/manual/chemistry_guide/New()
-	..()
 	dat = {"
 				<head>
 				<style>
diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm
index 445820d220..f8023ae8e3 100644
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -37,7 +37,8 @@
 	light_impact = 7
 	flash_range = 7
 
-/obj/item/syndie/c4explosive/New()
+/obj/item/syndie/c4explosive/Initialize(mapload)
+	. = ..()
 	var/K = rand(1,2000)
 	K = md5(num2text(K)+name)
 	K = copytext(K,1,7)
@@ -51,8 +52,11 @@
 	playsound(src, 'sound/weapons/armbomb.ogg', 75, 1)
 	for(var/mob/O in hearers(src, null))
 		O.show_message("[icon2html(src, O.client)] " + span_warning(" The [src.name] beeps!"))
-	sleep(50)
-	explosion(get_turf(src), devastate, heavy_impact, light_impact, flash_range)
+	addtimer(CALLBACK(src, PROC_REF(do_detonate)), 5 SECONDS, TIMER_DELETE_ME)
+
+/obj/item/syndie/c4explosive/proc/do_detonate()
+	SHOULD_NOT_OVERRIDE(TRUE)
+	PRIVATE_PROC(TRUE)
 	for(var/dirn in cardinal)		//This is to guarantee that C4 at least breaks down all immediately adjacent walls and doors.
 		var/turf/simulated/wall/T = get_step(src,dirn)
 		if(locate(/obj/machinery/door/airlock) in T)
diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm
index 56318a0aae..97e9cc2eb1 100644
--- a/code/game/objects/mob_spawner_vr.dm
+++ b/code/game/objects/mob_spawner_vr.dm
@@ -136,8 +136,8 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	var/datum/proximity_monitor/mobspawner/prox
 	var/list/mobs_in_range = list()
 
-/obj/structure/mob_spawner/scanner/New()
-	..()
+/obj/structure/mob_spawner/scanner/Initialize(mapload)
+	. = ..()
 	prox = new(src, range)
 
 //CHOMPEdit Start
diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm
index 0883fd26ad..209cc0cf79 100644
--- a/code/game/objects/structures/barricades.dm
+++ b/code/game/objects/structures/barricades.dm
@@ -10,14 +10,13 @@
 	var/maxhealth = 100
 	var/datum/material/material
 
-/obj/structure/barricade/New(var/newloc, var/material_name)
-	..(newloc)
+/obj/structure/barricade/Initialize(mapload, var/material_name)
+	. = ..()
 	if(!material_name)
 		material_name = MAT_WOOD
 	material = get_material_by_name("[material_name]")
 	if(!material)
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	name = "[material.display_name] barricade"
 	desc = "This space is blocked off by a barricade made of [material.display_name]."
 	color = material.icon_colour
@@ -116,16 +115,11 @@
 	icon = 'icons/obj/sandbags.dmi'
 	icon_state = "blank"
 
-/obj/structure/barricade/sandbag/New(var/newloc, var/material_name)
+/obj/structure/barricade/sandbag/Initialize(mapload, var/material_name)
 	if(!material_name)
 		material_name = MAT_CLOTH
-	..(newloc, material_name)
-	material = get_material_by_name("[material_name]")
-	if(!material)
-		qdel(src)
-		return
+	. = ..(mapload, material_name)
 	name = "[material.display_name] [initial(name)]"
-	desc = "This space is blocked off by a barricade made of [material.display_name]."
 	color = null
 	maxhealth = material.integrity * 2	// These things are, commonly, used to stop bullets where possible.
 	health = maxhealth
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 819ab5c39f..2e6503acd9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -49,15 +49,13 @@
 		else
 			add_overlay("open")
 
-//VOREStation Add Start
 /obj/structure/closet/secure_closet/guncabinet/excursion
 	name = "expedition weaponry cabinet"
 	req_one_access = list(access_explorer,access_armory) //CHOMP keep explo
 
-/obj/structure/closet/secure_closet/guncabinet/excursion/New()
-	..()
+/obj/structure/closet/secure_closet/guncabinet/excursion/Initialize(mapload)
+	. = ..()
 	for(var/i = 1 to 2)
 		new /obj/item/gun/energy/locked/frontier(src)
 	for(var/i = 1 to 2)
 		new /obj/item/gun/energy/locked/frontier/holdout(src)
-//VOREStation Add End
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 1b113c34b0..a6667eb254 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -164,8 +164,8 @@
 	var/self_del = 1
 	anchored = 0
 
-/obj/structure/closet/secure_closet/mind/New(var/datum/mind/mind_target, var/del_self = 1)
-	.=..()
+/obj/structure/closet/secure_closet/mind/Initialize(mapload, var/datum/mind/mind_target, var/del_self = 1)
+	. = ..()
 	self_del = del_self
 	if(mind_target)
 		owner = mind_target
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 9f948265fd..f4926d1ed3 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -13,7 +13,8 @@
 	var/intialOxy = 0
 	var/timer = 240 //eventually the person will be freed
 
-/obj/structure/closet/statue/New(loc, var/mob/living/L)
+/obj/structure/closet/statue/Initialize(mapload, var/mob/living/L)
+	. = ..()
 	if(L && (ishuman(L) || L.isMonkey() || iscorgi(L)))
 		if(L.buckled)
 			L.buckled = 0
@@ -41,11 +42,9 @@
 			desc = "If it takes forever, I will wait for you..."
 
 	if(health == 0) //meaning if the statue didn't find a valid target
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 
 	START_PROCESSING(SSobj, src)
-	..()
 
 /obj/structure/closet/statue/process()
 	timer--
diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm
index a0e47c1c76..ef2fb0fd60 100644
--- a/code/game/objects/structures/droppod.dm
+++ b/code/game/objects/structures/droppod.dm
@@ -13,16 +13,14 @@
 /obj/structure/drop_pod/polite
 	polite = TRUE
 
-/obj/structure/drop_pod/New(newloc, atom/movable/A, auto_open = FALSE)
-	..()
+/obj/structure/drop_pod/Initialize(mapload, atom/movable/A, auto_open = FALSE)
+	. = ..()
 	if(A)
 		A.forceMove(src) // helo
 		podfall(auto_open)
 		air = new(1000)
 
 /obj/structure/drop_pod/proc/podfall(auto_open)
-	set waitfor = FALSE // sleeping in new otherwise
-
 	var/turf/T = get_turf(src)
 	if(!T)
 		warning("Drop pod wasn't spawned on a turf")
@@ -36,9 +34,11 @@
 	for(var/turf/TN in turfs_nearby)
 		new /obj/effect/temporary_effect/shuttle_landing(TN)
 
-	// Wait a minute
-	sleep(4 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(do_fall), auto_open, T), 4 SECONDS, TIMER_DELETE_ME)
 
+/obj/structure/drop_pod/proc/do_fall(auto_open, turf/T)
+	SHOULD_NOT_OVERRIDE(TRUE)
+	PRIVATE_PROC(TRUE)
 	// Wheeeeeee
 	plane = ABOVE_PLANE
 	pixel_y = 300
@@ -49,10 +49,18 @@
 	animate(src, alpha = 255, time = 1 SECOND, flags = ANIMATION_PARALLEL)
 	filters += filter(type="drop_shadow", x=-64, y=100, size=10)
 	animate(filters[filters.len], x=0, y=0, size=0, time=3 SECONDS, flags=ANIMATION_PARALLEL, easing=SINE_EASING|EASE_OUT)
-	sleep(2 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(after_fall), auto_open, T), 2 SECONDS, TIMER_DELETE_ME)
+
+/obj/structure/drop_pod/proc/after_fall(auto_open, turf/T)
+	SHOULD_NOT_OVERRIDE(TRUE)
+	PRIVATE_PROC(TRUE)
 	new /obj/effect/effect/smoke(T)
 	T.hotspot_expose(900)
-	sleep(1 SECOND)
+	addtimer(CALLBACK(src, PROC_REF(on_impact), auto_open, T), 1 SECOND, TIMER_DELETE_ME)
+
+/obj/structure/drop_pod/proc/on_impact(auto_open, turf/T)
+	SHOULD_NOT_OVERRIDE(TRUE)
+	PRIVATE_PROC(TRUE)
 	filters = null
 
 	// CRONCH
@@ -78,14 +86,14 @@
 	icon_state = "[initial(icon_state)]"
 
 	if(auto_open)
-		sleep(2 SECONDS)
-		open_pod()
-		visible_message("\The [src] pops open!")
+		addtimer(CALLBACK(src, PROC_REF(open_pod), TRUE), 2 SECONDS, TIMER_DELETE_ME)
 	else
 		for(var/mob/M in src)
 			to_chat(M, span_danger("You've landed! Open the hatch if you think it's safe! \The [src] has enough air to last for a while..."))
 
-/obj/structure/drop_pod/proc/open_pod()
+/obj/structure/drop_pod/proc/open_pod(dropped)
+	if(dropped)
+		visible_message("\The [src] pops open!")
 	if(finished)
 		return
 	icon_state = "[initial(icon_state)]_open"
diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm
index c516e9a9ee..334ee23fe6 100644
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -272,8 +272,8 @@
 	pixel_y = -16
 	shake_animation_degrees = 2
 
-/obj/structure/flora/tree/winter/New()
-	..()
+/obj/structure/flora/tree/winter/Initialize(mapload)
+	. = ..()
 	icon_state = "[base_state][rand(1, 6)]"
 
 
@@ -289,8 +289,8 @@
 	pixel_y = -16
 	shake_animation_degrees = 2
 
-/obj/structure/flora/tree/winter1/New()
-	..()
+/obj/structure/flora/tree/winter1/Initialize(mapload)
+	. = ..()
 	icon_state = "[base_state][rand(1, 6)]"
 
 // Sif trees
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index d9a192039c..84c47d5e12 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -19,15 +19,18 @@
 	var/applies_material_colour = 1
 	var/wall_type = /turf/simulated/wall
 
-/obj/structure/girder/New(var/newloc, var/material_key)
-	..(newloc)
+/obj/structure/girder/Initialize(mapload, var/material_key)
+	. = ..()
 	if(!material_key)
 		material_key = default_material
-	set_material(material_key)
+	var/our_material = get_material_by_name(material_key)
+	if(!our_material)
+		return INITIALIZE_HINT_QDEL
+	set_material(our_material)
 	update_icon()
 
 /obj/structure/girder/Destroy()
-	if(girder_material.products_need_process())
+	if(girder_material && girder_material.products_need_process())
 		STOP_PROCESSING(SSobj, src)
 	. = ..()
 
@@ -45,10 +48,8 @@
 	return total_radiation
 
 
-/obj/structure/girder/proc/set_material(var/new_material)
-	girder_material = get_material_by_name(new_material)
-	if(!girder_material)
-		qdel(src)
+/obj/structure/girder/proc/set_material(var/datum/material/new_material)
+	girder_material = new_material
 	name = "[girder_material.display_name] [initial(name)]"
 	max_health = round(girder_material.integrity) //Should be 150 with default integrity (steel). Weaker than ye-olden Girders now.
 	health = max_health
@@ -75,8 +76,8 @@
 	health = 50
 	cover = 25
 
-/obj/structure/girder/displaced/New(var/newloc, var/material_key)
-	..(newloc, material_key)
+/obj/structure/girder/displaced/Initialize(mapload, material_key)
+	. = ..()
 	displace()
 
 /obj/structure/girder/proc/displace()
diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm
index bd642a6f8c..e376467ae9 100644
--- a/code/game/objects/structures/gravemarker.dm
+++ b/code/game/objects/structures/gravemarker.dm
@@ -19,14 +19,13 @@
 
 	var/datum/material/material
 
-/obj/structure/gravemarker/New(var/newloc, var/material_name)
-	..(newloc)
+/obj/structure/gravemarker/Initialize(mapload, var/material_name)
+	. = ..()
 	if(!material_name)
 		material_name = MAT_WOOD
 	material = get_material_by_name("[material_name]")
 	if(!material)
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	color = material.icon_colour
 
 /obj/structure/gravemarker/examine(mob/user)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 513cd6a026..fac255fda3 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -385,10 +385,9 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
 	var/callme = "pimpin' ride"	//how do people refer to it?
 
 
-/obj/structure/bed/chair/janicart/New()
+/obj/structure/bed/chair/janicart/Initialize(mapload, new_material, new_padding_material)
+	. = ..()
 	create_reagents(300)
-	update_layer()
-
 
 /obj/structure/bed/chair/janicart/examine(mob/user)
 	. = ..()
diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm
index 761dc3ca6f..2ee3f1fa65 100644
--- a/code/game/objects/structures/railing.dm
+++ b/code/game/objects/structures/railing.dm
@@ -22,8 +22,8 @@
 	icon_modifier = "grey_"
 	icon_state = "grey_railing0"
 
-/obj/structure/railing/New(loc, constructed = 0)
-	..()
+/obj/structure/railing/Initialize(mapload, constructed = 0)
+	. = ..()
 	// TODO - "constructed" is not passed to us. We need to find a way to do this safely.
 	if (constructed) // player-constructed railings
 		anchored = FALSE
diff --git a/code/game/objects/structures/simple_doors_vr.dm b/code/game/objects/structures/simple_doors_vr.dm
index e45608ca2c..033b86d430 100644
--- a/code/game/objects/structures/simple_doors_vr.dm
+++ b/code/game/objects/structures/simple_doors_vr.dm
@@ -1,5 +1,5 @@
 /datum/material/flockium
-	name = "flockium"
+	name = MAT_FLOKIUM
 	//stack_type = /obj/item/stack/material/sandstone
 	icon_base = "flock"
 	icon_reinf = "flock"
@@ -20,5 +20,5 @@
 	icon = 'icons/goonstation/featherzone.dmi'
 	icon_state = "flockdoor"
 
-/obj/structure/simple_door/flock/New(var/newloc, var/newmat)
-	..(newloc, "flockium")
+/obj/structure/simple_door/flock/Initialize(mapload, var/newmat)
+	. = ..(mapload, MAT_FLOKIUM)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 281e914f56..32b9fbd8c2 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -19,21 +19,20 @@ var/global/list/stool_cache = list() //haha stool
 /obj/item/stool/padded
 	icon_state = "stool_padded_preview" //set for the map
 
-/obj/item/stool/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc)
+/obj/item/stool/Initialize(mapload, var/new_material, var/new_padding_material)
+	. = ..()
 	if(!new_material)
 		new_material = MAT_STEEL
 	material = get_material_by_name(new_material)
 	if(new_padding_material)
 		padding_material = get_material_by_name(new_padding_material)
 	if(!istype(material))
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	force = round(material.get_blunt_damage()*0.4)
 	update_icon()
 
-/obj/item/stool/padded/New(var/newloc, var/new_material)
-	..(newloc, MAT_STEEL, MAT_CARPET)
+/obj/item/stool/padded/Initialize(mapload, var/new_material)
+	. = ..(mapload, MAT_STEEL, MAT_CARPET)
 
 /obj/item/stool/update_icon()
 	// Prep icon.
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
index b13b72bf03..6e9cfe35e9 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
@@ -15,5 +15,5 @@
 /obj/item/stool/baystool/padded
 	icon_state = "bar_stool_padded_preview" //set for the map
 
-/obj/item/stool/baystool/padded/New(var/newloc, var/new_material)
-	..(newloc, MAT_STEEL, MAT_CARPET)
+/obj/item/stool/baystool/padded/Initialize(mapload, var/new_material)
+	. = ..(mapload, MAT_STEEL, MAT_CARPET)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 702146f13a..74e70ff83e 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -32,8 +32,8 @@
 	secure = "secure_"
 	icon_state = "l_secure_windoor_assembly01"
 
-/obj/structure/windoor_assembly/New(Loc, start_dir=NORTH, constructed=0)
-	..()
+/obj/structure/windoor_assembly/Initialize(mapload, start_dir=NORTH, constructed=0)
+	. = ..()
 	if(constructed)
 		state = "01"
 		anchored = FALSE
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index c821cb3072..cec7c9a5d4 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -392,8 +392,8 @@
 	update_nearby_tiles(need_rebuild=1)
 	return
 
-/obj/structure/window/New(Loc, start_dir=null, constructed=0)
-	..()
+/obj/structure/window/Initialize(mapload, start_dir=null, constructed=0)
+	. = ..()
 
 	if (start_dir)
 		set_dir(start_dir)
diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
index 5f48a2e591..28ec32edc8 100644
--- a/code/game/turfs/flooring/flooring_decals.dm
+++ b/code/game/turfs/flooring/flooring_decals.dm
@@ -10,18 +10,12 @@ var/list/floor_decals = list()
 	layer = DECAL_LAYER
 	var/supplied_dir
 
-/obj/effect/floor_decal/New(var/newloc, var/newdir, var/newcolour)
+/obj/effect/floor_decal/Initialize(mapload, var/newdir, var/newcolour)
 	supplied_dir = newdir
 	if(newcolour)
 		color = newcolour
-	..(newloc)
-
-// TODO: identify what is causing these atoms to be qdeleted in New()/Initialize(mapload)
-// somewhere in this chain. Alternatively repath to /obj/floor_decal or some other
-// abstract handler that explicitly doesn't invoke any obj behavior.
-/obj/effect/floor_decal/Initialize(mapload)
 	add_to_turf_decals()
-	flags |= ATOM_INITIALIZED
+	..()
 	return INITIALIZE_HINT_QDEL
 
 // This is a separate proc from initialize() to facilitiate its caching and other stuff.  Look into it someday.
@@ -632,9 +626,9 @@ var/list/floor_decals = list()
 	name = "random asteroid rubble"
 	icon_state = "asteroid0"
 
-/obj/effect/floor_decal/asteroid/New()
+/obj/effect/floor_decal/asteroid/Initialize(mapload, newdir, newcolour)
 	icon_state = "asteroid[rand(0,9)]"
-	..()
+	. = ..()
 
 /obj/effect/floor_decal/chapel
 	name = "chapel"
diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm
index 6187beccc9..aa0b47b23a 100644
--- a/code/game/turfs/simulated/fancy_shuttles.dm
+++ b/code/game/turfs/simulated/fancy_shuttles.dm
@@ -25,7 +25,8 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
 	var/icon/split_icon
 	var/fancy_shuttle_tag
 
-/obj/effect/fancy_shuttle/New() // has to be very early so others can grab it
+INITIALIZE_IMMEDIATE(/obj/effect/fancy_shuttle)
+/obj/effect/fancy_shuttle/Initialize(mapload) // has to be very early so others can grab it
 	. = ..()
 	if(!fancy_shuttle_tag)
 		error("Fancy shuttle with no tag at [x],[y],[z]! Type is: [type]")
diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm
index c7d8b16dde..3803b15bc0 100644
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -14,9 +14,11 @@
 	var/image/turf_image
 	var/list/decals
 
-/obj/landed_holder/New(var/location = null, var/turf/simulated/shuttle/turf)
-	..(null)
-	my_turf = turf
+/obj/landed_holder/Initialize(mapload)
+	. = ..()
+	if(loc)
+		my_turf = get_turf(src)
+		moveToNullspace()
 
 /obj/landed_holder/proc/land_on(var/turf/T)
 	//Gather destination information
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index 8b61df3cc8..c9a59a540f 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -100,10 +100,15 @@
 
 /turf/simulated/wall/durasteel/Initialize(mapload)
 	. = ..(mapload, MAT_DURASTEEL, MAT_DURASTEEL)
-/turf/simulated/wall/durasteel/blueserg/New(var/newloc)
-	..(newloc,MAT_DURASTEEL, MAT_DURASTEEL)
+
+// CHOMPAdd Start
+/turf/simulated/wall/durasteel/blueserg/Initialize(mapload)
+	. = ..(mapload, MAT_DURASTEEL, MAT_DURASTEEL)
+
 /turf/simulated/wall/durasteel/blueserg/attackby(obj/item/I, mob/user)
 	return
+// CHOMPAdd ENd
+
 /turf/simulated/wall/wood/Initialize(mapload)
 	. = ..(mapload,  MAT_WOOD)
 
diff --git a/code/modules/Phorochemistry/Phorochemputer.dm b/code/modules/Phorochemistry/Phorochemputer.dm
index ec65d78543..185f36987b 100644
--- a/code/modules/Phorochemistry/Phorochemputer.dm
+++ b/code/modules/Phorochemistry/Phorochemputer.dm
@@ -20,7 +20,8 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
 	var/turf/dest_loc
 	var/field
 
-/obj/machinery/computer/phoronics/New()
+/obj/machinery/computer/phoronics/Initialize(mapload)
+	. = ..()
 	intensity = 1
 	timeLeft = 0
 	timeLeftMax = 0
diff --git a/code/modules/Phorochemistry/misc_phoronics.dm b/code/modules/Phorochemistry/misc_phoronics.dm
index 2c6f690fae..33638b4df7 100644
--- a/code/modules/Phorochemistry/misc_phoronics.dm
+++ b/code/modules/Phorochemistry/misc_phoronics.dm
@@ -59,8 +59,8 @@ proc/gaseous_reagent_check(var/mob/living/carbon/human/H) //protective clothing
 	desc = "Looks like it would make a great throwing weapon."
 	throwforce = 20
 
-/obj/structure/closet/l3closet/scientist/phoronics/New() //two sets of chemical protection
-	..()
+/obj/structure/closet/l3closet/scientist/phoronics/Initialize(mapload) //two sets of chemical protection
+	. = ..()
 
 	new /obj/item/clothing/suit/bio_suit/scientist( src )
 	new /obj/item/clothing/head/bio_hood/scientist( src )
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 933cda8fe2..ae9814e2c4 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -143,9 +143,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 /obj/effect/statclick/ticket_list
 	var/current_state
 
-/obj/effect/statclick/ticket_list/New(loc, name, state)
-	current_state = state
-	..()
+/obj/effect/statclick/ticket_list/Initialize(mapload, text, target)
+	. = ..()
+	current_state = target
 
 /obj/effect/statclick/ticket_list/Click()
 	GLOB.ahelp_tickets.BrowseTickets(current_state)
@@ -616,9 +616,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 /obj/effect/statclick/ahelp
 	var/datum/admin_help/ahelp_datum
 
-/obj/effect/statclick/ahelp/New(loc, datum/admin_help/AH)
-	ahelp_datum = AH
-	..(loc)
+/obj/effect/statclick/ahelp/Initialize(mapload, text, target)
+	. = ..()
+	ahelp_datum = target
 
 /obj/effect/statclick/ahelp/update()
 	return ..(ahelp_datum.name)
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index dd93ea687f..077c88573a 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -28,7 +28,8 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging)
 	icon = 'icons/480x480.dmi'
 	icon_state = "25percent"
 
-/obj/effect/debugging/camera_range/New()
+/obj/effect/debugging/camera_range/Initialize(mapload, ...)
+	. = ..()
 	src.pixel_x = -224
 	src.pixel_y = -224
 
diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm
index e3125f4c67..a78a9c618c 100644
--- a/code/modules/awaymissions/loot_vr.dm
+++ b/code/modules/awaymissions/loot_vr.dm
@@ -11,8 +11,9 @@
 	name = "low prob loot spawner"
 	icon_state = "grabbed"
 	low_probability = 1
+	delete_me = TRUE
 
-/obj/effect/landmark/loot_spawn/New()
+/obj/effect/landmark/loot_spawn/Initialize(mapload)
 
 	switch(pick( \
 	low_probability * 1000;"nothing", \
@@ -347,7 +348,7 @@
 			//for(var/i=0,i<num,i++) //VORESTATION AI TEMPORARY REMOVAL
 				//new /mob/living/simple_mob/hostile/viscerator(C)  //VORESTATION AI TEMPORARY REMOVAL
 
-	qdel(src)
+	. = ..()
 
 
 /**********************************/
diff --git a/code/modules/blob2/blobs/node.dm b/code/modules/blob2/blobs/node.dm
index 072769b73a..da984be9b5 100644
--- a/code/modules/blob2/blobs/node.dm
+++ b/code/modules/blob2/blobs/node.dm
@@ -9,8 +9,8 @@ var/list/blob_nodes = list()
 	health_regen = 3
 	point_return = 50
 
-/obj/structure/blob/node/New(var/newloc)
-	..()
+/obj/structure/blob/node/Initialize(mapload, new_overmind)
+	. = ..()
 	blob_nodes += src
 	START_PROCESSING(SSobj, src)
 	update_icon()
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 3caac3d45c..4a26c5787d 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -23,8 +23,8 @@
 /obj/item/blobcore_chunk/is_open_container()
 	return 1
 
-/obj/item/blobcore_chunk/New(var/atom/newloc, var/datum/blob_type/parentblob = null)
-	..(newloc)
+/obj/item/blobcore_chunk/Initialize(mapload, var/datum/blob_type/parentblob = null)
+	. = ..()
 
 	create_reagents(120)
 	setup_blobtype(parentblob)
diff --git a/code/modules/blob2/mobs/spore.dm b/code/modules/blob2/mobs/spore.dm
index dd645c8539..cb92011343 100644
--- a/code/modules/blob2/mobs/spore.dm
+++ b/code/modules/blob2/mobs/spore.dm
@@ -30,11 +30,11 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 2
 
-/mob/living/simple_mob/hostile/blob/spore/New(var/newloc, var/obj/structure/blob/factory/my_factory)
+/mob/living/simple_mob/hostile/blob/spore/Initialize(mapload, var/obj/structure/blob/factory/my_factory)
 	if(istype(my_factory))
 		factory = my_factory
 		factory.spores += src
-	..(newloc)
+	. = ..()
 
 /mob/living/simple_mob/hostile/blob/spore/Destroy()
 	if(factory)
diff --git a/code/modules/casino/casino_cards.dm b/code/modules/casino/casino_cards.dm
index 07ed7182a7..e13eca7494 100644
--- a/code/modules/casino/casino_cards.dm
+++ b/code/modules/casino/casino_cards.dm
@@ -2,7 +2,8 @@
 //Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation
 //Modified by GhostActual#2055 for use with VOREstation
 
-/obj/item/deck/cards/casino/New()
+/obj/item/deck/cards/casino/Initialize(mapload)
+	. = ..()
 	var/datum/playingcard/casino/P
 	for(var/suit in list("spades","clubs","diamonds","hearts"))
 
diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm
index ea95296c80..2b8825705e 100644
--- a/code/modules/clothing/accessories/accessory_vr.dm
+++ b/code/modules/clothing/accessories/accessory_vr.dm
@@ -85,8 +85,8 @@
 	icon_override = icon_previous_override
 
 //ywedit start. forces different sprite sheet on equip
-/obj/item/clothing/accessory/collar/New()
-	..()
+/obj/item/clothing/accessory/collar/Initialize(mapload)
+	. = ..()
 	icon_previous_override = icon_override
 
 /obj/item/clothing/accessory/collar/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites.
diff --git a/code/modules/clothing/accessories/clothing.dm b/code/modules/clothing/accessories/clothing.dm
index fad731f841..fb433f24b0 100644
--- a/code/modules/clothing/accessories/clothing.dm
+++ b/code/modules/clothing/accessories/clothing.dm
@@ -94,16 +94,21 @@
 
 /obj/item/clothing/accessory/hawaiian_random
 	name = "random hawaiian shirt"
-	desc = "A random set of hawaiian shirts for style."
 
-/obj/item/clothing/accessory/hawaiian_random/New()
-	return pick(
-			prob(2);/obj/item/clothing/accessory/hawaiian,
-			prob(2);/obj/item/clothing/accessory/hawaiian/blue,
-			prob(2);/obj/item/clothing/accessory/hawaiian/pink,
-			prob(2);/obj/item/clothing/accessory/hawaiian/red,
-			prob(2);/obj/item/clothing/accessory/hawaiian/yellow
-			)
+/obj/item/clothing/accessory/hawaii/random/Initialize(mapload)
+	var/random_color = pick("blue", "pink", "red", "yellow", "cyan")
+	icon_state = "hawaiian_[random_color]"
+	name = "[random_color] hawaiian shirt"
+	. = ..()
+
+/obj/item/clothing/accessory/hawaii/random_flower
+	name = "flower-pattern shirt"
+
+/obj/item/clothing/accessory/hawaii/random_flower/Initialize(mapload)
+	if(prob(50))
+		icon_state = "hawaiian_red"
+	color = color_rotation(rand(-11,12)*15)
+	. = ..()
 
 /*
  * 80s
@@ -137,13 +142,16 @@
 	desc = "A classic themed neosilk tropical shirt. This one makes you feel out of touch."
 	icon_state = "miamivice"
 
-/obj/item/clothing/accessory/tropical_random/New()
-	return pick(
-			prob(2);/obj/item/clothing/accessory/tropical,
-			prob(2);/obj/item/clothing/accessory/tropical/green,
-			prob(2);/obj/item/clothing/accessory/tropical/pink,
-			prob(2);/obj/item/clothing/accessory/tropical/blue
-			)
+/obj/item/clothing/accessory/tropical_random/Initialize(mapload)
+	. = ..()
+	var/obj/item/clothing/accessory/new_item = pick(/obj/item/clothing/accessory/tropical,
+													/obj/item/clothing/accessory/tropical/green,
+													/obj/item/clothing/accessory/tropical/pink,
+													/obj/item/clothing/accessory/tropical/blue)
+
+	name = initial(new_item.name)
+	desc = initial(new_item.desc)
+	icon_state = initial(new_item.icon_state)
 
 /*
  * Chaps
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 9ee545e7c0..acd4c86e9c 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -42,8 +42,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/clothing/under/chameleon/New()
-	..()
+/obj/item/clothing/under/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		var/blocked = list(src.type, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/under, blocked)
@@ -79,8 +79,8 @@
 	body_parts_covered = 0
 	var/global/list/clothing_choices
 
-/obj/item/clothing/head/chameleon/New()
-	..()
+/obj/item/clothing/head/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		var/blocked = list(src.type)//Prevent infinite loops and bad hats.
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/head, blocked)
@@ -114,8 +114,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/clothing/suit/chameleon/New()
-	..()
+/obj/item/clothing/suit/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		var/blocked = list(src.type, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice, /obj/item/clothing/suit/greatcoat)
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/suit, blocked)
@@ -148,8 +148,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/clothing/shoes/chameleon/New()
-	..()
+/obj/item/clothing/shoes/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		var/blocked = list(src.type, /obj/item/clothing/shoes/syndigaloshes, /obj/item/clothing/shoes/cyborg)//prevent infinite loops and bad shoes.
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/shoes, blocked)
@@ -182,8 +182,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/storage/backpack/chameleon/New()
-	..()
+/obj/item/storage/backpack/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		var/blocked = list(src.type, /obj/item/storage/backpack/satchel/withwallet)
 		clothing_choices = generate_chameleon_choices(/obj/item/storage/backpack, blocked)
@@ -235,8 +235,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/clothing/gloves/chameleon/New()
-	..()
+/obj/item/clothing/gloves/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/gloves, list(src.type))
 
@@ -269,8 +269,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/clothing/mask/chameleon/New()
-	..()
+/obj/item/clothing/mask/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/mask, list(src.type))
 
@@ -338,8 +338,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/storage/belt/chameleon/New()
-	..()
+/obj/item/storage/belt/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		clothing_choices = generate_chameleon_choices(/obj/item/storage/belt, list(src.type))
 
@@ -378,8 +378,8 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
 
-/obj/item/clothing/accessory/chameleon/New()
-	..()
+/obj/item/clothing/accessory/chameleon/Initialize(mapload)
+	. = ..()
 	if(!clothing_choices)
 		var/blocked = list(src.type, /obj/item/clothing/accessory/storage)
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/accessory, blocked)
@@ -422,15 +422,14 @@
 	var/obj/item/projectile/copy_projectile
 	var/global/list/gun_choices
 
-/obj/item/gun/energy/chameleon/New()
-	..()
+/obj/item/gun/energy/chameleon/Initialize(mapload)
+	. = ..()
 
 	if(!gun_choices)
 		gun_choices = list()
 		for(var/gun_type in typesof(/obj/item/gun/) - src.type)
 			var/obj/item/gun/G = gun_type
 			src.gun_choices[initial(G.name)] = gun_type
-	return
 
 /obj/item/gun/energy/chameleon/consume_next_projectile()
 	var/obj/item/projectile/P = ..()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index b1784fcd14..0f1ccdca76 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -38,8 +38,8 @@
 	gunshot_residue = null
 
 
-/obj/item/clothing/New()
-	..()
+/obj/item/clothing/Initialize(mapload)
+	. = ..()
 	if(starting_accessories)
 		for(var/T in starting_accessories)
 			var/obj/item/clothing/accessory/tie = new T(src)
@@ -288,8 +288,10 @@
 	icon_state = "block"
 	slot_flags = SLOT_EARS | SLOT_TWOEARS
 
-/obj/item/clothing/ears/offear/New(var/obj/O)
-	if(O)
+/obj/item/clothing/ears/offear/Initialize(mapload)
+	. = ..()
+	if(isobj(loc))
+		var/obj/O = loc
 		name = O.name
 		desc = O.desc
 		icon = O.icon
@@ -444,8 +446,8 @@
 	var/datum/unarmed_attack/special_attack = null //do the gloves have a special unarmed attack?
 	var/special_attack_type = null
 
-/obj/item/clothing/gloves/New()
-	..()
+/obj/item/clothing/gloves/Initialize(mapload)
+	. = ..()
 	if(special_attack_type && ispath(special_attack_type))
 		special_attack = new special_attack_type
 
@@ -1015,8 +1017,8 @@
 		return
 	..()
 
-/obj/item/clothing/under/New()
-	..()
+/obj/item/clothing/under/Initialize(mapload)
+	. = ..()
 	if(worn_state)
 		LAZYSET(item_state_slots, slot_w_uniform_str, worn_state)
 	else
@@ -1210,9 +1212,9 @@
 		to_chat(usr, span_notice("You roll down your [src]'s sleeves."))
 	update_clothing_icon()
 
-/obj/item/clothing/under/rank/New()
+/obj/item/clothing/under/rank/Initialize(mapload)
+	. = ..()
 	sensor_mode = pick(0,1,2,3)
-	..()
 
 /obj/item/clothing/Destroy()
 	STOP_PROCESSING(SSobj, src)
diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm
index 1c3e17a3c6..699a1a6a44 100644
--- a/code/modules/clothing/clothing_vr.dm
+++ b/code/modules/clothing/clothing_vr.dm
@@ -9,7 +9,7 @@
 		SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi',
 		SPECIES_WEREBEAST = 'icons/inventory/feet/mob_vr_werebeast.dmi')
 
-/obj/item/clothing/shoes/New()
+/obj/item/clothing/shoes/Initialize(mapload)
 	inside_emotes = list(
 		span_red("You feel weightless for a moment as \the [name] moves upwards."),
 		span_red("\The [name] are a ride you've got no choice but to participate in as the wearer moves."),
@@ -17,7 +17,7 @@
 		span_red("More motion while \the [name] move, feet pressing down against you.")
 	)
 
-	..()
+	. = ..()
 /* //Must be handled in clothing.dm
 /obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running)
 	if(prob(1) && !recent_squish)
@@ -171,8 +171,12 @@
 		SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi',
 		SPECIES_WEREBEAST = 'icons/inventory/uniform/mob_vr_werebeast.dmi')
 
-/obj/item/clothing/under/New(var/mob/living/carbon/human/H)
-	..()
+/obj/item/clothing/under/Initialize(mapload)
+	. = ..()
+	if(!ishuman(loc))
+		return
+
+	var/mob/living/carbon/human/H = loc
 	sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1)
 	switch(sensorpref)
 		if(1) sensor_mode = 0				//Sensors off
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index 27468d9d8b..5c4d3f597b 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -2,8 +2,8 @@
 	name = DEVELOPER_WARNING_NAME
 	var/obj/item/storage/internal/pockets
 
-/obj/item/clothing/suit/storage/New()
-	..()
+/obj/item/clothing/suit/storage/Initialize(mapload)
+	. = ..()
 	pockets = new/obj/item/storage/internal(src)
 	pockets.max_w_class = ITEMSIZE_SMALL		//fit only pocket sized items
 	pockets.max_storage_space = ITEMSIZE_COST_SMALL * 2
@@ -94,8 +94,8 @@
 	icon_state = "[toggleicon][open ? "_open" : ""][hood_up ? "_t" : ""]"
 
 //New Vest 4 pocket storage and badge toggles, until suit accessories are a thing.
-/obj/item/clothing/suit/storage/vest/heavy/New()
-	..()
+/obj/item/clothing/suit/storage/vest/heavy/Initialize(mapload)
+	. = ..()
 	pockets = new/obj/item/storage/internal(src)
 	pockets.max_w_class = ITEMSIZE_SMALL
 	pockets.max_storage_space = ITEMSIZE_COST_SMALL * 4
diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm
index 8d52e7a06f..76bf121449 100644
--- a/code/modules/economy/cash_register.dm
+++ b/code/modules/economy/cash_register.dm
@@ -31,6 +31,9 @@
 	cash_stored = rand(10, 70)*10
 	transaction_devices += src // Global reference list to be properly set up by /proc/setup_economy()
 
+/obj/machinery/cash_register/Destroy()
+	transaction_devices -= src
+	. = ..()
 
 /obj/machinery/cash_register/examine(mob/user as mob)
 	. = ..(user)
diff --git a/code/modules/economy/money_bag.dm b/code/modules/economy/money_bag.dm
index aa2c3398f7..d515a1249b 100644
--- a/code/modules/economy/money_bag.dm
+++ b/code/modules/economy/money_bag.dm
@@ -88,8 +88,8 @@
 
 /obj/item/moneybag/vault
 
-/obj/item/moneybag/vault/New()
-	..()
+/obj/item/moneybag/vault/Initialize(mapload)
+	. = ..()
 	new /obj/item/coin/silver(src)
 	new /obj/item/coin/silver(src)
 	new /obj/item/coin/silver(src)
diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm
index 18f29bb50b..6ec759f3e4 100644
--- a/code/modules/economy/retail_scanner.dm
+++ b/code/modules/economy/retail_scanner.dm
@@ -24,13 +24,18 @@
 
 
 // Claim machine ID
-/obj/item/retail_scanner/New()
+/obj/item/retail_scanner/Initialize(mapload)
+	. = ..()
 	machine_id = "[station_name()] RETAIL #[num_financial_terminals++]"
 	if(locate(/obj/structure/table) in loc)
 		pixel_y = 3
 	transaction_devices += src // Global reference list to be properly set up by /proc/setup_economy()
 
 
+/obj/item/retail_scanner/Destroy()
+	transaction_devices -= src
+	. = ..()
+
 // Always face the user when put on a table
 /obj/item/retail_scanner/afterattack(atom/movable/AM, mob/user, proximity)
 	if(!proximity)	return
diff --git a/code/modules/entopics_vr/entopics.dm b/code/modules/entopics_vr/entopics.dm
index a3ea9e35ab..d31bfb78f8 100644
--- a/code/modules/entopics_vr/entopics.dm
+++ b/code/modules/entopics_vr/entopics.dm
@@ -119,8 +119,8 @@ var/global/list/alt_farmanimals = list()
 
 	var/datum/entopic/ent_debug
 
-/obj/item/entopic_debug/New()
-	..()
+/obj/item/entopic_debug/Initialize(mapload)
+	. = ..()
 	ent_debug = new(aholder = src, aicon = icon, aicon_state = "holo_Jin")
 
 /proc/entopic_icon_helper(var/atom/A,var/holo = TRUE)
diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm
index c2f23a9e90..db234eaa3b 100644
--- a/code/modules/events/meteor_strike_vr.dm
+++ b/code/modules/events/meteor_strike_vr.dm
@@ -23,8 +23,8 @@
 	icon_state = "large"
 	anchored = TRUE
 
-/obj/effect/meteor_falling/New()
-	..()
+/obj/effect/meteor_falling/Initialize(mapload)
+	. = ..()
 	SpinAnimation()
 	meteor_fall()
 
@@ -76,8 +76,8 @@
 	density = TRUE
 	climbable = TRUE
 
-/obj/structure/meteorite/New()
-	..()
+/obj/structure/meteorite/Initialize(mapload)
+	. = ..()
 	icon = turn(icon, 90)
 	switch(rand(1,100))
 		if(1 to 60)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 8b75fa0740..75b2cb43b2 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -260,11 +260,11 @@ Gunshots/explosions/opening doors/less rare audio (done)
 			for(var/mob/O in oviewers(world.view , my_target))
 				to_chat(O, span_bolddanger("[my_target] stumbles around."))
 
-/obj/effect/fake_attacker/New()
-	..()
+/obj/effect/fake_attacker/Initialize(mapload)
+	. = ..()
 	QDEL_IN(src, 30 SECONDS)
 	step_away(src,my_target,2)
-	spawn attack_loop()
+	addtimer(CALLBACK(src, PROC_REF(attack_loop)), rand(5, 10), TIMER_DELETE_ME)
 
 /obj/effect/fake_attacker/Destroy()
 	if(my_target)
@@ -292,35 +292,35 @@ Gunshots/explosions/opening doors/less rare audio (done)
 
 
 /obj/effect/fake_attacker/proc/attack_loop()
-	while(1)
-		sleep(rand(5,10))
-		if(src.health < 0)
-			collapse()
-			continue
-		if(get_dist(src,my_target) > 1)
-			src.set_dir(get_dir(src,my_target))
-			step_towards(src,my_target)
-			updateimage()
-		else
-			if(prob(15))
-				if(weapon_name)
-					my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
-					my_target.show_message(span_bolddanger("[my_target] has been attacked with [weapon_name] by [src.name]!"), 1)
-					my_target.halloss += 8
-					if(prob(20)) my_target.eye_blurry += 3
-					if(prob(33))
-						if(!locate(/obj/effect/overlay) in my_target.loc)
-							fake_blood(my_target)
-				else
-					my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))
-					my_target.show_message(span_bolddanger("[src.name] has punched [my_target]!"), 1)
-					my_target.halloss += 4
-					if(prob(33))
-						if(!locate(/obj/effect/overlay) in my_target.loc)
-							fake_blood(my_target)
-
+	if(src.health < 0)
+		collapse()
+		addtimer(CALLBACK(src, PROC_REF(attack_loop)), rand(5, 10), TIMER_DELETE_ME)
+		return
+	if(get_dist(src,my_target) > 1)
+		src.set_dir(get_dir(src,my_target))
+		step_towards(src,my_target)
+		updateimage()
+	else
 		if(prob(15))
-			step_away(src,my_target,2)
+			if(weapon_name)
+				my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
+				my_target.show_message(span_bolddanger("[my_target] has been attacked with [weapon_name] by [src.name]!"), 1)
+				my_target.halloss += 8
+				if(prob(20)) my_target.eye_blurry += 3
+				if(prob(33))
+					if(!locate(/obj/effect/overlay) in my_target.loc)
+						fake_blood(my_target)
+			else
+				my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))
+				my_target.show_message(span_bolddanger("[src.name] has punched [my_target]!"), 1)
+				my_target.halloss += 4
+				if(prob(33))
+					if(!locate(/obj/effect/overlay) in my_target.loc)
+						fake_blood(my_target)
+
+	if(prob(15))
+		step_away(src,my_target,2)
+	addtimer(CALLBACK(src, PROC_REF(attack_loop)), rand(5, 10), TIMER_DELETE_ME)
 
 /obj/effect/fake_attacker/proc/collapse()
 	collapse = 1
@@ -331,9 +331,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 	O.name = "blood"
 	var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
 	target << I
-	spawn(300)
-		qdel(O)
-	return
+	QDEL_IN(O, 30 SECONDS)
 
 var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_magazine/s357,\
 	/obj/item/gun/energy/crossbow, /obj/item/melee/energy/sword,\
diff --git a/code/modules/food/food/snacks_ch.dm b/code/modules/food/food/snacks_ch.dm
index d8e675be72..1905649a62 100644
--- a/code/modules/food/food/snacks_ch.dm
+++ b/code/modules/food/food/snacks_ch.dm
@@ -276,11 +276,11 @@
 	nutriment_amt = 12
 	nutriment_desc = list("bread" = 4, "sweetness" = 6)
 
-/obj/item/reagent_containers/food/snacks/tastybread/New()
-	..()
+/obj/item/reagent_containers/food/snacks/tastybread/Initialize(mapload)
+	. = ..()
 	if(prob(1))
 		new /obj/item/reagent_containers/food/snacks/tastybread/sequel(src)
-		qdel(src) //Dispose of the body, let no one find it.
+		return INITIALIZE_HINT_QDEL
 
 /obj/item/reagent_containers/food/snacks/tastybread/sequel/Initialize(mapload)
 	. = ..()
diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm
index 35ac4c065f..c7212fe717 100644
--- a/code/modules/food/kitchen/icecream.dm
+++ b/code/modules/food/kitchen/icecream.dm
@@ -183,7 +183,8 @@
 	var/ice_creamed = 0
 	var/cone_type
 
-/obj/item/reagent_containers/food/snacks/icecream/New()
+/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload)
+	. = ..()
 	create_reagents(20)
 	reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
 
diff --git a/code/modules/games/cah.dm b/code/modules/games/cah.dm
index 7545ffc1f2..3215883912 100644
--- a/code/modules/games/cah.dm
+++ b/code/modules/games/cah.dm
@@ -14,8 +14,8 @@
 	icon_state = "cag_black"
 	blanks = 0
 
-/obj/item/deck/cah/New()
-	..()
+/obj/item/deck/cah/Initialize(mapload)
+	. = ..()
 	var/datum/playingcard/P
 	for(var/cardtext in card_text_list)
 		P = new()
diff --git a/code/modules/games/cards_ch.dm b/code/modules/games/cards_ch.dm
index be9fb4ff69..383114503c 100644
--- a/code/modules/games/cards_ch.dm
+++ b/code/modules/games/cards_ch.dm
@@ -20,7 +20,8 @@
 	icon = 'icons/obj/playing_cards_ch.dmi'
 	icon_state = "casino_deck"
 
-/obj/item/deck/cards/casino/New()
+/obj/item/deck/cards/casino/Initialize(mapload)
+	. = ..()
 	var/datum/playingcard/casino/P
 	for(var/suit in list("spades","clubs","diamonds","hearts"))
 
diff --git a/code/modules/games/spaceball_cards.dm b/code/modules/games/spaceball_cards.dm
index a564c83b36..8706a3f67a 100644
--- a/code/modules/games/spaceball_cards.dm
+++ b/code/modules/games/spaceball_cards.dm
@@ -7,8 +7,8 @@
 	icon_state = "card_pack_spaceball"
 	parentdeck = "spaceball"
 
-/obj/item/pack/spaceball/New()
-	..()
+/obj/item/pack/spaceball/Initialize(mapload)
+	. = ..()
 	var/datum/playingcard/P
 	var/i
 	var/year = 300 + text2num(time2text(world.timeofday, "YYYY")) //VOREStation Edit
diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm
index 5489bb05fd..4b16249084 100644
--- a/code/modules/games/tarot.dm
+++ b/code/modules/games/tarot.dm
@@ -6,8 +6,8 @@
 	desc = "For all your occult needs!"
 	icon_state = "deck_tarot"
 
-/obj/item/deck/tarot/New()
-	..()
+/obj/item/deck/tarot/Initialize(mapload)
+	. = ..()
 
 	var/datum/playingcard/P
 	for(var/name in list("Fool","Magician","High Priestess","Empress","Emperor","Hierophant","Lovers","Chariot","Strength","Hermit","Wheel of Fortune","Justice","Hanged Man","Death","Temperance","Devil","Tower","Star","Moon","Sun","Judgement","World"))
@@ -49,8 +49,8 @@
 	desc = "A limited edition tarot deck for the scene-girl inclined!"
 	icon_state = "dark_tarot"
 
-/obj/item/deck/dark_tarot/New()
-	..()
+/obj/item/deck/dark_tarot/Initialize(mapload)
+	. = ..()
 
 	var/datum/playingcard/P
 	for(var/name in list("fool","magician","high priestess","empress","emperor","hierophant","lovers","chariot","strength","hermit","wheel of fortune","justice","hanged man","death","temperance","devil","tower","star","moon","sun","judgement","world","white dragon with blue eyes","charred lizard","dark lotus","bash","reverse","rules","acid","abyss","maw"))
diff --git a/code/modules/games/wizoff.dm b/code/modules/games/wizoff.dm
index b6dd9bde9b..3035552fc2 100644
--- a/code/modules/games/wizoff.dm
+++ b/code/modules/games/wizoff.dm
@@ -15,8 +15,8 @@
 	desc = "A Wiz-Off deck. Fight an arcane battle for the fate of the universe: Draw 5! Play 5! Best of 5!"
 	icon_state = "wizoff"
 
-/obj/item/deck/wizoff/New()
-	..()
+/obj/item/deck/wizoff/Initialize(mapload)
+	. = ..()
 	var/datum/playingcard/P
 	for(var/cardtext in card_wiz_list)
 		P = new()
@@ -64,9 +64,6 @@
 	title = "WizOff Guide"
 	drop_sound = 'sound/items/drop/paper.ogg'
 	pickup_sound = 'sound/items/pickup/paper.ogg'
-
-/obj/item/book/manual/wizzoffguide/New()
-	..()
 	dat = {"
 
 		<html>
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index f3bd60c674..2d8ffa3a86 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -8,8 +8,8 @@
 	var/list/genes = list()
 	var/genesource = "unknown"
 
-/obj/item/disk/botany/New()
-	..()
+/obj/item/disk/botany/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(-5,5)
 	pixel_y = rand(-5,5)
 
@@ -27,8 +27,8 @@
 	name = "flora disk box"
 	desc = "A box of flora data disks, apparently."
 
-/obj/item/storage/box/botanydisk/New()
-	..()
+/obj/item/storage/box/botanydisk/Initialize(mapload)
+	. = ..()
 	for(var/i = 0;i<7;i++)
 		new /obj/item/disk/botany(src)
 
diff --git a/code/modules/integrated_electronics/core/assemblies/device.dm b/code/modules/integrated_electronics/core/assemblies/device.dm
index b901f52dbe..6a2117ba4b 100644
--- a/code/modules/integrated_electronics/core/assemblies/device.dm
+++ b/code/modules/integrated_electronics/core/assemblies/device.dm
@@ -6,10 +6,10 @@
 
 	var/obj/item/electronic_assembly/device/EA
 
-/obj/item/assembly/electronic_assembly/New()
+/obj/item/assembly/electronic_assembly/Initialize(mapload)
+	. = ..()
 	EA = new(src)
 	EA.holder = src
-	..()
 
 /obj/item/assembly/electronic_assembly/attackby(obj/item/I as obj, mob/user as mob)
 	if (I.has_tool_quality(TOOL_CROWBAR))
@@ -70,8 +70,8 @@
 	max_complexity = IC_COMPLEXITY_BASE * 3/4
 
 
-/obj/item/electronic_assembly/device/New()
-	..()
+/obj/item/electronic_assembly/device/Initialize(mapload)
+	. = ..()
 	var/obj/item/integrated_circuit/built_in/device_input/input = new(src)
 	var/obj/item/integrated_circuit/built_in/device_output/output = new(src)
 	input.assembly = src
diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm
index 2e39b8958a..7e375637b0 100644
--- a/code/modules/integrated_electronics/core/integrated_circuit.dm
+++ b/code/modules/integrated_electronics/core/integrated_circuit.dm
@@ -31,14 +31,14 @@ a creative player the means to solve many problems.  Circuits are held inside an
 /obj/item/integrated_circuit/proc/any_examine(mob/user)
 	return
 
-/obj/item/integrated_circuit/New()
+/obj/item/integrated_circuit/Initialize(mapload)
+	. = ..()
 	displayed_name = name
 	if(!size) size = w_class
 	if(size == -1) size = 0
 	setup_io(inputs, /datum/integrated_io, inputs_default)
 	setup_io(outputs, /datum/integrated_io, outputs_default)
 	setup_io(activators, /datum/integrated_io/activate)
-	..()
 
 /obj/item/integrated_circuit/proc/on_data_written() //Override this for special behaviour when new data gets pushed to the circuit.
 	return
diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm
index eb53a3fec2..23283d81f4 100644
--- a/code/modules/integrated_electronics/passive/power.dm
+++ b/code/modules/integrated_electronics/passive/power.dm
@@ -144,8 +144,8 @@
 	var/volume = 60
 	var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, REAGENT_ID_FUEL = 15000, REAGENT_ID_CARBON = 10000, REAGENT_ID_ETHANOL= 10000, REAGENT_ID_NUTRIMENT = 8000, REAGENT_ID_BLOOD = 5000)
 
-/obj/item/integrated_circuit/passive/power/chemical_cell/New()
-	..()
+/obj/item/integrated_circuit/passive/power/chemical_cell/Initialize(mapload)
+	. = ..()
 	create_reagents(volume)
 
 /obj/item/integrated_circuit/passive/power/chemical_cell/interact(mob/user)
diff --git a/code/modules/integrated_electronics/subtypes/data_transfer.dm b/code/modules/integrated_electronics/subtypes/data_transfer.dm
index 1a6496868d..457277c5b6 100644
--- a/code/modules/integrated_electronics/subtypes/data_transfer.dm
+++ b/code/modules/integrated_electronics/subtypes/data_transfer.dm
@@ -16,12 +16,12 @@
 	power_draw_per_use = 4
 	var/number_of_inputs = 2
 
-/obj/item/integrated_circuit/transfer/multiplexer/New()
+/obj/item/integrated_circuit/transfer/multiplexer/Initialize(mapload)
 	for(var/i = 1 to number_of_inputs)
 		inputs["input [i]"] = IC_PINTYPE_ANY // This is just a string since pins don't get built until ..() is called.
 //		inputs += "input [i]"
 	complexity = number_of_inputs
-	..()
+	. = ..()
 	desc += " It has [number_of_inputs] input pins."
 	extended_desc += " This multiplexer has a range from 1 to [inputs.len - 1]."
 
@@ -64,13 +64,13 @@
 	power_draw_per_use = 4
 	var/number_of_outputs = 2
 
-/obj/item/integrated_circuit/transfer/demultiplexer/New()
+/obj/item/integrated_circuit/transfer/demultiplexer/Initialize(mapload)
 	for(var/i = 1 to number_of_outputs)
 	//	outputs += "output [i]"
 		outputs["output [i]"] = IC_PINTYPE_ANY
 	complexity = number_of_outputs
 
-	..()
+	. = ..()
 	desc += " It has [number_of_outputs] output pins."
 	extended_desc += " This demultiplexer has a range from 1 to [outputs.len]."
 
@@ -112,13 +112,13 @@
 	power_draw_per_use = 4
 	var/number_of_outputs = 2
 
-/obj/item/integrated_circuit/transfer/pulsedemultiplexer/New()
+/obj/item/integrated_circuit/transfer/pulsedemultiplexer/Initialize(mapload)
 	for(var/i = 1 to number_of_outputs)
 	//	outputs += "output [i]"
 		activators["output [i]"] = IC_PINTYPE_PULSE_OUT
 	complexity = number_of_outputs
 
-	..()
+	. = ..()
 	desc += " It has [number_of_outputs] output pins."
 	extended_desc += " This pulse demultiplexer has a range from 1 to [activators.len - 1]."
 
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index e9cc02de1a..d1cbcb7dde 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -540,9 +540,9 @@
 	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
 	power_draw_per_use = 15
 
-/obj/item/integrated_circuit/input/microphone/New()
-	..()
-	listening_objects |= src
+/obj/item/integrated_circuit/input/microphone/Initialize(mapload)
+	. = ..()
+	listening_objects += src
 
 /obj/item/integrated_circuit/input/microphone/Destroy()
 	listening_objects -= src
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index 9abdc279ae..debf957b4e 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -145,8 +145,8 @@
 	var/obj/item/grenade/attached_grenade
 	var/pre_attached_grenade_type
 
-/obj/item/integrated_circuit/manipulation/grenade/New()
-	..()
+/obj/item/integrated_circuit/manipulation/grenade/Initialize(mapload)
+	. = ..()
 	if(pre_attached_grenade_type)
 		var/grenade = new pre_attached_grenade_type(src)
 		attach_grenade(grenade)
diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm
index 0fb72e7088..f577b39981 100644
--- a/code/modules/integrated_electronics/subtypes/memory.dm
+++ b/code/modules/integrated_electronics/subtypes/memory.dm
@@ -11,12 +11,12 @@
 	power_draw_per_use = 1
 	var/number_of_pins = 1
 
-/obj/item/integrated_circuit/memory/New()
+/obj/item/integrated_circuit/memory/Initialize(mapload)
 	for(var/i = 1 to number_of_pins)
 		inputs["input [i]"] = IC_PINTYPE_ANY // This is just a string since pins don't get built until ..() is called.
 		outputs["output [i]"] = IC_PINTYPE_ANY
+	. = ..()
 	complexity = number_of_pins
-	..()
 
 /obj/item/integrated_circuit/memory/examine(mob/user)
 	. = ..()
diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm
index d902368282..3d7c43be78 100644
--- a/code/modules/integrated_electronics/subtypes/reagents.dm
+++ b/code/modules/integrated_electronics/subtypes/reagents.dm
@@ -4,8 +4,8 @@
 	unacidable = TRUE
 	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2)
 
-/obj/item/integrated_circuit/reagent/New()
-	..()
+/obj/item/integrated_circuit/reagent/Initialize(mapload)
+	. = ..()
 	if(volume)
 		create_reagents(volume)
 
diff --git a/code/modules/interserver shipping/shipping_hooks.dm b/code/modules/interserver shipping/shipping_hooks.dm
index 1ca89a5450..3f8b098665 100644
--- a/code/modules/interserver shipping/shipping_hooks.dm	
+++ b/code/modules/interserver shipping/shipping_hooks.dm	
@@ -3,12 +3,13 @@
  */
 
 // Snowflake marker for now. Because easy modularity.
-/obj/effect/landmark/shipping_marker/New()
+/obj/effect/landmark/shipping_marker/Initialize(mapload)
 	switch (name)
 		if ("return")
 			shippping_return = loc
 
 	delete_me = TRUE
+	. = ..()
 
 /**
  * Does all of the shipping ID init at round start.
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index a88bbce010..82b7e323fb 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -127,20 +127,18 @@ Book Cart End
 /obj/structure/bookcase/manuals/medical
 	name = "Medical Manuals bookcase"
 
-/obj/structure/bookcase/manuals/medical/New()
-	..()
+/obj/structure/bookcase/manuals/medical/Initialize(mapload)
 	new /obj/item/book/manual/medical_cloning(src)
 	new /obj/item/book/manual/wiki/medical_diagnostics_manual(src)
 	new /obj/item/book/manual/wiki/medical_diagnostics_manual(src)
 	new /obj/item/book/manual/wiki/medical_diagnostics_manual(src)
-	update_icon()
+	. = ..()
 
 
 /obj/structure/bookcase/manuals/engineering
 	name = "Engineering Manuals bookcase"
 
-/obj/structure/bookcase/manuals/engineering/New()
-	..()
+/obj/structure/bookcase/manuals/engineering/Initialize(mapload)
 	new /obj/item/book/manual/wiki/engineering_construction(src)
 	new /obj/item/book/manual/engineering_particle_accelerator(src)
 	new /obj/item/book/manual/wiki/engineering_hacking(src)
@@ -148,15 +146,14 @@ Book Cart End
 	new /obj/item/book/manual/atmospipes(src)
 	new /obj/item/book/manual/engineering_singularity_safety(src)
 	new /obj/item/book/manual/evaguide(src)
-	update_icon()
+	. = ..()
 
 /obj/structure/bookcase/manuals/research_and_development
 	name = "R&D Manuals bookcase"
 
-/obj/structure/bookcase/manuals/research_and_development/New()
-	..()
+/obj/structure/bookcase/manuals/research_and_development/Initialize(mapload)
 	new /obj/item/book/manual/research_and_development(src)
-	update_icon()
+	. = ..()
 
 
 /*
diff --git a/code/modules/lighting/lighting_area.dm b/code/modules/lighting/lighting_area.dm
index 490a62473d..2a7b8040b9 100644
--- a/code/modules/lighting/lighting_area.dm
+++ b/code/modules/lighting/lighting_area.dm
@@ -1,9 +1,3 @@
 /area
 	luminosity           = TRUE
 	var/dynamic_lighting = TRUE
-
-/area/New()
-	. = ..()
-
-	if(dynamic_lighting)
-		luminosity = FALSE
diff --git a/code/modules/lighting/sunlight_handler.dm b/code/modules/lighting/sunlight_handler.dm
index 26a6bfac8f..32641a73f2 100644
--- a/code/modules/lighting/sunlight_handler.dm
+++ b/code/modules/lighting/sunlight_handler.dm
@@ -1,17 +1,9 @@
-/turf/New(loc, ..., is_turfchange=FALSE)
-	. = ..(args)
-
 /turf/simulated
 	var/datum/sunlight_handler/shandler
 	var/shandler_noinit = FALSE
 
-/turf/simulated/New(loc, ..., is_turfchange=FALSE) //This is so fucking awful have mercy on my soul for writing this
-	if(is_turfchange)
-		shandler_noinit = TRUE
-	. = ..(args)
-
 /turf/simulated/Initialize(mapload)
-	. = ..(args)
+	. = ..()
 	if(mapload)
 		return INITIALIZE_HINT_LATELOAD
 
diff --git a/code/modules/materials/materials/_materials.dm b/code/modules/materials/materials/_materials.dm
index d9ea76cda9..0e08ac5897 100644
--- a/code/modules/materials/materials/_materials.dm
+++ b/code/modules/materials/materials/_materials.dm
@@ -317,8 +317,6 @@ var/list/name_to_material
 		G.reinf_material = reinf_material
 		G.reinforce_girder()
 	if(girder_material)
-		if(istype(girder_material, /datum/material))
-			girder_material = girder_material.name
 		G.set_material(girder_material)
 
 
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 521ab37fc7..59e0c7fcd1 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -286,8 +286,8 @@
 	var/on = 0
 	var/brightness_on = 4 //luminosity when on
 
-/obj/item/stack/lightpole/New()
-	..()
+/obj/item/stack/lightpole/Initialize(mapload)
+	. = ..()
 	base_state = icon_state
 
 /obj/item/stack/lightpole/blue
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index bf12eb2cd8..73a902320e 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -93,9 +93,9 @@
 	var/last_revive_notification = null // world.time of last notification, used to avoid spamming players from defibs or cloners.
 	var/cleanup_timer // Refernece to a timer that will delete this mob if no client returns
 
-/mob/observer/dead/New(mob/body, aghost = FALSE)
+/mob/observer/dead/Initialize(mapload, aghost = FALSE)
 
-	appearance = body
+	appearance = loc
 	invisibility = INVISIBILITY_OBSERVER
 	layer = BELOW_MOB_LAYER
 	plane = PLANE_GHOSTS
@@ -107,30 +107,31 @@
 	see_in_dark = world.view //I mean. I don't even know if byond has occlusion culling... but...
 
 	var/turf/T
-	if(ismob(body))
-		T = get_turf(body)				//Where is the body located?
-		attack_log = body.attack_log	//preserve our attack logs by copying them to our ghost
-		gender = body.gender
-		if(body.mind && body.mind.name)
-			name = body.mind.name
+	if(ismob(loc))
+		var/mob/M = loc
+		T = get_turf(M)				//Where is the body located?
+		attack_log = M.attack_log	//preserve our attack logs by copying them to our ghost
+		gender = M.gender
+		if(M.mind && M.mind.name)
+			name = M.mind.name
 		else
-			if(body.real_name)
-				name = body.real_name
+			if(M.real_name)
+				name = M.real_name
 			else
 				if(gender == MALE)
 					name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
 				else
 					name = capitalize(pick(first_names_female)) + " " + capitalize(pick(last_names))
 
-		mind = body.mind	//we don't transfer the mind but we keep a reference to it.
+		mind = M.mind	//we don't transfer the mind but we keep a reference to it.
 
 		// Fix for naked ghosts.
 		// Unclear why this isn't being grabbed by appearance.
-		if(ishuman(body))
-			var/mob/living/carbon/human/H = body
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
 			add_overlay(H.overlays_standing)
-		default_pixel_x = body.default_pixel_x
-		default_pixel_y = body.default_pixel_y
+		default_pixel_x = M.default_pixel_x
+		default_pixel_y = M.default_pixel_y
 	if(!T && length(latejoin))
 		T = get_turf(pick(latejoin))			//Safety in case we cannot find the body's position
 	if(T)
@@ -145,7 +146,7 @@
 	animate(src, pixel_y = 2, time = 10, loop = -1)
 	animate(pixel_y = default_pixel_y, time = 10, loop = -1)
 	observer_mob_list += src
-	..()
+	. = ..()
 	visualnet = ghostnet
 
 /mob/observer/dead/proc/checkStatic()
diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm
index 402218a71a..8a3710aa13 100644
--- a/code/modules/mob/freelook/ai/eye.dm
+++ b/code/modules/mob/freelook/ai/eye.dm
@@ -7,8 +7,8 @@
 	name = "Inactive AI Eye"
 	icon_state = "AI-eye"
 
-/mob/observer/eye/aiEye/New()
-	..()
+/mob/observer/eye/aiEye/Initialize(mapload)
+	. = ..()
 	visualnet = cameranet
 
 /mob/observer/eye/aiEye/Destroy()
@@ -73,17 +73,6 @@
 		client.eye = eyeobj
 	SetName(src.name)
 
-// Intiliaze the eye by assigning it's "ai" variable to us. Then set it's loc to us.
-/mob/living/silicon/ai/Initialize(mapload)
-	. = ..()
-	create_eyeobj()
-	if(eyeobj)
-		eyeobj.loc = src.loc
-
-/mob/living/silicon/ai/Destroy()
-	destroy_eyeobj()
-	return ..()
-
 /atom/proc/move_camera_by_click()
 	if(isAI(usr))
 		var/mob/living/silicon/ai/AI = usr
diff --git a/code/modules/mob/freelook/mask/eye.dm b/code/modules/mob/freelook/mask/eye.dm
index 4fcbc35149..253196e343 100644
--- a/code/modules/mob/freelook/mask/eye.dm
+++ b/code/modules/mob/freelook/mask/eye.dm
@@ -8,6 +8,6 @@
 	acceleration = 0
 	owner_follows_eye = 1
 
-/mob/observer/eye/maskEye/New()
-	..()
+/mob/observer/eye/maskEye/Initialize(mapload)
+	. = ..()
 	visualnet = cultnet
diff --git a/code/modules/mob/freelook/mask/update_triggers.dm b/code/modules/mob/freelook/mask/update_triggers.dm
index d257dfc173..493e8f3e0a 100644
--- a/code/modules/mob/freelook/mask/update_triggers.dm
+++ b/code/modules/mob/freelook/mask/update_triggers.dm
@@ -18,8 +18,8 @@
 
 #undef CULT_UPDATE_BUFFER
 
-/mob/living/New()
-	..()
+/mob/living/Initialize(mapload)
+	. = ..()
 	cultnet.updateVisibility(src, 0)
 
 /mob/living/rejuvenate()
diff --git a/code/modules/mob/language/outsider.dm b/code/modules/mob/language/outsider.dm
index d6f85442d8..2c1b95b5f5 100644
--- a/code/modules/mob/language/outsider.dm
+++ b/code/modules/mob/language/outsider.dm
@@ -86,7 +86,7 @@
 	syllables = list("sss","sSs","SSS")
 
 /datum/language/xenos
-	name = "Hivemind"
+	name = LANGUAGE_HIVEMIND
 	desc = "A psychic link permitting members of a xenomorph hive to communicate over enormous distances. Requires a specialized organ only found in xenomorph specimens." //CHOMPedit
 	machine_understands = 0 // CHOMPedit: Borgs and AI can't figure this one out.
 	speech_verb = "hisses"
diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm
index d6186b153a..1eb140d7b8 100644
--- a/code/modules/mob/language/synthetic.dm
+++ b/code/modules/mob/language/synthetic.dm
@@ -1,5 +1,5 @@
 /datum/language/binary
-	name = "Robot Talk"
+	name = LANGUAGE_ROBOT_TALK
 	desc = "Most human stations support free-use communications protocols and routing hubs for synthetic use."
 	colour = "say_quote_italics"
 	speech_verb = "states"
@@ -58,7 +58,7 @@
 		R.cell_use_power(C.active_usage)
 
 /datum/language/binary/drone
-	name = "Drone Talk"
+	name = LANGUAGE_DRONE_TALK
 	desc = "A heavily encoded damage control coordination stream."
 	speech_verb = "transmits"
 	ask_verb = "transmits"
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index efe153b30c..c18833722a 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -337,8 +337,8 @@
 	w_class = ITEMSIZE_NORMAL
 
 
-/obj/item/farmbot_arm_assembly/New(var/newloc, var/theTank)
-	..(newloc)
+/obj/item/farmbot_arm_assembly/Initialize(mapload, var/theTank)
+	. = ..()
 	if(!theTank) // If an admin spawned it, it won't have a watertank it, so lets make one for em!
 		tank = new /obj/structure/reagent_dispensers/watertank(src)
 	else
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 1fc159e3f8..dcdd74e8f7 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -52,7 +52,7 @@
 /mob/living/carbon/alien/get_default_language()
 	if(default_language)
 		return default_language
-	return GLOB.all_languages["Xenolingua"] //CHOMPedit
+	return GLOB.all_languages[LANGUAGE_XENOLINGUA]
 
 /mob/living/carbon/alien/say_quote(var/message, var/datum/language/speaking = null)
 	var/verb = "hisses"
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 3c64771da7..0bd06c2149 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -4,7 +4,7 @@
 	adult_form = /mob/living/carbon/human
 	speak_emote = list("hisses")
 	icon_state = "larva"
-	language = "Hivemind"
+	language = LANGUAGE_HIVEMIND
 	maxHealth = 50
 	health = 50
 	faction = FACTION_XENO
@@ -12,5 +12,5 @@
 
 /mob/living/carbon/alien/larva/Initialize(mapload)
 	. = ..()
-	add_language("Xenolingua") //Bonus language. CHOMPedit
+	add_language(LANGUAGE_XENOLINGUA) //Bonus language.
 	internal_organs |= new /obj/item/organ/internal/xenos/hivenode(src)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index d6ac428b60..29775f0f1e 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -20,7 +20,8 @@
 	var/obj/item/radio/headset/mmi_radio/radio = null//Let's give it a radio.
 	var/mob/living/body_backup = null //add reforming
 
-/obj/item/mmi/New()
+/obj/item/mmi/Initialize(mapload)
+	. = ..()
 	radio = new(src)//Spawns a radio inside the MMI.
 
 /obj/item/mmi/verb/toggle_radio()
@@ -185,16 +186,16 @@
 	var/ghost_query_type = null
 	var/datum/ghost_query/Q //This is used so we can unregister ourself.
 
-/obj/item/mmi/digital/New()
+/obj/item/mmi/digital/Initialize(mapload)
+	. = ..()
 	src.brainmob = new(src)
-//	src.brainmob.add_language("Robot Talk")//No binary without a binary communication device
+//	src.brainmob.add_language(LANGUAGE_ROBOT_TALK)//No binary without a binary communication device
 	src.brainmob.add_language(LANGUAGE_GALCOM)
 	src.brainmob.add_language(LANGUAGE_EAL)
 	src.brainmob.loc = src
 	src.brainmob.container = src
 	src.brainmob.set_stat(CONSCIOUS)
 	src.brainmob.silent = 0
-	radio = new(src)
 	dead_mob_list -= src.brainmob
 
 /obj/item/mmi/digital/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -300,8 +301,8 @@
 	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4)
 	ghost_query_type = /datum/ghost_query/drone_brain
 
-/obj/item/mmi/digital/robot/New()
-	..()
+/obj/item/mmi/digital/robot/Initialize(mapload)
+	. = ..()
 	src.brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN","NJS","SKS","DRD","IOS","CRM","IBM","TEX","LVM","BSD",))]-[rand(1000, 9999)]"
 	src.brainmob.real_name = src.brainmob.name
 
@@ -343,8 +344,8 @@
 	..()
 	icon_state = "posibrain"
 
-/obj/item/mmi/digital/posibrain/New()
-	..()
+/obj/item/mmi/digital/posibrain/Initialize(mapload)
+	. = ..()
 	src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
 	src.brainmob.real_name = src.brainmob.name
 
diff --git a/code/modules/mob/living/carbon/human/human_species_vr.dm b/code/modules/mob/living/carbon/human/human_species_vr.dm
index 4a018a2ed3..be2d418ddb 100644
--- a/code/modules/mob/living/carbon/human/human_species_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_species_vr.dm
@@ -1,42 +1,42 @@
 /mob/living/carbon/human/dummy
 	no_vore = TRUE //Dummies don't need bellies.
 
-/mob/living/carbon/human/sergal/New(var/new_loc)
+/mob/living/carbon/human/sergal/Initialize(mapload)
 	h_style = "Sergal Plain"
-	..(new_loc, SPECIES_SERGAL)
+	. = ..(mapload, SPECIES_SERGAL)
 
-/mob/living/carbon/human/akula/New(var/new_loc)
-	..(new_loc, SPECIES_AKULA)
+/mob/living/carbon/human/akula/Initialize(mapload)
+	. = ..(mapload, SPECIES_AKULA)
 
-/mob/living/carbon/human/nevrean/New(var/new_loc)
-	..(new_loc, SPECIES_NEVREAN)
+/mob/living/carbon/human/nevrean/Initialize(mapload)
+	. = ..(mapload, SPECIES_NEVREAN)
 
-/mob/living/carbon/human/xenochimera/New(var/new_loc)
-	..(new_loc, SPECIES_XENOCHIMERA)
+/mob/living/carbon/human/xenochimera/Initialize(mapload)
+	. = ..(mapload, SPECIES_XENOCHIMERA)
 
-/mob/living/carbon/human/spider/New(var/new_loc)
-	..(new_loc, SPECIES_VASILISSAN)
+/mob/living/carbon/human/spider/Initialize(mapload)
+	. = ..(mapload, SPECIES_VASILISSAN)
 
-/mob/living/carbon/human/vulpkanin/New(var/new_loc)
-	..(new_loc, SPECIES_VULPKANIN)
+/mob/living/carbon/human/vulpkanin/Initialize(mapload)
+	. = ..(mapload, SPECIES_VULPKANIN)
 
-/mob/living/carbon/human/protean/New(var/new_loc)
-	..(new_loc, SPECIES_PROTEAN)
+/mob/living/carbon/human/protean/Initialize(mapload)
+	. = ..(mapload, SPECIES_PROTEAN)
 
-/mob/living/carbon/human/alraune/New(var/new_loc)
-	..(new_loc, SPECIES_ALRAUNE)
+/mob/living/carbon/human/alraune/Initialize(mapload)
+	. = ..(mapload, SPECIES_ALRAUNE)
 
-/mob/living/carbon/human/shadekin/New(var/new_loc)
-	..(new_loc, SPECIES_SHADEKIN)
+/mob/living/carbon/human/shadekin/Initialize(mapload)
+	. = ..(mapload, SPECIES_SHADEKIN)
 
-/mob/living/carbon/human/altevian/New(var/new_loc)
-	..(new_loc, SPECIES_ALTEVIAN)
+/mob/living/carbon/human/altevian/Initialize(mapload)
+	. = ..(mapload, SPECIES_ALTEVIAN)
 
-/mob/living/carbon/human/lleill/New(var/new_loc)
-	..(new_loc, SPECIES_LLEILL)
+/mob/living/carbon/human/lleill/Initialize(mapload)
+	. = ..(mapload, SPECIES_LLEILL)
 
-/mob/living/carbon/human/hanner/New(var/new_loc)
-	..(new_loc, SPECIES_HANNER)
+/mob/living/carbon/human/hanner/Initialize(mapload)
+	. = ..(mapload, SPECIES_HANNER)
 
-/mob/living/carbon/human/sparkledog/New(var/new_loc)
-	..(new_loc, SPECIES_SPARKLE)
+/mob/living/carbon/human/sparkledog/Initialize(mapload)
+	. = ..(mapload, SPECIES_SPARKLE)
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm b/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm
index 841566f43f..2aca3193f3 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm
@@ -84,8 +84,8 @@ GLOBAL_LIST_BOILERPLATE(all_darkportal_hubs, /obj/structure/dark_portal/hub)
 	locked = src
 	locked_name = src.name
 
-/obj/structure/dark_portal/hub/New()
-	..()
+/obj/structure/dark_portal/hub/Initialize(mapload)
+	. = ..()
 	set_light(2, 3, "#ffffff")
 
 /obj/structure/dark_portal/hub/close_portal()
diff --git a/code/modules/mob/living/carbon/human/species/station/greyYW.dm b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
index 75962137af..1f87d3982e 100644
--- a/code/modules/mob/living/carbon/human/species/station/greyYW.dm
+++ b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
@@ -74,5 +74,5 @@
 	if(H.fire_stacks < 0 && H.get_water_protection() <= 0.5)	// If over half your body is soaked, you're melting.
 		H.adjustFireLoss(max(0,(3 - (3 * H.get_water_protection()))))	// Tripled because 0.5 is miniscule, and fire_stacks are capped in both directions.
 
-/mob/living/carbon/human/grey/New(var/new_loc) //makes grey spawnable
-	..(new_loc, SPECIES_GREY_YW)
+/mob/living/carbon/human/grey/Initialize(mapload) //makes grey spawnable
+	. = ..(mapload, SPECIES_GREY_YW)
diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
index ab6cd535d9..3e36c8140c 100644
--- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
@@ -102,14 +102,13 @@
 	return
 
 //Constructor allows passing the human to sync damages
-/mob/living/simple_mob/slime/promethean/New(var/newloc, var/mob/living/carbon/human/H)
-	..()
-	if(H)
-		humanform = H
-		updatehealth()
+/mob/living/simple_mob/slime/promethean/Initialize(mapload, var/mob/living/carbon/human/H)
+	. = ..()
+	if(!H)
+		return INITIALIZE_HINT_QDEL
 
-	else
-		qdel(src)
+	humanform = H
+	updatehealth()
 
 /mob/living/simple_mob/slime/promethean/updatehealth()
 	if(!humanform)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
index eda19fb63b..b35af674b7 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
@@ -68,7 +68,7 @@
 	emote_see = list("shifts wetly","undulates placidly")
 
 //Constructor allows passing the human to sync damages
-/mob/living/simple_mob/protean_blob/New(var/newloc, var/mob/living/carbon/human/H)
+/mob/living/simple_mob/protean_blob/Initialize(mapload, var/mob/living/carbon/human/H)
 	. = ..()
 	if(!H)
 		stack_trace("URGENT: A protean blob was created without a humanform! src = [src] ckey = [ckey]! The blob has been deleted.")
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
index e59d021f63..c8e4696175 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
@@ -3,8 +3,8 @@
 	name = SPECIES_XENO
 	name_plural = "Xenomorphs"
 
-	default_language = "Xenomorph"
-	language = "Hivemind"
+	default_language = LANGUAGE_XENOLINGUA
+	language = LANGUAGE_HIVEMIND
 	assisted_langs = list()
 	unarmed_types = list(/datum/unarmed_attack/claws/strong/xeno, /datum/unarmed_attack/bite/strong/xeno)
 	hud_type = /datum/hud_data/alien
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
index 8dcf913c65..7e9a524b46 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
@@ -7,24 +7,24 @@
 	new_alien.set_species("Xenomorph [alien_caste]")
 	return new_alien
 
-/mob/living/carbon/human/xdrone/New(var/new_loc)
+/mob/living/carbon/human/xdrone/Initialize(mapload)
 	h_style = "Bald"
 	faction = FACTION_XENO
-	..(new_loc, SPECIES_XENO_DRONE)
+	. = ..(mapload, SPECIES_XENO_DRONE)
 
-/mob/living/carbon/human/xsentinel/New(var/new_loc)
+/mob/living/carbon/human/xsentinel/Initialize(mapload)
 	h_style = "Bald"
 	faction = FACTION_XENO
-	..(new_loc, SPECIES_XENO_SENTINEL)
+	. = ..(mapload, SPECIES_XENO_SENTINEL)
 
-/mob/living/carbon/human/xhunter/New(var/new_loc)
+/mob/living/carbon/human/xhunter/Initialize(mapload)
 	h_style = "Bald"
 	faction = FACTION_XENO
-	..(new_loc, SPECIES_XENO_HUNTER)
+	. = ..(mapload, SPECIES_XENO_HUNTER)
 
-/mob/living/carbon/human/xqueen/New(var/new_loc)
+/mob/living/carbon/human/xqueen/Initialize(mapload)
 	h_style = "Bald"
 	faction = FACTION_XENO
-	..(new_loc, SPECIES_XENO_QUEEN)
+	. = ..(mapload, SPECIES_XENO_QUEEN)
 
 //Removed AddInfectionImages, no longer required.
diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm
index f83d03e0d3..90201af788 100644
--- a/code/modules/mob/living/carbon/metroid/items.dm
+++ b/code/modules/mob/living/carbon/metroid/items.dm
@@ -26,8 +26,8 @@
 		enhanced = 1
 		qdel(O)
 */
-/obj/item/slime_extract/New()
-	..()
+/obj/item/slime_extract/Initialize(mapload)
+	. = ..()
 	create_reagents(5)
 //	reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 30)
 
@@ -326,8 +326,8 @@
 	var/Flush = 30
 	var/Uses = 5 // uses before it goes inert
 
-/obj/item/slime_core/New()
-		..()
+/obj/item/slime_core/Initialize(mapload)
+		. = ..()
 		create_reagents(100)
 		POWERFLAG = rand(1,10)
 		Uses = rand(7, 25)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index a17f1dc2ea..e73e925a08 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1,5 +1,5 @@
-/mob/living/New()
-	..()
+/mob/living/Initialize(mapload)
+	. = ..()
 
 	//Prime this list if we need it.
 	if(has_huds)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 0a27aa7b7d..7ad1e583fb 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -106,7 +106,8 @@ var/list/ai_verbs_default = list(
 	remove_verb(src, ai_verbs_default)
 	remove_verb(src, silicon_subsystems)
 
-/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0)
+/mob/living/silicon/ai/Initialize(mapload, is_decoy, datum/ai_laws/L, obj/item/mmi/B, safety = FALSE)
+
 	announcement = new()
 	announcement.title = "A.I. Announcement"
 	announcement.announcement_type = "A.I. Announcement"
@@ -128,7 +129,6 @@ var/list/ai_verbs_default = list(
 	anchored = TRUE
 	canmove = 0
 	density = TRUE
-	loc = loc
 
 	if(!is_dummy)
 		aiCommunicator = new /obj/item/communicator/integrated(src)
@@ -156,7 +156,7 @@ var/list/ai_verbs_default = list(
 		add_ai_verbs(src)
 
 	//Languages
-	add_language("Robot Talk", 1)
+	add_language(LANGUAGE_ROBOT_TALK, 1)
 	add_language(LANGUAGE_GALCOM, 1)
 	add_language(LANGUAGE_SOL_COMMON, 1)
 	add_language(LANGUAGE_UNATHI, 1)
@@ -175,20 +175,25 @@ var/list/ai_verbs_default = list(
 	if(!safety)//Only used by AIize() to successfully spawn an AI.
 		if (!B)//If there is no player/brain inside.
 			empty_playable_ai_cores += new/obj/structure/AIcore/deactivated(loc)//New empty terminal.
-			qdel(src)//Delete AI.
-			return
-		else
-			if (B.brainmob.mind)
-				B.brainmob.mind.transfer_to(src)
+			return INITIALIZE_HINT_QDEL //Delete AI.
 
-			on_mob_init()
+		if (B.brainmob.mind)
+			B.brainmob.mind.transfer_to(src)
+
+		on_mob_init()
 
-	spawn(5)
-		new /obj/machinery/ai_powersupply(src)
 
 	ai_list += src
-	..()
-	return
+	. = ..()
+
+	new /obj/machinery/ai_powersupply(src)
+
+	if(CONFIG_GET(flag/allow_ai_shells))
+		add_verb(src, /mob/living/silicon/ai/proc/deploy_to_shell_act)
+
+	create_eyeobj()
+	if(eyeobj)
+		eyeobj.loc = src.loc
 
 /mob/living/silicon/ai/proc/on_mob_init()
 	var/init_text = list(span_bold("You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras)."),
@@ -240,6 +245,7 @@ var/list/ai_verbs_default = list(
 	QDEL_NULL(aiCamera)
 	hack = null
 
+	destroy_eyeobj()
 	return ..()
 
 /mob/living/silicon/ai/get_status_tab_items()
diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
index 27effd765f..18db9be96d 100644
--- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm
+++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
@@ -1,11 +1,6 @@
 /mob/living/silicon/ai
 	var/mob/living/silicon/robot/deployed_shell = null //For shell control
 
-/mob/living/silicon/ai/Initialize(mapload)
-	if(CONFIG_GET(flag/allow_ai_shells))
-		add_verb(src, /mob/living/silicon/ai/proc/deploy_to_shell_act)
-	return ..()
-
 /mob/living/silicon/ai/proc/deploy_to_shell(var/mob/living/silicon/robot/target)
 	if(!CONFIG_GET(flag/allow_ai_shells))
 		to_chat(src, span_warning("AI Shells are not allowed on this server. You shouldn't have this verb because of it, so consider making a bug report."))
diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm
index 1002308971..622fcd0b4e 100644
--- a/code/modules/mob/living/silicon/ai/ai_vr.dm
+++ b/code/modules/mob/living/silicon/ai/ai_vr.dm
@@ -1,5 +1,5 @@
-/mob/living/silicon/ai/Initialize(mapload, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0)
-	. = ..(mapload, L, B, safety)
+/mob/living/silicon/ai/Initialize(mapload, is_decoy, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = FALSE)
+	. = ..()
 	add_language(LANGUAGE_BIRDSONG,		1)
 	add_language(LANGUAGE_SAGARU,		1)
 	add_language(LANGUAGE_CANILUNZT,	1)
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index 3a43ef2bb2..c859d9d3ac 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -5,8 +5,5 @@
 	anchored = TRUE // -- TLE
 	canmove = 0
 
-/mob/living/silicon/decoy/New()
-	src.icon = 'icons/mob/AI.dmi'
-	src.icon_state = "ai"
-	src.anchored = TRUE
-	src.canmove = 0
+/mob/living/silicon/decoy/Initialize(mapload)
+	. = ..(mapload, TRUE)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 8a47d8a220..47f6e234df 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -112,9 +112,13 @@
 
 	var/our_icon_rotation = 0
 
-/mob/living/silicon/pai/New(var/obj/item/paicard)
-	src.loc = paicard
-	card = paicard
+/mob/living/silicon/pai/Initialize(mapload)
+	. = ..()
+
+	card = loc
+	if(!istype(card))
+		return INITIALIZE_HINT_QDEL
+
 	sradio = new(src)
 	communicator = new(src)
 	if(card)
@@ -135,15 +139,14 @@
 
 	//PDA
 	pda = new(src)
-	spawn(5)
-		pda.ownjob = "Personal Assistant"
-		pda.owner = text("[]", src)
-		pda.name = pda.owner + " (" + pda.ownjob + ")"
+	pda.ownjob = "Personal Assistant"
+	pda.owner = text("[]", src)
+	pda.name = pda.owner + " (" + pda.ownjob + ")"
 
-		var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger)
-		if(M)
-			M.toff = FALSE
-	..()
+	var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger)
+	if(M)
+		M.toff = FALSE
+	. = ..()
 
 /mob/living/silicon/pai/Login()
 	..()
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
index b6e738abec..7fa047adaf 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
@@ -8,10 +8,7 @@
 	throwforce = 0
 	attack_verb = list("nuzzled", "nosed", "booped")
 	w_class = ITEMSIZE_TINY
-
-/obj/item/boop_module/New()
-	..()
-	flags |= NOBLUDGEON //No more attack messages
+	flags = NOBLUDGEON //No more attack messages
 
 /obj/item/boop_module/attack_self(mob/user)
 	if (!( istype(user.loc, /turf) ))
@@ -135,10 +132,7 @@
 	var/emagged = 0
 	var/datum/matter_synth/water = null //CHOMPAdd readds water
 	var/busy = 0 	//prevents abuse and runtimes
-
-/obj/item/robot_tongue/New()
-	..()
-	flags |= NOBLUDGEON //No more attack messages
+	flags = NOBLUDGEON //No more attack messages
 
 /obj/item/robot_tongue/attack_self(mob/user)
 	var/mob/living/silicon/robot/R = user
@@ -285,10 +279,7 @@
 	icon = 'icons/mob/dogborg_vr.dmi'
 	icon_state = "scrub0"
 	var/enabled = FALSE
-
-/obj/item/pupscrubber/New()
-	..()
-	flags |= NOBLUDGEON
+	flags = NOBLUDGEON
 
 /obj/item/pupscrubber/attack_self(mob/user)
 	var/mob/living/silicon/robot/R = user
@@ -392,10 +383,7 @@
 	force = 0
 	throwforce = 0
 	var/bluespace = FALSE
-
-/obj/item/dogborg/pounce/New()
-	..()
-	flags |= NOBLUDGEON
+	flags = NOBLUDGEON
 
 /obj/item/dogborg/pounce/attack_self(mob/user)
 	var/mob/living/silicon/robot/R = user
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm
index 4db6a77d8d..78a653962b 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm
@@ -47,10 +47,10 @@
 	var/ore_storage = FALSE //CHOMPAdd
 	var/max_ore_storage = 500 //CHOMPAdd
 	var/current_capacity = 0 //CHOMPAdd
+	flags = NOBLUDGEON
 
-/obj/item/dogborg/sleeper/New()
-	..()
-	flags |= NOBLUDGEON //No more attack messages
+/obj/item/dogborg/sleeper/Initialize(mapload)
+	. = ..()
 	files = new /datum/research/techonly(src)
 	med_analyzer = new /obj/item/healthanalyzer
 
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index fcbdd5e64f..4dcc97976f 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -102,22 +102,19 @@ var/list/mob_hat_cache = list()
 	can_pick_shell = FALSE
 	shell_accessories = list("eyes-miningdrone")
 
-/mob/living/silicon/robot/drone/New()
-	..()
+/mob/living/silicon/robot/drone/Initialize(mapload, is_decoy)
+	. = ..(mapload, is_decoy, FALSE, TRUE)
 	add_verb(src, /mob/living/proc/ventcrawl)
 	add_verb(src, /mob/living/proc/hide)
-	remove_language("Robot Talk")
-	add_language("Robot Talk", 0)
-	add_language("Drone Talk", 1)
+	remove_language(LANGUAGE_ROBOT_TALK)
+	add_language(LANGUAGE_ROBOT_TALK, 0)
+	add_language(LANGUAGE_DRONE_TALK, 1)
 	serial_number = rand(0,999)
 
 	//They are unable to be upgraded, so let's give them a bit of a better battery.
 	cell.maxcharge = 10000
 	cell.charge = 10000
 
-	// NO BRAIN.
-	mmi = null
-
 	//We need to screw with their HP a bit. They have around one fifth as much HP as a full borg.
 	for(var/V in components) if(V != "power cell")
 		var/datum/robot_component/C = components[V]
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index c16ea267ac..286124b355 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -14,7 +14,7 @@
 			return emote(copytext(message,2))
 
 		if(copytext(message,1,2) == ";")
-			var/datum/language/L = GLOB.all_languages["Drone Talk"]
+			var/datum/language/L = GLOB.all_languages[LANGUAGE_DRONE_TALK]
 			if(istype(L))
 				return L.broadcast(src,trim(copytext(message,2)))
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 64b9e251d0..4609cd4cb4 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -142,13 +142,13 @@
 	vore_fullness_ex = list()
 	vore_icon_bellies = list()
 
-/mob/living/silicon/robot/New(loc, var/unfinished = 0)
+/mob/living/silicon/robot/Initialize(mapload, is_decoy, unfinished = FALSE)
 	spark_system = new /datum/effect/effect/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 	robotact = new(src)
 
-	add_language("Robot Talk", 1)
+	add_language(LANGUAGE_ROBOT_TALK, 1)
 	add_language(LANGUAGE_GALCOM, 1)
 	add_language(LANGUAGE_EAL, 1)
 
@@ -185,7 +185,7 @@
 	else if(ispath(cell))
 		cell = new cell(src)
 
-	..()
+	. = ..()
 
 	if(cell)
 		var/datum/robot_component/cell_component = components["power cell"]
@@ -317,7 +317,7 @@
 				mmi.brainmob.languages = M.original_languages
 			else
 				mmi.brainmob.languages = languages
-			mmi.brainmob.remove_language("Robot Talk")
+			mmi.brainmob.remove_language(LANGUAGE_ROBOT_TALK)
 			mind.transfer_to(mmi.brainmob)
 		else if(!shell) // Shells don't have brainmbos in their MMIs.
 			to_chat(src, span_danger("Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug."))
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 181bd148fc..cd04086258 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -12,10 +12,14 @@
 
 	var/obj/item/loaded_item	//What is currently inside the analyzer.
 
-/obj/item/portable_destructive_analyzer/New()
-	..()
+/obj/item/portable_destructive_analyzer/Initialize(mapload)
+	. = ..()
 	files = new /datum/research/techonly(src) //Setup the research data holder.
 
+/obj/item/portable_destructive_analyzer/Destroy()
+	qdel_null(files)
+	. = ..()
+
 /obj/item/portable_destructive_analyzer/attack_self(user as mob)
 	var/response = tgui_alert(user, 	"Analyzing the item inside will *DESTROY* the item for good.\n\
 							Syncing to the research server will send the data that is stored inside to research.\n\
@@ -606,9 +610,9 @@
 	var/overload_time = 0			//Stores the time of overload
 	var/last_flash = 0				//Stores the time of last flash
 
-/obj/item/borg/combat/shield/New()
+/obj/item/borg/combat/shield/Initialize(mapload)
+	. = ..()
 	START_PROCESSING(SSobj, src)
-	..()
 
 /obj/item/borg/combat/shield/Destroy()
 	STOP_PROCESSING(SSobj, src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
index f38b85f5fc..2215488dd6 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
@@ -12,7 +12,10 @@
 					)
 	can_be_pushed = 0
 
-/obj/item/robot_module/xenomaid/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/xenomaid/Initialize(mapload)
+	var/mob/living/silicon/robot/R = loc
+	if(!istype(R))
+		return INITIALIZE_HINT_QDEL
 	src.modules += new /obj/item/flash(src)
 	src.modules += new /obj/item/soap/nanotrasen(src)
 	src.modules += new /obj/item/storage/bag/trash(src)
@@ -23,7 +26,7 @@
 	src.emag.name = "Lube spray"
 	R.icon 		 = 'icons/mob/robots_yw.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
-	..()
+	. = ..()
 
 
 
@@ -36,7 +39,10 @@
 	networks = list(NETWORK_MINE)
 	can_be_pushed = 0
 
-/obj/item/robot_module/blade/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/blade/Initialize(mapload)
+	var/mob/living/silicon/robot/R = loc
+	if(!istype(R))
+		return INITIALIZE_HINT_QDEL
 	src.modules += new /obj/item/dogborg/jaws/big(src) //In case there's some kind of hostile mob.
 	src.modules += new /obj/item/dogborg/boop_module(src) //Boop people on the nose.
 	src.modules += new /obj/item/dogborg/tongue(src) //This is so they can clean up bloody evidence after it's examined, and so they can lick crew.
@@ -57,7 +63,7 @@
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
-	..()
+	. = ..()
 
 
 /obj/item/robot_module/surgeryhound
@@ -71,7 +77,10 @@
 					"Dark Medical Hound (Static)" = "medihounddark"
 					)
 
-/obj/item/robot_module/surgeryhound/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/surgeryhound/Initialize(mapload)
+	var/mob/living/silicon/robot/R = loc
+	if(!istype(R))
+		return INITIALIZE_HINT_QDEL
 	src.modules += new /obj/item/dogborg/jaws/small(src) //In case a patient is being attacked by carp.
 	src.modules += new /obj/item/dogborg/boop_module(src) //Boop the crew.
 	src.modules += new /obj/item/dogborg/tongue(src) //Clean up bloody items by licking them, and eat rubbish for
@@ -102,7 +111,7 @@
 	//R.icon_state = "medihound"
 	R.pixel_x 	 = -16
 	R.old_x  	 = -16
-	..()
+	. = ..()
 
 	var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000)
 	synths += medicine
diff --git a/code/modules/mob/living/silicon/robot/sprites/standard.dm b/code/modules/mob/living/silicon/robot/sprites/standard.dm
index 01a8f6efd2..bbc2cac30f 100644
--- a/code/modules/mob/living/silicon/robot/sprites/standard.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/standard.dm
@@ -169,7 +169,7 @@
 
 	can_be_pushed = 0
 
-/obj/item/robot_module/robot/standard/hound/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/robot/standard/hound/create_equipment(mob/living/silicon/robot/robot)
 	..()
 	src.modules += new /obj/item/melee/baton/loaded(src)
 	src.modules += new /obj/item/tool/wrench/cyborg(src)
@@ -203,5 +203,4 @@
 	add_verb(R,/mob/living/proc/toggle_rider_reins)
 	add_verb(R,/mob/living/proc/shred_limb)
 	add_verb(R,/mob/living/silicon/robot/proc/rest_style)
-	..()
 */
diff --git a/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm b/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm
index 78253a9ec4..b1a1655670 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm
@@ -46,7 +46,8 @@ What Borgs are available is sadly handled in the above file in the proc
 				"Vampire's Aid" = "boozeborg(red)",
 				"Vodka Komrade" = "boozeborg(vodka)"
 				)
-/obj/item/robot_module/robot/booze/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/robot/booze/create_equipment(mob/living/silicon/robot/robot)
+	..()
 	src.modules += new /obj/item/gripper/service(src)
 	//src.modules += new /obj/item/reagent_containers/glass/bucket(src)
 	//src.modules += new /obj/item/material/minihoe(src)
@@ -111,7 +112,6 @@ What Borgs are available is sadly handled in the above file in the proc
 	R.vore_capacity_ex = list("stomach" = 1)
 	R.wideborg = TRUE
 	add_verb(R,/mob/living/silicon/robot/proc/ex_reserve_refill) //TGPanel
-	..()
 
 /obj/item/robot_module/robot/booze/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
 	var/obj/item/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
diff --git a/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm b/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
index 69407a72d6..fecd463291 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
@@ -46,7 +46,10 @@ What Borgs are available is sadly handled in the above file in the proc
 				"Vampire's Aid" = "boozeborg(red)",
 				"Vodka Komrade" = "boozeborg(vodka)"
 				)
-/obj/item/robot_module/robot/booze/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/robot/booze/Initialize(mapload)
+	var/mob/living/silicon/robot/R = loc
+	if(!istype(R))
+		return INITIALIZE_HINT_QDEL
 	src.modules += new /obj/item/gripper/service(src)
 	//src.modules += new /obj/item/reagent_containers/glass/bucket(src)
 	//src.modules += new /obj/item/material/minihoe(src)
@@ -111,7 +114,7 @@ What Borgs are available is sadly handled in the above file in the proc
 	R.vore_capacity_ex = list("stomach" = 1)
 	R.wideborg = TRUE
 	add_verb(R,/mob/living/silicon/robot/proc/ex_reserve_refill) //CHOMPEdit TGPanel
-	..()
+	. = ..()
 
 /obj/item/robot_module/robot/booze/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
 	var/obj/item/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
diff --git a/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-modules.dm b/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-modules.dm
index 0cae32e274..9a6f45fb3f 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-modules.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-modules.dm
@@ -27,7 +27,8 @@
 /obj/item/robot_module/robot/exploration
 	can_be_pushed = 0
 
-/obj/item/robot_module/robot/exploration/New(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/robot/exploration/create_equipment(mob/living/silicon/robot/robot)
+	..()
 	src.modules += new /obj/item/dogborg/sleeper/exploration(src)
 	src.modules += new /obj/item/cataloguer(src)
 	src.modules += new /obj/item/gun/energy/robotic/flare(src)
@@ -40,5 +41,3 @@
 	src.modules += new /obj/item/card/id/exploration/borg(src)
 
 	src.emag += new /obj/item/melee/robotic/jaws/big/explojaws(src)
-
-	..()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 8b99babbfe..7cea3d9697 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -29,15 +29,16 @@
 
 	var/hudmode = null
 
-/mob/living/silicon/New()
+/mob/living/silicon/Initialize(mapload, is_decoy = FALSE)
+	. = ..()
 	silicon_mob_list += src
-	..()
-	add_language(LANGUAGE_GALCOM)
-	apply_default_language(GLOB.all_languages[LANGUAGE_GALCOM])
-	init_id()
-	init_subsystems()
+	if(!is_decoy)
+		add_language(LANGUAGE_GALCOM)
+		apply_default_language(GLOB.all_languages[LANGUAGE_GALCOM])
+		init_id()
+		init_subsystems()
 
-	AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6)
+		AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6)
 
 /mob/living/silicon/Destroy()
 	silicon_mob_list -= src
diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm
index 289bd0fe6d..99503ba4af 100644
--- a/code/modules/mob/living/simple_animal/aliens/synx.dm
+++ b/code/modules/mob/living/simple_animal/aliens/synx.dm
@@ -170,9 +170,9 @@
 	)
 */
 
-/mob/living/simple_mob/animal/synx/New() //this is really cool. Should be able to ventcrawl canonicaly, contort, and make random speech.
+/mob/living/simple_mob/animal/synx/Initialize(mapload) //this is really cool. Should be able to ventcrawl canonicaly, contort, and make random speech.
 //some things should be here that arent tho.
-	..()
+	. = ..()
 	add_verb(src,/mob/living/proc/ventcrawl) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/proc/distend_stomach) //CHOMPEdit TGPanel //to do later: sprites of stomach outside the body.
 	add_verb(src,/mob/living/simple_mob/proc/contort) //CHOMPEdit TGPanel
@@ -709,8 +709,8 @@
 	faction = "SYN"
 
 
-/mob/living/simple_mob/animal/synx/ai/pet/greed/synth/New()
-	..()
+/mob/living/simple_mob/animal/synx/ai/pet/greed/synth/Initialize(mapload)
+	. = ..()
 	name = "SYN-KinC-([rand(100,999)])"
 
 /mob/living/simple_mob/animal/synx/ai/pet/greed/synth/goodboy
@@ -777,7 +777,8 @@
 	set category = "Debug.Synx" //CHOMPEdit
 	icon_state = input(usr, "What would you like to change icon_state to?", "Respriting", null)
 
-/mob/living/simple_mob/animal/synx/ai/pet/debug/New()
+/mob/living/simple_mob/animal/synx/ai/pet/debug/Initialize(mapload)
+	. = ..()
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/rename) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/resprite) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/redesc) //CHOMPEdit TGPanel
diff --git a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm
index b5daa89dc3..3d78bc85c4 100644
--- a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm
@@ -30,13 +30,9 @@
 	var/mob/living/simple_mob/vore/overmap/parent_mob_type
 	var/mob/living/simple_mob/vore/overmap/parent
 
-/obj/effect/overmap/visitable/simplemob/New(newloc, new_parent)
-	if(new_parent)
-		parent = new_parent
-	return ..()
-
-/obj/effect/overmap/visitable/simplemob/Initialize(mapload)
+/obj/effect/overmap/visitable/simplemob/Initialize(mapload, new_parent)
 	. = ..()
+	parent = new_parent
 	if(!parent_mob_type && !parent)
 		log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.")
 		return INITIALIZE_HINT_QDEL
@@ -139,13 +135,9 @@
 	var/om_child_type
 	var/shipvore = FALSE	//Enable this to allow the mob to eat spaceships by dragging them onto its sprite.
 
-/mob/living/simple_mob/vore/overmap/New(mapload, new_child)
-	if(new_child)
-		child_om_marker = new_child
-	return ..()
-
-/mob/living/simple_mob/vore/overmap/Initialize(mapload)
+/mob/living/simple_mob/vore/overmap/Initialize(mapload, new_child)
 	. = ..()
+	child_om_marker = new_child
 	if(!om_child_type)
 		log_and_message_admins("An improperly configured OM mob tried to spawn, and was deleted.")
 		return INITIALIZE_HINT_QDEL
@@ -172,13 +164,9 @@
 	var/mob/living/simple_mob/vore/overmap/parent_mob_type
 	var/mob/living/simple_mob/vore/overmap/parent
 
-/obj/effect/overmap/visitable/ship/simplemob/New(newloc, new_parent)
-	if(new_parent)
-		parent = new_parent
-	return ..()
-
-/obj/effect/overmap/visitable/ship/simplemob/Initialize(mapload)
+/obj/effect/overmap/visitable/ship/simplemob/Initialize(mapload, new_parent)
 	. = ..()
+	parent = new_parent
 	if(!parent_mob_type && !parent)
 		log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.")
 		return INITIALIZE_HINT_QDEL
diff --git a/code/modules/mob/living/simple_mob/sd_pets.dm b/code/modules/mob/living/simple_mob/sd_pets.dm
index 3e3ea4cd66..1878c74a72 100644
--- a/code/modules/mob/living/simple_mob/sd_pets.dm
+++ b/code/modules/mob/living/simple_mob/sd_pets.dm
@@ -38,20 +38,16 @@
 	desc = "Don't make fun, they have a condition."
 	digestable = 0
 
-/mob/living/simple_mob/animal/passive/mouse/jerboa/leggy/New()
-	..()
-	name = initial(name)
-	desc = initial(desc)
+/mob/living/simple_mob/animal/passive/mouse/jerboa/leggy/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 /mob/living/simple_mob/animal/passive/mouse/brown/feivel
 	name = "Feivel"
 	desc = "Heading out west wasn't far enough, so he's going to space!"
 	digestable = 0
 
-/mob/living/simple_mob/animal/passive/mouse/brown/feivel/New()
-	..()
-	name = initial(name)
-	desc = initial(desc)
+/mob/living/simple_mob/animal/passive/mouse/brown/feivel/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 /mob/living/simple_mob/animal/passive/cat/jones
 	name = "Jones"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
index 4b73ccac19..ce071a25a2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm	
@@ -123,12 +123,12 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
 		if(prob(25))
 			L.adjustHalLoss(leech)
 
-/mob/living/simple_mob/vore/alienanimals/space_jellyfish/New(newloc, jellyfish)
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Initialize(mapload, jellyfish)
+	. = ..()
 	GLOB.jellyfish_count ++
 	var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/parent = jellyfish
 	if(parent)
 		parent.faction = faction
-	..()
 
 /mob/living/simple_mob/vore/alienanimals/space_jellyfish/death()
 	. = ..()
@@ -177,11 +177,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
 
 	var/inherited_nutriment = 0
 
-/obj/item/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit)
-	inherited_nutriment	= inherit
-	. = ..()
-
-/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize(mapload)
-	nutriment_amt += inherited_nutriment
+/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize(mapload, inherit)
 	. = ..()
+	nutriment_amt += inherit
 	reagents.add_reagent(REAGENT_ID_NUTRIMENT, nutriment_amt, nutriment_desc)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
index e4d32fb38e..51c537c123 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm	
@@ -120,8 +120,6 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	var/teppi_warned = FALSE
 	var/teppi_mutate = FALSE	//Allows Teppi to get their children's colors scrambled, and possibly other things later on!
 
-	var/teppi_growingup = FALSE // flag to prevent multiple qdels
-
 	attacktext = list("nipped", "chomped", "bonked", "stamped on")
 	attack_sound = 'sound/voice/teppi/roar.ogg' // make a better one idiot
 	friendly = list("snoofs", "nuzzles", "nibbles", "smooshes on")
@@ -691,10 +689,6 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 			var/nutrition_cost = 500 + (nutrition / 2)
 			adjust_nutrition(-nutrition_cost)
 			new /mob/living/simple_mob/vore/alienanimals/teppi(loc, src)
-			if(!teppi_growingup)
-				teppi_growingup = TRUE
-				qdel(src)
-				return
 		else
 			visible_message("\The [src] whines pathetically...", runemessage = "whines")
 			if(prob(50))
@@ -769,13 +763,14 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 		return TRUE
 
 //Handles both growing up from a baby and also passing parent details to new babies.
-/mob/living/simple_mob/vore/alienanimals/teppi/New(newloc, teppi1, teppi2)
+/mob/living/simple_mob/vore/alienanimals/teppi/Initialize(mapload, teppi1, teppi2)
 	GLOB.teppi_count ++
 	if(teppi1 && !teppi2)
 		inherit_from_baby(teppi1)
+		qdel(teppi1)
 	else if (teppi1 && teppi2)
 		inherit_from_parents(teppi1, teppi2)
-	..()
+	. = ..()
 
 /mob/living/simple_mob/vore/alienanimals/teppi/Destroy()
 	GLOB.teppi_count --
@@ -1141,13 +1136,13 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 			return
 
 //This a teppi with funny colors will spawn!
-/mob/living/simple_mob/vore/alienanimals/teppi/mutant/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/mutant/Initialize(mapload)
 	teppi_mutate = TRUE
 	. = ..()
 
 //Custom teppi colors! For funzies.
 
-/mob/living/simple_mob/vore/alienanimals/teppi/cass/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/cass/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#c69c85"
 	marking_color = "#eeb698"
@@ -1158,7 +1153,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	horn_type =  "0"
 	. = ..()
 
-/mob/living/simple_mob/vore/alienanimals/teppi/baby/cass/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/baby/cass/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#c69c85"
 	marking_color = "#eeb698"
@@ -1169,7 +1164,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	horn_type =  "0"
 	. = ..()
 
-/mob/living/simple_mob/vore/alienanimals/teppi/aronai/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/aronai/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#404040"
 	marking_color = "#222222"
@@ -1180,7 +1175,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	horn_type = "1"
 	. = ..()
 
-/mob/living/simple_mob/vore/alienanimals/teppi/lira/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/lira/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#fdfae9"
 	marking_color = "#ffffc0"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
index c4ccbac387..28a70575f9 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm	
@@ -32,8 +32,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 	var/eggsleft = 0
 	var/body_color
 
-/mob/living/simple_mob/animal/passive/chicken/New()
-	..()
+/mob/living/simple_mob/animal/passive/chicken/Initialize(mapload)
+	. = ..()
 	if(!body_color)
 		body_color = pick( list("brown","black","white") )
 	icon_state = "chicken_[body_color]"
@@ -132,8 +132,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 
 	var/amount_grown = 0
 
-/mob/living/simple_mob/animal/passive/chick/New()
-	..()
+/mob/living/simple_mob/animal/passive/chick/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(-6, 6)
 	pixel_y = rand(0, 10)
 
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
index 556d10d678..b3065ebd23 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm	
@@ -24,10 +24,11 @@
 
 	var/datum/reagents/udder = null
 
-/mob/living/simple_mob/animal/passive/cow/New()
+/mob/living/simple_mob/animal/passive/cow/Initialize(mapload)
+	. = ..()
+
 	udder = new(50)
 	udder.my_atom = src
-	..()
 
 /mob/living/simple_mob/animal/passive/cow/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	var/obj/item/reagent_containers/glass/G = O
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
index 4b949d687f..28f527494e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm	
@@ -27,10 +27,10 @@
 
 	var/datum/reagents/udder = null
 
-/mob/living/simple_mob/animal/goat/New()
+/mob/living/simple_mob/animal/goat/Initialize(mapload)
+	. = ..()
 	udder = new(50)
 	udder.my_atom = src
-	..()
 
 /mob/living/simple_mob/animal/goat/Life()
 	. = ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
index 38d946b8b5..d45fac3c7f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
@@ -52,25 +52,24 @@
 	pain_emote_1p = list("squeak", "squik") // CHOMP Addition: Pain/etc sounds
 	pain_emote_1p = list("squeaks", "squiks") // CHOMP Addition: Pain/etc sounds
 
-//CHOMPEdit Start
-/mob/living/simple_mob/animal/passive/mouse/Initialize(mapload)
-	. = ..()
-	ghostjoin = 1
-	ghostjoin_icon()
-	active_ghost_pods |= src
-
+//CHOMPAdd Start
 /mob/living/simple_mob/animal/passive/mouse/Destroy()
 	active_ghost_pods -= src
 	return ..()
-//CHOMPEdit End
+//CHOMPAdd End
 
-/mob/living/simple_mob/animal/passive/mouse/New()
-	..()
+/mob/living/simple_mob/animal/passive/mouse/Initialize(mapload, keep_parent_data)
+	. = ..()
+	//CHOMPAdd Start
+	ghostjoin = 1
+	ghostjoin_icon()
+	active_ghost_pods += src
+	//CHOMPAdd End
 
 	add_verb(src, /mob/living/proc/ventcrawl)
 	add_verb(src, /mob/living/proc/hide)
 
-	if(name == initial(name))
+	if(!keep_parent_data && name == initial(name))
 		name = "[name] ([rand(1, 1000)])"
 	real_name = name
 
@@ -81,7 +80,7 @@
 	icon_living = "mouse_[body_color]"
 	icon_dead = "mouse_[body_color]_dead"
 	icon_rest = "mouse_[body_color]_sleep"
-	if (body_color != "rat")
+	if (!keep_parent_data && body_color != "rat")
 		desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
 		holder_type = /obj/item/holder/mouse/rat
 	if (body_color == "operative")
@@ -151,10 +150,8 @@
 	name = "Tom"
 	desc = "Jerry the cat is not amused."
 
-/mob/living/simple_mob/animal/passive/mouse/brown/Tom/New()
-	..()
-	// Change my name back, don't want to be named Tom (666)
-	name = initial(name)
+/mob/living/simple_mob/animal/passive/mouse/brown/Tom/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 /mob/living/simple_mob/animal/passive/mouse/black
 	body_color = "black"
@@ -204,10 +201,8 @@
 	name = "Agent Cheese"
 	desc = "I like my cheese Swiss... not American."
 
-/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese/New()
-	..()
-	// Change my name back, don't want to be named agent_cheese (666)
-	name = initial(name)
+/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 // Mouse noises
 /datum/say_list/mouse
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
index a0acf27576..f563cac690 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
@@ -56,11 +56,8 @@
 	desc = "Dainty, well groomed and cared for, her eyes glitter with untold knowledge..."
 	gender = FEMALE
 
-/mob/living/simple_mob/animal/passive/mouse/white/apple/New()
-	..()
-	// Change my name back, don't want to be named Apple (666)
-	name = initial(name)
-	desc = initial(desc)
+/mob/living/simple_mob/animal/passive/mouse/white/apple/Initialize(mapload, keep_parent_data)
+	. = ..(mapload, TRUE)
 
 
 /obj/item/holder/mouse/attack_self(mob/living/carbon/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm
index 1c84becd6a..f75ad91a6c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm
@@ -171,8 +171,8 @@
 	name = "Cooper"
 	desc = "A lonely miner's best friend."
 
-/mob/living/simple_mob/animal/passive/mouse/mining/New()
-	..()
+/mob/living/simple_mob/animal/passive/mouse/mining/Initialize(mapload)
+	. = ..()
 
 	add_verb(src,/mob/living/proc/ventcrawl) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/proc/hide) //CHOMPEdit TGPanel
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm
index d9282d9d55..5a0a89efa2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm
@@ -68,8 +68,8 @@
 	pain_emote_1p = list("squeak", "squik") // CHOMP Addition: Pain/etc sounds
 	pain_emote_1p = list("squeaks", "squiks") // CHOMP Addition: Pain/etc sounds
 
-/mob/living/simple_mob/animal/space/mouse_army/New()
-	..()
+/mob/living/simple_mob/animal/space/mouse_army/Initialize(mapload)
+	. = ..()
 
 	add_verb(src,/mob/living/proc/ventcrawl) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/proc/hide) //CHOMPEdit TGPanel
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
index 511a384756..337b9125d4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
@@ -216,7 +216,7 @@
 	icon_state = "sneksnakbox"
 	storage_slots = 7
 
-/obj/item/storage/box/snakesnackbox/New()
+/obj/item/storage/box/snakesnackbox/Initialize(mapload)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
@@ -224,4 +224,4 @@
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
-	..()
+	. = ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
index de7e0faaa2..9a74d3a453 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
@@ -28,17 +28,13 @@
 	var/prey_ooc_dislikes
 	var/was_mob = FALSE //CHOMPAdd - tracks if the dominated being was a mob
 
-/mob/living/dominated_brain/New(loc, var/mob/living/pred, preyname, var/mob/living/prey)
-	. = ..()
+/mob/living/dominated_brain/Initialize(mapload, var/mob/living/pred, preyname, var/mob/living/prey)
 	prey_name = preyname
 	if(prey)
 		prey_body = prey
 	pred_body = pred
-
-/mob/living/dominated_brain/Initialize(mapload)
 	if(!isliving(loc))
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	. = ..()
 	lets_register_our_signals()
 	add_verb(src, /mob/living/dominated_brain/proc/resist_control)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm
index 1600398d93..ae8f7aeb9d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm
@@ -349,7 +349,8 @@ GLOBAL_LIST_INIT(valid_random_lamias, list(
 ))
 
 /mob/living/simple_mob/vore/lamia/random
-/mob/living/simple_mob/vore/lamia/random/New()
+
+/mob/living/simple_mob/vore/lamia/random/Initialize(mapload)
 	var/mob/living/simple_mob/vore/lamia/new_attrs = pick(GLOB.valid_random_lamias)
 
 	name = initial(new_attrs.name)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm
index 755815e977..db59bd8f4e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm
@@ -182,8 +182,8 @@
 
 	glow_toggle = !glow_toggle
 
-/mob/living/simple_mob/vore/leopardmander/exotic/New()
-	..()
+/mob/living/simple_mob/vore/leopardmander/exotic/Initialize(mapload)
+	. = ..()
 	add_verb(src,/mob/living/simple_mob/vore/leopardmander/exotic/proc/toggle_glow) //CHOMPEdit TGPanel
 
 /mob/living/simple_mob/vore/leopardmander/exotic/init_vore()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index 95c8d47726..8091ba7c97 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -312,23 +312,22 @@
 	var/prey_ckey
 
 
-/mob/living/simple_mob/vore/morph/dominated_prey/New(loc, pckey, parent, prey)
+/mob/living/simple_mob/vore/morph/dominated_prey/Initialize(mapload, pckey, parent, prey)
 	. = ..()
-	if(pckey)
-		prey_ckey = pckey
-		parent_morph = parent
-		prey_body = prey
-		prey_body.forceMove(get_turf(parent_morph))
-		prey_body.muffled = FALSE
-		prey_body.absorbed = FALSE
-		absorbed = TRUE
-		ckey = prey_ckey
-		prey_body.ckey = parent_morph.original_ckey
-		parent_morph.forceMove(src)
-		name = "[prey_body.name]"
-		to_chat(prey_body, span_notice("You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form."))
-	else
-		qdel(src)
+	if(!pckey)
+		return INITIALIZE_HINT_QDEL
+	prey_ckey = pckey
+	parent_morph = parent
+	prey_body = prey
+	prey_body.forceMove(get_turf(parent_morph))
+	prey_body.muffled = FALSE
+	prey_body.absorbed = FALSE
+	absorbed = TRUE
+	ckey = prey_ckey
+	prey_body.ckey = parent_morph.original_ckey
+	parent_morph.forceMove(src)
+	name = "[prey_body.name]"
+	to_chat(prey_body, span_notice("You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form."))
 
 /mob/living/simple_mob/vore/morph/dominated_prey/death(gibbed)
 	. = ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm
index 81c77e9948..85348aca49 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm
@@ -21,9 +21,11 @@
 	var/shift_mode = NOT_WHILE_SHIFTED
 	var/ab_sound
 
-/obj/effect/rakshasa_ability/New(var/new_kin)
-	..()
-	my_kin = new_kin
+/obj/effect/rakshasa_ability/Initialize(mapload)
+	. = ..()
+	my_kin = loc
+	if(!istype(my_kin))
+		return INITIALIZE_HINT_QDEL
 	loc = null
 
 /obj/effect/rakshasa_ability/Destroy()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm
index 957f616e00..d4e080fe14 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm
@@ -21,10 +21,9 @@
 	..()
 	color = basecolor
 
-/obj/structure/gootrap/New()
-	..()
+/obj/structure/gootrap/Initialize(mapload)
+	. = ..()
 	update_icon()
-	return
 
 /obj/structure/gootrap/attack_hand(mob/user as mob)
 	if(has_buckled_mobs() && can_use(user))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm
index 67b9472899..ef492a6558 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm
@@ -163,12 +163,14 @@
 	var/turf/my_turf = null //The turf we spawn on.
 	var/base_escape_time = 1 MINUTE //How long does it take to struggle free? Affected by the victim's size_multiplier.
 
-/obj/effect/slug_glue/New()
-	..()
-	dissipate()
+/obj/effect/slug_glue/Initialize(mapload)
+	. = ..()
+	if(!persist_time)
+		return INITIALIZE_HINT_QDEL
 	my_turf = get_turf(src)
 	if(istype(my_turf, /turf/simulated/floor/water)) //Aside from not making sense in water, this prevents drowning.
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
+	QDEL_IN(src, persist_time)
 /*	for(var/obj/effect/slug_glue/G in my_turf.contents)
 		if(G == src)
 			continue
@@ -176,15 +178,6 @@
 			qdel(G) //Prevent glue layering
 */ //Not including this due to performance concerns but keeping as comments for reference.
 
-/obj/effect/slug_glue/proc/dissipate() //When spawned, set a timer to despawn.
-	if(!persist_time)
-		qdel(src)
-		return
-	else
-		spawn(persist_time) //I used sleep() here first and it made the slug sleep for 5 minutes when spawning glue. Byond.
-		qdel(src)
-		return
-
 /obj/effect/slug_glue/Destroy()
 	. = ..()
 	if(my_slug)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm b/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm
index 17dc8122cd..61ca1c4279 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm
@@ -31,8 +31,8 @@
 
 	faction = FACTION_SUCCUBUS
 
-/mob/living/simple_mob/vore/succubus/New()
-	..()
+/mob/living/simple_mob/vore/succubus/Initialize(mapload)
+	. = ..()
 	if(random_skin)
 		icon_living = pick(skins)
 		icon_rest = "[icon_living]asleep"
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm
index 69a2f34def..d29eb252d1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm
@@ -38,8 +38,8 @@
 	pixel_y = 0
 	faction = FACTION_WOLFTAUR
 
-/mob/living/simple_mob/vore/wolftaur/New()
-	..()
+/mob/living/simple_mob/vore/wolftaur/Initialize(mapload)
+	. = ..()
 	if(random_skin)
 		icon_living = pick(skins)
 		icon_rest = "[icon_living]_rest"
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 0d35f2a334..502c5c32c2 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -36,15 +36,13 @@
 	destroy_on_drop = TRUE	//VOREStation Edit
 
 
-/obj/item/grab/New(mob/user, mob/victim)
-	..()
-	loc = user
-	assailant = user
+/obj/item/grab/Initialize(mapload, mob/victim)
+	. = ..()
+	assailant = loc
 	affecting = victim
 
-	if(affecting.anchored || !assailant.Adjacent(victim))
-		qdel(src)
-		return
+	if(!istype(assailant) || !istype(affecting) || affecting.anchored || !assailant.Adjacent(victim))
+		return INITIALIZE_HINT_QDEL
 
 	affecting.grabbed_by += src
 	affecting.reveal(span_warning("You are revealed as [assailant] grabs you."))
diff --git a/code/modules/mob/mob_planes.dm b/code/modules/mob/mob_planes.dm
index 99a9df9ad9..ae629be708 100644
--- a/code/modules/mob/mob_planes.dm
+++ b/code/modules/mob/mob_planes.dm
@@ -130,10 +130,8 @@
 	var/invis_toggle = FALSE
 	var/list/sub_planes
 
-/obj/screen/plane_master/New()
-	..(null) //Never be in anything ever.
-
 /obj/screen/plane_master/proc/backdrop(mob/mymob)
+	return
 
 /obj/screen/plane_master/proc/set_desired_alpha(var/new_alpha)
 	if(new_alpha != alpha && new_alpha > 0 && new_alpha <= 255)
diff --git a/code/modules/mob/mob_planes_vr.dm b/code/modules/mob/mob_planes_vr.dm
index 0cfc934109..291d6a2c13 100644
--- a/code/modules/mob/mob_planes_vr.dm
+++ b/code/modules/mob/mob_planes_vr.dm
@@ -4,10 +4,10 @@
 	plane_masters[VIS_CH_HEALTH_VR] 	= new /obj/screen/plane_master{plane = PLANE_CH_HEALTH_VR}			//Health bar but transparent at 100
 	plane_masters[VIS_CH_BACKUP] 		= new /obj/screen/plane_master{plane = PLANE_CH_BACKUP}				//Backup implant status
 	plane_masters[VIS_CH_VANTAG] 		= new /obj/screen/plane_master{plane = PLANE_CH_VANTAG}				//Vore Antags
-	plane_masters[VIS_CH_STOMACH] 		= new /obj/screen/plane_master{plane = PLANE_CH_STOMACH}				//Stomach
-	plane_masters[VIS_SOULCATCHER] 		= new /obj/screen/plane_master{plane = PLANE_SOULCATCHER}				// Soulcatcher
+	plane_masters[VIS_CH_STOMACH] 		= new /obj/screen/plane_master{plane = PLANE_CH_STOMACH}			//Stomach
+	plane_masters[VIS_SOULCATCHER] 		= new /obj/screen/plane_master{plane = PLANE_SOULCATCHER}			// Soulcatcher
 
-	plane_masters[VIS_AUGMENTED]		= new /obj/screen/plane_master/augmented(M = my_mob)				//Augmented reality
+	plane_masters[VIS_AUGMENTED]		= new /obj/screen/plane_master/augmented(null, my_mob)				//Augmented reality
 	..()
 
 /////////////////
@@ -17,8 +17,8 @@
 	var/state = FALSE //Saves cost with the lists
 	var/mob/my_mob
 
-/obj/screen/plane_master/augmented/New(null, var/mob/M)
-	..()
+/obj/screen/plane_master/augmented/Initialize(mapload, var/mob/M)
+	. = ..()
 	my_mob = M
 
 /obj/screen/plane_master/augmented/Destroy()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index c7dd507d4d..8704b2d9b5 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -22,8 +22,8 @@
 
 	var/created_for
 
-/mob/new_player/New()
-	mob_list += src
+/mob/new_player/Initialize(mapload)
+	. = ..()
 	add_verb(src, /mob/proc/insidePanel)
 	//CHOMPEdit Begin
 	if(length(GLOB.newplayer_start))
@@ -31,7 +31,6 @@
 	else
 		forceMove(locate(1,1,1))
 	//CHOMPEdit End
-	flags |= ATOM_INITIALIZED // Explicitly don't use Initialize().  New players join super early and use New()
 
 
 /mob/new_player/Destroy()
@@ -458,7 +457,6 @@
 	spawning = 1
 	close_spawn_windows()
 
-	//CHOMPEdit start - join as mob in crystal...
 	var/obj/item/itemtf = join_props["itemtf"]
 	if(itemtf && istype(itemtf, /obj/item/capture_crystal))
 		var/obj/item/capture_crystal/cryst = itemtf
@@ -482,7 +480,6 @@
 			cryst.update_icon()
 			qdel(src)
 			return
-	//CHOMPEdit end
 
 	job_master.AssignRole(src, rank, 1)
 
@@ -524,7 +521,6 @@
 
 	ticker.mode.latespawn(character)
 
-	//CHOMPEdit Begin - non-crew join don't get a message
 	if(rank == JOB_OUTSIDER)
 		log_and_message_admins("has joined the round as non-crew. (<A href='byond://?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)",character)
 		if(!(J.mob_type & JOB_SILICON))
@@ -533,7 +529,6 @@
 		log_and_message_admins("has joined the round as anomaly. (<A href='byond://?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)",character)
 		if(!(J.mob_type & JOB_SILICON))
 			ticker.minds += character.mind
-	//CHOMPEdit End
 	else if(J.mob_type & JOB_SILICON)
 		AnnounceCyborg(character, rank, join_message, announce_channel, character.z)
 	else
@@ -547,9 +542,8 @@
 			if(imp.handle_implant(character,character.zone_sel.selecting))
 				imp.post_implant(character)
 	var/gut = join_props["voreny"]
-	var/start_absorbed = join_props["absorb"] //CHOMPAdd
+	var/start_absorbed = join_props["absorb"]
 	var/mob/living/prey = join_props["prey"]
-	//CHOMPEdit Start - Item TF
 	if(itemtf && istype(itemtf, /obj/item/capture_crystal))
 		//We want to be in the crystal, not actually possessing the crystal.
 		var/obj/item/capture_crystal/cryst = itemtf
@@ -563,7 +557,6 @@
 		itemtf.trash_eatable = character.devourable
 		itemtf.unacidable = !character.digestable
 		character.forceMove(possessed_voice)
-	//CHOMPEdit End
 	else if(prey)
 		character.copy_from_prefs_vr(1,1) //Yes I know we're reloading these, shut up
 		var/obj/belly/gut_to_enter
@@ -575,21 +568,15 @@
 		tele.set_up("#00FFFF", get_turf(prey))
 		tele.start()
 		character.forceMove(get_turf(prey))
-		//CHOMPAdd Start
 		if(start_absorbed)
 			prey.absorbed = 1
-		//CHOMPAdd End
 		prey.forceMove(gut_to_enter)
 	else
 		if(gut)
-			//CHOMPAdd Start
 			if(start_absorbed)
 				character.absorbed = 1
-			//CHOMPAdd End
 			character.forceMove(gut)
 
-	character.client.init_verbs() // init verbs for the late join
-
 	character.client.init_verbs()
 	qdel(src) // Delete new_player mob
 
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 21422ef3d6..20d6a9d0d3 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -105,7 +105,7 @@
 		O.key = key
 
 	//Languages
-	add_language("Robot Talk", 1)
+	add_language(LANGUAGE_ROBOT_TALK, 1)
 	add_language(LANGUAGE_GALCOM, 1)
 	add_language(LANGUAGE_SOL_COMMON, 1)
 	add_language(LANGUAGE_UNATHI, 1)
@@ -155,7 +155,7 @@
 	for(var/t in organs)
 		qdel(t)
 
-	var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( loc )
+	var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(loc)
 
 	O.gender = gender
 	O.invisibility = 0
diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm
index f4ff407fe1..a51d0be7b4 100644
--- a/code/modules/modular_computers/hardware/_hardware.dm
+++ b/code/modules/modular_computers/hardware/_hardware.dm
@@ -59,12 +59,11 @@
 /obj/item/computer_hardware/proc/diagnostics(var/mob/user)
 	to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")
 
-/obj/item/computer_hardware/New(var/obj/L)
-	..()
+/obj/item/computer_hardware/Initialize(mapload)
+	. = ..()
 	w_class = hardware_size
-	if(istype(L, /obj/item/modular_computer))
-		holder2 = L
-		return
+	if(istype(loc, /obj/item/modular_computer))
+		holder2 = loc
 
 /obj/item/computer_hardware/Destroy()
 	holder2 = null
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index 7d69ea8bcf..6aa08685a6 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -56,19 +56,21 @@
 	hardware_size = 1
 	battery_rating = 30000
 
-/obj/item/computer_hardware/battery_module/lambda/New()
-	..()
-	battery = new/obj/item/cell/infinite(src)
+/obj/item/computer_hardware/battery_module/lambda/Initialize(mapload)
+	. = ..(mapload, /obj/item/cell/infinite)
 
 /obj/item/computer_hardware/battery_module/diagnostics(var/mob/user)
 	..()
 	to_chat(user, "Internal battery charge: [battery.charge]/[battery.maxcharge] CU")
 
-/obj/item/computer_hardware/battery_module/New()
-	battery = new/obj/item/cell(src)
+/obj/item/computer_hardware/battery_module/Initialize(mapload, cell_type)
+	if(ispath(cell_type))
+		battery = new cell_type(src)
+	else
+		battery = new/obj/item/cell(src)
 	battery.maxcharge = battery_rating
 	battery.charge = 0
-	..()
+	. = ..()
 
 /obj/item/computer_hardware/battery_module/Destroy()
 	qdel_null(battery)
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index e78bf0eafa..8e74350ac1 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -182,6 +182,6 @@
 	stored_files = null
 	return ..()
 
-/obj/item/computer_hardware/hard_drive/New()
+/obj/item/computer_hardware/hard_drive/Initialize(mapload)
+	. = ..()
 	install_default_programs()
-	..()
diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm
index 6cb5fc0dd3..f1f2e942e4 100644
--- a/code/modules/modular_computers/hardware/network_card.dm
+++ b/code/modules/modular_computers/hardware/network_card.dm
@@ -33,8 +33,8 @@ var/global/ntnet_card_uid = 1
 	if(ethernet)
 		to_chat(user, "OpenEth (Physical Connection) - Physical network connection port")
 
-/obj/item/computer_hardware/network_card/New(var/l)
-	..(l)
+/obj/item/computer_hardware/network_card/Initialize(mapload)
+	. = ..()
 	identification_id = ntnet_card_uid
 	ntnet_card_uid++
 
diff --git a/code/modules/modular_computers/hardware/portable_hard_drive.dm b/code/modules/modular_computers/hardware/portable_hard_drive.dm
index f627b2671a..e40791b3b0 100644
--- a/code/modules/modular_computers/hardware/portable_hard_drive.dm
+++ b/code/modules/modular_computers/hardware/portable_hard_drive.dm
@@ -26,8 +26,8 @@
 	max_capacity = 256
 	origin_tech = list(TECH_DATA = 4)
 
-/obj/item/computer_hardware/hard_drive/portable/New()
-	..()
+/obj/item/computer_hardware/hard_drive/portable/Initialize(mapload)
+	. = ..()
 	stored_files = list()
 	recalculate_size()
 
diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm
index 0b4b5e4e21..f46785562c 100644
--- a/code/modules/multiz/basic.dm
+++ b/code/modules/multiz/basic.dm
@@ -2,13 +2,12 @@
 var/list/z_levels = list()// Each bit re... haha just kidding this is a list of bools now
 
 // If the height is more than 1, we mark all contained levels as connected.
-/obj/effect/landmark/map_data/New()
+INITIALIZE_IMMEDIATE(/obj/effect/landmark/map_data)
+/obj/effect/landmark/map_data/Initialize(mapload)
 	for(var/i = (z - height + 1) to (z-1))
 		if (z_levels.len <i)
 			z_levels.len = i
 		z_levels[i] = TRUE
-
-/obj/effect/landmark/map_data/Initialize(mapload)
 	..()
 	return INITIALIZE_HINT_QDEL
 
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index af0e2c7ca3..d26e4a1849 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -432,9 +432,11 @@
 	icon_state = "beacon"
 	var/mob/living/parent_human
 
-/mob/observer/eye/ar_soul/New(var/mob/brainmob, var/human)
-	ASSERT(brainmob && brainmob.client)
-	..()
+/mob/observer/eye/ar_soul/Initialize(mapload, var/human)
+	. = ..()
+	var/mob/brainmob = loc
+	if(!istype(brainmob) || !brainmob.client)
+		return INITIALIZE_HINT_QDEL
 
 	owner = brainmob				//Set eyeobj's owner
 	parent_human = human			//E-z reference to human
@@ -449,13 +451,12 @@
 
 	//Time to play dressup
 	if(brainmob.client.prefs)
-		var/mob/living/carbon/human/dummy/dummy = new ()
-		brainmob.client.prefs.dress_preview_mob(dummy)
-		sleep(1 SECOND) //Strange bug in preview code? Without this, certain things won't show up. Yay race conditions?
-		dummy.regenerate_icons()
+		var/mob/living/carbon/human/dummy/mannequin = get_mannequin(brainmob.client.ckey)
+		mannequin.delete_inventory(TRUE)
+		brainmob.client.prefs.dress_preview_mob(mannequin)
+		mannequin.regenerate_icons()
 
-		var/icon/new_icon = getHologramIcon(getCompoundIcon(dummy))
-		qdel(dummy)
+		var/icon/new_icon = getHologramIcon(getCompoundIcon(mannequin))
 		icon = new_icon
 
 /mob/observer/eye/ar_soul/Destroy()
diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 8772694e39..10970b5916 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -189,11 +189,13 @@
 	light_color = "#ed9200"
 	anchored = TRUE
 
-/obj/effect/engine_exhaust/New(var/turf/nloc, var/ndir, var/flame)
-	..(nloc)
+/obj/effect/engine_exhaust/Initialize(mapload, var/ndir, var/flame)
+	. = ..()
 	if(flame)
 		icon_state = "exhaust"
-		nloc.hotspot_expose(1000,125)
+		if(isturf(loc))
+			var/turf/T = loc
+			T.hotspot_expose(1000,125)
 		set_light(0.5, 3)
 	set_dir(ndir)
 	QDEL_IN(src, 20)
diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm
index ed68f9bd58..d74cc9bffb 100644
--- a/code/modules/paperwork/adminpaper.dm
+++ b/code/modules/paperwork/adminpaper.dm
@@ -16,7 +16,7 @@
 	var/footer = null
 	var/footerOn = FALSE
 
-/obj/item/paper/admin/Initialize(mapload) //ChompEDIT New --> Initialize
+/obj/item/paper/admin/Initialize(mapload, text, title)
 	. = ..()
 	generateInteractions()
 
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index dea46fe7ad..56766feb5f 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -11,7 +11,7 @@
 
 	var/obj/item/paper/internalPaper
 
-/obj/item/paperplane/Initialize(mapload, obj/item/paper/newPaper) //ChompEDIT New --> Initialize
+/obj/item/paperplane/Initialize(mapload, obj/item/paper/newPaper)
 	. = ..()
 	pixel_y = rand(-8, 8)
 	pixel_x = rand(-9, 9)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index a1e4003e00..f36a1a4788 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -131,8 +131,8 @@
 	flags = OPENCONTAINER
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
 
-/obj/item/pen/reagent/New()
-	..()
+/obj/item/pen/reagent/Initialize(mapload)
+	. = ..()
 	create_reagents(30)
 
 /obj/item/pen/reagent/attack(mob/living/M as mob, mob/user as mob)
@@ -247,9 +247,10 @@
 	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
 
-/obj/item/pen/reagent/sleepy/New()
-	..()
-	reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
+/obj/item/pen/reagent/sleepy/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 22)	// CHOMPEdit
+	// reagents.add_reagent(REAGENT_ID_STOXIN, 14)	// CHOMPRemove
 
 
 /*
@@ -258,8 +259,8 @@
 /obj/item/pen/reagent/paralysis
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
 
-/obj/item/pen/reagent/paralysis/New()
-	..()
+/obj/item/pen/reagent/paralysis/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent(REAGENT_ID_ZOMBIEPOWDER, 5)
 	reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 10)
 
@@ -337,13 +338,11 @@
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
-/obj/item/pen/crayon/New()
-	name = "[colourName] crayon"
+/obj/item/pen/crayon/Initialize(mapload)
+	. = ..()
+	name = "[colourName] [name]"
 
 /obj/item/pen/crayon/marker
 	name = "marker"
 	desc = "A chisel-tip permanent marker. Hopefully non-toxic."
 	icon_state = "markerred"
-
-/obj/item/pen/crayon/marker/New()
-	name = "[colourName] marker"
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index 5d3e7dc004..716f34468f 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -271,7 +271,8 @@ var/list/civilian_cartridges = list(
 	programs = list(new/datum/data/pda/utility/toggle_door)
 	messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate)
 
-/obj/item/cartridge/syndicate/New()
+/obj/item/cartridge/syndicate/Initialize(mapload)
+	. = ..()
 	var/datum/data/pda/utility/toggle_door/D = programs[1]
 	if(istype(D))
 		D.remote_door_id = initial_remote_door_id
diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index 832b8458fb..e2ad870007 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -128,8 +128,8 @@ var/global/list/obj/item/pda/PDAs = list()
 		close(user)
 	return 0
 
-/obj/item/pda/New(var/mob/living/carbon/human/H)
-	..()
+/obj/item/pda/Initialize(mapload)
+	. = ..()
 	PDAs += src
 	PDAs = sortAtom(PDAs)
 	update_programs()
@@ -137,7 +137,13 @@ var/global/list/obj/item/pda/PDAs = list()
 		cartridge = new default_cartridge(src)
 		cartridge.update_programs(src)
 	new /obj/item/pen(src)
-	pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.pdachoice : 1)
+
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		pdachoice = H.pdachoice
+	else
+		pdachoice = 1
+
 	switch(pdachoice)
 		if(1)
 			icon = 'icons/obj/pda_vr.dmi'			//VOREStation edit
diff --git a/code/modules/pda/pda_subtypes.dm b/code/modules/pda/pda_subtypes.dm
index 1b687d54fa..3968515c24 100644
--- a/code/modules/pda/pda_subtypes.dm
+++ b/code/modules/pda/pda_subtypes.dm
@@ -43,7 +43,7 @@
 	default_cartridge = /obj/item/cartridge/mime
 	icon_state = "pda-mime"
 
-/obj/item/pda/mime/New()
+/obj/item/pda/mime/Initialize(mapload)
 	. = ..()
 	var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
 	if(M)
@@ -128,7 +128,7 @@
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader."
 	model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant"
 
-/obj/item/pda/librarian/New()
+/obj/item/pda/librarian/Initialize(mapload)
 	. = ..()
 	var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
 	if(M)
@@ -171,44 +171,44 @@
 	)
 	var/list/cartridges_to_send_to = list()
 
-/obj/item/pda/multicaster/command/New()
-	..()
+/obj/item/pda/multicaster/command/Initialize(mapload)
+	. = ..()
 	owner = "Command Department"
 	name = "Command Department (Relay)"
 	cartridges_to_send_to = command_cartridges
 
-/obj/item/pda/multicaster/security/New()
-	..()
+/obj/item/pda/multicaster/security/Initialize(mapload)
+	. = ..()
 	owner = "Security Department"
 	name = "Security Department (Relay)"
 	cartridges_to_send_to = security_cartridges
 
-/obj/item/pda/multicaster/engineering/New()
-	..()
+/obj/item/pda/multicaster/engineering/Initialize(mapload)
+	. = ..()
 	owner = "Engineering Department"
 	name = "Engineering Department (Relay)"
 	cartridges_to_send_to = engineering_cartridges
 
-/obj/item/pda/multicaster/medical/New()
-	..()
+/obj/item/pda/multicaster/medical/Initialize(mapload)
+	. = ..()
 	owner = "Medical Department"
 	name = "Medical Department (Relay)"
 	cartridges_to_send_to = medical_cartridges
 
-/obj/item/pda/multicaster/research/New()
-	..()
+/obj/item/pda/multicaster/research/Initialize(mapload)
+	. = ..()
 	owner = "Research Department"
 	name = "Research Department (Relay)"
 	cartridges_to_send_to = research_cartridges
 
-/obj/item/pda/multicaster/cargo/New()
-	..()
+/obj/item/pda/multicaster/cargo/Initialize(mapload)
+	. = ..()
 	owner = "Cargo Department"
 	name = "Cargo Department (Relay)"
 	cartridges_to_send_to = cargo_cartridges
 
-/obj/item/pda/multicaster/civilian/New()
-	..()
+/obj/item/pda/multicaster/civilian/Initialize(mapload)
+	. = ..()
 	owner = "Civilian Services Department"
 	name = "Civilian Services Department (Relay)"
 	cartridges_to_send_to = civilian_cartridges
@@ -230,8 +230,8 @@
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "pdabox"
 
-/obj/item/storage/box/PDAs/New()
-	..()
+/obj/item/storage/box/PDAs/Initialize(mapload)
+	. = ..()
 	new /obj/item/pda(src)
 	new /obj/item/pda(src)
 	new /obj/item/pda(src)
diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm
index ee406ddf45..6f4a65ac79 100644
--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -89,7 +89,7 @@
 			var/list/b = signal.data
 			botstatus = b.Copy()
 
-/obj/item/radio/integrated/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
+/obj/item/radio/integrated/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local Initialize(mapload) to support map spawned bots.
 	if(radio_controller)
 		radio_controller.add_object(src, control_freq, radio_filter = bot_filter)
 
diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm
index 725b7f05a4..0151d8bd79 100644
--- a/code/modules/persistence/noticeboard.dm
+++ b/code/modules/persistence/noticeboard.dm
@@ -179,7 +179,8 @@
 	notices = 5
 	icon_state = "nboard05"
 
-/obj/structure/noticeboard/anomaly/Initialize(mapload) //ChompEDIT New --> Initialize
+/obj/structure/noticeboard/anomaly/Initialize(mapload)
+	. = ..()
 	var/obj/item/paper/P = new()
 	P.name = "Memo RE: proper analysis procedure"
 	P.info = "<br>We keep test dummies in pens here for a reason, so standard procedure should be to activate newfound alien artifacts and place the two in close proximity. Promising items I might even approve monkey testing on."
@@ -214,4 +215,3 @@
 	P.stamped = list(/obj/item/stamp/rd)
 	P.add_overlay("paper_stamped_rd")
 	contents += P
-	. = ..() //ChompEDIT New --> Initialize
diff --git a/code/modules/planet/sun.dm b/code/modules/planet/sun.dm
index f8e8e23be0..77f3840bd7 100644
--- a/code/modules/planet/sun.dm
+++ b/code/modules/planet/sun.dm
@@ -79,8 +79,8 @@
 	var/turfs_providing_spreads = list()
 	var/spreads = list()
 
-/atom/movable/sun_visuals/New()
-	..()
+/atom/movable/sun_visuals/Initialize(mapload)
+	. = ..()
 	spreads["1"] = new /atom/movable/sun_visuals_overlap(src, NORTH, "white_gradient")
 	spreads["2"] = new /atom/movable/sun_visuals_overlap(src, SOUTH, "white_gradient")
 	spreads["4"] = new /atom/movable/sun_visuals_overlap(src, EAST, "white_gradient")
@@ -185,7 +185,7 @@
 	alpha = 0
 	color = "#FFFFFF"
 
-/atom/movable/sun_visuals_overlap/New(newloc, newdir, newstate)
-	..()
+/atom/movable/sun_visuals_overlap/Initialize(mapload, newdir, newstate)
+	. = ..()
 	icon_state = newstate
 	dir = newdir
diff --git a/code/modules/planet/thor.dm b/code/modules/planet/thor.dm
index f037011f27..091090cdbf 100644
--- a/code/modules/planet/thor.dm
+++ b/code/modules/planet/thor.dm
@@ -759,8 +759,8 @@ var/datum/planet/thor/planet_thor = null
 	name = "deep ocean"
 	alpha = 0
 
-/obj/machinery/power/smes/buildable/offmap_spawn/empty/New()
-	..(1)
+/obj/machinery/power/smes/buildable/offmap_spawn/empty/Initialize(mapload)
+	. = ..()
 	charge = 0
 	RCon = TRUE
 	input_level = input_level_max
diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm
index 5e0b518d6d..f19acbc9d3 100644
--- a/code/modules/power/fusion/core/core_field.dm
+++ b/code/modules/power/fusion/core/core_field.dm
@@ -47,8 +47,8 @@
 	var/last_range
 	var/last_power
 
-/obj/effect/fusion_em_field/New(loc, var/obj/machinery/power/fusion_core/new_owned_core)
-	..()
+/obj/effect/fusion_em_field/Initialize(mapload, var/obj/machinery/power/fusion_core/new_owned_core)
+	. = ..()
 
 	set_light(light_min_range,light_min_power)
 	last_range = light_min_range
@@ -56,7 +56,7 @@
 
 	owned_core = new_owned_core
 	if(!owned_core)
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 	id_tag = owned_core.id_tag
 	//create the gimmicky things to handle field collisions
 	var/obj/effect/fusion_particle_catcher/catcher
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm
index 7c8611dcd1..f83694dd9c 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm
@@ -4,8 +4,8 @@
 	fuel_colour = "#FCE300"
 	fuel_type = "blitz"
 
-/obj/item/fuel_assembly/blitz/New(var/newloc)
-	..(newloc, "blitz")
+/obj/item/fuel_assembly/blitz/Initialize(mapload)
+	. = ..(mapload, "blitz")
 
 /obj/item/fuel_assembly/blitz/unshielded/Initialize(mapload)
 	. = ..()
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 5b1ff3eae1..bdf96e7e98 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -34,11 +34,11 @@
 	movement_range = 25
 	energy = 50
 
-/obj/effect/accelerated_particle/New(loc, dir = 2)
+/obj/effect/accelerated_particle/Initialize(mapload, dir = 2)
+	. = ..()
 	src.loc = loc
 	src.set_dir(dir)
-	spawn(0)
-		move(1)
+	addtimer(CALLBACK(src, PROC_REF(move)), 0.1 SECONDS)
 
 
 /obj/effect/accelerated_particle/Bump(atom/A)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 598e176650..7e3ea8302a 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -31,12 +31,11 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
 
 	var/chained = 0//Adminbus chain-grab
 
-/obj/singularity/New(loc, var/starting_energy = 50)
+/obj/singularity/Initialize(mapload, var/starting_energy = 50)
 	//CARN: admin-alert for chuckle-fuckery.
 	admin_investigate_setup()
+	. = ..()
 	energy = starting_energy
-
-	..()
 	START_PROCESSING(SSobj, src)
 	for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
 		if(singubeacon.active)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 95afcae9dd..efc8edf3ca 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -86,6 +86,35 @@ GLOBAL_LIST_EMPTY(smeses)
 		connect_to_network()
 	if(!should_be_mapped)
 		warning("Non-buildable or Non-magical SMES at [src.x]X [src.y]Y [src.z]Z")
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/power/smes/buildable/LateInitialize()
+	. = ..()
+	// Detect new coils placed by mappers
+	var/list/parts_found = list()
+	for(var/i = 1, i <= loc.contents.len, i++)
+		var/obj/item/W = loc.contents[i]
+		if(istype(W, /obj/item/smes_coil))
+			parts_found.Add(W)
+	// If any coils are on us, clear base coils and rebuild using these ones
+	if(parts_found.len == 0)
+		return
+	while(TRUE)
+		var/obj/item/smes_coil/C = locate(/obj/item/smes_coil) in component_parts
+		if(isnull(C))
+			break
+		component_parts.Remove(C)
+		C.forceMove(src.loc)
+		qdel(C)
+		cur_coils--
+	// Rebuild from mapper's coils
+	for(var/i = 1, i <= parts_found.len, i++)
+		if (cur_coils < max_coils)
+			var/obj/item/W = parts_found[i]
+			cur_coils++
+			component_parts.Add(W)
+			W.forceMove(src)
+	RefreshParts()
 
 /obj/machinery/power/smes/Destroy()
 	for(var/obj/machinery/power/terminal/T in terminals)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 3d26b3427f..1614c7391d 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -23,12 +23,9 @@
 	var/energy_to_raise = 32
 	var/energy_to_lower = -20
 
-/obj/singularity/energy_ball/New(loc, starting_energy = 50, is_miniball = FALSE)
-	..()
-	miniball = is_miniball
-
-/obj/singularity/energy_ball/Initialize(mapload)
+/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
 	. = ..()
+	miniball = is_miniball
 	if(!miniball)
 		set_light(10, 7, "#EEEEFF")
 
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm
index 6e428e5460..bc04aee1e3 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm
@@ -50,8 +50,8 @@
 	max_w_class = ITEMSIZE_NORMAL
 	can_hold = list(/obj/item/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical)
 
-/obj/item/storage/secure/briefcase/nerd_pack_med/New()
-	..()
+/obj/item/storage/secure/briefcase/nerd_pack_med/Initialize(mapload)
+	. = ..()
 	new /obj/item/gun/projectile/cell_loaded/medical(src)
 	new /obj/item/ammo_magazine/cell_mag/medical(src)
 	new /obj/item/ammo_casing/microbattery/medical/brute(src)
@@ -66,8 +66,8 @@
 	max_w_class = ITEMSIZE_NORMAL
 	can_hold = list(/obj/item/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical)
 
-/obj/item/storage/secure/briefcase/nerd_pack_cmo/New()
-	..()
+/obj/item/storage/secure/briefcase/nerd_pack_cmo/Initialize(mapload)
+	. = ..()
 	new /obj/item/gun/projectile/cell_loaded/medical/cmo(src)
 	new /obj/item/ammo_magazine/cell_mag/medical(src)
 	new /obj/item/ammo_casing/microbattery/medical/brute(src)
diff --git a/code/modules/projectiles/guns/projectile_ch.dm b/code/modules/projectiles/guns/projectile_ch.dm
index 34439f6286..c6c421ec4f 100644
--- a/code/modules/projectiles/guns/projectile_ch.dm
+++ b/code/modules/projectiles/guns/projectile_ch.dm
@@ -450,8 +450,8 @@
 	if(!manual_chamber)
 		process_chambered()
 
-/obj/item/gun/projectile/New(loc, var/starts_loaded = 1)
-	..()
+/obj/item/gun/projectile/Initialize(mapload, var/starts_loaded = 1)
+	. = ..()
 	if(manual_chamber)
 		verbs |= /obj/item/gun/projectile/verb/change_firemode
 	update_icon()
diff --git a/code/modules/reagents/reagents/other_ch.dm b/code/modules/reagents/reagents/other_ch.dm
index 8978ac5cef..af3fddbc79 100644
--- a/code/modules/reagents/reagents/other_ch.dm
+++ b/code/modules/reagents/reagents/other_ch.dm
@@ -148,8 +148,8 @@
 	name = "bottle of Benzilate pills"
 	desc = "This just hurts to look at with how many words of caution are scrawled on the lable. Better eat all of 'em!"
 
-/obj/item/storage/pill_bottle/benzilate/New()
-	..()
+/obj/item/storage/pill_bottle/benzilate/Initialize(mapload)
+	. = ..()
 	new /obj/item/reagent_containers/pill/benzilate( src )
 	new /obj/item/reagent_containers/pill/benzilate( src )
 	new /obj/item/reagent_containers/pill/benzilate( src )
@@ -162,8 +162,8 @@
 	name = "bottle of Phenethylamine pills"
 	desc = "Looks like someone drew a happy face on the label, replacing whatever was previously present."
 
-/obj/item/storage/pill_bottle/phenethylamine/New()
-	..()
+/obj/item/storage/pill_bottle/phenethylamine/Initialize(mapload)
+	. = ..()
 	new /obj/item/reagent_containers/pill/phenethylamine( src )
 	new /obj/item/reagent_containers/pill/phenethylamine( src )
 	new /obj/item/reagent_containers/pill/phenethylamine( src )
diff --git a/code/modules/resleeving/implant_ch.dm b/code/modules/resleeving/implant_ch.dm
index f65ec15808..a66d715359 100644
--- a/code/modules/resleeving/implant_ch.dm
+++ b/code/modules/resleeving/implant_ch.dm
@@ -6,9 +6,6 @@
 	icon_state = "laptop-gun"
 	desc = "After discovering clients constantly lacked staff to replace implants, Vey-Medical designed this version capable of creating implants on demand."
 	anchored = TRUE
-
-/obj/structure/backup_implanter_ch/New()
-	..()
 	germ_level = 0
 
 //Click to get implant.
diff --git a/code/modules/tables/update_triggers.dm b/code/modules/tables/update_triggers.dm
index b4c346a54b..9bf9a808f1 100644
--- a/code/modules/tables/update_triggers.dm
+++ b/code/modules/tables/update_triggers.dm
@@ -1,4 +1,4 @@
-/obj/structure/window/Initialize(mapload)
+/obj/structure/window/Initialize(mapload, start_dir=null, constructed=0)
 	. = ..()
 	for(var/obj/structure/table/T in view(src, 1))
 		T.update_connections()
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 8506d8b563..1771b9744e 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -1078,7 +1078,7 @@
 					R.mmi.brainmob.languages = MB.original_languages
 				else
 					R.mmi.brainmob.languages = R.languages
-				R.mmi.brainmob.remove_language("Robot Talk")
+				R.mmi.brainmob.remove_language(LANGUAGE_ROBOT_TALK)
 				hasMMI = R.mmi
 				M.mind.transfer_to(hasMMI.brainmob)
 				R.mmi = null
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index b66bb3fa10..7b46c5a799 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -1579,13 +1579,10 @@
 			else
 				user.custom_emote_vr(1, span_vnotice("spills [RTB.reagent_name] from [TG]'s [lowertext(RTB.name)] onto the floor!"))
 
-			var/obj/effect/decal/cleanable/blood/reagent/puddle = null
 			if (RTB.custom_reagentcolor)
-				puddle = new /obj/effect/decal/cleanable/blood/reagent(RTB.reagent_name, RTB.custom_reagentcolor, RTB.reagentid, puddle_amount, user.ckey, TG.ckey)
+				new /obj/effect/decal/cleanable/blood/reagent(TG.loc, RTB.reagent_name, RTB.custom_reagentcolor, RTB.reagentid, puddle_amount, user.ckey, TG.ckey)
 			else
-				puddle = new /obj/effect/decal/cleanable/blood/reagent(RTB.reagent_name, RTB.reagentcolor, RTB.reagentid, puddle_amount, user.ckey, TG.ckey)
-
-			puddle.loc = TG.loc
+				new /obj/effect/decal/cleanable/blood/reagent(TG.loc, RTB.reagent_name, RTB.reagentcolor, RTB.reagentid, puddle_amount, user.ckey, TG.ckey)
 
 			var/soundfile
 			if(!RTB.fancy_vore)
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index 27e3d3b2d7..5358ca2570 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -1535,7 +1535,7 @@
 						MMI.brainmob.mind.transfer_to(R)
 						MMI.loc = R
 						R.mmi = MMI
-						R.mmi.brainmob.add_language("Robot Talk")
+						R.mmi.brainmob.add_language(LANGUAGE_ROBOT_TALK)
 					else //reference /datum/surgery_step/robotics/install_mmi/end_step
 						var/obj/item/organ/internal/mmi_holder/holder
 						if(istype(MMI, /obj/item/mmi/digital/posibrain))
diff --git a/code/modules/vore/fluffstuff/MadokaSpear.dm b/code/modules/vore/fluffstuff/MadokaSpear.dm
index be0b647bfc..5ab34d26e3 100644
--- a/code/modules/vore/fluffstuff/MadokaSpear.dm
+++ b/code/modules/vore/fluffstuff/MadokaSpear.dm
@@ -35,8 +35,8 @@
 	name = "[initial(name)] (Wielded)"
 	update_icon()
 
-/obj/item/oldtwohanded/New()
-	..()
+/obj/item/oldtwohanded/Initialize(mapload)
+	. = ..()
 	update_icon()
 
 /obj/item/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE)
diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm
index 26ac2ea89b..0a1b28f683 100644
--- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm
@@ -8,14 +8,13 @@
 	storage_slots = 7
 	var/list/has_items = list()
 
-/obj/item/storage/box/fluff/New()
+/obj/item/storage/box/fluff/Initialize(mapload)
 	storage_slots = has_items.len
 	allowed = list()
 	for(var/P in has_items)
 		allowed += P
 		new P(src)
-	..()
-	return
+	. = ..()
 // END - DO NOT EDIT PROTOTYPE
 
 
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index 868fea3cc9..086c70eb55 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -1320,8 +1320,8 @@
 	slot_flags = SLOT_TIE | SLOT_OCLOTHING
 	w_class = 2
 
-/obj/item/accessory/fluff/kettek_collar/New()
-	..()
+/obj/item/accessory/fluff/kettek_collar/Initialize(mapload)
+	. = ..()
 	verbs |= /obj/item/accessory/fluff/kettek_collar/proc/change_color
 	color = get_random_colour()
 	update_icon()
diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm
index 1b8bca9b5b..7076a089f9 100644
--- a/code/modules/vore/fluffstuff/custom_items_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_items_yw.dm
@@ -676,11 +676,10 @@
 		/obj/item/reagent_containers/food/snacks/chocolatebar,
 		)
 
-/obj/item/storage/secure/briefcase/fluff/jeans/New() //this is entierly nessicary to spawn stuff. "FUN" -luke
+/obj/item/storage/secure/briefcase/fluff/jeans/Initialize(mapload) //this is entierly nessicary to spawn stuff. "FUN" -luke
 	storage_slots = has_items.len
 	allowed = list()
 	for(var/P in has_items)
 		allowed += P
 		new P(src)
-	..()
-	return
+	. = ..()
diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm
index 645eeb4d26..d6196b1ddf 100644
--- a/code/modules/xenobio2/mob/xeno.dm
+++ b/code/modules/xenobio2/mob/xeno.dm
@@ -74,13 +74,13 @@ Also includes Life and New
 
 		return 1	//Everything worked okay.
 
-/mob/living/simple_mob/xeno/New()
+/mob/living/simple_mob/xeno/Initialize(mapload)
 
 	traitdat = new()
 
 	ProcessTraits()
 
-	..()
+	. = ..()
 	if(colored)
 		color = traitdat.get_trait(TRAIT_XENO_COLOR)
 	create_reagents(internal_vol)
diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm
index 8d1e1bf20b..3640d3f55d 100644
--- a/maps/expedition_vr/beach/_beach.dm
+++ b/maps/expedition_vr/beach/_beach.dm
@@ -60,19 +60,6 @@
 /obj/away_mission_init/beachcave
 	name = "away mission initializer - beachcave"
 
-//In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself
-/obj/away_mission_init/beachcave/Initialize(mapload)
-	// Cave submaps are first.
-	/*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal)
-	seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep)
-
-	// Now for the tunnels.
-	new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_BEACH_CAVE, world.maxx, world.maxy)
-	new /datum/random_map/noise/ore/beachmine(null, 1, 1, Z_LEVEL_BEACH_CAVE, 64, 64)*/
-
-	flags |= ATOM_INITIALIZED
-	return INITIALIZE_HINT_QDEL
-
 // Two mob spawners that are placed on the map that spawn some mobs!
 // They keep track of their mob, and when it's dead, spawn another (only if nobody is looking)
 // Note that if your map has step teleports, mobs may wander through them accidentally and not know how to get back
diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm
index 64ca06cb27..8c021ce59f 100644
--- a/maps/expedition_vr/space/_debrisfield.dm
+++ b/maps/expedition_vr/space/_debrisfield.dm
@@ -41,13 +41,10 @@
 	teleport_z = z
 
 //This does nothing right now, but is framework if we do POIs for this place
+
 /obj/away_mission_init/debrisfield
 	name = "away mission initializer - debrisfield"
 
-/obj/away_mission_init/debrisfield/Initialize(mapload)
-	flags |= ATOM_INITIALIZED
-	return INITIALIZE_HINT_QDEL
-
 /area/tether_away/debrisfield
 	name = "Away Mission - Debris Field"
 	icon = 'icons/turf/areas_vr.dmi'
diff --git a/maps/groundbase/groundbase_shuttles.dm b/maps/groundbase/groundbase_shuttles.dm
index 1c21e86cf5..f5d677cfe9 100644
--- a/maps/groundbase/groundbase_shuttles.dm
+++ b/maps/groundbase/groundbase_shuttles.dm
@@ -51,6 +51,9 @@
 	landmark_tag = "groundbase"
 
 ///////////////////////////////////////////////
+/obj/effect/shuttle_landmark/shuttle_initializer/axolotl/Initialize(mapload)
+	shuttle_type = /datum/shuttle/autodock/overmap/axolotl
+	. = ..()
 
 // Escape shuttle
 /datum/shuttle/autodock/ferry/emergency/escape
diff --git a/maps/stellar_delight/stellar_delight_shuttles.dm b/maps/stellar_delight/stellar_delight_shuttles.dm
new file mode 100644
index 0000000000..f1515243a1
--- /dev/null
+++ b/maps/stellar_delight/stellar_delight_shuttles.dm
@@ -0,0 +1,68 @@
+//////////////////////////////////////////////////////////////
+// Escape shuttle and pods
+/datum/shuttle/autodock/ferry/escape_pod/portescape
+	name = "Port Escape Pod"
+	location = FERRY_LOCATION_STATION
+	shuttle_area = /area/stellardelight/deck2/portescape
+	warmup_time = 0
+	landmark_station = "port_ship_berth"
+	landmark_offsite = "port_escape_cc"
+	landmark_transition = "port_escape_transit"
+	docking_controller_tag = "port_escape_pod"
+	move_time = SHUTTLE_TRANSIT_DURATION_RETURN
+	move_direction = EAST
+
+/datum/shuttle/autodock/ferry/escape_pod/starboardescape
+	name = "Starboard Escape Pod"
+	location = FERRY_LOCATION_STATION
+	shuttle_area = /area/stellardelight/deck2/starboardescape
+	warmup_time = 0
+	landmark_station = "starboard_ship_berth"
+	landmark_offsite = "starboard_escape_cc"
+	landmark_transition = "starboard_escape_transit"
+	docking_controller_tag = "starboard_escape_pod"
+	move_time = SHUTTLE_TRANSIT_DURATION_RETURN
+	move_direction = WEST
+
+/////EXPLORATION SHUTTLE
+/datum/shuttle/autodock/overmap/exboat
+	name = "Exploration Shuttle"
+	current_location = "sd_explo"
+	docking_controller_tag = "explodocker"
+	shuttle_area = /area/stellardelight/deck1/exploshuttle
+	fuel_consumption = 0
+	defer_initialisation = TRUE
+	range = 1
+
+/obj/effect/shuttle_landmark/shuttle_initializer/exploration/Initialize(mapload)
+	shuttle_type = /datum/shuttle/autodock/overmap/exboat
+	. = ..()
+
+/datum/shuttle/autodock/overmap/mineboat
+	name = "Mining Shuttle"
+	current_location = "sd_mining"
+	docking_controller_tag = "miningdocker"
+	shuttle_area = /area/stellardelight/deck1/miningshuttle
+	fuel_consumption = 0
+	defer_initialisation = TRUE
+	range = 1
+
+/obj/effect/shuttle_landmark/shuttle_initializer/mining/Initialize(mapload)
+	shuttle_type = /datum/shuttle/autodock/overmap/mineboat
+	. = ..()
+
+/datum/shuttle/autodock/overmap/sdboat
+	name = "Starstuff"
+	current_location = "port_shuttlepad"
+	docking_controller_tag = "sdboat_docker"
+	shuttle_area = list(/area/shuttle/sdboat/fore,/area/shuttle/sdboat/aft)
+	fuel_consumption = 1
+	defer_initialisation = TRUE
+
+/obj/effect/shuttle_landmark/shuttle_initializer/sdboat/Initialize(mapload)
+	shuttle_type = /datum/shuttle/autodock/overmap/sdboat
+	. = ..()
+
+/obj/item/paper/dockingcodes/sd/Initialize(mapload, ...)
+	codes_from_z = Z_LEVEL_SHIP_LOW
+	return ..()
diff --git a/maps/stellar_delight/stellar_delight_things.dm b/maps/stellar_delight/stellar_delight_things.dm
index a0a7871c83..651ba0054b 100644
--- a/maps/stellar_delight/stellar_delight_things.dm
+++ b/maps/stellar_delight/stellar_delight_things.dm
@@ -44,9 +44,6 @@
 	item_state = "newscodex"
 	author = "Central Command"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Stellar Delight User's Guide"
-
-/obj/item/book/manual/sd_guide/New()
-	..()
 	dat = {"<html>
 				<head>
 				<style>
diff --git a/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm b/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm
index c1df8ef4c1..b788060e2b 100644
--- a/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm
+++ b/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm
@@ -217,9 +217,11 @@
 	)
 */
 
-/mob/living/simple_mob/animal/synx/Initialize(mapload) //this is really cool. Should be able to ventcrawl canonicaly, contort, and make random speech.
+/mob/living/simple_mob/animal/synx/Initialize(mapload, is_pet) //this is really cool. Should be able to ventcrawl canonicaly, contort, and make random speech.
 //some things should be here that arent tho.
 	. = ..()
+	if(is_pet)
+		return
 	add_verb(src,/mob/living/proc/ventcrawl) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/proc/distend_stomach) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/proc/contort) //CHOMPEdit TGPanel
@@ -970,7 +972,7 @@
 	icon_state = input(usr, "What would you like to change icon_state to?", "Respriting", null)
 
 /mob/living/simple_mob/animal/synx/ai/pet/debug/Initialize(mapload)
-	. = ..()
+	. = ..(mapload, TRUE)
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/rename) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/resprite) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/redesc) //CHOMPEdit TGPanel
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm
index 18339fd4f4..3a75002063 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm
@@ -148,7 +148,7 @@
 /turf/simulated/floor/plating/turfpack/sif,
 /area/submap/CaveS)
 "F" = (
-/turf/simulated/wall,
+/turf/simulated/wall/turfpack/sif,
 /area/submap/CaveS)
 "G" = (
 /obj/structure/closet/crate,
diff --git a/tgui/packages/tgui-panel/reconnect.tsx b/tgui/packages/tgui-panel/reconnect.tsx
index 12e118432d..a7505cadd3 100644
--- a/tgui/packages/tgui-panel/reconnect.tsx
+++ b/tgui/packages/tgui-panel/reconnect.tsx
@@ -1,5 +1,5 @@
 import { useDispatch } from 'tgui/backend';
-import { Button } from 'tgui-core/components';
+import { Button, Stack } from 'tgui-core/components';
 
 import { dismissWarning } from './game/actions';
 
@@ -20,33 +20,39 @@ export const ReconnectButton = (props) => {
   }
   const dispatch = useDispatch();
   return (
-    <>
-      <Button
-        color="white"
-        onClick={() => {
-          Byond.command('.reconnect');
-        }}
-      >
-        Reconnect
-      </Button>
-      <Button
-        color="white"
-        icon="power-off"
-        tooltip="Relaunch game"
-        tooltipPosition="bottom-end"
-        onClick={() => {
-          location.href = `byond://${url}`;
-          Byond.command('.quit');
-        }}
-      />
-      <Button
-        color="white"
-        onClick={() => {
-          dispatch(dismissWarning());
-        }}
-      >
-        Dismiss
-      </Button>
-    </>
+    <Stack>
+      <Stack.Item>
+        <Button
+          color="white"
+          onClick={() => {
+            Byond.command('.reconnect');
+          }}
+        >
+          Reconnect
+        </Button>
+      </Stack.Item>
+      <Stack.Item>
+        <Button
+          color="white"
+          icon="power-off"
+          tooltip="Relaunch game"
+          tooltipPosition="bottom-end"
+          onClick={() => {
+            location.href = `byond://${url}`;
+            Byond.command('.quit');
+          }}
+        />
+      </Stack.Item>
+      <Stack.Item>
+        <Button
+          color="white"
+          onClick={() => {
+            dispatch(dismissWarning());
+          }}
+        >
+          Dismiss
+        </Button>
+      </Stack.Item>
+    </Stack>
   );
 };
diff --git a/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerColors.tsx b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerColors.tsx
new file mode 100644
index 0000000000..5a7c15702c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerColors.tsx
@@ -0,0 +1,220 @@
+import { useBackend } from 'tgui/backend';
+import {
+  Button,
+  ColorBox,
+  Dropdown,
+  NumberInput,
+  Section,
+  Stack,
+} from 'tgui-core/components';
+
+import { SPRITE_ACCESSORY_COLOR_CHANNEL_NAMES } from './constants';
+import type { Data } from './types';
+
+export const AppearanceChangerColors = (props) => {
+  const { act, data } = useBackend<Data>();
+
+  const {
+    change_eye_color,
+    change_skin_tone,
+    change_skin_color,
+    change_hair_color,
+    change_facial_hair_color,
+    eye_color,
+    skin_color,
+    hair_color,
+    hair_grad,
+    hair_color_grad,
+    facial_hair_color,
+    ears_color,
+    ears2_color,
+    ears_alpha,
+    secondary_ears_alpha,
+    tail_color,
+    tail2_color,
+    tail3_color,
+    tail_alpha,
+    wing_color,
+    wing2_color,
+    wing3_color,
+    wing_alpha,
+    ear_secondary_colors,
+    hair_grads,
+  } = data;
+
+  return (
+    <Section title="Colors" fill scrollable>
+      <Stack vertical fill>
+        {change_eye_color ? (
+          <Stack.Item>
+            <ColorBox color={eye_color} mr={1} />
+            <Button onClick={() => act('eye_color')}>Change Eye Color</Button>
+          </Stack.Item>
+        ) : (
+          ''
+        )}
+        {change_skin_tone ? (
+          <Stack.Item>
+            <Button onClick={() => act('skin_tone')}>Change Skin Tone</Button>
+          </Stack.Item>
+        ) : (
+          ''
+        )}
+        {change_skin_color ? (
+          <Stack.Item>
+            <ColorBox color={skin_color} mr={1} />
+            <Button onClick={() => act('skin_color')}>Change Skin Color</Button>
+          </Stack.Item>
+        ) : (
+          ''
+        )}
+        {change_hair_color ? (
+          <>
+            <Stack.Item>
+              <ColorBox color={hair_color} mr={1} />
+              <Button onClick={() => act('hair_color')}>
+                Change Hair Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              <Stack>
+                <Stack.Item>
+                  <ColorBox color={hair_color_grad} mr={1} />
+                  <Button onClick={() => act('hair_color_grad')}>
+                    Change Hair gradiant Color
+                  </Button>
+                </Stack.Item>
+                <Stack.Item width="30%">
+                  <Dropdown
+                    autoScroll={false}
+                    selected={hair_grad || 'None'}
+                    options={hair_grads.map((key: string) => {
+                      return {
+                        displayText: key,
+                        value: key,
+                      };
+                    })}
+                    onSelected={(val: string) =>
+                      act('hair_grad', { picked: val })
+                    }
+                  />
+                </Stack.Item>
+              </Stack>
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={ears_color} mr={1} />
+              <Button onClick={() => act('ears_color')}>
+                Change Ears Color (Primary)
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={ears2_color} mr={1} />
+              <Button onClick={() => act('ears2_color')}>
+                Change Ears Color (Secondary)
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              Ears Alpha:{' '}
+              <NumberInput
+                step={1}
+                minValue={0}
+                value={ears_alpha}
+                maxValue={255}
+                onDrag={(val: number) => act('ears_alpha', { ears_alpha: val })}
+              />
+            </Stack.Item>
+            {ear_secondary_colors.map((color, index) => (
+              <Stack.Item key={index}>
+                <ColorBox color={color} mr={1} />
+                <Button
+                  onClick={() =>
+                    act('ears_secondary_color', { channel: index + 1 })
+                  }
+                >
+                  Change Secondary Ears Color (
+                  {SPRITE_ACCESSORY_COLOR_CHANNEL_NAMES[index]})
+                </Button>
+              </Stack.Item>
+            ))}
+            <Stack.Item>
+              Horns Alpha:{' '}
+              <NumberInput
+                step={1}
+                minValue={0}
+                value={secondary_ears_alpha}
+                maxValue={255}
+                onDrag={(val: number) =>
+                  act('secondary_ears_alpha', { secondary_ears_alpha: val })
+                }
+              />
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={tail_color} mr={1} />
+              <Button onClick={() => act('tail_color')}>
+                Change Tail Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={tail2_color} mr={1} />
+              <Button onClick={() => act('tail2_color')}>
+                Change Secondary Tail Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={tail3_color} mr={1} />
+              <Button onClick={() => act('tail3_color')}>
+                Change Tertiary Tail Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              Tail Alpha:{' '}
+              <NumberInput
+                step={1}
+                minValue={0}
+                value={tail_alpha}
+                maxValue={255}
+                onDrag={(val: number) => act('tail_alpha', { tail_alpha: val })}
+              />
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={wing_color} mr={1} />
+              <Button onClick={() => act('wing_color')}>
+                Change Wing Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={wing2_color} mr={1} />
+              <Button onClick={() => act('wing2_color')}>
+                Change Secondary Wing Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              <ColorBox color={wing3_color} mr={1} />
+              <Button onClick={() => act('wing3_color')}>
+                Change Tertiary Wing Color
+              </Button>
+            </Stack.Item>
+            <Stack.Item>
+              Wing Alpha:{' '}
+              <NumberInput
+                step={1}
+                minValue={0}
+                value={wing_alpha}
+                maxValue={255}
+                onDrag={(val: number) => act('wing_alpha', { wing_alpha: val })}
+              />
+            </Stack.Item>
+          </>
+        ) : null}
+        {change_facial_hair_color ? (
+          <Stack.Item>
+            <ColorBox color={facial_hair_color} mr={1} />
+            <Button onClick={() => act('facial_hair_color')}>
+              Change Facial Hair Color
+            </Button>
+          </Stack.Item>
+        ) : null}
+      </Stack>
+    </Section>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerDetails.tsx b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerDetails.tsx
deleted file mode 100644
index deffbbf458..0000000000
--- a/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerDetails.tsx
+++ /dev/null
@@ -1,340 +0,0 @@
-import { useState } from 'react';
-import { useBackend } from 'tgui/backend';
-import {
-  Box,
-  Button,
-  ColorBox,
-  Dropdown,
-  ImageButton,
-  Input,
-  LabeledList,
-  NumberInput,
-  Section,
-  Stack,
-  Tabs,
-} from 'tgui-core/components';
-import { createSearch } from 'tgui-core/string';
-
-import {
-  MARKINGS_PER_PAGE,
-  SPRITE_ACCESSORY_COLOR_CHANNEL_NAMES,
-} from './constants';
-import type { bodyStyle, Data } from './types';
-
-export const AppearanceChangerColors = (props) => {
-  const { act, data } = useBackend<Data>();
-
-  const {
-    change_eye_color,
-    change_skin_tone,
-    change_skin_color,
-    change_hair_color,
-    change_facial_hair_color,
-    eye_color,
-    skin_color,
-    hair_color,
-    hair_grad,
-    hair_color_grad,
-    facial_hair_color,
-    ears_color,
-    ears2_color,
-    ears_alpha,
-    secondary_ears_alpha,
-    tail_color,
-    tail2_color,
-    tail3_color,
-    tail_alpha,
-    wing_color,
-    wing2_color,
-    wing3_color,
-    wing_alpha,
-    ear_secondary_colors,
-    hair_grads,
-  } = data;
-
-  return (
-    <Section title="Colors" fill scrollable>
-      {change_eye_color ? (
-        <Box>
-          <ColorBox color={eye_color} mr={1} />
-          <Button onClick={() => act('eye_color')}>Change Eye Color</Button>
-        </Box>
-      ) : (
-        ''
-      )}
-      {change_skin_tone ? (
-        <Box>
-          <Button onClick={() => act('skin_tone')}>Change Skin Tone</Button>
-        </Box>
-      ) : (
-        ''
-      )}
-      {change_skin_color ? (
-        <Box>
-          <ColorBox color={skin_color} mr={1} />
-          <Button onClick={() => act('skin_color')}>Change Skin Color</Button>
-        </Box>
-      ) : (
-        ''
-      )}
-      {change_hair_color ? (
-        <>
-          <Box>
-            <ColorBox color={hair_color} mr={1} />
-            <Button onClick={() => act('hair_color')}>Change Hair Color</Button>
-          </Box>
-          <Box>
-            <ColorBox color={hair_color_grad} mr={1} />
-            <Button onClick={() => act('hair_color_grad')}>
-              Change Hair gradiant Color
-            </Button>
-            <Dropdown
-              autoScroll={false}
-              width="30%"
-              selected={hair_grad || 'None'}
-              options={hair_grads.map((key: string) => {
-                return {
-                  displayText: key,
-                  value: key,
-                };
-              })}
-              onSelected={(val: string) => act('hair_grad', { picked: val })}
-            />
-          </Box>
-          <Box>
-            <ColorBox color={ears_color} mr={1} />
-            <Button onClick={() => act('ears_color')}>
-              Change Ears Color (Primary)
-            </Button>
-          </Box>
-          <Box>
-            <ColorBox color={ears2_color} mr={1} />
-            <Button onClick={() => act('ears2_color')}>
-              Change Ears Color (Secondary)
-            </Button>
-          </Box>
-          <Box>
-            Ears Alpha:{' '}
-            <NumberInput
-              step={1}
-              minValue={0}
-              value={ears_alpha}
-              maxValue={255}
-              onDrag={(val: number) => act('ears_alpha', { ears_alpha: val })}
-            />
-          </Box>
-          {ear_secondary_colors.map((color, index) => (
-            <Box key={index}>
-              <ColorBox color={color} mr={1} />
-              <Button
-                onClick={() =>
-                  act('ears_secondary_color', { channel: index + 1 })
-                }
-              >
-                Change Secondary Ears Color (
-                {SPRITE_ACCESSORY_COLOR_CHANNEL_NAMES[index]})
-              </Button>
-            </Box>
-          ))}
-          <Box>
-            Horns Alpha:{' '}
-            <NumberInput
-              step={1}
-              minValue={0}
-              value={ears_alpha}
-              maxValue={255}
-              onDrag={(val: number) =>
-                act('secondary_ears_alpha', { secondary_ears_alpha: val })
-              }
-            />
-          </Box>
-          <Box>
-            <ColorBox color={tail_color} mr={1} />
-            <Button onClick={() => act('tail_color')}>Change Tail Color</Button>
-          </Box>
-          <Box>
-            <ColorBox color={tail2_color} mr={1} />
-            <Button onClick={() => act('tail2_color')}>
-              Change Secondary Tail Color
-            </Button>
-          </Box>
-          <Box>
-            <ColorBox color={tail3_color} mr={1} />
-            <Button onClick={() => act('tail3_color')}>
-              Change Tertiary Tail Color
-            </Button>
-          </Box>
-          <Box>
-            Tail Alpha:{' '}
-            <NumberInput
-              step={1}
-              minValue={0}
-              value={tail_alpha}
-              maxValue={255}
-              onDrag={(val: number) => act('tail_alpha', { tail_alpha: val })}
-            />
-          </Box>
-          <Box>
-            <ColorBox color={wing_color} mr={1} />
-            <Button onClick={() => act('wing_color')}>Change Wing Color</Button>
-          </Box>
-          <Box>
-            <ColorBox color={wing2_color} mr={1} />
-            <Button onClick={() => act('wing2_color')}>
-              Change Secondary Wing Color
-            </Button>
-          </Box>
-          <Box>
-            <ColorBox color={wing3_color} mr={1} />
-            <Button onClick={() => act('wing3_color')}>
-              Change Tertiary Wing Color
-            </Button>
-          </Box>
-          <Box>
-            Wing Alpha:{' '}
-            <NumberInput
-              step={1}
-              minValue={0}
-              value={wing_alpha}
-              maxValue={255}
-              onDrag={(val: number) => act('wing_alpha', { wing_alpha: val })}
-            />
-          </Box>
-        </>
-      ) : null}
-      {change_facial_hair_color ? (
-        <Box>
-          <ColorBox color={facial_hair_color} mr={1} />
-          <Button onClick={() => act('facial_hair_color')}>
-            Change Facial Hair Color
-          </Button>
-        </Box>
-      ) : null}
-    </Section>
-  );
-};
-
-export const AppearanceChangerMarkings = (props) => {
-  const { act, data } = useBackend<Data>();
-
-  const { markings, marking_styles } = data;
-
-  const [searchText, setSearchText] = useState<string>('');
-  const [tabIndex, setTabIndex] = useState(0);
-
-  const searcher = createSearch(searchText, (style: bodyStyle) => {
-    return style.name;
-  });
-
-  const filteredStyles = marking_styles.filter(searcher);
-
-  filteredStyles.sort((a, b) =>
-    a.name.toLowerCase().localeCompare(b.name.toLowerCase()),
-  );
-  const styleTabCount = Math.ceil(filteredStyles.length / MARKINGS_PER_PAGE);
-
-  const shownStyles: bodyStyle[][] = [];
-
-  for (let i = 0; i < styleTabCount; i++) {
-    shownStyles[i] = filteredStyles.slice(
-      i * MARKINGS_PER_PAGE,
-      i * MARKINGS_PER_PAGE + MARKINGS_PER_PAGE,
-    );
-  }
-
-  return (
-    <Section title="Markings" fill scrollable>
-      <Stack vertical>
-        <Stack.Item>
-          <LabeledList>
-            {markings.map((m) => (
-              <LabeledList.Item key={m.marking_name} label={m.marking_name}>
-                <Stack>
-                  <Stack.Item grow />
-                  <Stack.Item>
-                    <ColorBox color={m.marking_color} mr={1} />
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      onClick={() =>
-                        act('marking', { todo: 4, name: m.marking_name })
-                      }
-                    >
-                      Change Color
-                    </Button>
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      onClick={() =>
-                        act('marking', { todo: 0, name: m.marking_name })
-                      }
-                    >
-                      -
-                    </Button>
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      onClick={() =>
-                        act('marking', { todo: 3, name: m.marking_name })
-                      }
-                    >
-                      Move down
-                    </Button>
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      onClick={() =>
-                        act('marking', { todo: 2, name: m.marking_name })
-                      }
-                    >
-                      Move up
-                    </Button>
-                  </Stack.Item>
-                </Stack>
-              </LabeledList.Item>
-            ))}
-          </LabeledList>
-        </Stack.Item>
-        <Stack.Item>
-          <Input
-            fluid
-            placeholder={'Search for markings...'}
-            value={searchText}
-            onChange={(val) => setSearchText(val)}
-          />
-        </Stack.Item>
-        <Stack.Item>
-          <Tabs>
-            <Stack wrap="wrap" justify="center">
-              {shownStyles.map((_, i) => (
-                <Stack.Item key={i}>
-                  <Tabs.Tab
-                    selected={tabIndex === i}
-                    onClick={() => setTabIndex(i)}
-                  >
-                    Page {i + 1}
-                  </Tabs.Tab>
-                </Stack.Item>
-              ))}
-            </Stack>
-          </Tabs>
-        </Stack.Item>
-        <Stack.Item>
-          {shownStyles[tabIndex]?.map((style) => (
-            <ImageButton
-              key={style.name}
-              tooltip={style.name}
-              dmIcon={style.icon}
-              dmIconState={style.icon_state}
-              onClick={() => {
-                act('marking', { todo: 1, name: style.name });
-              }}
-            >
-              {style.name}
-            </ImageButton>
-          ))}
-        </Stack.Item>
-      </Stack>
-    </Section>
-  );
-};
diff --git a/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerMarkings.tsx b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerMarkings.tsx
new file mode 100644
index 0000000000..2963a3d10b
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerMarkings.tsx
@@ -0,0 +1,148 @@
+import { useState } from 'react';
+import { useBackend } from 'tgui/backend';
+import {
+  Button,
+  ColorBox,
+  ImageButton,
+  Input,
+  LabeledList,
+  Section,
+  Stack,
+  Tabs,
+} from 'tgui-core/components';
+import { createSearch } from 'tgui-core/string';
+
+import { MARKINGS_PER_PAGE } from './constants';
+import type { bodyStyle, Data } from './types';
+
+export const AppearanceChangerMarkings = (props) => {
+  const { act, data } = useBackend<Data>();
+
+  const { markings, marking_styles } = data;
+
+  const [searchText, setSearchText] = useState<string>('');
+  const [tabIndex, setTabIndex] = useState(0);
+
+  const searcher = createSearch(searchText, (style: bodyStyle) => {
+    return style.name;
+  });
+
+  const filteredStyles = marking_styles.filter(searcher);
+
+  filteredStyles.sort((a, b) =>
+    a.name.toLowerCase().localeCompare(b.name.toLowerCase()),
+  );
+  const styleTabCount = Math.ceil(filteredStyles.length / MARKINGS_PER_PAGE);
+
+  const shownStyles: bodyStyle[][] = [];
+
+  for (let i = 0; i < styleTabCount; i++) {
+    shownStyles[i] = filteredStyles.slice(
+      i * MARKINGS_PER_PAGE,
+      i * MARKINGS_PER_PAGE + MARKINGS_PER_PAGE,
+    );
+  }
+
+  return (
+    <Stack vertical fill>
+      <Stack.Item>
+        <Input
+          fluid
+          placeholder={'Search for markings...'}
+          value={searchText}
+          onChange={(val) => setSearchText(val)}
+        />
+      </Stack.Item>
+      <Stack.Item grow>
+        <Section title="Markings" fill scrollable>
+          <Stack vertical>
+            <Stack.Item>
+              <LabeledList>
+                {markings.map((m) => (
+                  <LabeledList.Item key={m.marking_name} label={m.marking_name}>
+                    <Stack>
+                      <Stack.Item grow />
+                      <Stack.Item>
+                        <ColorBox color={m.marking_color} mr={1} />
+                      </Stack.Item>
+                      <Stack.Item>
+                        <Button
+                          onClick={() =>
+                            act('marking', { todo: 4, name: m.marking_name })
+                          }
+                        >
+                          Change Color
+                        </Button>
+                      </Stack.Item>
+                      <Stack.Item>
+                        <Button
+                          onClick={() =>
+                            act('marking', { todo: 0, name: m.marking_name })
+                          }
+                        >
+                          -
+                        </Button>
+                      </Stack.Item>
+                      <Stack.Item>
+                        <Button
+                          onClick={() =>
+                            act('marking', { todo: 3, name: m.marking_name })
+                          }
+                        >
+                          Move down
+                        </Button>
+                      </Stack.Item>
+                      <Stack.Item>
+                        <Button
+                          onClick={() =>
+                            act('marking', { todo: 2, name: m.marking_name })
+                          }
+                        >
+                          Move up
+                        </Button>
+                      </Stack.Item>
+                    </Stack>
+                  </LabeledList.Item>
+                ))}
+              </LabeledList>
+            </Stack.Item>
+            <Stack.Item>
+              <Tabs>
+                <Stack wrap="wrap" justify="center">
+                  {shownStyles.map((_, i) => (
+                    <Stack.Item key={i}>
+                      <Tabs.Tab
+                        selected={tabIndex === i}
+                        onClick={() => setTabIndex(i)}
+                      >
+                        Page {i + 1}
+                      </Tabs.Tab>
+                    </Stack.Item>
+                  ))}
+                </Stack>
+              </Tabs>
+            </Stack.Item>
+            <Stack.Item>
+              <Stack wrap="wrap" justify="center">
+                {shownStyles[tabIndex]?.map((style) => (
+                  <Stack.Item key={style.name}>
+                    <ImageButton
+                      tooltip={style.name}
+                      dmIcon={style.icon}
+                      dmIconState={style.icon_state}
+                      onClick={() => {
+                        act('marking', { todo: 1, name: style.name });
+                      }}
+                    >
+                      {style.name}
+                    </ImageButton>
+                  </Stack.Item>
+                ))}
+              </Stack>
+            </Stack.Item>
+          </Stack>
+        </Section>
+      </Stack.Item>
+    </Stack>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerParts.tsx b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerParts.tsx
index 24872b5411..a4e8c7d89a 100644
--- a/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerParts.tsx
+++ b/tgui/packages/tgui/interfaces/AppearanceChanger/AppearanceChangerParts.tsx
@@ -45,29 +45,31 @@ export const AppearanceChangerParts = (props: {
           </Stack.Item>
           <Stack.Item grow>
             <Section title={section} fill scrollable>
-              {canClear && (
-                <ImageButton
-                  tooltip="-- Not Set --"
-                  onClick={() => act(actions[i], { clear: true })}
-                  selected={currentStyle[i] === null}
-                >
-                  -- Not Set --
-                </ImageButton>
-              )}
-              {selectableStyles[i].map((style) => (
-                <ImageButton
-                  tooltip={style.name}
-                  dmIcon={style.icon}
-                  dmIconState={style.icon_state}
-                  key={style.name}
-                  onClick={() => {
-                    act(actions[i], { ref: style.instance });
-                  }}
-                  selected={style.name === currentStyle[i]}
-                >
-                  {style.name}
-                </ImageButton>
-              ))}
+              <Stack wrap="wrap" justify="center">
+                {canClear && (
+                  <ImageButton
+                    tooltip="-- Not Set --"
+                    onClick={() => act(actions[i], { clear: true })}
+                    selected={currentStyle[i] === null}
+                  >
+                    -- Not Set --
+                  </ImageButton>
+                )}
+                {selectableStyles[i].map((style) => (
+                  <ImageButton
+                    tooltip={style.name}
+                    dmIcon={style.icon}
+                    dmIconState={style.icon_state}
+                    key={style.name}
+                    onClick={() => {
+                      act(actions[i], { ref: style.instance });
+                    }}
+                    selected={style.name === currentStyle[i]}
+                  >
+                    {style.name}
+                  </ImageButton>
+                ))}
+              </Stack>
             </Section>
           </Stack.Item>
         </Fragment>
@@ -112,20 +114,22 @@ export const AppearanceChangerHair = (props: {
           </Stack.Item>
           <Stack.Item grow>
             <Section title={section} fill scrollable>
-              {selectableStyles[i].map((style) => (
-                <ImageButton
-                  tooltip={style.name}
-                  dmIcon={style.icon}
-                  dmIconState={style.icon_state}
-                  key={style.name}
-                  onClick={() => {
-                    act(actions[i], { name: style.name });
-                  }}
-                  selected={style.name === currentStyle[i]}
-                >
-                  {style.name}
-                </ImageButton>
-              ))}
+              <Stack wrap="wrap" justify="center">
+                {selectableStyles[i].map((style) => (
+                  <ImageButton
+                    tooltip={style.name}
+                    dmIcon={style.icon}
+                    dmIconState={style.icon_state}
+                    key={style.name}
+                    onClick={() => {
+                      act(actions[i], { name: style.name });
+                    }}
+                    selected={style.name === currentStyle[i]}
+                  >
+                    {style.name}
+                  </ImageButton>
+                ))}
+              </Stack>
             </Section>
           </Stack.Item>
         </Fragment>
diff --git a/tgui/packages/tgui/interfaces/AppearanceChanger/index.tsx b/tgui/packages/tgui/interfaces/AppearanceChanger/index.tsx
index 4c721cf640..78b581621e 100644
--- a/tgui/packages/tgui/interfaces/AppearanceChanger/index.tsx
+++ b/tgui/packages/tgui/interfaces/AppearanceChanger/index.tsx
@@ -17,12 +17,10 @@ import {
   AppearanceChangerSpecies,
 } from './AppearanceChangerBody';
 import { AppearanceChangerBodyRecords } from './AppearanceChangerBodyRecords';
-import {
-  AppearanceChangerColors,
-  AppearanceChangerMarkings,
-} from './AppearanceChangerDetails';
+import { AppearanceChangerColors } from './AppearanceChangerColors';
 import { AppearanceChangerFlavor } from './AppearanceChangerFlavor';
 import { AppearanceChangerHeader } from './AppearanceChangerHeader';
+import { AppearanceChangerMarkings } from './AppearanceChangerMarkings';
 import {
   AppearanceChangerHair,
   AppearanceChangerParts,
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index fc29b25e92..6a93fc8062 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -21,6 +21,9 @@
 @include meta.load-css('./atomic/outline.scss');
 @include meta.load-css('./atomic/text.scss');
 
+// Components
+@include meta.load-css('./components/NanoMap.scss');
+
 // Interfaces
 @include meta.load-css('./interfaces/AutomatedTellerMachine.scss');
 @include meta.load-css('./interfaces/ListInput.scss');
diff --git a/tools/ci/validate_files.sh b/tools/ci/validate_files.sh
index 636404986c..faafe68dd6 100755
--- a/tools/ci/validate_files.sh
+++ b/tools/ci/validate_files.sh
@@ -32,7 +32,7 @@ else
 	map_files="-r --include=maps/**/**.dmm --include=modular_chomp/maps/**/**.dmm" # CHOMPEdit - Modular maps
 	# shuttle_map_files="-r --include=_maps/shuttles/**.dmm"
 	code_x_515="-r --include=code/**/!(__byond_version_compat).dm"
-fi
+fi;
 
 echo -e "${BLUE}Using grep provider at $(which $grep)${NC}"
 
@@ -71,7 +71,7 @@ retVal=$?
 if [ $retVal -ne 0 ]; then
 	echo -e "${RED}The variables 'step_x' and 'step_y' are present on a map, and they 'break' movement ingame.${NC}"
 	FAILED=1
-fi
+fi;
 
 part "wrongly offset APCs"
 if grep -Pzo '/obj/structure/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?[013-9]\d*?[^\d]*?\s*?\},?\n' $map_files ||
@@ -101,7 +101,7 @@ retVal=$?
 if [ $retVal -ne 0 ]; then
 	echo -e "${RED}A map containing the word 'test' is included. This is not allowed to be committed.${NC}"
 	FAILED=1
-fi
+fi;
 
 section "code issues"
 
@@ -143,7 +143,7 @@ retVal=$?
 if [ $retVal -ne 0 ]; then
 	echo -e "${RED}Do not modify the example.yml changelog file.${NC}"
 	FAILED=1
-fi
+fi;
 
 part "color macros"
 #Checking for color macros
@@ -152,7 +152,7 @@ retVal=$?
 if [ $retVal -ne 0 ]; then
 	echo -e "${RED}Do not use any byond color macros (such as \blue), they are deprecated.${NC}"
 	FAILED=1
-fi
+fi;
 
 part "typescript react files"
 if ls -1 tgui/**/*.jsx 2>/dev/null; then
@@ -202,7 +202,7 @@ retVal=$?
 if [ $retVal -ne 0 ]; then
 	echo -e "${RED}Some HTML tags are missing their opening/closing partners. Please correct this.${NC}"
 	FAILED=1
-fi
+fi;
 
 part "proc ref syntax"
 if $grep '\.proc/' $code_x_515 ; then
@@ -240,14 +240,14 @@ if [ "$pcre2_support" -eq 1 ]; then
 		echo
 		echo -e "${RED}ERROR: TIMER_OVERRIDE used without TIMER_UNIQUE.${NC}"
 		FAILED=1
-	fi
+	fi;
 
 	part "trailing newlines"
 	if $grep -PU '[^\n]$(?!\n)' $code_files; then
 		echo
 		echo -e "${RED}ERROR: File(s) with no trailing newline detected, please add one.${NC}"
 		FAILED=1
-	fi
+	fi;
 
 	part "improper atom initialize args"
 	if $grep -P '^/(obj|mob|turf|area|atom)/.+/Initialize\((?!mapload).*\)' $code_files; then
@@ -256,6 +256,14 @@ if [ "$pcre2_support" -eq 1 ]; then
 		FAILED=1
 	fi;
 
+	part "improper atom New usage"
+	(num=`$grep -n '^/?(obj|mob|turf|area|atom)/?.*/New\(' $code_files | wc -l`; echo "$num New (expecting 2 or less)"; [ $num -le 2 ])
+	retVal=$?
+	if [ $retVal -ne 0 ]; then
+		echo -e "${RED}Do not use any New() calls, they've been replaced by Initialize(mapload).${NC}"
+		FAILED=1
+	fi;
+
 	part "tag"
 	#Checking for 'tag' set to something on maps
 	(! $grep -Pn '( |\t|;|{)tag( ?)=' $map_files)
@@ -263,7 +271,7 @@ if [ "$pcre2_support" -eq 1 ]; then
 	if [ $retVal -ne 0 ]; then
 		echo -e "${RED}A map has 'tag' set on an atom. It may cause problems and should be removed.${NC}"
 		FAILED=1
-	fi
+	fi;
 
 	(! $grep -Pn '( |\t|;|{)tag( ?)=' $map_files)
 	retVal=$?
@@ -280,7 +288,7 @@ if [ "$pcre2_support" -eq 1 ]; then
 	if [ $retVal -ne 0 ]; then
 		echo -e "${RED}A broken span tag class is present (check quotes).${NC}"
 		FAILED=1
-	fi
+	fi;
 
 	part "old style hrefs"
 	(! $grep -Pn "href[\s='\"\\ ]*\?" $code_files)
@@ -288,11 +296,11 @@ if [ "$pcre2_support" -eq 1 ]; then
 	if [ $retVal -ne 0 ]; then
 		echo -e "${RED}old-style hrefs detected, see ripgrep output.${NC}"
 		FAILED=1
-	fi
+	fi;
 else
 	echo -e "${RED}pcre2 not supported, skipping checks requiring pcre2"
 	echo -e "if you want to run these checks install ripgrep with pcre2 support.${NC}"
-fi
+fi;
 
 if [ $FAILED = 0 ]; then
 	echo
@@ -300,7 +308,7 @@ if [ $FAILED = 0 ]; then
 else
 	echo
 	echo -e "${RED}Errors found, please fix them and try again.${NC}"
-fi
+fi;
 
 # Quit with our status code
 exit $FAILED
diff --git a/vorestation.dme b/vorestation.dme
index 4f7390eb34..5187f85f96 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1102,7 +1102,6 @@
 #include "code\game\machinery\teleporter.dm"
 #include "code\game\machinery\transportpod.dm"
 #include "code\game\machinery\turret_control.dm"
-#include "code\game\machinery\upgrade_machinery.dm"
 #include "code\game\machinery\vending_yw.dm"
 #include "code\game\machinery\vitals_monitor.dm"
 #include "code\game\machinery\wall_frames.dm"