From 0e1750634fe418be55bda797d15057ae92fe10b9 Mon Sep 17 00:00:00 2001 From: AlaunusLux <89751433+AlaunusLux@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:10:33 -0500 Subject: [PATCH] Allows only either a suit cooler or an airtank to be installed into a voidsuit (#19692) Fixes #19691 --- code/modules/clothing/spacesuits/void/void.dm | 4 ++ ...-cooler-and-airtank-concurrent-install.yml | 58 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 html/changelogs/alaunuslux-disallow-suit-cooler-and-airtank-concurrent-install.yml diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 7e69f45b2ad..52a16fa7dc9 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -314,6 +314,8 @@ else if(istype(attacking_item,/obj/item/tank)) if(tank) to_chat(user, "\The [src] already has an airtank installed.") + else if(cooler) + to_chat(user, "\The [src] already has a suit cooler installed, there is no room for an airtank.") else if(istype(attacking_item,/obj/item/tank/phoron)) to_chat(user, "\The [attacking_item] cannot be inserted into \the [src]'s storage compartment.") else @@ -325,6 +327,8 @@ else if (istype(attacking_item, /obj/item/device/suit_cooling_unit)) if(cooler) to_chat(user, "\The [src] already has a suit cooler installed.") + else if(tank) + to_chat(user, "\The [src] already has an airtank installed, there is no room for a suit cooler.") else playsound(src, 'sound/items/Deconstruct.ogg', 30, 1) to_chat(user, "You insert \the [attacking_item] into \the [src]'s storage compartment.") diff --git a/html/changelogs/alaunuslux-disallow-suit-cooler-and-airtank-concurrent-install.yml b/html/changelogs/alaunuslux-disallow-suit-cooler-and-airtank-concurrent-install.yml new file mode 100644 index 00000000000..a559e9ccfc2 --- /dev/null +++ b/html/changelogs/alaunuslux-disallow-suit-cooler-and-airtank-concurrent-install.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: AlaunusLux + +# 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: "Disallows installing both an airtank and a suit cooler into the same voidsuit."