From f14c7191a52f9274d699c809789951071a5b87f1 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 25 Sep 2017 01:41:48 +0300 Subject: [PATCH] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart (#30980) * Small initialize fix batch /mob/living/simple_animal/parrot/Poly/ghost /obj/effect/spawner/bundle /obj/item/device/radio/headset/headset_sec/alt/department /obj/effect/mob_spawn/human/golem /obj/item/device/radio/headset/abductor /obj/item/nullrod/tribal_knife /obj/effect/spawner/xeno_egg_delivery /turf/open/chasm/straight_down * Requested changes --- code/game/gamemodes/miniantags/abduction/abduction_gear.dm | 2 +- code/game/objects/effects/spawners/bundle.dm | 2 +- code/game/objects/effects/spawners/xeno_egg_delivery.dm | 2 +- code/game/objects/items/holy_weapons.dm | 6 ++---- code/game/objects/structures/ghost_role_spawners.dm | 2 +- code/game/turfs/simulated/chasm.dm | 2 +- code/modules/jobs/job_types/security.dm | 2 +- code/modules/mob/living/simple_animal/parrot.dm | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index c55b4db4075..8c6bf1a8aa0 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -532,7 +532,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} flags_2 = BANG_PROTECT_2 /obj/item/device/radio/headset/abductor/Initialize(mapload) - ..() + . = ..() make_syndie() /obj/item/device/radio/headset/abductor/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index cfe8761b84c..be32f0df199 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -12,7 +12,7 @@ var/turf/T = get_turf(src) for(var/path in items) new path(T) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/spawner/bundle/costume/chicken name = "chicken costume spawner" diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index a452dae7497..593c953adf1 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -17,4 +17,4 @@ log_game("An alien egg has been delivered to [A] at [COORD(T)]") var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen." SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)) - qdel(src) + return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index c20a2acdd79..903466bc682 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -387,12 +387,10 @@ flags_2 = SLOWS_WHILE_IN_HAND_2 /obj/item/nullrod/tribal_knife/Initialize(mapload) - ..() - -/obj/item/nullrod/tribal_knife/New() - ..() + . = ..() START_PROCESSING(SSobj, src) + /obj/item/nullrod/tribal_knife/Destroy() STOP_PROCESSING(SSobj, src) . = ..() diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index dfba88fcc82..cee0f31040b 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -123,7 +123,7 @@ golems, so that no golem may ever be forced to serve again." /obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null) - ..() + . = ..() if(species) name += " ([initial(species.prefix)])" mob_species = species diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index da92d6b9dde..3fdd6b1cc95 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -125,7 +125,7 @@ /turf/open/chasm/straight_down/Initialize() - ..() + . = ..() drop_x = x drop_y = y if(z+1 <= world.maxz) diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index 33f030fd22a..67a705455c4 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -295,10 +295,10 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S /obj/item/device/radio/headset/headset_sec/alt/department/Initialize() + . = ..() wires = new/datum/wires/radio(src) secure_radio_connections = new recalculateChannels() - ..() /obj/item/device/radio/headset/headset_sec/alt/department/engi keyslot = new /obj/item/device/encryptionkey/headset_sec diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index cf9f0a27f44..e8e945f77ca 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -970,7 +970,7 @@ /mob/living/simple_animal/parrot/Poly/ghost/Initialize() memory_saved = TRUE //At this point nothing is saved - ..() + . = ..() /mob/living/simple_animal/parrot/Poly/ghost/handle_automated_speech() if(ismob(loc))