From 67152f0a753cdbea1dea898a8c95664a6ef22efa Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 22 Feb 2021 01:29:49 -0700
Subject: [PATCH] more

---
 code/defines/obj/weapon.dm                    |  3 +
 code/game/objects/items/weapons/manuals.dm    | 85 ++++++++++++++++++
 code/modules/mob/living/bot/medbot.dm         |  2 +-
 .../mob/living/carbon/metroid/items.dm        | 89 +------------------
 .../modules/mob/living/silicon/decoy/decoy.dm |  5 +-
 code/modules/mob/living/silicon/pai/pai.dm    |  6 +-
 .../mob/living/silicon/pai/software.dm        |  4 +-
 .../silicon/robot/dogborg/dog_modules_vr.dm   |  4 +-
 .../mob/living/silicon/robot/robot_items.dm   | 10 +--
 .../silicon/robot/robot_modules/station.dm    |  9 +-
 .../robot/robot_modules/station/cargo.dm      |  4 +-
 .../robot/robot_modules/station/drone.dm      |  4 +-
 .../mob/living/silicon/robot/robot_vr.dm      |  4 +-
 .../mob/living/silicon/robot/syndicate.dm     |  5 +-
 code/modules/mob/living/silicon/silicon.dm    |  4 +-
 code/modules/mob/living/simple_mob/corpse.dm  | 16 ++--
 .../subtypes/animal/farm animals/chicken.dm   | 10 +--
 .../subtypes/animal/farm animals/cow.dm       |  6 +-
 .../subtypes/animal/farm animals/goat.dm      |  6 +-
 .../subtypes/animal/passive/mouse.dm          |  4 +-
 .../subtypes/animal/space/mouse_army.dm       |  4 +-
 .../subtypes/animal/space/snake_vr.dm         |  3 +-
 .../subtypes/occult/constructs/_construct.dm  |  4 +-
 .../living/simple_mob/subtypes/vore/frog.dm   |  4 +-
 .../subtypes/vore/shadekin/ability_objects.dm | 10 +--
 .../subtypes/vore/solargrub_larva.dm          | 10 +--
 code/modules/mob/living/voice/voice.dm        |  4 +-
 code/modules/mob/new_player/new_player.dm     |  5 +-
 .../modular_computers/NTNet/NTNet_relay.dm    |  4 +-
 .../computers/modular_computer/core.dm        |  4 +-
 .../computers/subtypes/dev_telescreen.dm      |  6 +-
 .../modular_computers/hardware/hard_drive.dm  |  4 +-
 .../hardware/network_card.dm                  |  4 +-
 .../hardware/portable_hard_drive.dm           |  6 +-
 code/modules/multiz/basic.dm                  |  2 +-
 code/modules/multiz/pipes.dm                  |  4 +-
 code/modules/multiz/turf_obj_hooks.dm         | 11 ---
 code/modules/multiz/zshadow.dm                | 12 +--
 code/modules/nifsoft/nif_statpanel.dm         |  8 +-
 code/modules/nifsoft/nifsoft.dm               | 14 ++-
 code/modules/organs/internal/brain.dm         | 44 ++++-----
 code/modules/organs/internal/eyes.dm          | 19 ++--
 code/modules/organs/internal/heart.dm         | 15 ++--
 code/modules/organs/internal/kidneys.dm       | 16 ++--
 code/modules/organs/internal/liver.dm         | 15 ++--
 code/modules/organs/internal/lungs.dm         | 16 ++--
 code/modules/organs/internal/voicebox.dm      | 12 +--
 code/modules/organs/organ_external.dm         |  7 +-
 code/modules/organs/robolimbs.dm              |  4 +-
 code/modules/organs/subtypes/machine.dm       |  4 +-
 code/modules/organs/subtypes/xenos.dm         | 79 ++++++++--------
 .../overmap/ships/engines/gas_thruster.dm     |  4 +-
 code/modules/paperwork/adminpaper.dm          |  7 +-
 code/modules/paperwork/clipboard.dm           |  3 +-
 code/modules/paperwork/faxmachine.dm          |  9 +-
 code/modules/paperwork/folders.dm             |  6 +-
 code/modules/paperwork/paper.dm               |  8 +-
 code/modules/paperwork/paperplane.dm          |  2 +-
 code/modules/paperwork/papershredder.dm       | 11 +--
 code/modules/paperwork/pen.dm                 | 22 ++---
 code/modules/paperwork/photography.dm         |  5 +-
 code/modules/power/antimatter/computer.dm     | 22 ++---
 code/modules/power/antimatter/control.dm      |  8 +-
 code/modules/power/antimatter/engine.dm       | 31 ++++---
 code/modules/power/antimatter/shielding.dm    | 11 +--
 code/modules/power/batteryrack.dm             |  7 +-
 code/modules/power/cable.dm                   | 19 ++--
 code/modules/power/fission/computer.dm        |  5 +-
 code/modules/power/fractal_reactor.dm         |  4 +-
 code/modules/power/generator_type2.dm         | 18 ++--
 code/modules/power/gravitygenerator.dm        | 24 ++---
 code/modules/power/grid_checker.dm            |  4 +-
 code/modules/power/lighting.dm                | 21 +++--
 code/modules/power/lighting_vr.dm             |  8 +-
 code/modules/power/port_gen.dm                |  7 +-
 code/modules/power/sensors/powernet_sensor.dm |  4 +-
 code/modules/power/smes.dm                    | 50 +++++------
 code/modules/power/terminal.dm                |  8 +-
 78 files changed, 480 insertions(+), 482 deletions(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 579467a2ded..41d026dc827 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -42,6 +42,9 @@
 
 /obj/item/soap/deluxe
 	icon_state = "soapdeluxe"
+
+/obj/item/soap/deluxe/Initialize(mapload)
+	. = ..()
 	desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]."
 
 /obj/item/soap/syndie
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index b767e8eb373..2cdbd2df441 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -10,6 +10,9 @@
 	icon_state ="bookEngineering"
 	author = "Engineering Encyclopedia"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Station Repairs and Construction"
