cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Browse Source 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
This commit is contained in:
PsiOmegaDelta
2015-08-13 08:09:28 +02:00
parent 0ba7643217 ac80136603
commit 77d0bbd643
319 changed files with 5837 additions and 4354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/explosion_particles.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/effect/expl_particles/New()
..()
spawn (15)
src.loc = null
qdel(src)
return
/obj/effect/expl_particles/Move()
@@ -49,7 +49,7 @@
/obj/effect/explosion/New()
..()
spawn (10)
src.loc = null
qdel(src)
return
/datum/effect/system/explosion