shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into TGUI-3.0

Browse Source
This commit is contained in:
Artur
2020-05-30 18:52:02 +03:00
parent a6d7a33669 266707b119
commit 19f215477e
361 changed files with 10271 additions and 3115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/emitter.dm
+1 -1
View File
@@ -75,7 +75,7 @@
/obj/machinery/power/emitter/ComponentInitialize()
. = ..()
AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
/obj/machinery/power/emitter/RefreshParts()
var/max_firedelay = 120
code/modules/power/singularity/field_generator.dm
+1 -1
View File
@@ -61,7 +61,7 @@ field_generator power level display
/obj/machinery/field/generator/ComponentInitialize()
. = ..()
AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
/obj/machinery/field/generator/process()
if(active == FG_ONLINE)