Stun batons will no longer randomly stun people when they bump/are bumped by a guy holding one.

Bit of blob mode work.
Added a Blob Core sprite by Scottzar


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2247 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-22 04:27:33 +00:00
parent c0c7f7482c
commit c972c33d76
7 changed files with 96 additions and 42 deletions

View File

@@ -49,7 +49,6 @@
proc/check_mutations()//These could be their own objects I guess
if(blobtype != "Blob") return
desc = "This really needs a better sprite."
//Spaceeeeeeblobbb
if((istype(src.loc, /turf/space)) || (blobdebug == 4))
active = 0
@@ -68,7 +67,7 @@
brute_resist = 2
fire_resist = 2
name = "blob core"
icon_state = "blob_node"//needs a new sprite
icon_state = "blob_core"
blobtype = "Core"
active_blobs -= src
processing_objects.Add(src)
@@ -108,7 +107,7 @@
if(check_mutations())
return
if((blobtype == "Blob") && (pulse <= 2))
if((blobtype == "Blob") && (pulse <= 2) && (prob(30)))
blobdebug = 4
check_mutations()
return
@@ -181,7 +180,7 @@
else
T.blob_act()
del(B)
for(var/atom/A in T)//This might be killing the spores, it IS killing the spores and come to think of it I am ok with this
for(var/atom/A in T)
A.blob_act()
return
@@ -241,6 +240,18 @@
src.update()
proc/revert()
name = "blob"
icon_state = "blob"
brute_resist = 4
fire_resist = 1
blobtype = "Blob"
blobdebug = 0
health = (health/2)
active_blobs += src
src.update()
return 1
/datum/station_state/proc/count()
for(var/turf/T in world)