cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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

4
code/modules/power/apc.dm
View File

@@ -1,3 +1,5 @@
GLOBAL_LIST_EMPTY(apcs)
#define CRITICAL_APC_EMP_PROTECTION 10 // EMP effect duration is divided by this number if the APC has "critical" flag
//update_state
#define UPDATE_CELL_IN 1
@@ -169,6 +171,7 @@
/obj/machinery/power/apc/New(turf/loc, var/ndir, var/building=0)
..()
wires = new(src)
GLOB.apcs += src
// offset 24 pixels in direction of dir
// this allows the APC to be embedded in a wall, yet still inside an area
@@ -189,6 +192,7 @@
src.update_icon()
/obj/machinery/power/apc/Destroy()
GLOB.apcs -= src
src.update()
area.apc = null
area.power_light = 0