Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2021-11-12 08:50:23 +08:00
parent 4ec1f216ff 007d347d82
commit 8b16653744
100 changed files with 814 additions and 709 deletions
@@ -300,7 +300,7 @@
 	area.power_equip = FALSE
 	area.power_environ = FALSE
 	area.power_change()
-	area.poweralert(FALSE, src)
+	area.poweralert(TRUE, src)
 	if(occupier)
 		malfvacate(1)
 	qdel(wires)
@@ -1444,8 +1444,6 @@
 			lighting = autoset(lighting, AUTOSET_ON)
 			environ = autoset(environ, AUTOSET_ON)
 			area.poweralert(FALSE, src)
-			if(cell.percent() > 75)
-				area.poweralert(FALSE, src)

 		// now trickle-charge the cell
 		if(chargemode && charging == APC_CHARGING && operating)