mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Remove data systems in favor of global datums (#82943)
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
|
||||
if(charger in charging)
|
||||
// Stop any existing charging, this'll clean things up properly
|
||||
DSmove_manager.stop_looping(charger)
|
||||
GLOB.move_manager.stop_looping(charger)
|
||||
|
||||
charging += charger
|
||||
actively_moving = FALSE
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
var/time_to_hit = min(get_dist(charger, target), charge_distance) * charge_speed
|
||||
|
||||
var/datum/move_loop/new_loop = DSmove_manager.home_onto(charger, target, delay = charge_speed, timeout = time_to_hit, priority = MOVEMENT_ABOVE_SPACE_PRIORITY)
|
||||
var/datum/move_loop/new_loop = GLOB.move_manager.home_onto(charger, target, delay = charge_speed, timeout = time_to_hit, priority = MOVEMENT_ABOVE_SPACE_PRIORITY)
|
||||
if(!new_loop)
|
||||
return
|
||||
RegisterSignal(new_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move), override = TRUE)
|
||||
@@ -96,7 +96,7 @@
|
||||
/datum/action/cooldown/mob_cooldown/charge/update_status_on_signal(mob/source, new_stat, old_stat)
|
||||
. = ..()
|
||||
if(new_stat == DEAD)
|
||||
DSmove_manager.stop_looping(source) //This will cause the loop to qdel, triggering an end to our charging
|
||||
GLOB.move_manager.stop_looping(source) //This will cause the loop to qdel, triggering an end to our charging
|
||||
|
||||
/datum/action/cooldown/mob_cooldown/charge/proc/do_charge_indicator(atom/charger, atom/charge_target)
|
||||
var/turf/target_turf = get_turf(charge_target)
|
||||
|
||||
Reference in New Issue
Block a user