From 288c6a8f8489f899d982257b9c89438523ad64de Mon Sep 17 00:00:00 2001 From: lewcc Date: Sun, 3 Oct 2021 23:07:36 -0400 Subject: [PATCH 1/2] SSUs are now attackable if the user doesn't have help intent --- code/game/machinery/suit_storage_unit.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 333baa9aa8d..586f20c736c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -100,13 +100,13 @@ /obj/machinery/suit_storage_unit/security/pod_pilot req_access = list(ACCESS_PILOT) - + /obj/machinery/suit_storage_unit/security/hos name = "Head of Security's suit storage unit" suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos mask_type = /obj/item/clothing/mask/gas/sechailer/hos req_access = list(ACCESS_HOS) - + /obj/machinery/suit_storage_unit/security/hos/secure secure = TRUE @@ -315,6 +315,8 @@ if(shocked) if(shock(user, 100)) return + if (user.a_intent != INTENT_HELP) + return ..() if(!is_operational()) if(panel_open) to_chat(usr, "Close the maintenance panel first.") From 428494386be2fc5a31d57c68c78ee15b5aff158b Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Mon, 4 Oct 2021 12:41:20 -0400 Subject: [PATCH 2/2] when the storage unit is SSUs ensures the unit can still be interacted with as usual in non-help intent even when the unit isn't operational. Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/machinery/suit_storage_unit.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 5276a109e68..923b147f113 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -312,9 +312,9 @@ if(shocked) if(shock(user, 100)) return - if (user.a_intent != INTENT_HELP) - return ..() if(!is_operational()) + if(user.a_intent != INTENT_HELP) + return ..() if(panel_open) to_chat(usr, "Close the maintenance panel first.") else