Merge branch 'master' into clockcultrework_v2

code/modules/power/antimatter/containment_jar.dm

@@ -37,4 +37,4 @@
 	if(fuel < wanted)
 		wanted = fuel
 	fuel -= wanted
-	return wanted
+	return wanted

code/modules/power/apc.dm

@@ -1082,11 +1082,12 @@
 		if("lockdown")
 			var/celluse = rand(20,35)
 			celluse = celluse /100
+			if(!cell.use(cell.maxcharge*celluse))
+				return
 			for (var/obj/machinery/door/D in GLOB.airlocks)
 				if (get_area(D) == area)
 					INVOKE_ASYNC(D,/obj/machinery/door.proc/hostile_lockdown,usr, FALSE)
 					addtimer(CALLBACK(D,/obj/machinery/door.proc/disable_lockdown, FALSE), 30 SECONDS)
-			cell.charge -= cell.maxcharge*celluse
 			var/obj/item/implant/hijack/H = usr.getImplant(/obj/item/implant/hijack)
 			H.stealthcooldown = world.time + 3 MINUTES
 		if("occupy")
@@ -1373,9 +1374,9 @@
 	// next: take from or charge to the cell, depending on how much is left
 	if(cell && !shorted)
 		if(cur_excess > 0)
-			var/charging_cell = min(cur_excess, cell.maxcharge * GLOB.CHARGELEVEL)
+			var/charging_cell = min(min(cur_excess*GLOB.CELLRATE, cell.maxcharge * GLOB.CHARGELEVEL), cell.maxcharge - cell.charge)
 			cell.give(charging_cell)
-			add_load(charging_cell)
+			add_load(charging_cell/GLOB.CELLRATE)
 			lastused_total += charging_cell
 			longtermpower = min(10,longtermpower + 1)
 			if(chargemode && !charging)

code/modules/power/cell.dm

@@ -86,6 +86,8 @@
 
 // recharge the cell
 /obj/item/stock_parts/cell/proc/give(amount)
+	if(amount < 0)
+		return
 	if(rigged && amount > 0)
 		explode()
 		return 0

code/modules/power/multiz.dm

@@ -77,4 +77,4 @@
 	above = locate(/obj/machinery/power/deck_relay) in(SSmapping.get_turf_above(T))
 	if(below || above)
 		icon_state = "cablerelay-on"
-	return TRUE
+	return TRUE

code/modules/power/powernet.dm

@@ -98,4 +98,4 @@
 	if(avail >= 1000)
 		return clamp(round(avail/10000), 10, 90) + rand(-5,5)
 	else
-		return 0
+		return 0

code/modules/power/singularity/collector.dm

@@ -1,7 +1,7 @@
 // stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
 #define RAD_COLLECTOR_EFFICIENCY 80 	// radiation needs to be over this amount to get power
-#define RAD_COLLECTOR_COEFFICIENT 100
-#define RAD_COLLECTOR_STORED_OUT 0.04	// (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
+#define RAD_COLLECTOR_COEFFICIENT 125
+#define RAD_COLLECTOR_STORED_OUT 0.05	// (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
 #define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process()
 #define RAD_COLLECTOR_OUTPUT min(stored_power, (stored_power*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
 

code/modules/power/singularity/investigate.dm

@@ -1,4 +1,4 @@
 /area/engine/engineering/poweralert(state, source)
 	if (state != poweralm)
 		investigate_log("has a power alarm!", INVESTIGATE_SINGULO)
-	..()
+	..()

code/modules/power/singularity/narsie.dm

@@ -78,6 +78,7 @@
 	set_security_level("delta")
 	SSshuttle.registerHostileEnvironment(src)
 	SSshuttle.lockdown = TRUE
+	SSpersistence.station_was_destroyed = TRUE
 	sleep(600)
 	if(resolved == FALSE)
 		resolved = TRUE