+
+/obj/item/book/manual/engineering_construction/Initialize(mapload)
+	..()
 	dat = {"
 
 		<html><head>
@@ -28,6 +31,9 @@
 	icon_state ="bookParticleAccelerator"
 	author = "Engineering Encyclopedia"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Particle Accelerator User's Guide"
+
+/obj/item/book/manual/engineering_particle_accelerator/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -72,6 +78,9 @@
 	icon_state = "bookSupermatter"
 	author = "Central Engineering Division"
 	title = "Supermatter Engine Operating Manual"
+
+/obj/item/book/manual/supermatter_engine/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -221,6 +230,9 @@
 	icon_state = "bookSupermatter"
 	author = "Cindy Crawfish"
 	title = "R-UST Operating Manual"
+
+/obj/item/book/manual/rust_engine/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -258,6 +270,9 @@
 	icon_state ="bookHacking"
 	author = "Engineering Encyclopedia"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Hacking"
+
+/obj/item/book/manual/engineering_hacking/Initialize(mapload)
+	..()
 	dat = {"
 
 		<html><head>
@@ -805,12 +820,16 @@
 			</html>
 		"}
 
+
 /obj/item/book/manual/security_space_law
 	name = "Corporate Regulations"
 	desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations."
 	icon_state = "bookSpaceLaw"
 	author = "The Company"
 	title = "Corporate Regulations"
+
+/obj/item/book/manual/security_space_law/Initialize(mapload)
+	..()
 	dat = {"
 
 		<html><head>
@@ -824,12 +843,17 @@
 
 		"}
 
+
+
 /obj/item/book/manual/medical_diagnostics_manual
 	name = "Medical Diagnostics Manual"
 	desc = "First, do no harm. A detailed medical practitioner's guide."
 	icon_state = "bookMedical"
 	author = "Medical Department"
 	title = "Medical Diagnostics Manual"
+
+/obj/item/book/manual/medical_diagnostics_manual/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -874,6 +898,9 @@
 	icon_state ="bookEngineering2"
 	author = "Engineering Encyclopedia"
 	title = "Engineering Textbook"
+
+/obj/item/book/manual/engineering_guide/Initialize(mapload)
+	..()
 	dat = {"
 
 		<html><head>
@@ -886,6 +913,7 @@
 
 		"}
 
+
 /obj/item/book/manual/chef_recipes
 	name = "Chef Recipes"
 	icon_state = "cooked_book"
@@ -1335,6 +1363,9 @@
 	icon_state = "sop"
 	author = "NanoTrasen"
 	title = "Standard Operating Procedure"
+
+/obj/item/book/manual/standard_operating_procedure/Initialize(mapload)
+	..()
 	dat = {"
 
 		<html><head>
@@ -1354,6 +1385,9 @@
 	icon_state = "commandGuide"
 	author = "Jeremiah Acacius"
 	title = "Corporate Regulations"
+
+/obj/item/book/manual/command_guide/Initialize(mapload)
+	..()
 	dat = {"
 
 		<html><head>
@@ -1372,6 +1406,9 @@
 	icon_state = "hum_mic"
 	author = "Melora Creager"
 	title = "The Humanized Mice"
+
+/obj/item/book/manual/the_humanized_mice/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1430,6 +1467,9 @@
 	icon_state = "sop_se"
 	author = "NanoTrasen"
 	title = "SOP Volume 1: Alert Levels"
+
+/obj/item/book/manual/legal/sop_vol1/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1536,6 +1576,9 @@
 	icon_state = "sop_se"
 	author = "NanoTrasen"
 	title = "SOP Volume 2: Emergency Situations Protocol"
+
+/obj/item/book/manual/legal/sop_vol2/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1715,6 +1758,9 @@
 	icon_state = "sop_se"
 	author = "NanoTrasen"
 	title = "SOP Volume 3: Legal Clauses"
+
+/obj/item/book/manual/legal/sop_vol3/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1783,6 +1829,9 @@
 	icon_state = "sop_se"
 	author = "NanoTrasen"
 	title = "SOP Volume 4: Courtesy Procedures"
+
+/obj/item/book/manual/legal/sop_vol4/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1846,6 +1895,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.1: Department Regulations (Cargo)"
+
+/obj/item/book/manual/legal/sop_vol5_1/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1919,6 +1971,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.2: Department Regulations (Engineering)"
+
+/obj/item/book/manual/legal/sop_vol5_2/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -1997,6 +2052,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.3: Department Regulations (Medical)"
+
+/obj/item/book/manual/legal/sop_vol5_3/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -2167,6 +2225,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.4: Department Regulations (Research)"
+
+/obj/item/book/manual/legal/sop_vol5_4/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -2281,6 +2342,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.5: Department Regulations (Security)"
+
+/obj/item/book/manual/legal/sop_vol5_5/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -2532,6 +2596,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.6: Department Regulations (Command)"
+
+/obj/item/book/manual/legal/sop_vol5_6/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -2596,6 +2663,9 @@
 	icon_state = "sop_se_vol5"
 	author = "NanoTrasen"
 	title = "SOP Volume 5.7: Department Regulations (Internal Affairs)"
+
+/obj/item/book/manual/legal/sop_vol5_7/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -2729,6 +2799,9 @@
 	icon_state = "corpreg_se"
 	author = "NanoTrasen"
 	title = "Corporate Regulations Volume 1: Introduction"
+
+/obj/item/book/manual/legal/cr_vol1/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -2859,6 +2932,9 @@
 	icon_state = "corpreg_se"
 	author = "NanoTrasen"
 	title = "Corporate Regulations Volume 2: Infractions (Low)"
+
+/obj/item/book/manual/legal/cr_vol2/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -3114,6 +3190,9 @@
 	icon_state = "corpreg_se"
 	author = "NanoTrasen"
 	title = "Corporate Regulations Volume 3: Infractions (Moderate)"
+
+/obj/item/book/manual/legal/cr_vol3/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -3309,6 +3388,9 @@
 	icon_state = "corpreg_se"
 	author = "NanoTrasen"
 	title = "Corporate Regulations Volume 4: Infractions (Severe)"
+
+/obj/item/book/manual/legal/cr_vol4/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -3431,6 +3513,9 @@
 	icon_state = "corpreg_se"
 	author = "NanoTrasen"
 	title = "Corporate Regulations Volume 5: Supplementals"
+
+/obj/item/book/manual/legal/cr_vol5/Initialize(mapload)
+	..()
 	dat = {"<html>
 				<head>
 				<style>
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index f0960f2ff6a..23d2bf1c6b3 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -398,7 +398,7 @@
 	. = ..()
 	return INITIALIZE_HINT_QDEL
 
-/obj/item/fireaid_arm_assembly/LateInitialize()
+/obj/item/firstaid_arm_assembly/LateInitialize()
 	. = ..()
 	if(skin)
 		overlays += image('icons/obj/aibots.dmi', "kit_skin_[src.skin]")
diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm
index 4ca306a1bee..ca1ee4012d8 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("slimejelly", 30)
 
@@ -306,88 +306,3 @@
 
 /mob/living/carbon/slime/has_eyes()
 	return 0
-
-//////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them////////////////////////
-
-/*
-// Basically this slime Core catalyzes reactions that normally wouldn't happen anywhere
-/obj/item/slime_core
-	name = "slime extract"
-	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
-	icon = 'icons/mob/slimes.dmi'
-	icon_state = "slime extract"
-	force = 1.0
-	w_class = ITEMSIZE_TINY
-	throwforce = 1.0
-	throw_speed = 2
-	throw_range = 6
-	origin_tech = list(TECH_BIO = 4)
-	var/POWERFLAG = 0 // sshhhhhhh
-	var/Flush = 30
-	var/Uses = 5 // uses before it goes inert
-
-/obj/item/slime_core/New()
-		..()
-		create_reagents(100)
-		POWERFLAG = rand(1,10)
-		Uses = rand(7, 25)
-		//flags |= NOREACT
-/*
-		spawn()
-			Life()
-
-	proc/Life()
-		while(src)
-			sleep(25)
-			Flush--
-			if(Flush <= 0)
-				reagents.clear_reagents()
-				Flush = 30
-*/
-
-
-
-/obj/item/reagent_containers/food/snacks/egg/slime
-	name = "slime egg"
-	desc = "A small, gelatinous egg."
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "slime egg-growing"
-	bitesize = 12
-	origin_tech = list(TECH_BIO = 4)
-	var/grown = 0
-
-/obj/item/reagent_containers/food/snacks/egg/slime/Initialize(mapload)
-	. = ..()
-	reagents.add_reagent("nutriment", 4)
-	reagents.add_reagent("slimejelly", 1)
-	spawn(rand(1200,1500))//the egg takes a while to "ripen"
-		Grow()
-
-/obj/item/reagent_containers/food/snacks/egg/slime/proc/Grow()
-	grown = 1
-	icon_state = "slime egg-grown"
-	START_PROCESSING(SSobj, src)
-	return
-
-/obj/item/reagent_containers/food/snacks/egg/slime/proc/Hatch()
-	STOP_PROCESSING(SSobj, src)
-	var/turf/T = get_turf(src)
-	src.visible_message("<span class='warning'> The [name] pulsates and quivers!</span>")
-	spawn(rand(50,100))
-		src.visible_message("<span class='warning'> The [name] bursts open!</span>")
-		new/mob/living/carbon/slime(T)
-		qdel(src)
-
-
-/obj/item/reagent_containers/food/snacks/egg/slime/process(delta_time)
-	var/turf/location = get_turf(src)
-	var/datum/gas_mixture/environment = location.return_air()
-	if (environment.phoron > MOLES_PHORON_VISIBLE)//phoron exposure causes the egg to hatch
-		src.Hatch()
-
-/obj/item/reagent_containers/food/snacks/egg/slime/attackby(obj/item/W as obj, mob/user as mob)
-	if(istype( W, /obj/item/pen/crayon ))
-		return
-	else
-		..()
-*/
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index 1ef6a2745da..f382b707a91 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -5,8 +5,9 @@
 	anchored = 1 // -- TLE
 	canmove = 0
 
-/mob/living/silicon/decoy/New()
+/mob/living/silicon/decoy/Initialize(mapload)
+	. = ..()
 	src.icon = 'icons/mob/AI.dmi'
 	src.icon_state = "ai"
 	src.anchored = 1
-	src.canmove = 0
\ No newline at end of file
+	src.canmove = 0
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 6f8693a36cd..a64bab5c41a 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -89,9 +89,9 @@
 
 	var/current_pda_messaging = null
 
-/mob/living/silicon/pai/New(var/obj/item/paicard)
-	src.loc = paicard
-	card = paicard
+/mob/living/silicon/pai/Initialize(mapload)
+	. = ..()
+	card = loc
 	sradio = new(src)
 	communicator = new(src)
 	if(card)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index c32aa558246..00190d06ef2 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -33,8 +33,8 @@ var/global/list/default_pai_software = list()
 			default_pai_software[P.id] = P
 	return r
 
-/mob/living/silicon/pai/New()
-	..()
+/mob/living/silicon/pai/Initialize(mapload)
+	. = ..()
 	software = default_pai_software.Copy()
 
 /mob/living/silicon/pai/verb/paiInterface()
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
index 559eeec9a38..fd13bb3ed5a 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
@@ -58,8 +58,8 @@
 	attack_verb = list("nuzzled", "nosed", "booped")
 	w_class = ITEMSIZE_TINY
 
-/obj/item/dogborg/boop_module/New()
-	..()
+/obj/item/dogborg/boop_module/Initialize(mapload)
+	. = ..()
 	flags |= NOBLUDGEON //No more attack messages
 
 /obj/item/dogborg/boop_module/attack_self(mob/user)
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 3b767dbe1e4..3d4ddf7b8f3 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -12,8 +12,8 @@
 
 	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/attack_self(user as mob)
@@ -354,13 +354,13 @@
 	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)
-	..()
+	return ..()
 
 /obj/item/borg/combat/shield/attack_self(var/mob/living/user)
 	set_shield_level()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index c2d91d43e28..334823320b9 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -45,8 +45,9 @@ GLOBAL_LIST_INIT(robot_modules, list(
 	var/list/original_languages = list()
 	var/list/added_networks = list()
 
-/obj/item/robot_module/New(var/mob/living/silicon/robot/R)
-	..()
+/obj/item/robot_module/Initialize(mapload)
+	. = ..()
+	var/mob/living/silicon/robot/R = loc
 	R.module = src
 
 	add_camera_networks(R)
@@ -161,8 +162,8 @@ GLOBAL_LIST_INIT(robot_modules, list(
 		R.status_flags |= CANPUSH
 
 // Cyborgs (non-drones), default loadout. This will be given to every module.
-/obj/item/robot_module/robot/New()
-	..()
+/obj/item/robot_module/robot/Initialize(mapload)
+	. = ..()
 	src.modules += new /obj/item/flash/robot(src)
 	src.modules += new /obj/item/tool/crowbar/cyborg(src)
 	src.modules += new /obj/item/extinguisher(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station/cargo.dm b/code/modules/mob/living/silicon/robot/robot_modules/station/cargo.dm
index 39d15a98fb7..b9007e2bbd0 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station/cargo.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station/cargo.dm
@@ -19,8 +19,8 @@
 					"Miss M" = "miss-miner"
 				)
 
-/obj/item/robot_module/robot/miner/New()
-	..()
+/obj/item/robot_module/robot/miner/Initialize(mapload)
+	. = ..()
 	src.modules += new /obj/item/borg/sight/material(src)
 	src.modules += new /obj/item/tool/wrench/cyborg(src)
 	src.modules += new /obj/item/tool/screwdriver/cyborg(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station/drone.dm b/code/modules/mob/living/silicon/robot/robot_modules/station/drone.dm
index fcbc31112f0..8c6623b1fbd 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station/drone.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station/drone.dm
@@ -104,8 +104,8 @@
 	channels = list("Supply" = 1)
 	networks = list(NETWORK_MINE)
 
-/obj/item/robot_module/drone/mining/New()
-	..()
+/obj/item/robot_module/drone/mining/Initialize(mapload)
+	. = ..()
 	src.modules += new /obj/item/borg/sight/material(src)
 	src.modules += new /obj/item/pickaxe/borgdrill(src)
 	src.modules += new /obj/item/storage/bag/ore(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm
index bff83b1c6ee..da523221de7 100644
--- a/code/modules/mob/living/silicon/robot/robot_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_vr.dm
@@ -210,8 +210,8 @@
 	buckle_movable = TRUE
 	buckle_lying = FALSE
 
-/mob/living/silicon/robot/New(loc,var/unfinished = 0)
-	..()
+/mob/living/silicon/robot/Initialize(mapload, unfinished = FALSE)
+	. = ..()
 	riding_datum = new /datum/riding/dogborg(src)
 
 /mob/living/silicon/robot/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE)
diff --git a/code/modules/mob/living/silicon/robot/syndicate.dm b/code/modules/mob/living/silicon/robot/syndicate.dm
index 9e7149b4c77..e8eb5853e8d 100644
--- a/code/modules/mob/living/silicon/robot/syndicate.dm
+++ b/code/modules/mob/living/silicon/robot/syndicate.dm
@@ -6,13 +6,12 @@
 	lawchannel = "State"
 	idcard_type = /obj/item/card/id/syndicate
 
-/mob/living/silicon/robot/syndicate/New()
+/mob/living/silicon/robot/syndicate/Initialize(mapload)
 	if(!cell)
 		cell = new /obj/item/cell(src)
 		cell.maxcharge = 25000
 		cell.charge = 25000
-
-	..()
+	. = ..()
 
 /mob/living/silicon/robot/syndicate/init()
 	aiCamera = new/obj/item/camera/siliconcam/robot_camera(src)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 8540ccc7179..3112c19386e 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -28,9 +28,9 @@
 
 	var/hudmode = null
 
-/mob/living/silicon/New()
+/mob/living/silicon/Initialize(mapload)
 	silicon_mob_list |= src
-	..()
+	. = ..()
 	add_language(LANGUAGE_GALCOM)
 	set_default_language(GLOB.all_languages[LANGUAGE_GALCOM])
 	init_id()
diff --git a/code/modules/mob/living/simple_mob/corpse.dm b/code/modules/mob/living/simple_mob/corpse.dm
index c2990257238..9691bad7ee5 100644
--- a/code/modules/mob/living/simple_mob/corpse.dm
+++ b/code/modules/mob/living/simple_mob/corpse.dm
@@ -27,8 +27,9 @@
 	var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
 	var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID
 
-/obj/effect/landmark/mobcorpse/New()
+/obj/effect/landmark/mobcorpse/Initialize(mapload)
 	createCorpse()
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
 	var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
@@ -78,10 +79,6 @@
 			W.assignment = corpseidjob
 		W.registered_name = M.real_name
 		M.equip_to_slot_or_del(W, slot_wear_id)
-	delete_me = 1
-	qdel(src)
-
-
 
 //List of different corpse types
 
@@ -191,8 +188,10 @@
 	name = "vox"
 	corpseid = 0
 
-/obj/effect/landmark/mobcorpse/vox/New()
+/obj/effect/landmark/mobcorpse/vox/Initialize()
+	. = ..()
 	createvoxCorpse()
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/mobcorpse/vox/proc/createvoxCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
 	var/mob/living/carbon/human/vox/M = new /mob/living/carbon/human/vox (src.loc)
@@ -242,9 +241,6 @@
 			W.assignment = corpseidjob
 		W.registered_name = M.real_name
 		M.equip_to_slot_or_del(W, slot_wear_id)
-	delete_me = 1
-	qdel(src)
-
 
 //Types of Vox corpses:
 
@@ -302,4 +298,4 @@
 	corpseid = 0
 
 /obj/effect/landmark/mobcorpse/syndicatecommando
-	name = "Mercenary Commando"
\ No newline at end of file
+	name = "Mercenary Commando"
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 e359f48cef2..31164728d64 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	
@@ -30,8 +30,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]"
@@ -42,8 +42,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 	GLOB.chicken_count += 1
 
 /mob/living/simple_mob/animal/passive/chicken/Destroy()
-	..()
 	GLOB.chicken_count -= 1
+	return ..()
 
 /mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens
@@ -129,8 +129,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 cf1597ede86..d8e8d18fc45 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	
@@ -22,10 +22,10 @@
 
 	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
@@ -64,4 +64,4 @@
 /datum/say_list/cow
 	speak = list("moo?","moo","MOOOOOO")
 	emote_hear = list("brays", "moos","moos hauntingly")
-	emote_see = list("shakes its head")
\ No newline at end of file
+	emote_see = list("shakes its head")
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 7ac2733dcca..28afc15d9e3 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()
 	. = ..()
@@ -78,4 +78,4 @@
 	emote_see = list("shakes its head", "stamps a foot", "glares around")
 
 	// say_got_target doesn't seem to handle emotes, but keeping this here in case someone wants to make it work
-//	say_got_target = list("<span class='warning'>[src] gets an evil-looking gleam in their eye.</span>")
\ No newline at end of file
+//	say_got_target = list("<span class='warning'>[src] gets an evil-looking gleam in their eye.</span>")
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 10efc8b3a25..3d1f02a8b7e 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
@@ -40,8 +40,8 @@
 	no_vore = 1 //Mice can't eat others due to the amount of bugs caused by it.
 	vore_taste = "cheese"
 
-/mob/living/simple_mob/animal/passive/mouse/New()
-	..()
+/mob/living/simple_mob/animal/passive/mouse/Initialize(mapload)
+	. = ..()
 
 	verbs += /mob/living/proc/ventcrawl
 	verbs += /mob/living/proc/hide
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm
index 9a4fae0d44d..d8fccc3bd40 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm
@@ -63,8 +63,8 @@
 
 	var/rank //pyro, operative, ammo, stealth. more to come. Do not leave blank.
 
-/mob/living/simple_mob/animal/space/mouse_army/New()
-	..()
+/mob/living/simple_mob/animal/space/mouse_army/Initialize(mapload)
+	. = ..()
 
 	verbs += /mob/living/proc/ventcrawl
 	verbs += /mob/living/proc/hide
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 fa5ff103f22..15636f7649e 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
@@ -154,7 +154,7 @@
 	icon_state = "sneksnakbox"
 	storage_slots = 7
 
-/obj/item/storage/box/snakesnackbox/New()
+/obj/item/storage/box/snakesnackbox/PopulateContents()
 	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)
@@ -162,4 +162,3 @@
 	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/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
index e38646b17b3..830fbda8bd3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
@@ -100,8 +100,8 @@
 /mob/living/simple_mob/construct/cultify()
 	return
 
-/mob/living/simple_mob/construct/New()
-	..()
+/mob/living/simple_mob/construct/Initialize(mapload)
+	. = ..()
 	name = text("[initial(name)] ([rand(1, 1000)])")
 	real_name = name
 	for(var/spell in construct_spells)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm
index 9e1609336d5..9e0df907fed 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm
@@ -17,11 +17,11 @@
 	ai_holder_type = /datum/ai_holder/simple_mob/melee
 
 // Pepe is love, not hate.
-/mob/living/simple_mob/vore/aggressive/frog/New()
+/mob/living/simple_mob/vore/aggressive/frog/Initialize(mapload)
+	. = ..()
 	if(rand(1,1000000) == 1)
 		name = "rare Pepe"
 		desc = "You found a rare Pepe. Screenshot for good luck."
-	..()
 
 // Activate Noms!
 /mob/living/simple_mob/vore/aggressive/frog
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
index 40355f7ab01..b59ca72eea9 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
@@ -8,10 +8,10 @@
 	var/shift_mode = NOT_WHILE_SHIFTED
 	var/ab_sound
 
-/obj/effect/shadekin_ability/New(var/new_kin)
-	..()
-	my_kin = new_kin
-	loc = null
+/obj/effect/shadekin_ability/Initialize(mapload)
+	. = ..()
+	my_kin = loc
+	moveToNullspace()
 
 /obj/effect/shadekin_ability/Destroy()
 	my_kin = null
@@ -165,4 +165,4 @@
 /obj/effect/shadekin_ability/energy_feast/do_ability()
 	if(!..())
 		return
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
index 4931e4f6ec1..31ccafa0380 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
@@ -56,8 +56,8 @@ var/global/list/grub_machine_overlays = list()
 	GLOB.solargrubs -= src
 	return ..()
 
-/mob/living/simple_mob/animal/solargrub_larva/New()
-	..()
+/mob/living/simple_mob/animal/solargrub_larva/Initialize(mapload)
+	. = ..()
 	powermachine = new(src)
 	sparks = new(src)
 	sparks.set_up()
@@ -256,13 +256,13 @@ var/global/list/grub_machine_overlays = list()
 		ignored_targets += A
 
 
-/obj/machinery/abstract_grub_machine/New()
-	..()
+/obj/machinery/abstract_grub_machine/Initialize(mapload, newdir)
+	. = ..()
 	shuffle_power_usages()
 	grub = loc
 	if(!istype(grub))
 		grub = null
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 
 /obj/machinery/abstract_grub_machine/Destroy()
 	grub = null
diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm
index d1ed946e67e..329ccf4e56f 100644
--- a/code/modules/mob/living/voice/voice.dm
+++ b/code/modules/mob/living/voice/voice.dm
@@ -7,13 +7,13 @@
 
 	emote_type = 2 //This lets them emote through containers.  The communicator has a image feed of the person calling them so...
 
-/mob/living/voice/New(loc)
+/mob/living/voice/Initialize(mapload)
+	. = ..()
 	add_language(LANGUAGE_GALCOM)
 	set_default_language(GLOB.all_languages[LANGUAGE_GALCOM])
 
 	if(istype(loc, /obj/item/communicator))
 		comm = loc
-	..()
 
 // Proc: transfer_identity()
 // Parameters: 1 (speaker - the mob (usually an observer) to copy information from)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f18bb9b28e8..cfa3091b809 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -15,14 +15,15 @@
 
 	anchored = 1	// Don't get pushed around
 
-/mob/new_player/New()
+/mob/new_player/Initialize(mapload)
 	mob_list += src
+	flags |= INITIALIZED
+	return INITIALIZE_HINT_NORMAL
 
 /mob/new_player/verb/new_player_panel()
 	set src = usr
 	new_player_panel_proc()
 
-
 /mob/new_player/proc/new_player_panel_proc()
 	var/output = "<div align='center'>"
 	output +="<hr>"
diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm
index 9f6d8632767..1563f96d2d7 100644
--- a/code/modules/modular_computers/NTNet/NTNet_relay.dm
+++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm
@@ -92,7 +92,7 @@
 		ntnet_global.add_log("Manual override: Network blacklist cleared.")
 		return 1
 
-/obj/machinery/ntnet_relay/New()
+/obj/machinery/ntnet_relay/Initialize(mapload)
 	uid = gl_uid
 	gl_uid++
 	component_parts = list()
@@ -103,7 +103,7 @@
 		ntnet_global.relays.Add(src)
 		NTNet = ntnet_global
 		ntnet_global.add_log("New quantum relay activated. Current amount of linked relays: [NTNet.relays.len]")
-	..()
+	return ..()
 
 /obj/machinery/ntnet_relay/Destroy()
 	if(ntnet_global)
diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm
index 5e0f981b7a3..fba00a13e6c 100644
--- a/code/modules/modular_computers/computers/modular_computer/core.dm
+++ b/code/modules/modular_computers/computers/modular_computer/core.dm
@@ -41,14 +41,14 @@
 /obj/item/modular_computer/proc/install_default_programs()
 	return 1
 
-/obj/item/modular_computer/New()
+/obj/item/modular_computer/Initialize(mapload)
+	. = ..()
 	START_PROCESSING(SSobj, src)
 	install_default_hardware()
 	if(hard_drive)
 		install_default_programs()
 	update_icon()
 	update_verbs()
-	..()
 
 /obj/item/modular_computer/Destroy()
 	kill_program(1)
diff --git a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
index 61c1a269f29..e2356e05a48 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
@@ -18,8 +18,8 @@
 	broken_damage = 150
 	w_class = ITEMSIZE_HUGE
 
-/obj/item/modular_computer/telescreen/New()
-	..()
+/obj/item/modular_computer/telescreen/Initialize(mapload)
+	. = ..()
 	// Allows us to create "north bump" "south bump" etc. named objects, for more comfortable mapping.
 	name = "telescreen"
 
@@ -56,4 +56,4 @@
 				screen_on = TRUE
 				to_chat(user, "You secure \the [src].")
 			return
-	..()
\ No newline at end of file
+	..()
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index aaf02c27a14..3f65827085e 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -162,6 +162,6 @@
 	stored_files = null
 	return ..()
 
-/obj/item/computer_hardware/hard_drive/New()
+/obj/item/computer_hardware/hard_drive/Initialize(mapload)
 	install_default_programs()
-	..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm
index 9e54b9c64a8..809d0ba8294 100644
--- a/code/modules/modular_computers/hardware/network_card.dm
+++ b/code/modules/modular_computers/hardware/network_card.dm
@@ -25,8 +25,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 10302950c50..e40791b3b0e 100644
--- a/code/modules/modular_computers/hardware/portable_hard_drive.dm
+++ b/code/modules/modular_computers/hardware/portable_hard_drive.dm
@@ -26,12 +26,12 @@
 	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()
 
 /obj/item/computer_hardware/hard_drive/portable/Destroy()
 	if(holder2 && (holder2.portable_drive == src))
 		holder2.portable_drive = null
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm
index 0c369ade97f..8c3daa9c0a4 100644
--- a/code/modules/multiz/basic.dm
+++ b/code/modules/multiz/basic.dm
@@ -8,7 +8,7 @@ var/list/z_levels = list()// Each bit re... haha just kidding this is a list of
 			z_levels.len = i
 		z_levels[i] = TRUE
 
-/obj/effect/landmark/map_data/Initialize(mapload)
+/obj/effect/landmark/map_data/Initialize()
 	..()
 	return INITIALIZE_HINT_QDEL
 
diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm
index 0a6ee2b1048..c978c0e23aa 100644
--- a/code/modules/multiz/pipes.dm
+++ b/code/modules/multiz/pipes.dm
@@ -28,8 +28,8 @@ obj/machinery/atmospherics/pipe/zpipe
 
 	level = 1
 
-/obj/machinery/atmospherics/pipe/zpipe/New()
-	..()
+/obj/machinery/atmospherics/pipe/zpipe/Initialize(mapload, newdir)
+	. = ..()
 	init_dir()
 
 /obj/machinery/atmospherics/pipe/zpipe/init_dir()
diff --git a/code/modules/multiz/turf_obj_hooks.dm b/code/modules/multiz/turf_obj_hooks.dm
index a1fba841f3d..c36cdcdea92 100644
--- a/code/modules/multiz/turf_obj_hooks.dm
+++ b/code/modules/multiz/turf_obj_hooks.dm
@@ -24,17 +24,6 @@
 			// log_debug("[T] ([T.x],[T.y],[T.z]) queued for update for [src].update_icon()")
 			SSopenspace.add_turf(T, 1)
 
-// Ouch... this is painful. But is there any other way?
-/* - No for now
-/obj/New()
-	. = ..()
-	if(SSopenspace.subsystem_initialized && !invisibility)
-		var/turf/T = GetAbove(src)
-		if(isopenspace(T))
-			// log_debug("[T] ([T.x],[T.y],[T.z]) queued for update for [src]New()")
-			SSopenspace.add_turf(T, 1)
-*/
-
 // Just as New() we probably should hook Destroy() If we can think of something more efficient, lets hear it.
 /obj/Destroy()
 	if(SSopenspace.subsystem_initialized && !invisibility && isturf(loc))
diff --git a/code/modules/multiz/zshadow.dm b/code/modules/multiz/zshadow.dm
index ca8e2a9e384..f0829a188d4 100644
--- a/code/modules/multiz/zshadow.dm
+++ b/code/modules/multiz/zshadow.dm
@@ -16,12 +16,12 @@
 /mob/zshadow/can_fall()
 	return FALSE
 
-/mob/zshadow/New(var/mob/L)
-	if(!istype(L))
-		qdel(src)
-		return
-	owner = L
-	sync_icon(L)
+/mob/zshadow/Initialize(mapload)
+	. = ..()
+	if(!isliving(loc))
+		return INITIALIZE_HINT_QDEL
+	owner = loc
+	sync_icon(loc)
 
 /mob/zshadow/Destroy()
 	owner.shadow = null
diff --git a/code/modules/nifsoft/nif_statpanel.dm b/code/modules/nifsoft/nif_statpanel.dm
index 0cf2307b650..45c6dc1d42e 100644
--- a/code/modules/nifsoft/nif_statpanel.dm
+++ b/code/modules/nifsoft/nif_statpanel.dm
@@ -26,7 +26,8 @@
 	if(nif.stat == NIF_WORKING)
 		stat("- Modules -", "LMB: Toggle, Shift+LMB: Info/Uninstall")
 		for(var/nifsoft in nif.nifsofts)
-			if(!nifsoft) continue
+			if(!nifsoft)
+				continue
 			var/datum/nifsoft/NS = nifsoft
 			var/obj/effect/nif_stat/stat_line = NS.stat_line
 			stat("[stat_line.nifsoft_name]",stat_line.atom_button_text())
@@ -39,8 +40,9 @@
 	var/datum/nifsoft/nifsoft	//Reference to our nifsoft
 	var/toggleable = FALSE		//Won't change, prevents looking it up deeper
 
-/obj/effect/nif_stat/New(var/datum/nifsoft/new_soft)
-	..()
+INITIALIZE_IMMEDIATE(/obj/effect/nif_stat)
+/obj/effect/nif_stat/Initialize(mapload, datum/nifsoft/new_soft)
+	. = ..()
 	nifsoft = new_soft
 	nifsoft_name = new_soft.name
 	name = new_soft.name
diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm
index 11758ecfcf7..097b4b9fa60 100644
--- a/code/modules/nifsoft/nifsoft.dm
+++ b/code/modules/nifsoft/nifsoft.dm
@@ -47,7 +47,7 @@
 	ASSERT(nif_load)
 
 	nif = nif_load
-	stat_line = new(src)
+	stat_line = new(null, src)
 	if(!install(nif))
 		qdel(src)
 
@@ -269,8 +269,7 @@
 	desc = "A box of free nifsofts for security employees."
 	icon_state = "disk_kit"
 
-/obj/item/storage/box/nifsofts_security/New()
-	..()
+/obj/item/storage/box/nifsofts_security/PopulateContents()
 	for(var/i = 0 to 7)
 		new /obj/item/disk/nifsoft/security(src)
 
@@ -293,8 +292,7 @@
 	desc = "A box of free nifsofts for engineering employees."
 	icon_state = "disk_kit"
 
-/obj/item/storage/box/nifsofts_engineering/New()
-	..()
+/obj/item/storage/box/nifsofts_engineering/PopulateContents()
 	for(var/i = 0 to 7)
 		new /obj/item/disk/nifsoft/engineering(src)
 
@@ -316,8 +314,7 @@
 	desc = "A box of free nifsofts for medical employees."
 	icon_state = "disk_kit"
 
-/obj/item/storage/box/nifsofts_medical/New()
-	..()
+/obj/item/storage/box/nifsofts_medical/PopulateContents()
 	for(var/i = 0 to 7)
 		new /obj/item/disk/nifsoft/medical(src)
 
@@ -340,7 +337,6 @@
 	desc = "A box of free nifsofts for mining employees."
 	icon_state = "disk_kit"
 
-/obj/item/storage/box/nifsofts_mining/New()
-	..()
+/obj/item/storage/box/nifsofts_mining/PopulateContents()
 	for(var/i = 0 to 7)
 		new /obj/item/disk/nifsoft/mining(src)
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index b50ef42d85b..94905076418 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -62,16 +62,18 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 		tmp_owner.internal_organs_by_name[organ_tag] = new replace_path(tmp_owner, 1)
 		tmp_owner = null
 
-/obj/item/organ/internal/brain/New()
-	..()
+/obj/item/organ/internal/brain/Initialize(mapload, ...)
+	. = ..()
 	health = config_legacy.default_brain_health
-	spawn(5)
-		if(brainmob && brainmob.client)
-			brainmob.client.screen.len = null //clear the hud
+	addtimer(CALLBACK(src, .proc/clear_brainmob_hud), 15)
+
+/obj/item/organ/internal/brain/proc/clear_brainmob_hud()
+	if(brainmob && brainmob.client)
+		brainmob.client.screen.len = null //clear the hud
 
 /obj/item/organ/internal/brain/Destroy()
 	QDEL_NULL(brainmob)
-	. = ..()
+	return ..()
 
 /obj/item/organ/internal/brain/proc/transfer_identity(var/mob/living/carbon/H)
 
@@ -165,14 +167,15 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 /obj/item/organ/internal/brain/slime/is_open_container()
 	return 1
 
-/obj/item/organ/internal/brain/slime/New()
-	..()
+/obj/item/organ/internal/brain/slime/Initialize(mapload)
+	. = ..()
 	create_reagents(50)
-	var/mob/living/carbon/human/H = null
-	spawn(15) //Match the core to the Promethean's starting color.
-		if(ishuman(owner))
-			H = owner
-			color = rgb(min(H.r_skin + 40, 255), min(H.g_skin + 40, 255), min(H.b_skin + 40, 255))
+	addtimer(CALLBACK(src, .proc/sync_color), 10 SECONDS)
+
+/obj/item/organ/internal/brain/slime/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		color = rgb(min(H.r_skin + 40, 255), min(H.g_skin + 40, 255), min(H.b_skin + 40, 255))
 
 /obj/item/organ/internal/brain/slime/proc/reviveBody()
 	var/datum/dna2/record/R = new /datum/dna2/record()
@@ -273,10 +276,11 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 	desc = "A piece of juicy meat found in a person's head. This one is strange."
 	icon_state = "brain_grey"
 
-/obj/item/organ/internal/brain/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/brain/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/brain/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		color = H.species.blood_color
diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm
index fecfbda05a4..d7a3829af5c 100644
--- a/code/modules/organs/internal/eyes.dm
+++ b/code/modules/organs/internal/eyes.dm
@@ -16,20 +16,21 @@
 /obj/item/organ/internal/eyes/robot
 	name = "optical sensor"
 
-/obj/item/organ/internal/eyes/robot/New()
-	..()
+/obj/item/organ/internal/eyes/robot/Initialize(mapload)
+	. = ..()
 	robotize()
 
 /obj/item/organ/internal/eyes/grey
 	icon_state = "eyes_grey"
 
-/obj/item/organ/internal/eyes/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/eyes/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/eyes/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		color = H.species.blood_color
 
 /obj/item/organ/internal/eyes/proc/change_eye_color()
 	set name = "Change Eye Color"
diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm
index 8144d56b321..c3cc2a68a21 100644
--- a/code/modules/organs/internal/heart.dm
+++ b/code/modules/organs/internal/heart.dm
@@ -29,10 +29,11 @@
 	icon_state = "heart_grey-on"
 	dead_icon = "heart_grey-off"
 
-/obj/item/organ/internal/heart/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/heart/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/heart/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		color = H.species.blood_color
diff --git a/code/modules/organs/internal/kidneys.dm b/code/modules/organs/internal/kidneys.dm
index 16524bd47fc..eb775f1222f 100644
--- a/code/modules/organs/internal/kidneys.dm
+++ b/code/modules/organs/internal/kidneys.dm
@@ -46,10 +46,12 @@
 /obj/item/organ/internal/kidneys/grey
 	icon_state = "kidneys_grey"
 
-/obj/item/organ/internal/kidneys/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/kidneys/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/kidneys/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
diff --git a/code/modules/organs/internal/liver.dm b/code/modules/organs/internal/liver.dm
index 956e905cf87..4212ae067e9 100644
--- a/code/modules/organs/internal/liver.dm
+++ b/code/modules/organs/internal/liver.dm
@@ -61,10 +61,11 @@
 /obj/item/organ/internal/liver/grey
 	icon_state = "liver_grey"
 
-/obj/item/organ/internal/liver/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/liver/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/liver/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		color = H.species.blood_color
diff --git a/code/modules/organs/internal/lungs.dm b/code/modules/organs/internal/lungs.dm
index e4d32bf57c7..4c6a95f3654 100644
--- a/code/modules/organs/internal/lungs.dm
+++ b/code/modules/organs/internal/lungs.dm
@@ -49,10 +49,12 @@
 /obj/item/organ/internal/lungs/grey
 	icon_state = "lungs_grey"
 
-/obj/item/organ/internal/lungs/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/lungs/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/lungs/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
diff --git a/code/modules/organs/internal/voicebox.dm b/code/modules/organs/internal/voicebox.dm
index a9bad7dcd8c..0561991ec19 100644
--- a/code/modules/organs/internal/voicebox.dm
+++ b/code/modules/organs/internal/voicebox.dm
@@ -12,8 +12,8 @@
 	will_assist_languages = list(LANGUAGE_GALCOM)
 	var/mute = FALSE
 
-/obj/item/organ/internal/voicebox/New()
-	..()
+/obj/item/organ/internal/voicebox/Initialize(mapload)
+	. = ..()
 	amend_assist_langs()
 
 /obj/item/organ/internal/voicebox/proc/amend_assist_langs()	// Adds the list of language datums assisted by the voicebox to the list used in speaking
@@ -30,14 +30,14 @@
 
 /obj/item/organ/internal/voicebox/assist	// In the off chance we get a species that doesn't speak GalCom by default
 
-/obj/item/organ/internal/voicebox/assist/New()
-	..()
+/obj/item/organ/internal/voicebox/assist/Initialize(mapload)
+	. = ..()
 	mechassist()
 
 /obj/item/organ/internal/voicebox/robot
 	name = "vocal synthesizer"
 	will_assist_languages = list(LANGUAGE_GALCOM, LANGUAGE_EAL) // Synthetics spawn with this by default
 
-/obj/item/organ/internal/voicebox/robot/New()
-	..()
+/obj/item/organ/internal/voicebox/robot/Initialize(mapload)
+	. = ..()
 	robotize()
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 430e3bb1fd5..61a966b74cf 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -219,13 +219,12 @@
 /obj/item/organ/external/update_health()
 	damage = min(max_damage, (brute_dam + burn_dam))
 
-/obj/item/organ/external/New(var/mob/living/carbon/holder)
-	..(holder, 0)
+/obj/item/organ/external/Initialize(mapload)
+	. = ..(mapload, FALSE)
 	if(owner)
 		replaced(owner)
 		sync_colour_to_human(owner)
-	spawn(1)
-		get_icon()
+	addtimer(CALLBACK(src, .proc/get_icon), 1)
 
 /obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
 	owner = target
diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm
index f3829974171..4223dd89063 100644
--- a/code/modules/organs/robolimbs.dm
+++ b/code/modules/organs/robolimbs.dm
@@ -460,8 +460,8 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
 	icon_state = "datadisk2"
 	var/company = ""
 
-/obj/item/disk/limb/New(var/newloc)
-	..()
+/obj/item/disk/limb/Initialize(mapload)
+	. = ..()
 	if(company)
 		name = "[company] [initial(name)]"
 
diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm
index e5869da81a9..332a65cd73e 100644
--- a/code/modules/organs/subtypes/machine.dm
+++ b/code/modules/organs/subtypes/machine.dm
@@ -6,9 +6,9 @@
 	parent_organ = BP_TORSO
 	vital = 1
 
-/obj/item/organ/internal/cell/New()
+/obj/item/organ/internal/cell/Initialize(mapload)
+	. = ..()
 	robotize()
-	..()
 
 /obj/item/organ/internal/cell/replaced()
 	..()
diff --git a/code/modules/organs/subtypes/xenos.dm b/code/modules/organs/subtypes/xenos.dm
index 844b647730e..eb83ba39b19 100644
--- a/code/modules/organs/subtypes/xenos.dm
+++ b/code/modules/organs/subtypes/xenos.dm
@@ -13,13 +13,15 @@
 /obj/item/organ/internal/xenos/eggsac/grey
 	icon_state = "sac_grey"
 
-/obj/item/organ/internal/xenos/eggsac/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/xenos/eggsac/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/xenos/eggsac/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
 
 /obj/item/organ/internal/xenos/plasmavessel
 	name = "plasma vessel"
@@ -54,13 +56,15 @@
 	icon_state = "plasma_grey"
 	stored_plasma = 200
 
-/obj/item/organ/internal/xenos/plasmavessel/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/xenos/plasmavessel/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/xenos/plasmavessel/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
 
 /obj/item/organ/internal/xenos/plasmavessel/queen
 	name = "bloated plasma vessel"
@@ -91,13 +95,15 @@
 /obj/item/organ/internal/xenos/acidgland/grey
 	icon_state = "acidgland_grey"
 
-/obj/item/organ/internal/xenos/acidgland/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/xenos/acidgland/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/xenos/acidgland/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
 
 /obj/item/organ/internal/xenos/hivenode
 	name = "hive node"
@@ -108,13 +114,15 @@
 /obj/item/organ/internal/xenos/hivenode/grey
 	icon_state = "xenode_grey"
 
-/obj/item/organ/internal/xenos/hivenode/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/xenos/hivenode/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
+
+/obj/item/organ/internal/xenos/hivenode/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
 
 /obj/item/organ/internal/xenos/resinspinner
 	name = "resin spinner"
@@ -130,14 +138,15 @@
 /obj/item/organ/internal/xenos/resinspinner/grey
 	icon_state = "xenode_grey"
 
-/obj/item/organ/internal/xenos/resinspinner/grey/colormatch/New()
-	..()
-	var/mob/living/carbon/human/H = null
-	spawn(15)
-		if(ishuman(owner))
-			H = owner
-			color = H.species.blood_color
+/obj/item/organ/internal/xenos/resinspinner/grey/colormatch/Initialize(mapload)
+	. = ..()
+	addtimer(CALLBACK(src, .proc/sync_color), 15)
 
+/obj/item/organ/internal/xenos/resinspinner/grey/colormatch/proc/sync_color()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.species.blood_color)
+			add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY)
 
 // XENOMORPH EXTERNAL ORGANS
 
diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 0ed75b7b836..c7efba989c5 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -191,8 +191,8 @@
 	light_color = "#ed9200"
 	anchored = 1
 
-/obj/effect/engine_exhaust/New(var/turf/nloc, var/ndir, var/flame)
-	..(nloc)
+/obj/effect/engine_exhaust/Initialize(mapload, ndir, flame)
+	. = ..(mapload)
 	if(flame)
 		icon_state = "exhaust"
 		nloc.hotspot_expose(1000,125)
diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm
index 2e069125eef..bd60488b2e0 100644
--- a/code/modules/paperwork/adminpaper.dm
+++ b/code/modules/paperwork/adminpaper.dm
@@ -16,11 +16,10 @@
 	var/footer = null
 	var/footerOn = FALSE
 
-/obj/item/paper/admin/New()
-	..()
+/obj/item/paper/admin/Initialize(mapload)
+	. = ..()
 	generateInteractions()
 
-
 /obj/item/paper/admin/proc/generateInteractions()
 	//clear first
 	interactions = null
@@ -152,4 +151,4 @@ obj/item/paper/admin/proc/updateDisplay()
 		return
 
 /obj/item/paper/admin/get_signature()
-	return input(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") as text|null
\ No newline at end of file
+	return input(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") as text|null
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index ddaf9b06a3e..2b6c1f0018e 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -11,7 +11,8 @@
 	var/obj/item/toppaper	//The topmost piece of paper.
 	slot_flags = SLOT_BELT
 
-/obj/item/clipboard/New()
+/obj/item/clipboard/Initialize(mapload)
+	. = ..()
 	update_icon()
 
 /obj/item/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 04c23855755..64a645e8e6f 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -23,12 +23,13 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 	var/department = "Unknown" // our department
 	var/destination = null // the department we're sending to
 
-/obj/machinery/photocopier/faxmachine/New()
+/obj/machinery/photocopier/faxmachine/Initialize(mapload)
+	. = ..()
 	allfaxes += src
-	if(!destination) destination = "[GLOB.using_map.boss_name]"
-	if( !(("[department]" in alldepartments) || ("[department]" in admin_departments)) )
+	if(!destination)
+		destination = "[GLOB.using_map.boss_name]"
+	if(!(("[department]" in alldepartments) || ("[department]" in admin_departments)) )
 		alldepartments |= department
-	..()
 
 /obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob)
 	user.set_machine(src)
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 74c2479f366..95fc542e757 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -40,12 +40,12 @@
 	desc = "A white folder with RD markings."
 	icon_state = "folder_rd"
 
-/obj/item/folder/white_rd/New()
+/obj/item/folder/white_rd/Initialize(mapload)
+	. = ..()
 	//add some memos
-	var/obj/item/paper/P = new()
+	var/obj/item/paper/P = new(src)
 	P.name = "Memo RE: proper analysis procedure"
 	P.info = "<br>We keep test dummies in pens here for a reason"
-	src.contents += P
 	update_icon()
 
 /obj/item/folder/yellow_ce
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 50d2412b770..ea8a6044e1b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -70,8 +70,8 @@
 	desc = "A gift card with a heart on the cover."
 	icon_state = "greetingcard_heart"
 
-/obj/item/paper/card/New()
-	..()
+/obj/item/paper/card/Initialize(mapload)
+	. = ..()
 	pixel_y = rand(-8, 8)
 	pixel_x = rand(-9, 9)
 	stamps = null
@@ -102,8 +102,8 @@
 
 //lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
 
-/obj/item/paper/New()
-	..()
+/obj/item/paper/Initialize(mapload)
+	. = ..()
 	pixel_y = rand(-8, 8)
 	pixel_x = rand(-9, 9)
 	stamps = ""
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 390c4754607..7b17e361af9 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/New(loc, obj/item/paper/newPaper)
+/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/papershredder.dm b/code/modules/paperwork/papershredder.dm
index 19162e70765..8e2c0f61c06 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -25,8 +25,8 @@
 		/obj/item/paper_bundle = 3,
 		)
 
-/obj/machinery/papershredder/New()
-	..()
+/obj/machinery/papershredder/Initialize(mapload, newdir)
+	. = ..()
 	component_parts = list()
 	component_parts += new /obj/item/stock_parts/motor(src)
 	component_parts += new /obj/item/stock_parts/gear(src)
@@ -154,11 +154,12 @@
 	throw_range = 3
 	throw_speed = 1
 
-/obj/item/shreddedp/New()
-	..()
+/obj/item/shreddedp/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(-5,5)
 	pixel_y = rand(-5,5)
-	if(prob(65)) color = pick("#BABABA","#7F7F7F")
+	if(prob(65))
+		color = pick("#BABABA","#7F7F7F")
 
 /obj/item/shreddedp/attackby(var/obj/item/W as obj, var/mob/user)
 	if(istype(W, /obj/item/flame/lighter))
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 44d3ba38fa2..76d903c85ca 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -87,8 +87,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)
@@ -112,19 +112,18 @@
 	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()
-	..()
+/obj/item/pen/reagent/sleepy/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
 
-
 /*
  * Parapens
  */
 /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("zombiepowder", 5)
 	reagents.add_reagent("cryptobiolin", 10)
 
@@ -208,7 +207,8 @@
 	user.visible_message("<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>")
 	return (BRUTELOSS|OXYLOSS)
 
-/obj/item/pen/crayon/New()
+/obj/item/pen/crayon/Initialize(mapload)
+	. = ..()
 	name = "[colourName] crayon"
 
 /obj/item/pen/crayon/marker
@@ -216,7 +216,8 @@
 	desc = "A chisel-tip permanent marker. Hopefully non-toxic."
 	icon_state = "markerred"
 
-/obj/item/pen/crayon/marker/New()
+/obj/item/pen/crayon/marker/Initialize(mapload)
+	. = ..()
 	name = "[colourName] marker"
 
 //Ritual Chalk
@@ -238,5 +239,6 @@
 	user.visible_message("<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to perform human transmutation!</b></font>")
 	return (BRUTELOSS|OXYLOSS)
 
-/obj/item/pen/crayon/chalk/New()
+/obj/item/pen/crayon/chalk/Initialize(mapload)
+	. = ..()
 	name = "[colourName] chalk"
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index a5181e15f21..4be21c1a94c 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -37,11 +37,10 @@ var/global/photo_count = 0
 	var/icon/tiny
 	var/photo_size = 3
 
-/obj/item/photo/New()
+/obj/item/photo/Initialize(mapload)
+	. = ..()
 	id = photo_count++
 
-
-
 /obj/item/photo/attack_self(mob/user as mob)
 	user.examinate(src)
 
diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm
index 5a52aabcb3b..b7e9bad16d9 100644
--- a/code/modules/power/antimatter/computer.dm
+++ b/code/modules/power/antimatter/computer.dm
@@ -15,16 +15,18 @@
 	var/obj/machinery/power/am_engine/injector/connected_I = null
 	var/state = STATE_DEFAULT
 
-/obj/machinery/computer/am_engine/New()
-	..()
-	spawn( 24 )
-		for(var/obj/machinery/power/am_engine/engine/E in world)
-			if(E.engine_id == src.engine_id)
-				src.connected_E = E
-		for(var/obj/machinery/power/am_engine/injector/I in world)
-			if(I.engine_id == src.engine_id)
-				src.connected_I = I
-	return
+/obj/machinery/computer/am_engine/Initialize(mapload)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/am_engine/LateInitialize()
+	. = ..()
+	for(var/obj/machinery/power/am_engine/engine/E in world)
+		if(E.engine_id == src.engine_id)
+			src.connected_E = E
+	for(var/obj/machinery/power/am_engine/injector/I in world)
+		if(I.engine_id == src.engine_id)
+			src.connected_I = I
 
 /obj/machinery/computer/am_engine/Topic(href, href_list)
 	if(..())
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 3ddccc13ad4..1bc2dcd7d25 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -29,17 +29,15 @@
 	var/stored_power = 0//Power to deploy per tick
 
 
-/obj/machinery/power/am_control_unit/New()
-	..()
+/obj/machinery/power/am_control_unit/Initialize(mapload, newdir)
+	. = ..()
 	linked_shielding = list()
 	linked_cores = list()
 
-
 /obj/machinery/power/am_control_unit/Destroy()//Perhaps damage and run stability checks rather than just qdel on the others
 	for(var/obj/machinery/am_shielding/AMS in linked_shielding)
 		qdel(AMS)
-	..()
-
+	return ..()
 
 /obj/machinery/power/am_control_unit/process(delta_time)
 	if(exploding)
diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm
index 949921511bd..48392646241 100644
--- a/code/modules/power/antimatter/engine.dm
+++ b/code/modules/power/antimatter/engine.dm
@@ -28,14 +28,14 @@
 
 //injector
 
-/obj/machinery/power/am_engine/injector/New()
-	..()
-	spawn( 13 )
-		var/loc = get_step(src, NORTH)
-		src.connected = locate(/obj/machinery/power/am_engine/engine, get_step(loc, NORTH))
-		return
-	return
+/obj/machinery/power/am_engine/injector/Initialize(mapload, newdir)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
+/obj/machinery/power/am_engine/injector/LateInitialize()
+	. = ..()
+	var/loc = get_step(src, NORTH)
+	connected = locate(/obj/machinery/power/am_engine/engine, get_step(loc, NORTH))
 
 /obj/machinery/power/am_engine/injector/attackby(obj/item/fuel/F, mob/user)
 	if( (stat & BROKEN) || !connected) return
@@ -71,15 +71,14 @@
 
 //engine
 
+/obj/machinery/power/am_engine/engine/Initialize(mapload, newdir)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
-/obj/machinery/power/am_engine/engine/New()
-	..()
-	spawn( 7 )
-		var/loc = get_step(src, SOUTH)
-		src.connected = locate(/obj/machinery/power/am_engine/injector, get_step(loc, SOUTH))
-		return
-	return
-
+/obj/machinery/power/am_engine/engine/LateInitialize()
+	. = ..()
+	var/loc = get_step(src, SOUTH)
+	src.connected = locate(/obj/machinery/power/am_engine/injector, get_step(loc, SOUTH))
 
 /obj/machinery/power/am_engine/engine/proc/engine_go()
 
@@ -204,4 +203,4 @@
 
 	stopping = 0
 
-	return
\ No newline at end of file
+	return
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index d3a2e84cd89..3b93f4c6a29 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -26,12 +26,13 @@ proc/cardinalrange(var/center)
 	var/efficiency = 1//How many cores this core counts for when doing power processing, phoron in the air and stability could affect this
 
 
-/obj/machinery/am_shielding/New(loc)
-	..(loc)
-	spawn(10)
-		controllerscan()
-	return
+/obj/machinery/am_shielding/Initialize(mapload, newdir)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
+/obj/machinery/am_shielding/LateInitialize()
+	. = ..()
+	controllerscan()
 
 /obj/machinery/am_shielding/proc/controllerscan(var/priorscan = 0)
 	//Make sure we are the only one here
diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index b4c4513931e..9d7176f5508 100644
--- a/code/modules/power/batteryrack.dm
+++ b/code/modules/power/batteryrack.dm
@@ -14,10 +14,9 @@
 	var/capacitors_amount = 0
 	var/global/list/br_cache = null
 
-/obj/machinery/power/smes/batteryrack/New()
-	..()
+/obj/machinery/power/smes/batteryrack/Initialize(mapload, newdir)
+	. = ..()
 	RefreshParts()
-	return
 
 //Maybe this should be moved up to obj/machinery
 /obj/machinery/power/smes/batteryrack/proc/add_parts()
@@ -25,8 +24,6 @@
 	component_parts += new /obj/item/cell/high
 	component_parts += new /obj/item/cell/high
 	component_parts += new /obj/item/cell/high
-	return
-
 
 /obj/machinery/power/smes/batteryrack/RefreshParts()
 	capacitors_amount = 0
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 8c51cf5a5a4..150ea5cdfbc 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -88,8 +88,8 @@ var/list/possible_cable_coil_colours = list(
 /obj/structure/cable/white
 	color = COLOR_WHITE
 
-/obj/structure/cable/New()
-	..()
+/obj/structure/cable/Initialize(mapload)
+	. = ..()
 
 	// ensure d1 & d2 reflect the icon_state for entering and exiting cable
 
@@ -100,7 +100,8 @@ var/list/possible_cable_coil_colours = list(
 	d2 = text2num( copytext( icon_state, dash+1 ) )
 
 	var/turf/T = src.loc			// hide if turf is not intact
-	if(level==1) hide(!T.is_plating())
+	if(level==1)
+		hide(!T.is_plating())
 	cable_list += src //add it to the global cable list
 
 
@@ -824,8 +825,8 @@ obj/structure/cable/proc/cableColor(var/colorC)
 /obj/item/stack/cable_coil/cut
 	item_state = "coil2"
 
-/obj/item/stack/cable_coil/cut/New(loc)
-	..()
+/obj/item/stack/cable_coil/cut/Initialize(mapload, new_amount, merge)
+	. = ..()
 	src.amount = rand(1,2)
 	pixel_x = rand(-2,2)
 	pixel_y = rand(-2,2)
@@ -904,16 +905,16 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	stacktype = /obj/item/stack/cable_coil
 	color = COLOR_BROWN
 
-/obj/item/stack/cable_coil/random/New()
+/obj/item/stack/cable_coil/random/Initialize(mapload, new_amount, merge)
+	. = ..()
 	stacktype = /obj/item/stack/cable_coil
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN, COLOR_SILVER, COLOR_GRAY, COLOR_BLACK, COLOR_MAROON, COLOR_OLIVE, COLOR_LIME, COLOR_TEAL, COLOR_NAVY, COLOR_PURPLE, COLOR_BEIGE, COLOR_BROWN)
-	..()
 
-/obj/item/stack/cable_coil/random_belt/New()
+/obj/item/stack/cable_coil/random_belt/Initialize(mapload, new_amount, merge)
+	. = ..()
 	stacktype = /obj/item/stack/cable_coil
 	color = pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE)
 	amount = 30
-	..()
 
 //Endless alien cable coil
 
diff --git a/code/modules/power/fission/computer.dm b/code/modules/power/fission/computer.dm
index 7d0f98b3e10..95aed2f36e9 100644
--- a/code/modules/power/fission/computer.dm
+++ b/code/modules/power/fission/computer.dm
@@ -18,12 +18,9 @@
 	circuit = /obj/item/circuitboard/fission_monitor
 	var/obj/machinery/power/fission/linked
 
-/obj/machinery/computer/fission_monitor/New()
-	..()
-
 /obj/machinery/computer/fission_monitor/Destroy()
 	linked = null
-	..()
+	return ..()
 
 /obj/machinery/computer/fission_monitor/attackby(var/obj/item/W as obj, var/mob/user as mob)
 	if(istype(W, /obj/item/multitool))
diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm
index 52e03883b6d..025e0b2d407 100644
--- a/code/modules/power/fractal_reactor.dm
+++ b/code/modules/power/fractal_reactor.dm
@@ -15,8 +15,8 @@
 	var/mapped_in = 0					//Do not announce creation when it's mapped in.
 
 	// This should be only used on Dev for testing purposes.
-/obj/machinery/power/fractal_reactor/New()
-	..()
+/obj/machinery/power/fractal_reactor/Initialize(mapload, newdir)
+	. = ..()
 	if(!mapped_in)
 		to_chat(world, "<b><font color='red'>WARNING:</font><font color='black'> Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]</font></b>")
 
diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm
index 2b02fc486e2..9b13d147b09 100644
--- a/code/modules/power/generator_type2.dm
+++ b/code/modules/power/generator_type2.dm
@@ -13,15 +13,17 @@
 	var/lastgenlev = -1
 
 
-/obj/machinery/power/generator_type2/New()
-	..()
-	spawn(5)
-		input1 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, 90))
-		input2 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, -90))
-		if(!input1 || !input2)
-			stat |= BROKEN
-		updateicon()
+/obj/machinery/power/generator_type2/Initialize(mapload, newdir)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
+/obj/machinery/power/generator_type2/LateInitialize()
+	. = ..()
+	input1 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, 90))
+	input2 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, -90))
+	if(!input1 || !input2)
+		stat |= BROKEN
+	updateicon()
 
 /obj/machinery/power/generator_type2/proc/updateicon()
 
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index cce064ec921..07332cf5c49 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -24,21 +24,21 @@
 	var/effectiverange = 25
 
 	// Borrows code from cloning computer
