cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced mobs with vore versions.

Browse Source
This commit is contained in:
Spades
2016-06-03 22:57:51 -04:00
parent 654814f257
commit aa2c74aef5
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/gamemodes/cult/cult_structures.dm
View File

@@ -109,7 +109,7 @@
light_color="#ff0000" light_color="#ff0000"
spawnable=list( spawnable=list(
/mob/living/simple_animal/hostile/scarybat, /mob/living/simple_animal/hostile/scarybat,
/mob/living/simple_animal/hostile/creature, /mob/living/simple_animal/hostile/vore/creature, // Vorestation Edit
/mob/living/simple_animal/hostile/faithless /mob/living/simple_animal/hostile/faithless
) )
@@ -118,7 +118,7 @@
light_color="#ff0000" light_color="#ff0000"
spawnable=list( spawnable=list(
/mob/living/simple_animal/hostile/scarybat/cult, /mob/living/simple_animal/hostile/scarybat/cult,
/mob/living/simple_animal/hostile/creature/cult, /mob/living/simple_animal/hostile/vore/creature/cult, // Vorestation Edit
/mob/living/simple_animal/hostile/faithless/cult /mob/living/simple_animal/hostile/faithless/cult
) )

2
code/game/gamemodes/events.dm
View File

@@ -210,7 +210,7 @@ var/hadevent = 0
/proc/carp_migration() // -- Darem /proc/carp_migration() // -- Darem
for(var/obj/effect/landmark/C in landmarks_list) for(var/obj/effect/landmark/C in landmarks_list)
if(C.name == "carpspawn") if(C.name == "carpspawn")
new /mob/living/simple_animal/hostile/carp(C.loc) new /mob/living/simple_animal/hostile/vore/carp(C.loc) // Vorestation edit
//sleep(100) //sleep(100)
spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes. spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
command_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", new_sound = 'sound/AI/commandreport.ogg') command_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", new_sound = 'sound/AI/commandreport.ogg')

2
code/game/machinery/teleporter.dm
View File

@@ -64,7 +64,7 @@
for(var/obj/machinery/teleport/hub/H in range(1)) for(var/obj/machinery/teleport/hub/H in range(1))
var/amount = rand(2,5) var/amount = rand(2,5)
for(var/i=0;i<amount;i++) for(var/i=0;i<amount;i++)
new /mob/living/simple_animal/hostile/carp(get_turf(H)) new /mob/living/simple_animal/hostile/vore/carp(get_turf(H)) // Vorestation edit
// //
else else
for(var/mob/O in hearers(src, null)) for(var/mob/O in hearers(src, null))

2
code/game/objects/items/weapons/grenades/spawnergrenade.dm
View File

@@ -37,6 +37,6 @@
/obj/item/weapon/grenade/spawnergrenade/spesscarp /obj/item/weapon/grenade/spawnergrenade/spesscarp
name = "carp delivery grenade" name = "carp delivery grenade"
spawner_type = /mob/living/simple_animal/hostile/carp spawner_type = /mob/living/simple_animal/hostile/vore/carp // Vorestation edit
deliveryamt = 5 deliveryamt = 5
origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4)

4
code/modules/events/carp_migration.dm
View File

@@ -37,11 +37,11 @@
while (i <= num_groups) while (i <= num_groups)
var/group_size = rand(group_size_min, group_size_max) var/group_size = rand(group_size_min, group_size_max)
for (var/j = 1, j <= group_size, j++) 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_animal/hostile/vore/carp(spawn_locations[i])) // Vorestation edit
i++ i++
/datum/event/carp_migration/end() /datum/event/carp_migration/end()
for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp) for(var/mob/living/simple_animal/hostile/vore/carp/C in spawned_carp) // Vorestation edit
if(!C.stat) if(!C.stat)
var/turf/T = get_turf(C) var/turf/T = get_turf(C)
if(istype(T, /turf/space)) if(istype(T, /turf/space))

4
code/modules/mob/transform_procs.dm
View File

@@ -300,7 +300,7 @@
return 1 return 1
if(ispath(MP, /mob/living/simple_animal/crab)) if(ispath(MP, /mob/living/simple_animal/crab))
return 1 return 1
if(ispath(MP, /mob/living/simple_animal/hostile/carp)) if(ispath(MP, /mob/living/simple_animal/hostile/vore/carp)) // Vorestation edit
return 1 return 1
if(ispath(MP, /mob/living/simple_animal/shade)) if(ispath(MP, /mob/living/simple_animal/shade))
return 1 return 1
@@ -308,7 +308,7 @@
return 1 return 1
if(ispath(MP, /mob/living/simple_animal/mouse)) if(ispath(MP, /mob/living/simple_animal/mouse))
return 1 //It is impossible to pull up the player panel for mice (Fixed! - Nodrak) return 1 //It is impossible to pull up the player panel for mice (Fixed! - Nodrak)
if(ispath(MP, /mob/living/simple_animal/hostile/bear)) if(ispath(MP, /mob/living/simple_animal/hostile/vore/bear)) // Vorestation edit
return 1 //Bears will auto-attack mobs, even if they're player controlled (Fixed! - Nodrak) return 1 //Bears will auto-attack mobs, even if they're player controlled (Fixed! - Nodrak)
if(ispath(MP, /mob/living/simple_animal/parrot)) if(ispath(MP, /mob/living/simple_animal/parrot))
return 1 //Parrots are no longer unfinished! -Nodrak return 1 //Parrots are no longer unfinished! -Nodrak

6
code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
View File

@@ -24,9 +24,9 @@
if(prob(33)) if(prob(33))
spawn_type = pick(\ spawn_type = pick(\
/mob/living/simple_animal/hostile/giant_spider/nurse,\ /mob/living/simple_animal/hostile/giant_spider/nurse,\
/mob/living/simple_animal/hostile/alien,\ /mob/living/simple_animal/hostile/vore/alien,\ // Vorestation Edit
/mob/living/simple_animal/hostile/bear,\ /mob/living/simple_animal/hostile/vore/bear,\ // Vorestation Edit
/mob/living/simple_animal/hostile/creature\ /mob/living/simple_animal/hostile/vore/creature\ // Vorestation Edit
) )
else else
spawn_type = pick(\ spawn_type = pick(\

2
code/modules/research/xenoarchaeology/finds/finds_special.dm
View File

@@ -87,7 +87,7 @@
if(charges >= 3) if(charges >= 3)
if(prob(5)) if(prob(5))
charges -= 1 charges -= 1
var/spawn_type = pick(/mob/living/simple_animal/hostile/creature) var/spawn_type = pick(/mob/living/simple_animal/hostile/vore/creature) // Vorestation Edit
new spawn_type(pick(view(1,src))) new spawn_type(pick(view(1,src)))
playsound(src.loc, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3) playsound(src.loc, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3)

4
code/modules/spells/aoe_turf/summons.dm
View File

@@ -20,7 +20,7 @@
invocation_type = SpI_SHOUT invocation_type = SpI_SHOUT
range = 1 range = 1
summon_type = list(/mob/living/simple_animal/hostile/carp) summon_type = list(/mob/living/simple_animal/hostile/vore/carp) // Vorestation Edit
hud_state = "wiz_carp" hud_state = "wiz_carp"
@@ -36,6 +36,6 @@
summon_amt = 10 summon_amt = 10
range = 3 range = 3
summon_type = list(/mob/living/simple_animal/hostile/creature) summon_type = list(/mob/living/simple_animal/hostile/vore/creature) // Vorestation Edit
hud_state = "wiz_creature" hud_state = "wiz_creature"