From aa2c74aef54429a08bad2e5556bcd6fa9d8126ad Mon Sep 17 00:00:00 2001
From: Spades <jeremy.spades.neil@gmail.com>
Date: Fri, 3 Jun 2016 22:57:51 -0400
Subject: [PATCH] Replaced mobs with vore versions.

---
 code/game/gamemodes/cult/cult_structures.dm                 | 4 ++--
 code/game/gamemodes/events.dm                               | 2 +-
 code/game/machinery/teleporter.dm                           | 2 +-
 code/game/objects/items/weapons/grenades/spawnergrenade.dm  | 2 +-
 code/modules/events/carp_migration.dm                       | 6 +++---
 code/modules/mob/transform_procs.dm                         | 4 ++--
 .../xenoarchaeology/artifact/artifact_autocloner.dm         | 6 +++---
 .../modules/research/xenoarchaeology/finds/finds_special.dm | 2 +-
 code/modules/spells/aoe_turf/summons.dm                     | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 0f2c4d83b6..b310bc9ca1 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -109,7 +109,7 @@
 	light_color="#ff0000"
 	spawnable=list(
 		/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
 	)
 
@@ -118,7 +118,7 @@
 	light_color="#ff0000"
 	spawnable=list(
 		/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
 	)
 
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 4bf9e808dd..bdc4052589 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -210,7 +210,7 @@ var/hadevent    = 0
 /proc/carp_migration() // -- Darem
 	for(var/obj/effect/landmark/C in landmarks_list)
 		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)
 	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')
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 13ff75e071..4dad236b73 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -64,7 +64,7 @@
 				for(var/obj/machinery/teleport/hub/H in range(1))
 					var/amount = rand(2,5)
 					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
 				for(var/mob/O in hearers(src, null))
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index 5ca0bd3845..05ad73489a 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -37,6 +37,6 @@
 
 /obj/item/weapon/grenade/spawnergrenade/spesscarp
 	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
 	origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4)
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index 5416ab2666..43d79ecc97 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -32,16 +32,16 @@
 			spawn_locations.Add(C.loc)
 	spawn_locations = shuffle(spawn_locations)
 	num_groups = min(num_groups, spawn_locations.len)
-	
+
 	var/i = 1
 	while (i <= num_groups)
 		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_animal/hostile/vore/carp(spawn_locations[i])) // Vorestation edit
 		i++
 
 /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)
 			var/turf/T = get_turf(C)
 			if(istype(T, /turf/space))
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index ca8d1bffe1..b83a8f5d3d 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -300,7 +300,7 @@
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/crab))
 		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
 	if(ispath(MP, /mob/living/simple_animal/shade))
 		return 1
@@ -308,7 +308,7 @@
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/mouse))
 		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)
 	if(ispath(MP, /mob/living/simple_animal/parrot))
 		return 1 //Parrots are no longer unfinished! -Nodrak
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
index 4daf56e056..4dd6ee7671 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
@@ -24,9 +24,9 @@
 	if(prob(33))
 		spawn_type = pick(\
 		/mob/living/simple_animal/hostile/giant_spider/nurse,\
-		/mob/living/simple_animal/hostile/alien,\
-		/mob/living/simple_animal/hostile/bear,\
-		/mob/living/simple_animal/hostile/creature\
+		/mob/living/simple_animal/hostile/vore/alien,\  // Vorestation Edit
+		/mob/living/simple_animal/hostile/vore/bear,\  // Vorestation Edit
+		/mob/living/simple_animal/hostile/vore/creature\  // Vorestation Edit
 		)
 	else
 		spawn_type = pick(\
diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm
index af73f541d6..12b64aa525 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_special.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm
@@ -87,7 +87,7 @@
 	if(charges >= 3)
 		if(prob(5))
 			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)))
 			playsound(src.loc, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3)
 
diff --git a/code/modules/spells/aoe_turf/summons.dm b/code/modules/spells/aoe_turf/summons.dm
index 996b583585..2d62b7c561 100644
--- a/code/modules/spells/aoe_turf/summons.dm
+++ b/code/modules/spells/aoe_turf/summons.dm
@@ -20,7 +20,7 @@
 	invocation_type = SpI_SHOUT
 	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"
 
@@ -36,6 +36,6 @@
 	summon_amt = 10
 	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"
\ No newline at end of file