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

Remove recursivemove + signals from being on EVERY machine by default (#7992)

Browse Source
This commit is contained in:
Raeschen
2024-03-19 21:02:06 +01:00
committed by GitHub
parent 580a27f1ad
commit 7dbb3ba53c
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/machinery/machinery_power.dm
View File

@@ -70,11 +70,20 @@
return amount // If channel is powered then you can do it. return amount // If channel is powered then you can do it.
return 0 return 0
/obj/machinery
var/recursive_set = FALSE //CHOMPEdit: bool to indicate if recursive movement detection ever got set. If it did, don't try to set it again!
// Do not do power stuff in New/Initialize until after ..() // Do not do power stuff in New/Initialize until after ..()
/obj/machinery/Initialize() /obj/machinery/Initialize()
. = ..() . = ..()
RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(update_power_on_move))
//ChompEDIT START -- only add this if we init on a non-turf (and non-null)
if(loc && !isturf(loc))
recursive_set = TRUE
AddComponent(/datum/component/recursive_move) AddComponent(/datum/component/recursive_move)
RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(update_power_on_move)) //we only need this for recursive moving
//ChompEDIT END
var/power = POWER_CONSUMPTION var/power = POWER_CONSUMPTION
REPORT_POWER_CONSUMPTION_CHANGE(0, power) REPORT_POWER_CONSUMPTION_CHANGE(0, power)
power_init_complete = TRUE power_init_complete = TRUE
@@ -94,6 +103,14 @@
/obj/machinery/Moved(atom/old_loc, direction, forced = FALSE) /obj/machinery/Moved(atom/old_loc, direction, forced = FALSE)
. = ..() . = ..()
update_power_on_move(src, old_loc, loc) update_power_on_move(src, old_loc, loc)
//ChompEDIT START -- only add this if we move into a non-turf (not null) and we've never been given recursive move handling
if(!recursive_set && loc && !isturf(loc))
recursive_set = TRUE
AddComponent(/datum/component/recursive_move)
RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(update_power_on_move)) //we only need this for recursive moving
//ChompEDIT END
/* No /* No
if(ismovable(old_loc)) // Unregister recursive movement. if(ismovable(old_loc)) // Unregister recursive movement.
UnregisterSignal(old_loc, COMSIG_OBSERVER_MOVED) UnregisterSignal(old_loc, COMSIG_OBSERVER_MOVED)