From 8015f1ad5bd567b7f70847ca04ca3cfd9b1c55f7 Mon Sep 17 00:00:00 2001 From: Nomoresolvalou Date: Fri, 17 May 2024 02:41:52 -0500 Subject: [PATCH 1/4] maintenance jack now will pry open unpowered doors --- code/game/objects/items/tools/maintenance_tools.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 5dff20727ba0..7f229c9fee09 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -557,13 +557,17 @@ if(requires_superstrength_pry) if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR return - if(!attacked_door.density) //If its open - return if(attacked_door.heavy) //Unopenable to_chat(usr, SPAN_DANGER("You cannot force [attacked_door] open.")) return if(user.action_busy) return + if(!attacked_door.density && !attacked_door.arePowerSystemsOn()) //If its open and unpowered + attacked_door.close(TRUE) + return + if(attacked_door.density && !attacked_door.arePowerSystemsOn()) // if its closed and unpowered + attacked_door.open(TRUE) + return user.visible_message(SPAN_DANGER("[user] jams [src] into [attacked_door] and starts to pry it open."), SPAN_DANGER("You jam [src] into [attacked_door] and start to pry it open.")) From 7082f069d3814e9168c15eb5e750c71eb22e5e9b Mon Sep 17 00:00:00 2001 From: Nomoresolvalou Date: Fri, 17 May 2024 23:42:30 -0500 Subject: [PATCH 2/4] re-added open door check --- code/game/objects/items/tools/maintenance_tools.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 7f229c9fee09..d796812f9e53 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -568,6 +568,8 @@ if(attacked_door.density && !attacked_door.arePowerSystemsOn()) // if its closed and unpowered attacked_door.open(TRUE) return + if(!attacked_door.density) //If its open + return user.visible_message(SPAN_DANGER("[user] jams [src] into [attacked_door] and starts to pry it open."), SPAN_DANGER("You jam [src] into [attacked_door] and start to pry it open.")) From a0c07099b27f960294df8a438709ae81ae991dd5 Mon Sep 17 00:00:00 2001 From: Nomoresolvalou Date: Sat, 18 May 2024 00:03:52 -0500 Subject: [PATCH 3/4] maint-jack powered door check --- code/game/objects/items/tools/maintenance_tools.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index d796812f9e53..8ca781139604 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -568,8 +568,8 @@ if(attacked_door.density && !attacked_door.arePowerSystemsOn()) // if its closed and unpowered attacked_door.open(TRUE) return - if(!attacked_door.density) //If its open - return + if(!attacked_door.density && attacked_door.arePowerSystemsOn()) //If its open and powered + return user.visible_message(SPAN_DANGER("[user] jams [src] into [attacked_door] and starts to pry it open."), SPAN_DANGER("You jam [src] into [attacked_door] and start to pry it open.")) From 13adface233a5799d99d08e8f8769801d36114ba Mon Sep 17 00:00:00 2001 From: Nomoresolvalou Date: Sat, 18 May 2024 00:54:30 -0500 Subject: [PATCH 4/4] fixed open door check --- code/game/objects/items/tools/maintenance_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 8ca781139604..8febff63ee5d 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -568,7 +568,7 @@ if(attacked_door.density && !attacked_door.arePowerSystemsOn()) // if its closed and unpowered attacked_door.open(TRUE) return - if(!attacked_door.density && attacked_door.arePowerSystemsOn()) //If its open and powered + if(!attacked_door.density) //If its open return user.visible_message(SPAN_DANGER("[user] jams [src] into [attacked_door] and starts to pry it open."),