Fixes several bad inits (#2605)

BeeStation · Mar 29, 2024 · 192b80b · 192b80b
1 parent 38f9b33
commit 192b80b
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 35 deletions.
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
@@ -322,6 +322,7 @@
 	icon_state = "random_layer1"
 
 /atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
+	. = ..()
 	src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
 
 /atom/movable/screen/parallax_layer/random/asteroids

diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
@@ -132,7 +132,8 @@ SUBSYSTEM_DEF(atoms)
 				qdeleted = TRUE
 			else
 				BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
-
+	if(qdeleted) //you are GONE (nsv13, but fine to replace in update)
+		return TRUE
 	if(!A)	//possible harddel
 		qdeleted = TRUE
 	else if(!(A.flags_1 & INITIALIZED_1))

diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
@@ -15,7 +15,7 @@
 	icon_state = "walkietalkie"
 
 /obj/item/implant/radio/antenna/Initialize(mapload)
-	..()
+	. = ..()
 	radio.name = "internal antenna"
 
 /datum/mutation/antenna/on_acquiring(mob/living/carbon/owner)

diff --git a/code/game/objects/items/bedsheets.dm b/code/game/objects/items/bedsheets.dm
@@ -294,7 +294,7 @@
 	dying_key = DYE_REGISTRY_DOUBLE_BEDSHEET
 
 /obj/item/bedsheet/double/Initialize()
-	..()
+	. = ..()
 	desc += " This one is double."
 
 /obj/item/bedsheet/double/blue

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -10,7 +10,7 @@
 	..()
 
 /obj/structure/closet/secure_closet/freezer/Initialize(mapload)
-	..()
+	. = ..()
 	recursive_organ_check(src)
 
 /obj/structure/closet/secure_closet/freezer/open(mob/living/user)

diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
@@ -196,11 +196,9 @@
 	return ..()
 
 /obj/structure/closet/crate/freezer/Initialize(mapload)
-	..()
+	. = ..()
 	recursive_organ_check(src)
 
-
-
 /obj/structure/closet/crate/freezer/blood
 	name = "blood freezer"
 	desc = "A freezer containing packs of blood."

diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -75,7 +75,7 @@
 	var/heavy_burn_msg = "peeling away"
 
 /obj/item/bodypart/Initialize(mapload)
-	..()
+	. = ..()
 	name = "[limb_id] [parse_zone(body_zone)]"
 	if(is_dimorphic)
 		limb_gender = pick("m", "f")

diff --git a/code/modules/xenoarchaeology/xenoartifact.dm b/code/modules/xenoarchaeology/xenoartifact.dm
@@ -424,7 +424,7 @@
 	if(prob(1))
 		material = pick(XENOA_PLASMA, XENOA_URANIUM, XENOA_BANANIUM)
 	difficulty = material
-	..()
+	. = ..()
 
 /datum/component/xenoartifact_pricing ///Pricing component for shipping solution. Consider swapping to cargo after change.
 	///Buying and selling related, based on guess qaulity
@@ -434,7 +434,7 @@
 
 /datum/component/xenoartifact_pricing/Initialize(...)
 	RegisterSignal(parent, XENOA_CHANGE_PRICE, PROC_REF(update_price))
-	..()
+	. = ..()
 
 /datum/component/xenoartifact_pricing/Destroy(force, silent)
 	UnregisterSignal(parent, XENOA_CHANGE_PRICE)
@@ -447,7 +447,7 @@
  ///Objective version for exploration
 /obj/item/xenoartifact/objective/Initialize(mapload, difficulty)
 	traits += new /datum/xenoartifact_trait/special/objective
-	..()
+	. = ..()
 
 /obj/item/xenoartifact/objective/ComponentInitialize()
 	AddComponent(/datum/component/gps, "[scramble_message_replace_chars("#########", 100)]", TRUE)

diff --git a/nsv13/code/modules/munitions/ammunition/gauss_ammo.dm b/nsv13/code/modules/munitions/ammunition/gauss_ammo.dm
@@ -36,9 +36,6 @@
 	var/goal = 45 SECONDS
 	var/ready = FALSE
 
-/obj/machinery/gauss_dispenser/Initialize(mapload)
-	. = ..()
-
 /obj/machinery/gauss_dispenser/RefreshParts()
 	progress_rate = 0 SECONDS
 	for(var/obj/item/stock_parts/S in component_parts)

diff --git a/nsv13/code/modules/munitions/ammunition/railgun_ammo.dm b/nsv13/code/modules/munitions/ammunition/railgun_ammo.dm
@@ -9,7 +9,7 @@
 	projectile_type = /obj/item/projectile/bullet/railgun_slug
 
 /obj/item/ship_weapon/ammunition/railgun_ammo/Initialize(mapload)
-	..()
+	. = ..()
 	AddComponent(/datum/component/two_handed, require_twohands=TRUE)
 
 /obj/item/ship_weapon/ammunition/railgun_ammo/uranium

diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/cargo_launcher.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/cargo_launcher.dm
@@ -31,8 +31,7 @@
 	bound_x = -64
 
 /obj/machinery/ship_weapon/torpedo_launcher/cargo/Initialize(mapload)
-	..()
-
+	. = ..()
 	if(!linked_dradis)
 		if(launcher_id) //If mappers set an ID
 			for(var/obj/machinery/computer/ship/dradis/minor/cargo/W in GLOB.machines)

diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/deck_guns.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/deck_guns.dm
@@ -837,6 +837,7 @@
 		return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/ship_weapon/deck_turret/LateInitialize()
+	. = ..()
 	link_via_id()
 
 /obj/machinery/ship_weapon/deck_turret/RefreshParts()//using this proc to create the parts instead

diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/deck_guns_construction.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/deck_guns_construction.dm
@@ -39,7 +39,7 @@
 	var/output_path = /obj/machinery/ship_weapon/deck_turret
 
 /obj/structure/ship_weapon/artillery_frame/Initialize(mapload)
-	..()
+	. = ..()
 	LAZYINITLIST(contents)
 
 /obj/structure/ship_weapon/artillery_frame/examine(mob/user)

diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/automation.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/automation.dm
@@ -345,7 +345,7 @@
 	var/list/linked_sorters = list()
 
 /obj/machinery/computer/ammo_sorter/Initialize(mapload, obj/item/circuitboard/C)
-	..()
+	. = ..()
 	if(mapload)
 		return INITIALIZE_HINT_LATELOAD
 

diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/torpedo_launcher.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/torpedo_launcher.dm
@@ -39,7 +39,7 @@
 	bound_x = -64
 
 /obj/machinery/ship_weapon/torpedo_launcher/Initialize(mapload)
-	..()
+	. = ..()
 	component_parts = list()
 	component_parts += new/obj/item/ship_weapon/parts/firing_electronics
 

diff --git a/nsv13/code/modules/munitions/ship_weapons/ship_weapon_parts.dm b/nsv13/code/modules/munitions/ship_weapons/ship_weapon_parts.dm
@@ -31,7 +31,7 @@
 	righthand_file = 'nsv13/icons/mob/inhands/weapons/bombs_righthand.dmi'
 
 /obj/item/ship_weapon/parts/loading_tray/Initialize(mapload)
-	..()
+	. = ..()
 	AddComponent(/datum/component/two_handed, require_twohands=TRUE)
 
 /**
@@ -46,7 +46,7 @@
 	righthand_file = 'nsv13/icons/mob/inhands/weapons/bombs_righthand.dmi'
 
 /obj/item/ship_weapon/parts/railgun_rail/Initialize(mapload)
-	..()
+	. = ..()
 	AddComponent(/datum/component/two_handed, require_twohands=TRUE)
 
 /**
@@ -61,7 +61,7 @@
 	righthand_file = 'nsv13/icons/mob/inhands/weapons/bombs_righthand.dmi'
 
 /obj/item/ship_weapon/parts/mac_barrel/Initialize(mapload)
-	..()
+	. = ..()
 	AddComponent(/datum/component/two_handed, require_twohands=TRUE)
 
 /obj/item/ship_weapon/parts/broadside_casing

diff --git a/nsv13/code/modules/overmap/effects.dm b/nsv13/code/modules/overmap/effects.dm
@@ -24,11 +24,6 @@
 	anchored = TRUE
 
 /obj/effect/particle_effect/phoron_explosion/Initialize(mapload)
-	..()
-	return INITIALIZE_HINT_LATELOAD
-
-/obj/effect/particle_effect/phoron_explosion/LateInitialize()
+	. = ..()
 	QDEL_IN(src, 1.5 SECONDS)
 
-/obj/effect/particle_effect/phoron_explosion/Destroy()
-	return ..()
diff --git a/nsv13/code/modules/overmap/starmap.dm b/nsv13/code/modules/overmap/starmap.dm
@@ -16,7 +16,7 @@
 	var/datum/star_system/selected_system = null
 	var/screen = STARMAP
 	var/can_control_ship = TRUE
-	var/current_sector = 2
+	var/current_sector = SECTOR_NEUTRAL
 	circuit = /obj/item/circuitboard/computer/ship/navigation
 
 /obj/machinery/computer/ship/navigation/LateInitialize()
@@ -154,11 +154,11 @@
 				if(system.is_hypergate)
 					label += " HYPERGATE"
 				if(system.is_capital && !label)
-					label = "CAPITAL"
-				if(system.trader && system.sector != 3) //Use shortnames in brazil for readability
-					label = " [system.trader.name]"
-				if(system.trader && system.sector == 3) //Use shortnames in brazil for readability
-					label = " [system.trader.shortname]"
+					label += "CAPITAL"
+				if(system.trader && system.sector != SECTOR_NEUTRAL) //Use shortnames in brazil for readability
+					label += " [system.trader.name]"
+				if(system.trader && system.sector == SECTOR_NEUTRAL) //Use shortnames in brazil for readability
+					label += " [system.trader.shortname]"
 				if(system.mission_sector)
 					label += " OCCUPIED"
 				if(system.objective_sector)