From 1bace2f3810d01a4d33c9aafbe4acaf9280d9772 Mon Sep 17 00:00:00 2001 From: Batrachophreno Date: Fri, 16 May 2025 04:33:47 -0400 Subject: [PATCH] Fix Airlock Assembly deconstruction (#20766) https://github.com/Aurorastation/Aurora.3/issues/17355 Fixed check for airlock assembly deconstruction. Also added a friendly feedback message about installing windows, not that I had trouble with that recently or anything. --- code/game/objects/structures/door_assembly.dm | 5 +- .../Batrachophreno-AirlockDisassembly.yml | 58 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Batrachophreno-AirlockDisassembly.yml diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index c95f2b17748..cc008114ff6 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -95,7 +95,7 @@ created_name = door_name else if(attacking_item.iswelder()) - if(!glass || anchored) + if(!glass && anchored) to_chat(user, SPAN_WARNING("\The [src] isn't ready to be welded yet. It doesn't have any installed glass to remove, and it has to be unsecured to deconstruct it.")) return var/obj/item/weldingtool/WT = attacking_item @@ -225,6 +225,9 @@ var/obj/item/stack/S = attacking_item var/material_name = S.get_material_name() if(S.get_amount() >= 2) + if(material_name != MATERIAL_GLASS_REINFORCED) + to_chat(user, SPAN_WARNING("You can only use reinforced glass to install a window into an airlock assembly.")) + return if(material_name == MATERIAL_GLASS_REINFORCED) user.visible_message("[user] starts installing \the [S] into the airlock assembly.", SPAN_WARNING("You start installing \the [S] into the airlock assembly.")) if(attacking_item.use_tool(src, user, 40, volume = 50) && !glass) diff --git a/html/changelogs/Batrachophreno-AirlockDisassembly.yml b/html/changelogs/Batrachophreno-AirlockDisassembly.yml new file mode 100644 index 00000000000..cf8f4551688 --- /dev/null +++ b/html/changelogs/Batrachophreno-AirlockDisassembly.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Batrachophreno + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Unanchored airlock assemblies can now be deconstructed with a welder."