cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-29 23:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix

Browse Source 
Fix harddel issues with 515 upgrade PR
This commit is contained in:
BongaTheProto
2024-04-07 03:16:55 -05:00
committed by GitHub
parent 2709ec887c 66bd025454
commit 78d4eaeaaa
31 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+1 -1
View File
@@ -113,7 +113,7 @@
set_frequency(frequency)
if(closeOtherId != null)
addtimer(CALLBACK(PROC_REF(update_other_id)), 5)
addtimer(CALLBACK(src, PROC_REF(update_other_id)), 5)
if(glass)
airlock_material = "glass"
if(security_level > AIRLOCK_SECURITY_METAL)
code/game/objects/items/implants/implantchair.dm
+3 -3
View File
@@ -76,10 +76,10 @@
ready_implants--
if(!replenishing && auto_replenish)
replenishing = TRUE
addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
addtimer(CALLBACK(src, PROC_REF(replenish)),replenish_cooldown)
if(injection_cooldown > 0)
ready = FALSE
addtimer(CALLBACK(src,"set_ready"),injection_cooldown)
addtimer(CALLBACK(src, PROC_REF(set_ready)),injection_cooldown)
else
playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, 1)
update_icon()
@@ -113,7 +113,7 @@
if(ready_implants < max_implants)
ready_implants++
if(ready_implants < max_implants)
addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
addtimer(CALLBACK(src, PROC_REF(replenish)), replenish_cooldown)
else
replenishing = FALSE
code/game/world.dm
+1 -1
View File
@@ -387,7 +387,7 @@ GLOBAL_LIST(topic_status_cache)
if(UNIX) lib = "libprof.so"
else CRASH("unsupported platform")
var/init = call(lib, "init")()
var/init = LIBCALL(lib, "init")()
if("0" != init) CRASH("[lib] init error: [init]")
/world/New()