diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ab9eff1bfc8..363485acba8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -96,7 +96,7 @@ set_default_attack(species.unarmed_attacks[1]) /mob/living/carbon/human/Destroy(force) - QDEL_NULL(ghost_spawner) + ghost_spawner = null //Srom (Shared Dreaming) srom_pulled_by = null diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 73f60ce1c45..b4faa5b04eb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -929,7 +929,7 @@ default behaviour is: QDEL_LIST(auras) QDEL_NULL(psi) QDEL_NULL(aiming) - QDEL_LIST(aimed_at_by) + aimed_at_by?.Cut() //Remove contained mobs if(loc) for(var/mob/M in contents) @@ -942,7 +942,7 @@ default behaviour is: available_maneuvers?.Cut() default_language = null QDEL_NULL(z_eye) - QDEL_NULL(last_weather) + last_weather = null return ..() /mob/living/proc/nervous_system_failure() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 95aa9ac0709..452ccef59c9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1,5 +1,9 @@ /mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game. MOB_STOP_THINKING(src) + pulling?.pulledby = null + pulling = null + pullin?.icon_state = "pull0" + pullin = null // Delete and null the grab objects that are touching this mob. QDEL_LIST(grabbed_by) GLOB.mob_list -= src @@ -52,12 +56,7 @@ QDEL_NULL(zone_sel) machine = null - pulling?.pulledby = null - pulling = null - pullin?.icon_state = "pull0" - pullin = null - - QDEL_LIST(client_colors) + client_colors = null additional_vision_handlers?.Cut() pinned?.Cut() QDEL_LIST(embedded) @@ -70,7 +69,7 @@ s_active = null wear_mask = null QDEL_NULL(dna) - QDEL_NULL(LAssailant) + LAssailant = null spell_list?.Cut() lastarea = null control_object = null @@ -113,7 +112,7 @@ QDEL_NULL(narsimage) QDEL_NULL(narglow) QDEL_NULL(riftimage) - QDEL_NULL(bloody_hands_mob) + bloody_hands_mob = null QDEL_NULL(eyeobj) QDEL_NULL(bg) my_client = null diff --git a/html/changelogs/hellfirejag-clear-some-overlyaggressive-nulls.yml b/html/changelogs/hellfirejag-clear-some-overlyaggressive-nulls.yml new file mode 100644 index 00000000000..a38860898c7 --- /dev/null +++ b/html/changelogs/hellfirejag-clear-some-overlyaggressive-nulls.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed some references being deleted instead of nulled."