From aed059e29b8c8538c25e9fec8a48e02b0d15daca Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Sat, 13 Jul 2024 04:23:00 +0200
Subject: [PATCH 1/2] let me dismantle & beebase gore
---
code/game/machinery/doors/airlock.dm | 32 ++++------------------------
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 37bf79682ef..eb8a431a617 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1085,9 +1085,12 @@
note = C
update_icon()
else if(HAS_TRAIT(C, TRAIT_DOOR_PRYER) && user.a_intent != INTENT_HARM)
+ //NSV13 - please don't make jaws of life inferior to crowbars.
+ if(C.tool_behaviour == TOOL_CROWBAR && !security_level && (panel_open && ((obj_flags & EMAGGED) || (density && welded && !operating && !hasPower() && !locked) || charge)))
+ try_to_crowbar(C, user)
+ //NSV13 end
if(isElectrified() && C?.siemens_coefficient)
shock(user,100)
-
if(locked)
to_chat(user, "The bolts are down, it won't budge!")
return
@@ -1180,33 +1183,6 @@
return
INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2)
- if(HAS_TRAIT(I, TRAIT_DOOR_PRYER)) //NSV13 - kept the ability to use crowbars and stuff on doors
- if(isElectrified())
- shock(user,100)//it's like sticking a forck in a power socket
- return
-
- if(!density)//already open
- return
-
- if(locked)
- to_chat(user, "The bolts are down, it won't budge!")
- return
-
- if(welded)
- to_chat(user, "It's welded, it won't budge!")
- return
-
- var/time_to_open = 5
- if(hasPower() && !prying_so_hard)
- time_to_open = 50
- playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) //is it aliens or just the CE being a dick?
- prying_so_hard = TRUE
- if(do_after(user, time_to_open, TRUE, src))
- open(2)
- if(density && !open(2))
- to_chat(user, "Despite your attempts, [src] refuses to open.")
- prying_so_hard = FALSE
-
/obj/machinery/door/airlock/open(forced=0)
if( operating || welded || locked )
return FALSE
From 190ea9168c3147efe386a7ad223d1604d8529a53 Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Sat, 13 Jul 2024 04:56:36 +0200
Subject: [PATCH 2/2] random line
---
code/game/machinery/doors/airlock.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index eb8a431a617..d4776194848 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1091,6 +1091,7 @@
//NSV13 end
if(isElectrified() && C?.siemens_coefficient)
shock(user,100)
+
if(locked)
to_chat(user, "The bolts are down, it won't budge!")
return