cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

Browse Source
This commit is contained in:
izac112
2020-05-13 10:21:49 +02:00
parent 9018186207 e94661ca84
commit bba0a05f5f
87 changed files with 1016 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/electrical_storm.dm
View File

@@ -28,7 +28,7 @@
/datum/event/electrical_storm/start()
..()
valid_apcs = list()
for(var/obj/machinery/power/apc/A in global.machines)
for(var/obj/machinery/power/apc/A in GLOB.apcs)
if(A.z in affecting_z)
valid_apcs.Add(A)
endWhen = (severity * 60) + startWhen

4
code/modules/events/ion_storm.dm
View File

@@ -199,14 +199,14 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
spawn(0)
to_world("Started processing APCs")
for (var/obj/machinery/power/apc/APC in machines)
for (var/obj/machinery/power/apc/APC in GLOB.apcs)
if(APC.z in station_levels)
APC.ion_act()
apcnum++
to_world("Finished processing APCs. Processed: [apcnum]")
spawn(0)
to_world("Started processing SMES")
for (var/obj/machinery/power/smes/SMES in machines)
for (var/obj/machinery/power/smes/SMES in GLOB.smeses)
if(SMES.z in station_levels)
SMES.ion_act()
smesnum++