From 439afee2abcdb21671aa46fdf27e401f72766c99 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 26 Jan 2019 14:54:01 -0800 Subject: [PATCH] Unclogs powersink drains --- code/controllers/subsystems/machines.dm | 2 +- code/game/objects/items/devices/powersink.dm | 5 +++++ html/changelogs/ater - sinks.yml | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/ater - sinks.yml diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm index 4cba70a981..d2c9399665 100644 --- a/code/controllers/subsystems/machines.dm +++ b/code/controllers/subsystems/machines.dm @@ -42,10 +42,10 @@ SUBSYSTEM_DEF(machines) /datum/controller/subsystem/machines/fire(resumed = 0) var/timer = TICK_USAGE + INTERNAL_PROCESS_STEP(SSMACHINES_POWER_OBJECTS,FALSE,process_power_objects,cost_power_objects,SSMACHINES_PIPENETS) // Higher priority, damnit INTERNAL_PROCESS_STEP(SSMACHINES_PIPENETS,TRUE,process_pipenets,cost_pipenets,SSMACHINES_MACHINERY) INTERNAL_PROCESS_STEP(SSMACHINES_MACHINERY,FALSE,process_machinery,cost_machinery,SSMACHINES_POWERNETS) INTERNAL_PROCESS_STEP(SSMACHINES_POWERNETS,FALSE,process_powernets,cost_powernets,SSMACHINES_POWER_OBJECTS) - INTERNAL_PROCESS_STEP(SSMACHINES_POWER_OBJECTS,FALSE,process_power_objects,cost_power_objects,SSMACHINES_PIPENETS) // rebuild all power networks from scratch - only called at world creation or by the admin verb // The above is a lie. Turbolifts also call this proc. diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 6ea73e8c78..ab314e5953 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -73,7 +73,12 @@ src.visible_message("[user] activates [src]!") mode = 2 icon_state = "powersink1" +<<<<<<< HEAD processing_objects.Add(src) +======= + START_PROCESSING(SSobj, src) + datum_flags &= ~DF_ISPROCESSING // Have to reset this flag so that PROCESSING_POWER_OBJECT can re-add it. It fails if the flag is already present. - Ater +>>>>>>> 5b22bed... Unclogs powersink drains (#5901) START_PROCESSING_POWER_OBJECT(src) if(2) //This switch option wasn't originally included. It exists now. --NeoFite src.visible_message("[user] deactivates [src]!") diff --git a/html/changelogs/ater - sinks.yml b/html/changelogs/ater - sinks.yml new file mode 100644 index 0000000000..771921c760 --- /dev/null +++ b/html/changelogs/ater - sinks.yml @@ -0,0 +1,4 @@ +author: Atermonera +delete-after: True +changes + - bugfix: "Powersink drains have been unclogged and work once more" \ No newline at end of file