diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3118de18566..c4e735c14e6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -41,6 +41,7 @@ /obj/item/clothing/Destroy() STOP_PROCESSING(SSprocessing, src) + QDEL_NULL_LIST(accessories) return ..() //Updates the icons of the mob wearing the clothing item, if any. diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 3989ea274f5..99bacb8e628 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -134,8 +134,7 @@ var/mob/living/silicon/robot/borg = loc borg.mmi = null if(brainmob) - qdel(brainmob) - brainmob = null + QDEL_NULL(brainmob) return ..() /obj/item/device/mmi/radio_enabled diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 11fd7882908..db88840afd3 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -14,6 +14,7 @@ if(stat!=DEAD) //If not dead. death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA ghostize() //Ghostize checks for key so nothing else is necessary. + container = null return ..() /mob/living/carbon/brain/say_understands(var/other)//Goddamn is this hackish, but this say code is so odd diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 44aabb3001b..154126fda8d 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -7,7 +7,7 @@ /mob/living/carbon/brain/gib() if(istype(container, /obj/item/device/mmi)) - qdel(container)//Gets rid of the MMI if there is one + QDEL_NULL(container)//Gets rid of the MMI if there is one if(loc) if(istype(loc,/obj/item/organ/internal/brain)) qdel(loc)//Gets rid of the brain item diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index a38cea51102..d3ce47812d0 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -48,6 +48,7 @@ /mob/living/silicon/Destroy() silicon_mob_list -= src QDEL_NULL(idcard) + QDEL_NULL(common_radio) for(var/datum/alarm_handler/AH in SSalarm.all_handlers) AH.unregister_alarm(src) return ..() diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 6fee4a9dfce..20d863f7f76 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -39,8 +39,7 @@ /obj/item/organ/internal/brain/Destroy() if(brainmob) - qdel(brainmob) - brainmob = null + QDEL_NULL(brainmob) return ..() /obj/item/organ/internal/brain/removed(var/mob/living/user) diff --git a/html/changelogs/mattatlas-delfixes.yml b/html/changelogs/mattatlas-delfixes.yml new file mode 100644 index 00000000000..609e9c9bb44 --- /dev/null +++ b/html/changelogs/mattatlas-delfixes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed some more hard deletion bugs."