Merge remote-tracking branch 'origin/master' into semi-sync

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")

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