From 699db89e94445f24ae1bd47566025f10a8a81495 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:57:00 +0200 Subject: [PATCH] Fix statue Initialize() (#16113) * fix * Correct Changelog Entry Type --------- Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- .../crates_lockers/closets/statue.dm | 6 +-- .../fluffyghost-fixstatueinitialize.yml | 41 +++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/fluffyghost-fixstatueinitialize.yml diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 4df7cb2242e..9eff4dec555 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -53,11 +53,11 @@ imprisoned = temporarymob if(health == 0) //meaning if the statue didn't find a valid target - qdel(src) - return + initialized = TRUE + return INITIALIZE_HINT_QDEL START_PROCESSING(SSprocessing, src) - ..() + . = ..() /obj/structure/closet/statue/process() timer -= 2 diff --git a/html/changelogs/fluffyghost-fixstatueinitialize.yml b/html/changelogs/fluffyghost-fixstatueinitialize.yml new file mode 100644 index 00000000000..fc6bae2806f --- /dev/null +++ b/html/changelogs/fluffyghost-fixstatueinitialize.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: "Fix statue Initialize(), that could self-del, making SSAtoms unhappy about it."