-/obj/machinery/computer/gravity_control_computer/New()
-	..()
-	spawn(5)
-		updatemodules()
-		return
-	return
+/obj/machinery/computer/gravity_control_computer/Initialize(mapload)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
-/obj/machinery/gravity_generator/New()
-	..()
-	spawn(5)
-		locatelocalareas()
-		return
-	return
+/obj/machinery/computer/gravity_control_computer/LateInitialize()
+	. = ..()
+	updatemodules()
 
+/obj/machinery/gravity_generator/Initialize(mapload, newdir)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
+/obj/machinery/gravity_generator/LateInitialize()
+	. = ..()
+	locatelocalareas()
 
 /obj/machinery/computer/gravity_control_computer/proc/updatemodules()
 	src.gravity_generator = findgenerator()
diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm
index 07a9ba16399..bed74627fbb 100644
--- a/code/modules/power/grid_checker.dm
+++ b/code/modules/power/grid_checker.dm
@@ -15,8 +15,8 @@
 	var/wire_allow_manual_3 = FALSE
 	var/opened = FALSE
 
-/obj/machinery/power/grid_checker/New()
-	..()
+/obj/machinery/power/grid_checker/Initialize(mapload, newdir)
+	. = ..()
 	connect_to_network()
 	update_icon()
 	wires = new(src)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index e52e658db6b..cc277a67375 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -30,8 +30,8 @@ var/global/list/light_type_cache = list()
 	var/fixture_type = /obj/machinery/light
 	var/sheets_refunded = 2
 
