Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes jaws of life airlock interactions & tiny bit of beebase cleanup #2694

Merged
merged 2 commits into from
Aug 24, 2024
Merged

Fixes jaws of life airlock interactions & tiny bit of beebase cleanup #2694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aed059e
let me dismantle & beebase gore
DeltaFire15 Jul 13, 2024
190ea91
random line
DeltaFire15 Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 4 additions & 27 deletions code/game/machinery/doors/airlock.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,10 @@
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)

Expand Down Expand Up @@ -1180,33 +1184,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, "<span class='warning'>The bolts are down, it won't budge!</span>")
return

if(welded)
to_chat(user, "<span class='warning'>It's welded, it won't budge!</span>")
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, "<span class='warning'>Despite your attempts, [src] refuses to open.</span>")
prying_so_hard = FALSE

/obj/machinery/door/airlock/open(forced=0)
if( operating || welded || locked )
return FALSE
Expand Down
Loading