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

[MIRROR] Some more Init and Destroy issues (#10317)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-06 12:36:25 +01:00
committed by GitHub
co-authored by Kashargul
parent 5e90dd067f
commit 5aad34f339
35 changed files with 165 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/catwalk.dm
+7 -1
View File
@@ -18,12 +18,18 @@
/obj/item/stack/tile/floor/techgrey = "#363f43")
var/health = 100
var/maxhealth = 100
var/delete_me = FALSE
/obj/structure/catwalk/Initialize()
. = ..()
if(delete_me)
return INITIALIZE_HINT_QDEL
for(var/obj/structure/catwalk/C in get_turf(src))
if(C != src)
qdel(C)
if(!(C.flags & ATOM_INITIALIZED))
C.delete_me = TRUE
else
qdel(C)
update_connections(1)
update_icon()
code/game/objects/structures/props/machines.dm
+25 -13
View File
@@ -579,6 +579,7 @@
var/contents_vis_flags = NONE
var/contents_original_pixel_y = 0
var/changing_state = FALSE
/obj/structure/prop/machine/nt_pod/Initialize(mapload)
. = ..()
@@ -641,33 +642,30 @@
return
if(!user.client?.holder)
return
if(changing_state)
return
AM.forceMove(src)
/obj/structure/prop/machine/nt_pod/change_state(state)
. = ..()
if(changing_state)
return
switch(state)
if("open")
changing_state = TRUE
cut_overlay("nt_pod_top_on")
cut_overlay("nt_pod_under")
// Fluid drains
fluid.icon_state = "nothing"
flick("nt_pod_emptying", fluid) // 8ds
sleep(8)
// Door opens
door.icon_state = "nothing"
flick("nt_pod_opening", door) // 9ds
sleep(9)
// GET OUT
outside.layer = BELOW_MOB_LAYER
if(contents.len)
for(var/atom/movable/AM as anything in contents)
unduct(AM)
addtimer(CALLBACK(src, PROC_REF(delayed_flick), door, "nothing", "nt_pod_opening", 0.9 SECONDS), 0.8 SECONDS) // 9ds
if("closed")
changing_state = TRUE
outside.layer = ABOVE_MOB_LAYER
cut_overlay("nt_pod_top_on")
add_overlay("nt_pod_top_on")
@@ -676,10 +674,8 @@
// Door closes
door.icon_state = "nt_pod_glass"
flick("nt_pod_closing", door) // 9ds
sleep(9)
// Fluid fills
fluid.icon_state = "nt_pod_liquid"
flick("nt_pod_filling", fluid) // 8ds
addtimer(CALLBACK(src, PROC_REF(delayed_flick), fluid, "nt_pod_liquid", "nt_pod_filling"), 0.9 SECONDS) // 8ds
if("panel_open")
cut_overlay("nt_pod_panel")
@@ -689,6 +685,22 @@
// Old Virology stuff
/obj/structure/prop/machine/nt_pod/proc/delayed_flick(var/obj/effect/overlay/ovrl, var/icon_state, var/flicked, var/get_out_time)
ovrl.icon_state = icon_state
flick(flicked, ovrl)
// GET OUT
if(get_out_time)
addtimer(CALLBACK(src, PROC_REF(get_out)), get_out_time)
return
changing_state = FALSE
/obj/structure/prop/machine/nt_pod/proc/get_out()
outside.layer = BELOW_MOB_LAYER
if(contents.len)
for(var/atom/movable/AM as anything in contents)
unduct(AM)
changing_state = FALSE
/obj/structure/prop/machine/centrifuge
name = "centrifuge"
desc = "Used to separate things with different weight. Spin 'em round, round, right round."