Rework power outage event (#13117)

* Rework power outage event

* Added compile time flag for event fixing itself when it ends

* Review Cleanup 1

* Fixed up line ending conflicts

* Going whole hog with a side of bacon

* Whoops, forgot the sausage and Canadian Bacon

* Better messaging and makes APC Overload an offical non-random event

* Test merge feedback rework
This commit is contained in:
Patrick Meade
2020-06-05 21:41:52 -06:00
committed by GitHub
parent 03b8a297d8
commit a2ecd79be7
9 changed files with 147 additions and 91 deletions
+1 -1
View File
@@ -244,7 +244,7 @@
else if(has_electronics && !terminal)
. += "Electronics installed but not wired."
else /* if(!has_electronics && !terminal) */
. += "There is no electronics nor connected wires."
. += "There are no electronics nor connected wires."
else
if(stat & MAINT)
. += "The cover is closed. Something wrong with it: it doesn't work."
-5
View File
@@ -29,11 +29,6 @@
var/output_level_max = 200000 // cap on output_level
var/output_used = 0 // amount of power actually outputted. may be less than output_level if the powernet returns excess power
//Holders for powerout event.
var/last_output_attempt = 0
var/last_input_attempt = 0
var/last_charge = 0
var/name_tag = null
var/obj/machinery/power/terminal/terminal = null