cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest

Browse Source 
Conflicts:
	code/WorkInProgress/Cib/amorph/amorph_hud.dm
	code/game/objects/structures/window.dm
	code/modules/mob/living/blob/blob.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/screen.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/tgstation.2.0.9.1.dmm
This commit is contained in:
Whitellama
2013-01-31 14:26:58 -08:00
parent 10127c4f34 753825c01c
commit 5d090b0611
1200 changed files with 106969 additions and 76361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/blob/blob.dm
View File

@@ -8,6 +8,7 @@
see_invisible = SEE_INVISIBLE_LEVEL_TWO
var/ghost_name = "Unknown"
var/creating_blob = 0
faction = "blob"
use_me = 0 //Blobs can't emote
@@ -252,3 +253,7 @@
B << "Check your Blob verbs and hit Create Node to build a node."
spawn(10)
del(G_found)