cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into to_chat

Browse Source 
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
This commit is contained in:
Tigercat2000
2016-04-05 15:54:48 -07:00
parent 78f53553f8 3d4e85f3e6
commit c72cc9606e
48 changed files with 196 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/tear.dm
+10 -8
View File
@@ -41,15 +41,17 @@
if(animation) qdel(animation)
spawn(rand(30,120))
var/blocked = blocked_mobs //global variable for blocked mobs
var/list/tear_critters = list()
for(var/T in typesof(/mob/living/simple_animal))
var/mob/living/simple_animal/SA = T
if(initial(SA.gold_core_spawnable) == CHEM_MOB_SPAWN_HOSTILE)
tear_critters += T
var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
for(var/i = 1, i <= 5, i++)
var/chosen = pick(critters)
var/mob/living/simple_animal/hostile/C = new chosen
C.faction = list("slimesummon")
C.loc = src.loc
for(var/i in 1 to 5)
var/chosen = pick(tear_critters)
var/mob/living/simple_animal/C = new chosen
C.faction |= "chemicalsummon"
C.forceMove(get_turf(src))
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(C, pick(NORTH,SOUTH,EAST,WEST))