cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-23 08:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lighting

Browse Source
This commit is contained in:
Mark van Alphen
2019-04-30 19:15:58 +02:00
committed by GitHub
parent 4705c4e2fe 3ce39ba6ea
commit ad2238f496
153 changed files with 4611 additions and 3785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/gamemodes/blob/blobs/factory.dm
View File

@@ -23,13 +23,12 @@
/obj/structure/blob/factory/run_action()
if(spores.len >= max_spores)
return 0
return
if(spore_delay > world.time)
return 0
return
flick("blob_factory_glow", src)
spore_delay = world.time + 100 // 10 seconds
var/mob/living/simple_animal/hostile/blob/blobspore/BS = new/mob/living/simple_animal/hostile/blob/blobspore(src.loc, src)
BS.color = overmind.blob_reagent_datum.complementary_color
BS.overmind = overmind
overmind.blob_mobs.Add(BS)
return 0

8
code/game/gamemodes/blob/blobs/resource.dm
View File

@@ -13,13 +13,9 @@
qdel(src)
/obj/structure/blob/resource/run_action()
if(resource_delay > world.time)
return 0
return
flick("blob_resource_glow", src)
resource_delay = world.time + 40 // 4 seconds
if(overmind)
overmind.add_points(1)
return 0