Converts screen hardref to a weakref (#19443)

* Weakrefs the  master object

* whoops
This commit is contained in:
Cameron Lennox
2026-05-03 19:43:14 -04:00
committed by GitHub
parent 98a56cfde8
commit 1d2cbea8e9
8 changed files with 35 additions and 23 deletions
+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
@@ -70,30 +70,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()