Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 63018fc

Browse files
Suit storage unit and ADSU tweaks, bugfixes (#22876)
* oops * fix * whatever * wack
1 parent de0801c commit 63018fc

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

code/game/machinery/decontamination.dm

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
max_integrity = 300
99
circuit = /obj/item/circuitboard/machine/decontamination_unit
1010
layer = OBJ_LAYER
11+
interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OFFLINE
1112
// if you add more storage slots, update cook() to clear their radiation too.
1213

1314
var/max_n_of_items = 53
@@ -147,10 +148,10 @@
147148
say("The decontamination process is completed, thank you for your patience.")
148149
playsound(src, 'sound/machines/decon/decon-open.ogg', 50, TRUE)
149150
if(mob_occupant)
150-
visible_message(span_notice("[src]'s gate slides open, ejecting you out."))
151+
visible_message(span_notice("[src]'s door slides open, ejecting [mob_occupant] out."))
151152
mob_occupant.radiation = 0
152153
else
153-
visible_message(span_notice("[src]'s gate slides open. The glowing yellow lights dim to a gentle green."))
154+
visible_message(span_notice("[src]'s door slides open. The glowing yellow lights dim to a gentle green."))
154155
var/list/things_to_clear = list() //Done this way since using get_all_contents on the SSU itself would include circuitry and such.
155156
if(occupant)
156157
things_to_clear += occupant
@@ -390,6 +391,8 @@
390391
locked = !locked
391392
. = TRUE
392393
if("uv")
394+
if(!is_operational())
395+
return
393396
var/mob/living/mob_occupant = occupant
394397
if(!occupant && !contents.len)
395398
return
@@ -472,6 +475,9 @@
472475
if(panel_open)
473476
to_chat(user, span_warning("Close the panel first!"))
474477
return
478+
if(locked)
479+
to_chat(user, span_warning("It's locked!"))
480+
return
475481
if(uv)
476482
to_chat(user, span_warning("You cannot open the gate while the cycle is running!"))
477483
return

code/game/machinery/suit_storage_unit.dm

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
density = TRUE
88
max_integrity = 250
99
circuit = /obj/item/circuitboard/machine/suit_storage_unit
10+
interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OFFLINE
1011

1112
var/obj/item/clothing/suit/space/suit = null
1213
var/obj/item/clothing/head/helmet/space/helmet = null
@@ -137,13 +138,6 @@
137138
storage = new storage_type(src)
138139
update_appearance(UPDATE_ICON)
139140

140-
/obj/machinery/suit_storage_unit/Destroy()
141-
QDEL_NULL(suit)
142-
QDEL_NULL(helmet)
143-
QDEL_NULL(mask)
144-
QDEL_NULL(storage)
145-
return ..()
146-
147141
/obj/machinery/suit_storage_unit/update_overlays()
148142
. = ..()
149143

@@ -443,6 +437,8 @@
443437
locked = !locked
444438
. = TRUE
445439
if("uv")
440+
if(!is_operational())
441+
return
446442
var/mob/living/mob_occupant = occupant
447443
if(!helmet && !mask && !suit && !storage && !occupant)
448444
return
@@ -479,6 +475,9 @@
479475
if(panel_open)
480476
to_chat(user, span_warning("Close the panel first!"))
481477
return
478+
if(locked)
479+
to_chat(user, span_warning("It's locked!"))
480+
return
482481
if(uv)
483482
to_chat(user, span_warning("You cannot open the gate while the cycle is running!"))
484483
return

0 commit comments

Comments
 (0)