From 17be7bdddb53707ffca260197b2d3828329f98b5 Mon Sep 17 00:00:00 2001 From: Zirok <108930384+Zirok-BYOND@users.noreply.github.com> Date: Sat, 27 Aug 2022 10:42:23 +0200 Subject: [PATCH 1/4] Fix antag spawners landmarks hard deleting. This seems to have been an issue related to init order. Commenting out the return INITIALIZE_HINT_QDEL works as well. --- code/game/objects/effects/landmarks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 6a390a0774..ce0970acd1 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -42,7 +42,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) if(delete_after_roundstart) qdel(src) -/obj/effect/landmark/start/New() +/obj/effect/landmark/start/Initialize(mapload) GLOB.start_landmarks_list += src if(jobspawn_override) if(!GLOB.jobspawn_overrides[name]) From 2d2d94b523b6403893606578de35bdab76e552b5 Mon Sep 17 00:00:00 2001 From: Zirok <108930384+Zirok-BYOND@users.noreply.github.com> Date: Sat, 27 Aug 2022 19:28:44 +0200 Subject: [PATCH 2/4] Fix /datum/gas_mixture and another jetpack-related typepath hard deleting. --- code/game/objects/items/tanks/jetpack.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 06c38ead9f..dfd53b3a0d 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -19,6 +19,10 @@ ion_trail = new ion_trail.set_up(src) +/obj/item/tank/jetpack/Destroy() + QDEL_NULL(ion_trail) + return ..() + /obj/item/tank/jetpack/populate_gas() if(gas_type) air_contents.set_moles(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))) From 2431a7f6eac9d756c20a76ac0fb6d63d2672d4a3 Mon Sep 17 00:00:00 2001 From: Zirok <108930384+Zirok-BYOND@users.noreply.github.com> Date: Sat, 27 Aug 2022 19:28:58 +0200 Subject: [PATCH 3/4] Fix /obj/effect/overlay/status_display_text hard deleting. These are used by the Status displays all over the station to show the time until the shuttle arrives, among other things. The problem was vis_contents hanging the message, see the BYOND ref for how vis_contents and vis_loc work. The vis_contents.cut() change is unrelated, but seems appropriate nonetheless. It is taken from current /tg/station code. --- code/game/atoms_movable.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 3e13720c67..7c7e1c56c7 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -123,6 +123,9 @@ moveToNullspace() + vis_locs = null //clears this atom out of all viscontents + vis_contents.Cut() + /atom/movable/proc/update_emissive_block() if(blocks_emissive != EMISSIVE_BLOCK_GENERIC) return From 9e9f2f538dc14c74bc16dee6fa4ccfa47e09b59b Mon Sep 17 00:00:00 2001 From: Zirok <108930384+Zirok-BYOND@users.noreply.github.com> Date: Sat, 27 Aug 2022 18:53:17 +0200 Subject: [PATCH 4/4] Fix /obj/item/robot_module hard deleting. --- .../code/modules/mob/living/silicon/robot/dogborg_equipment.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm index 91ec509f98..1e361c362a 100644 --- a/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm +++ b/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm @@ -400,6 +400,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! /obj/item/milking_machine/pleasuremaw/Destroy() STOP_PROCESSING(SSobj, src) //please no + QDEL_NULL(inserted_item) borg_self = null . = ..()