cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merges AI Branch into Master

Browse Source
This commit is contained in:
Atermonera
2018-12-01 00:06:38 -05:00
committed by VirgoBot
parent 15017e893e
commit 2df5e9fe0e
379 changed files with 22460 additions and 4751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/gamemaster/actions/carp_migration.dm
+2 -2
View File
@@ -52,12 +52,12 @@
while (i <= carp_amount)
var/group_size = rand(group_size_min, group_size_max)
for (var/j = 1, j <= group_size, j++)
spawned_carp.Add(new /mob/living/simple_animal/hostile/carp(spawn_locations[i]))
spawned_carp.Add(new /mob/living/simple_mob/animal/space/carp/event(spawn_locations[i]))
i++
message_admins("[spawned_carp.len] carp spawned by event.")
/datum/gm_action/carp_migration/end()
for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp)
for(var/mob/living/simple_mob/animal/space/carp/C in spawned_carp)
if(!C.stat)
var/turf/T = get_turf(C)
if(istype(T, /turf/space))
code/modules/gamemaster/actions/surprise_carp_attack.dm
+1 -3
View File
@@ -47,7 +47,5 @@
spawning_turf = space
break
if(spawning_turf)
var/mob/living/simple_animal/hostile/carp/C = new(spawning_turf)
C.target_mob = victim
C.stance = STANCE_ATTACK
new /mob/living/simple_mob/animal/space/carp(spawning_turf)
number_of_carp--