From fafc3e04a8b9fe6603fc87b5e53bfa28d73f7f9a Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:41:23 +0200 Subject: [PATCH] Fixed gravgen Destroy (#16128) --- code/modules/power/gravitygenerator.dm | 2 +- .../fluffyghost-fixgravgenassuminglinked.yml | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/fluffyghost-fixgravgenassuminglinked.yml diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index db06ebe0fd3..f5f58ce441a 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -135,7 +135,7 @@ for(var/obj/machinery/gravity_generator/part/O in parts) O.main_part = null qdel(O) - linked.gravity_generator = null + linked?.gravity_generator = null return ..() /obj/machinery/gravity_generator/main/proc/eventshutofftoggle() // Used by the gravity event. Bypasses charging and all of that stuff. diff --git a/html/changelogs/fluffyghost-fixgravgenassuminglinked.yml b/html/changelogs/fluffyghost-fixgravgenassuminglinked.yml new file mode 100644 index 00000000000..a5ddaf32857 --- /dev/null +++ b/html/changelogs/fluffyghost-fixgravgenassuminglinked.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: + - rscadd: "Fixed gravgen Destroy() which assumed to be linked, generating a runtime."