Merge remote-tracking branch 'origin/master' into TGUI-4

code/modules/power/apc.dm

@@ -38,6 +38,8 @@
 #define APC_CHARGING 1
 #define APC_FULLY_CHARGED 2
 
+#define MAXIMUM_COG_REGAIN 100 //How much charge drained by an integration cog can be priority-recharged in one processing-tick
+
 // the Area Power Controller (APC), formerly Power Distribution Unit (PDU)
 // one per area, needs wire connection to power network through a terminal
 
@@ -94,6 +96,7 @@
 	var/mob/living/silicon/ai/occupier = null
 	var/transfer_in_progress = FALSE //Is there an AI being transferred out of us?
 	var/obj/item/clockwork/integration_cog/integration_cog //Is there a cog siphoning power?
+	var/cog_drained = 0 //How much of the cell's charge was drained by an integration cog, recovering this amount takes priority over the normal APC cell recharge calculations, but comes after powering Essentials.
 	var/longtermpower = 10
 	var/auto_name = 0
 	var/failure_timer = 0
@@ -499,6 +502,7 @@
 			cell.forceMove(T)
 			cell.update_icon()
 			cell = null
+			cog_drained = 0 //No more cell means no more averting celldrain
 			charging = APC_NOT_CHARGING
 			update_icon()
 			return
@@ -701,7 +705,7 @@
 			START_PROCESSING(SSfastprocess, W)
 			playsound(src, 'sound/machines/clockcult/steam_whoosh.ogg', 50, FALSE)
 			opened = APC_COVER_CLOSED
-			locked = FALSE
+			locked = TRUE //Clockies get full APC access on cogged APCs, but they can't lock or unlock em unless they steal some ID to give all of them APC access, soo this is pretty much just QoL for them and makes cogs a tiny bit more stealthy
 			update_icon()
 		return
 	else if(panel_open && !opened && is_wire_tool(W))
@@ -1274,6 +1278,11 @@
 		cur_used -= lastused_light
 		lighting_satisfied = TRUE
 
+	//If drained by an integration cog: Forcefully avert as much of the powerdrain as possible, though a maximum of MAXIMUM_COG_REGAIN
+	if(cur_excess && cog_drained && cell)
+		var/cog_regain = cell.give(min(min(cog_drained, cur_excess), MAXIMUM_COG_REGAIN))
+		cur_excess -= cog_regain
+		cog_drained = max(0, cog_drained - cog_regain)
 
 	// next: take from or charge to the cell, depending on how much is left
 	if(cell && !shorted)
@@ -1536,6 +1545,8 @@
 #undef APC_UPOVERLAY_LOCKED
 #undef APC_UPOVERLAY_OPERATING
 
+#undef MAXIMUM_COG_REGAIN
+
 /*Power module, used for APC construction*/
 /obj/item/electronics/apc
 	name = "power control module"