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

Merge branch 'master' into upstream-merge-31601

Browse Source
This commit is contained in:
LetterJay
2017-10-14 10:17:16 -04:00
committed by GitHub
parent c28932e4d4 2d2adfbee5
commit d6903bcf3c
101 changed files with 4200 additions and 11173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/meteor/meteors.dm
+1 -1
View File
@@ -268,7 +268,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
..()
explosion(src.loc, 0, 0, 4, 3, 0)
new /obj/effect/decal/cleanable/greenglow(get_turf(src))
radiation_pulse(get_turf(src), 2, 5, 50, 1)
radiation_pulse(get_turf(src), 500)
//Meaty Ore
/obj/effect/meteor/meaty