diff --git a/baystation12.dme b/baystation12.dme
index a1074dc190..2b02c844aa 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -108,7 +108,6 @@
#include "code\controllers\Processes\nanoui.dm"
#include "code\controllers\Processes\obj.dm"
#include "code\controllers\Processes\pipenet.dm"
-#include "code\controllers\Processes\powernet.dm"
#include "code\controllers\Processes\Shuttle.dm"
#include "code\controllers\Processes\sun.dm"
#include "code\controllers\Processes\supply.dm"
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
index 232ef91973..dcc1bb207c 100644
--- a/code/controllers/Processes/machinery.dm
+++ b/code/controllers/Processes/machinery.dm
@@ -14,10 +14,6 @@
machines = dd_sortedObjectList(machines)
/datum/controller/process/machinery/proc/internal_process()
-//#ifdef PROFILE_MACHINES
- //machine_profiling.len = 0
- //#endif
-
for(var/obj/machinery/M in machines)
if(M && !M.gcDestroyed)
#ifdef PROFILE_MACHINES
@@ -43,6 +39,20 @@
scheck()
+ for(var/datum/powernet/powerNetwork in powernets)
+ if(istype(powerNetwork) && !powerNetwork.disposed)
+ powerNetwork.reset()
+ scheck()
+ continue
+
+ powernets.Remove(powerNetwork)
+
+ // Currently only used by powersinks. These items get priority processed before machinery
+ for(var/obj/item/I in processing_power_items)
+ if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list.
+ processing_power_items.Remove(I)
+ scheck()
+
/datum/controller/process/machinery/getStatName()
return ..()+"([machines.len])"
\ No newline at end of file
diff --git a/code/controllers/Processes/powernet.dm b/code/controllers/Processes/powernet.dm
deleted file mode 100644
index 4a85ea4150..0000000000
--- a/code/controllers/Processes/powernet.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/datum/controller/process/powernet/setup()
- name = "powernet"
- schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/powernet/doWork()
- for(var/datum/powernet/powerNetwork in powernets)
- if(istype(powerNetwork) && !powerNetwork.disposed)
- powerNetwork.reset()
- scheck()
- continue
-
- powernets.Remove(powerNetwork)
-
- // This is necessary to ensure powersinks are always the first devices that drain power from powernet.
- // Otherwise APCs or other stuff go first, resulting in bad things happening.
- for(var/obj/item/device/powersink/S in processing_objects)
- S.drain()
-
-/datum/controller/process/powernet/getStatName()
- return ..()+"([powernets.len])"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 4b9a89bda1..90edc04c0c 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -269,7 +269,7 @@ var/list/global/slot_flags_enumeration = list(
if(!M) return 0
if(!ishuman(M)) return 0
-
+
var/mob/living/carbon/human/H = M
var/list/mob_equip = list()
if(H.species.hud && H.species.hud.equip_slots)
@@ -277,22 +277,22 @@ var/list/global/slot_flags_enumeration = list(
if(H.species && !(slot in mob_equip))
return 0
-
+
//First check if the item can be equipped to the desired slot.
if("[slot]" in slot_flags_enumeration)
var/req_flags = slot_flags_enumeration["[slot]"]
if(!(req_flags & slot_flags))
return 0
-
+
//Next check that the slot is free
if(H.get_equipped_item(slot))
return 0
-
+
//Next check if the slot is accessible.
var/mob/_user = disable_warning? null : H
if(!H.slot_is_accessible(slot, src, _user))
return 0
-
+
//Lastly, check special rules for the desired slot.
switch(slot)
if(slot_l_ear, slot_r_ear)
@@ -355,7 +355,7 @@ var/list/global/slot_flags_enumeration = list(
/obj/item/proc/mob_can_unequip(mob/M, slot, disable_warning = 0)
if(!slot) return 0
if(!M) return 0
-
+
if(!canremove)
return 0
if(!M.slot_is_accessible(slot, src, disable_warning? null : M))
@@ -601,3 +601,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
usr.visible_message("[zoomdevicename ? "[usr] looks up from the [src.name]" : "[usr] lowers the [src.name]"].")
return
+
+
+/obj/item/proc/pwr_drain()
+ return 0 // Process Kill
\ No newline at end of file
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 21d0474a68..7851939899 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -27,6 +27,7 @@
/obj/item/device/powersink/Destroy()
processing_objects.Remove(src)
+ processing_power_items.Remove(src)
..()
/obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user)
@@ -49,6 +50,7 @@
else
if (mode == 2)
processing_objects.Remove(src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite
+ processing_power_items.Remove(src)
anchored = 0
mode = 0
src.visible_message("[user] detaches [src] from the cable!")
@@ -71,25 +73,27 @@
mode = 2
icon_state = "powersink1"
processing_objects.Add(src)
+ processing_power_items.Add(src)
if(2) //This switch option wasn't originally included. It exists now. --NeoFite
src.visible_message("[user] deactivates [src]!")
mode = 1
set_light(0)
icon_state = "powersink0"
processing_objects.Remove(src)
+ processing_power_items.Remove(src)
-/obj/item/device/powersink/proc/drain()
+/obj/item/device/powersink/pwr_drain()
if(!attached)
- return
+ return 0
if(drained_this_tick)
- return
+ return 1
drained_this_tick = 1
var/drained = 0
if(!PN)
- return
+ return 1
set_light(12)
PN.trigger_warning()
@@ -110,6 +114,7 @@
A.cell.use(drain_val * CELLRATE)
drained += drain_val
power_drained += drained
+ return 1
/obj/item/device/powersink/process()
diff --git a/code/global.dm b/code/global.dm
index 2e7ddeb0e6..fce133f586 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -8,6 +8,7 @@ var/global/obj/effect/datacore/data_core = null
var/global/list/all_areas = list()
var/global/list/machines = list()
var/global/list/processing_objects = list()
+var/global/list/processing_power_items = list()
var/global/list/active_diseases = list()
var/global/list/med_hud_users = list() // List of all entities using a medical HUD.
var/global/list/sec_hud_users = list() // List of all entities using a security HUD.