cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14554 from VOREStation/upstream-merge-8981

Browse Source 
[MIRROR] Safes Move Objects In Late Initialize.
This commit is contained in:
Heroman3003
2023-02-26 10:52:18 +10:00
committed by CHOMPStation2
parent d1d10dcd7d
commit ab8361b3f3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/structures/safe.dm
View File

@@ -22,15 +22,17 @@ FLOOR SAFES
var/maxspace = 24 //the maximum combined w_class of stuff in the safe var/maxspace = 24 //the maximum combined w_class of stuff in the safe
/obj/structure/safe/New() /obj/structure/safe/Initialize()
tumbler_1_pos = rand(0, 72) tumbler_1_pos = rand(0, 72)
tumbler_1_open = rand(0, 72) tumbler_1_open = rand(0, 72)
tumbler_2_pos = rand(0, 72) tumbler_2_pos = rand(0, 72)
tumbler_2_open = rand(0, 72) tumbler_2_open = rand(0, 72)
if(. != INITIALIZE_HINT_QDEL)
return INITIALIZE_HINT_LATELOAD
/obj/structure/safe/Initialize() /obj/structure/safe/LateInitialize()
. = ..() . = ..()
for(var/obj/item/I in loc) for(var/obj/item/I in loc)
if(space >= maxspace) if(space >= maxspace)
@@ -115,7 +117,7 @@ FLOOR SAFES
if(canhear) if(canhear)
to_chat(user, "<span class='notice'>You hear a [pick("click", "chink", "clink")] from \the [src].</span>") to_chat(user, "<span class='notice'>You hear a [pick("click", "chink", "clink")] from \the [src].</span>")
playsound(src, 'sound/machines/click.ogg', 20, 1) playsound(src, 'sound/machines/click.ogg', 20, 1)
check_unlocked(user, canhear) check_unlocked(user, canhear)
updateUsrDialog() updateUsrDialog()
return return