Merge branch 'master' into ss-alarms

This commit is contained in:
AffectedArc07
2019-04-23 20:37:42 +01:00
committed by GitHub
76 changed files with 593 additions and 356 deletions
+5
View File
@@ -1353,6 +1353,11 @@
L.broken(0, 1)
stoplag()
/obj/machinery/power/apc/proc/null_charge()
for(var/obj/machinery/light/L in area)
L.broken(0, 1)
stoplag()
/obj/machinery/power/apc/proc/setsubsystem(val)
if(cell && cell.charge > 0)
return (val==1) ? 0 : val