-/obj/machinery/light_construct/New(var/atom/newloc, var/newdir, var/building = 0, var/datum/frame/frame_types/frame_type, var/obj/machinery/light/fixture = null)
-	..(newloc)
+/obj/machinery/light_construct/Initialize(mapload, newdir, building = FALSE, datum/frame/frame_types/frame_type, obj/machinery/light/fixture)
+	. = ..(newloc, newdir)
 	if(fixture)
 		fixture_type = fixture.type
 		fixture.transfer_fingerprints_to(src)
@@ -219,9 +219,8 @@ var/global/list/light_type_cache = list()
 	shows_alerts = FALSE	//VOREStation Edit
 	var/lamp_shade = 1
 
-/obj/machinery/light/flamp/New(atom/newloc, obj/machinery/light_construct/construct = null)
-	..(newloc, construct)
-
+/obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct)
+	. = ..()
 	if(construct)
 		lamp_shade = 0
 		update_icon()
@@ -244,15 +243,15 @@ var/global/list/light_type_cache = list()
 	auto_flicker = TRUE
 
 //VOREStation Add - Shadeless!
-/obj/machinery/light/flamp/noshade/New()
+/obj/machinery/light/flamp/noshade/Initialize(mapload, obj/machinery/light_construct/construct)
+	. = ..()
 	lamp_shade = 0
 	update(0)
