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

Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

Browse Source
This commit is contained in:
LetterN
2021-11-21 10:34:14 +08:00
parent fa6946fae4 f6ff310849
commit 8dcfea5817
213 changed files with 86534 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -950,7 +950,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
CALCULATE_ADJACENT_TURFS(T)
//Do not blow up our internal radio
/obj/machinery/power/supermatter_crystal/contents_explosion(severity, target)
/obj/machinery/power/supermatter_crystal/contents_explosion(severity, target, origin)
return
/obj/machinery/power/supermatter_crystal/engine