cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 09:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed weapons rack not being able to be cut open with a welder (#19502)

Browse Source 
Fixed weapons rack not being able to be cut open with a welder
This commit is contained in:
Fluffy
2024-06-21 05:35:07 +00:00
committed by GitHub
parent f9fe2d0391
commit a0b49ebf29
2 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/weapons_rack.dm
+2 -13
View File
@@ -89,7 +89,7 @@
balloon_alert_to_viewers("[user] starts to cut through the lock on \the [src]!")
if(WT.use_tool(src, user, 20 SECONDS, extra_checks = CALLBACK(src, PROC_REF(can_continue_opening))))
if(WT.use_tool(src, user, 20 SECONDS, extra_checks = CALLBACK(src, PROC_REF(can_be_opened))))
//Last check because use_tool() is shitcoded
if(forced_open || !can_be_opened())
return
@@ -172,7 +172,7 @@
. = ..()
to_chat(user, SPAN_NOTICE("You start to fiddle with the electronic lock of \the [src]."))
if(do_after(user, 10 SECONDS, src, extra_checks = CALLBACK(src, PROC_REF(can_continue_opening))))
if(do_after(user, 10 SECONDS, src, extra_checks = CALLBACK(src, PROC_REF(can_be_opened))))
to_chat(user, SPAN_NOTICE("You manage to unlock \the [src]."))
toggle_lock(user)
@@ -247,14 +247,3 @@
return TRUE
else
return FALSE
/**
* Basically the inverse of `can_be_opened()`, because the `do_* / use_*` callbacks work the other way around
*
* Used only for callbacks, do not call directly
*/
/obj/structure/weapons_rack/proc/can_continue_opening()
SHOULD_NOT_SLEEP(TRUE)
SHOULD_BE_PURE(TRUE)
return !can_be_opened()