-	..()
 //VOREStation Add End
 
 // create a new lighting fixture
-/obj/machinery/light/New(atom/newloc, obj/machinery/light_construct/construct = null)
-	..(newloc)
+/obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct)
+	. = ..(newloc)
 
 	if(construct)
 		status = LIGHT_EMPTY
@@ -804,8 +803,8 @@ var/global/list/light_type_cache = list()
 			desc = "A broken [name]."
 
 
-/obj/item/light/New(atom/newloc, obj/machinery/light/fixture = null)
-	..()
+/obj/item/light/Initialize(mapload, obj/machinery/light/fixture)
+	. = ..()
 	if(fixture)
 		status = fixture.status
 		rigged = fixture.rigged
diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm
index fb4a15a8831..3dee90c77a6 100644
--- a/code/modules/power/lighting_vr.dm
+++ b/code/modules/power/lighting_vr.dm
@@ -7,13 +7,13 @@
 	layer = BELOW_MOB_LAYER
 
 //Vorestation addition, to override the New() proc further below, since this is a lamp.
-/obj/machinery/light/flamp/New()
-	..()
+/obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct)
+	. = ..()
 	layer = initial(layer)
 
 // create a new lighting fixture
-/obj/machinery/light/New()
-	..()
+/obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct)
+	. = ..()
 	//Vorestation addition, so large mobs stop looking stupid in front of lights.
 	if (dir == SOUTH) // Lights are backwards, SOUTH lights face north (they are on south wall)
 		layer = ABOVE_MOB_LAYER
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index b4c8bf9c249..adf5498f890 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -111,17 +111,14 @@
 
 /obj/machinery/power/port_gen/pacman/Initialize(mapload)
 	. = ..()
