cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

Browse Source 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
This commit is contained in:
PsiOmegaDelta
2015-06-05 14:59:52 +02:00
parent a07d20d657 989f34ad04
commit bad9c103eb
49 changed files with 1063 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/singularity/singularity.dm
View File

@@ -270,8 +270,6 @@
return 1
/obj/singularity/proc/eat()
set background = BACKGROUND_ENABLED
for(var/atom/X in orange(grav_pull, src))
var/dist = get_dist(X, src)
var/obj/singularity/S = src