From 3c8c61a7a91d79566d900e5dfd980a72a2b97f7a Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 31 Jul 2024 19:07:47 +0300 Subject: [PATCH] Portable atmos machine circuit boards fixes [NO GBP] (#85414) ## About The Pull Request ![image](https://github.com/user-attachments/assets/8c7247c3-ecf8-4598-a5d3-8db9cbef8921) I didn't check the examine text on the circuit boards when I was adding them. The pipe fitting items didn't have a proper name and the examine text was saying "pipe", confusing players. Also the machines remained wrenched down on construction if the frame was wrenched. And the fittings that people get from the RPD didn't have the correct typepath. ## Why It's Good For The Game Fixes #85384 Fixes #85409 Fixes #84778 ## Changelog :cl: fix: Portable atmos machine circuit boards list correct components fix: Portable atmos machine circuit boards accept unwrenched fittings fix: Portable atmos machines are movable on construction /:cl: --- code/game/machinery/pipe/construction.dm | 3 +++ .../machinery/components/trinary_devices/filter.dm | 2 +- .../machinery/components/unary_devices/vent_pump.dm | 2 +- .../machinery/components/unary_devices/vent_scrubber.dm | 1 + .../atmospherics/machinery/portable/portable_atmospherics.dm | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 80289a201be..ef18dc6b068 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -36,9 +36,11 @@ Buildable meters icon_state_preview = "junction" pipe_type = /obj/machinery/atmospherics/pipe/heat_exchanging/junction /obj/item/pipe/directional/vent + name = "air vent fitting" icon_state_preview = "uvent" pipe_type = /obj/machinery/atmospherics/components/unary/vent_pump /obj/item/pipe/directional/scrubber + name = "air scrubber fitting" icon_state_preview = "scrubber" pipe_type = /obj/machinery/atmospherics/components/unary/vent_scrubber /obj/item/pipe/directional/connector @@ -78,6 +80,7 @@ Buildable meters RPD_type = PIPE_TRIN_M var/flipped = FALSE /obj/item/pipe/trinary/flippable/filter + name = "gas filter fitting" icon_state_preview = "filter" pipe_type = /obj/machinery/atmospherics/components/trinary/filter /obj/item/pipe/trinary/flippable/mixer diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index 25217de538c..da6c75d699d 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -6,7 +6,7 @@ desc = "Very useful for filtering gasses." can_unwrench = TRUE - construction_type = /obj/item/pipe/trinary/flippable + construction_type = /obj/item/pipe/trinary/flippable/filter pipe_state = "filter" ///Rate of transfer of the gases to the outputs diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 02f0d203544..8a165830cec 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -5,7 +5,7 @@ name = "air vent" desc = "Has a valve and pump attached to it." - + construction_type = /obj/item/pipe/directional/vent use_power = IDLE_POWER_USE idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.15 can_unwrench = TRUE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 20a0b86b41c..22ee2f6b414 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -3,6 +3,7 @@ name = "air scrubber" desc = "Has a valve and pump attached to it." + construction_type = /obj/item/pipe/directional/scrubber use_power = IDLE_POWER_USE idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.1 active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.15 diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 9729c087145..210eb9b0d9e 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -51,6 +51,10 @@ AddElement(/datum/element/elevation, pixel_shift = 8) register_context() +/obj/machinery/portable_atmospherics/on_construction(mob/user) + . = ..() + set_anchored(FALSE) + /obj/machinery/portable_atmospherics/on_deconstruction(disassembled) if(nob_crystal_inserted) new /obj/item/hypernoblium_crystal(src)