-	if(anchored)
-		connect_to_network()
-
-/obj/machinery/power/port_gen/pacman/New()
-	..()
 	component_parts = list()
 	component_parts += new /obj/item/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/stock_parts/micro_laser(src)
 	component_parts += new /obj/item/stack/cable_coil(src, 2)
 	component_parts += new /obj/item/stock_parts/capacitor(src)
 	RefreshParts()
+	if(anchored)
+		connect_to_network()
 
 /obj/machinery/power/port_gen/pacman/Destroy()
 	DropFuel()
diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm
index 15ff90b352d..c2e580ce312 100644
--- a/code/modules/power/sensors/powernet_sensor.dm
+++ b/code/modules/power/sensors/powernet_sensor.dm
@@ -22,8 +22,8 @@
 // Proc: New()
 // Parameters: None
 // Description: Automatically assigns name according to ID tag.
-/obj/machinery/power/sensor/New()
-	..()
+/obj/machinery/power/sensor/Initialize(mapload, newdir)
+	. = ..()
 	auto_set_name()
 
 // Proc: auto_set_name()
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index e6659c216b3..6f08c19be0c 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -74,35 +74,31 @@
 	return smes_amt / SMESRATE
 
 
-/obj/machinery/power/smes/New()
-	..()
-	spawn(5)
-		if(!powernet)
-			connect_to_network()
+/obj/machinery/power/smes/Initialize(mapload, newdir)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
 
