cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck

Browse Source 
Conflicts:
	code/game/turfs/simulated/walls.dm
This commit is contained in:
Cheridan
2014-05-13 14:03:42 -05:00
parent 2d547d4d82 789dcf52bb
commit 3a0bd3de28
172 changed files with 2622 additions and 12201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/singularity.dm
+2 -1
View File
@@ -537,7 +537,8 @@ var/global/list/uneatable = list(
if(istype(A,/mob/living/))
var/mob/living/C = A
C.dust()
C.spawn_dust()
C.gib()
if(isturf(A))
var/turf/T = A