mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Fixed a supply shuttle runtime due to the stamping missing a null check.
Added a null check to cleanbots and new player preferences. Did a bit of blob and antimatter work. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3919 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -58,8 +58,23 @@
|
||||
G.client.mob = B
|
||||
del(G)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
Pulse(var/pulse = 0, var/origin_dir = 0)//Todo: Fix spaceblob expand
|
||||
set background = 1
|
||||
if(pulse > 20) return
|
||||
//Looking for another blob to pulse
|
||||
var/list/dirs = list(1,2,4,8)
|
||||
dirs.Remove(origin_dir)//Dont pulse the guy who pulsed us
|
||||
for(var/i = 1 to 4)
|
||||
if(!dirs.len) break
|
||||
var/dirn = pick(dirs)
|
||||
dirs.Remove(dirn)
|
||||
var/turf/T = get_step(src, dirn)
|
||||
var/obj/effect/blob/B = (locate(/obj/effect/blob) in T)
|
||||
if(!B)
|
||||
expand(T)//No blob here so try and expand
|
||||
return
|
||||
B.Pulse((pulse+1),get_dir(src.loc,T))
|
||||
return
|
||||
return
|
||||
*/
|
||||
@@ -6,7 +6,7 @@
|
||||
brute_resist = 1
|
||||
fire_resist = 2
|
||||
var/list/spores = list()
|
||||
var/max_spores = 6
|
||||
var/max_spores = 4
|
||||
|
||||
|
||||
update_icon()
|
||||
@@ -18,6 +18,6 @@
|
||||
|
||||
|
||||
run_action()
|
||||
if(spores.len > max_spores) return 0
|
||||
if(spores.len >= max_spores) return 0
|
||||
new/obj/effect/critter/blob(src.loc, src)
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user