-		dir_loop:
-			for(var/d in cardinal)
-				var/turf/T = get_step(src, d)
-				for(var/obj/machinery/power/terminal/term in T)
-					if(term && term.dir == turn(d, 180))
-						terminal = term
-						break dir_loop
-		if(!terminal)
-			stat |= BROKEN
-			return
-		terminal.master = src
-		if(!terminal.powernet)
-			terminal.connect_to_network()
-		update_icon()
-
-
-
-
-		if(!should_be_mapped)
-			warning("Non-buildable or Non-magical SMES at [src.x]X [src.y]Y [src.z]Z")
-
-	return
+/obj/machinery/power/smes/LateInitialize()
+	. = ..()
+	if(!powernet)
+		connect_to_network()
 
+	dir_loop:
+		for(var/d in cardinal)
+			var/turf/T = get_step(src, d)
+			for(var/obj/machinery/power/terminal/term in T)
+				if(term && term.dir == turn(d, 180))
+					terminal = term
+					break dir_loop
+	if(!terminal)
+		stat |= BROKEN
+		return
+	terminal.master = src
+	if(!terminal.powernet)
+		terminal.connect_to_network()
+	update_icon()
+	if(!should_be_mapped)
+		warning("Non-buildable or Non-magical SMES at [src.x]X [src.y]Y [src.z]Z")
 
 /obj/machinery/power/smes/disconnect_terminal()
 	if(terminal)
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index b9bff92e976..8c01ab29d2f 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -14,11 +14,11 @@
 	layer = WIRES_LAYER+0.01
 
 
-/obj/machinery/power/terminal/New()
-	..()
+/obj/machinery/power/terminal/Initialize(mapload, newdir)
+	. = ..()
 	var/turf/T = src.loc
-	if(level==1) hide(!T.is_plating())
-	return
+	if(level==1)
+		hide(!T.is_plating())
 
 /obj/machinery/power/terminal/Destroy()
 	if(master)