cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts screen hardref to a weakref (#12733)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-05-03 20:28:31 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 71a7f938e2
commit 775398d92d
8 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/leash.dm
+6 -4
View File
@@ -4,8 +4,9 @@
icon_state = "leash_master"
/atom/movable/screen/alert/leash_dom/Click()
var/obj/item/leash/owner = master
owner.unleash()
var/obj/item/leash/owner = master_ref?.resolve()
if(owner)
owner.unleash()
/atom/movable/screen/alert/leash_pet
name = "Leashed"
@@ -13,8 +14,9 @@
icon_state = "leash_pet"
/atom/movable/screen/alert/leash_dom/Click()
var/obj/item/leash/owner = master
owner.struggle_leash()
var/obj/item/leash/owner = master_ref?.resolve()
if(owner)
owner.struggle_leash()
///// OBJECT /////
//The leash object itself
code/game/objects/items/weapons/storage/storage.dm
+5 -5
View File
@@ -71,30 +71,30 @@
if(storage_slots)
src.boxes = new /atom/movable/screen/storage( )
src.boxes.name = "storage"
src.boxes.master = src
src.boxes.master_ref = WEAKREF(src)
src.boxes.icon_state = "block"
src.boxes.screen_loc = "7,7 to 10,8"
else
src.storage_start = new /atom/movable/screen/storage( )
src.storage_start.name = "storage"
src.storage_start.master = src
src.storage_start.master_ref = WEAKREF(src)
src.storage_start.icon_state = "storage_start"
src.storage_start.screen_loc = "7,7 to 10,8"
src.storage_continue = new /atom/movable/screen/storage( )
src.storage_continue.name = "storage"
src.storage_continue.master = src
src.storage_continue.master_ref = WEAKREF(src)
src.storage_continue.icon_state = "storage_continue"
src.storage_continue.screen_loc = "7,7 to 10,8"
src.storage_end = new /atom/movable/screen/storage( )
src.storage_end.name = "storage"
src.storage_end.master = src
src.storage_end.master_ref = WEAKREF(src)
src.storage_end.icon_state = "storage_end"
src.storage_end.screen_loc = "7,7 to 10,8"
src.closer = new /atom/movable/screen/close( )
src.closer.master = src
src.closer.master_ref = WEAKREF(src)
src.closer.icon_state = "storage_close"
src.closer.hud_layerise()
orient2hud()