From 62eb3bf50ff2c84bf54257cd1beb0bb1e0675498 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:38:13 +0200 Subject: [PATCH] Qdel diona metabolism and dionastat (#17322) * Atomization * dsfa --------- Co-authored-by: FluffyGhost --- .../living/carbon/alien/diona/diona_nymph.dm | 3 ++ code/modules/mob/living/carbon/diona_base.dm | 9 ++++ ...st-qdel_diona_metabolism_and_dionastat.yml | 41 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 html/changelogs/FluffyGhost-qdel_diona_metabolism_and_dionastat.yml diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm index 6184a10fac4..ce1c45853ad 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm @@ -324,6 +324,9 @@ /mob/living/carbon/alien/diona/Destroy() walk_to(src, 0) cleanupTransfer() + QDEL_NULL(ingested) + QDEL_NULL(vessel) + QDEL_NULL(DS) . = ..() /mob/living/carbon/alien/diona/proc/wear_hat(var/obj/item/new_hat) diff --git a/code/modules/mob/living/carbon/diona_base.dm b/code/modules/mob/living/carbon/diona_base.dm index 0b8d127c2c8..4934bde9b02 100644 --- a/code/modules/mob/living/carbon/diona_base.dm +++ b/code/modules/mob/living/carbon/diona_base.dm @@ -606,6 +606,15 @@ var/list/diona_banned_languages = list( var/regen_limb_progress var/pause_regen = FALSE +/datum/dionastats/Destroy(force) + sampled_DNA = null + language_progress = null + + last_location = null + regen_limb = null + regen_extra = null + . = ..() + /datum/dionastats/proc/do_blood_suck(var/mob/living/carbon/user, var/mob/living/carbon/human/H) user.visible_message(SPAN_DANGER("[user] is trying to bite [H.name]."), SPAN_DANGER("You start biting \the [H], you both must stay still!")) user.face_atom(get_turf(H)) diff --git a/html/changelogs/FluffyGhost-qdel_diona_metabolism_and_dionastat.yml b/html/changelogs/FluffyGhost-qdel_diona_metabolism_and_dionastat.yml new file mode 100644 index 00000000000..c7319c2f255 --- /dev/null +++ b/html/changelogs/FluffyGhost-qdel_diona_metabolism_and_dionastat.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: FluffyGhost + +# 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: "Diona nymphs should now QDEL correctly alongside dionastat."