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 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]) 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))) 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 . = ..()