From 5b163c44a8cc11556a99b6952f9d37ed2b57aa6b Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 08:50:53 +0100
Subject: [PATCH 01/21] Updates Mob_spawner_vr to new paths.

All the old paths have updated new ones besides the broken Otie.
---
 code/game/objects/mob_spawner_vr.dm | 31 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm
index 512f41137ab..41817e031b5 100644
--- a/code/game/objects/mob_spawner_vr.dm
+++ b/code/game/objects/mob_spawner_vr.dm
@@ -1,4 +1,4 @@
-/obj/structure/mob_spawner //VORESTATION AI TEMPORARY REMOVAL
+/obj/structure/mob_spawner
 	name = "mob spawner"
 	desc = "This shouldn't be seen, yell at a dev."
 	icon = 'icons/effects/effects.dmi'
@@ -9,8 +9,8 @@
 	var/spawn_delay = 10 MINUTES
 
 	var/list/spawn_types = list(
-	/*/mob/living/simple_mob/corgi = 100,
-	/mob/living/simple_mob/cat = 25*/ //VORESTATION AI TEMPORARY REMOVAL
+	/mob/living/simple_mob/animal/passive/dog/corgi = 100,
+	/mob/living/simple_mob/animal/passive/cat = 25
 	)
 
 	var/total_spawns = -1 //Total mob spawns, over all time, -1 for no limit
@@ -129,15 +129,14 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 //////////////
 // Spawners //
 /////////////
-/* //VORESTATION AI TEMPORARY REMOVAL
 /obj/structure/mob_spawner/scanner/corgi
 	name = "Corgi Lazy Spawner"
 	desc = "This is a proof of concept, not sure why you would use this one"
 	spawn_delay = 3 MINUTES
 	mob_faction = "Corgi"
 	spawn_types = list(
-	/mob/living/simple_mob/corgi = 75,
-	/mob/living/simple_mob/corgi/puppy = 50
+	/mob/living/simple_mob/animal/passive/dog/corgi = 75,
+	/mob/living/simple_mob/animal/passive/dog/corgi/puppy = 50
 	)
 
 	simultaneous_spawns = 5
@@ -157,10 +156,10 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	anchored = 1
 	invisibility = 101
 	spawn_types = list(
-	/mob/living/simple_mob/retaliate/gaslamp = 20,
-	/mob/living/simple_mob/otie/feral = 10,
-	/mob/living/simple_mob/hostile/dino/virgo3b = 5,
-	/mob/living/simple_mob/hostile/dragon/virgo3b = 1
+	/mob/living/simple_mob/animal/space/gaslamp = 20,
+//	/mob/living/simple_mob/otie/feral = 10,
+	/mob/living/simple_mob/vore/dino/virgo3b = 5,
+	/mob/living/simple_mob/vore/dragon/virgo3b = 1
 	)
 
 /obj/structure/mob_spawner/scanner/xenos
@@ -176,10 +175,10 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "alien_egg"
 	spawn_types = list(
-	/mob/living/simple_mob/hostile/alien/drone = 20,
-	/mob/living/simple_mob/hostile/alien = 10,
-	/mob/living/simple_mob/hostile/alien/sentinel = 5,
-	/mob/living/simple_mob/hostile/alien/queen = 1
+	/mob/living/simple_mob/animal/space/alien/drone = 20,
+	/mob/living/simple_mob/animal/space/alien = 10,
+	/mob/living/simple_mob/animal/space/alien/sentinel = 5,
+	/mob/living/simple_mob/animal/space/alien/queen = 1
 	)
 
 /obj/structure/mob_spawner/scanner/xenos/royal
@@ -195,5 +194,5 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "alien_egg"
 	spawn_types = list(
-	/mob/living/simple_mob/hostile/alien/queen = 5,
-	)*/
+	/mob/living/simple_mob/animal/space/alien/queen = 5,
+	)

From bd8912695542800af3d9450026c0b7a9eefda07f Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 09:08:36 +0100
Subject: [PATCH 02/21] Fixes random_vr except oties

---
 code/game/objects/random/random_vr.dm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm
index a027134ebc2..dcae284a185 100644
--- a/code/game/objects/random/random_vr.dm
+++ b/code/game/objects/random/random_vr.dm
@@ -178,14 +178,14 @@
 	icon_state = "x"
 	spawn_nothing_percentage = 10
 	var/faction = "wild animal"
-/*
+
 /obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
 	return pick(
-				prob(50);/mob/living/simple_mob/retaliate/gaslamp,
+				prob(50);/mob/living/simple_mob/animal/space/gaslamp,
 //				prob(50);/mob/living/simple_mob/otie/feral, // Removed until Otie code is unfucked.
-				prob(20);/mob/living/simple_mob/hostile/dino/virgo3b,
-				prob(1);/mob/living/simple_mob/hostile/dragon/virgo3b)
-*/ //VORESTATION AI TEMPORARY REMOVAL
+				prob(20);/mob/living/simple_mob/vore/dino/virgo3b,
+				prob(1);/mob/living/simple_mob/vore/dragon/virgo3b)
+
 /obj/random/outside_mob/spawn_item()
 	. = ..()
 	if(istype(., /mob/living/simple_mob))

From c0e0afe91938601931d1db37ca2ecfa7370473ad Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 10:25:28 +0100
Subject: [PATCH 03/21] Fixes most crates in largecrave_vr. Oties still broke.

---
 .../crates_lockers/largecrate_vr.dm           | 92 +++++++++----------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
index 90b07cc9ee5..324e72c7662 100644
--- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
@@ -1,4 +1,3 @@
-//VORESTATION AI TEMPORARY REMOVAL. Commented out until vore mobs are fixed.
 /obj/structure/largecrate/birds //This is an awful hack, but it's the only way to get multiple mobs spawned in one crate.
 	name = "Bird crate"
 	desc = "You hear chirping and cawing inside the crate. It sounds like there are a lot of birds in there..."
@@ -6,28 +5,27 @@
 /obj/structure/largecrate/birds/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(W.is_crowbar())
 		new /obj/item/stack/material/wood(src)
-		new /mob/living/simple_mob/bird(src)
-		new /mob/living/simple_mob/bird/kea(src)
-		new /mob/living/simple_mob/bird/eclectus(src)
-		new /mob/living/simple_mob/bird/greybird(src)
-		new /mob/living/simple_mob/bird/eclectusf(src)
-		new /mob/living/simple_mob/bird/blue_caique(src)
-		new /mob/living/simple_mob/bird/white_caique(src)
-		new /mob/living/simple_mob/bird/green_budgerigar(src)
-		new /mob/living/simple_mob/bird/blue_Budgerigar(src)
-		new /mob/living/simple_mob/bird/bluegreen_Budgerigar(src)
-		new /mob/living/simple_mob/bird/commonblackbird(src)
-		new /mob/living/simple_mob/bird/azuretit(src)
-		new /mob/living/simple_mob/bird/europeanrobin(src)
-		new /mob/living/simple_mob/bird/goldcrest(src)
-		new /mob/living/simple_mob/bird/ringneckdove(src)
-		new /mob/living/simple_mob/bird/cockatiel(src)
-		new /mob/living/simple_mob/bird/white_cockatiel(src)
-		new /mob/living/simple_mob/bird/yellowish_cockatiel(src)
-		new /mob/living/simple_mob/bird/grey_cockatiel(src)
-		new /mob/living/simple_mob/bird/too(src)
-		new /mob/living/simple_mob/bird/hooded_too(src)
-		new /mob/living/simple_mob/bird/pink_too(src)
+		new /mob/living/simple_mob/animal/passive/bird(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/kea(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/eclectus(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/grey_parrot(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/black_headed_caique(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/white_caique(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/budgerigar(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/blue(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/bluegreen(src)
+		new /mob/living/simple_mob/animal/passive/bird/black_bird(src)
+		new /mob/living/simple_mob/animal/passive/bird/azure_tit(src)
+		new /mob/living/simple_mob/animal/passive/bird/european_robin(src)
+		new /mob/living/simple_mob/animal/passive/bird/goldcrest(src)
+		new /mob/living/simple_mob/animal/passive/bird/ringneck_dove(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/white(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/yellowish(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/grey(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/sulphur_cockatoo(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/white_cockatoo(src)
+		new /mob/living/simple_mob/animal/passive/bird/parrot/pink_cockatoo(src)
 		var/turf/T = get_turf(src)
 		for(var/atom/movable/AM in contents)
 			if(AM.simulated) AM.forceMove(T)
@@ -40,42 +38,42 @@
 
 /obj/structure/largecrate/animal/pred
 	name = "Predator carrier"
-	starts_with = list(/mob/living/simple_mob/catgirl)
+	starts_with = list(/mob/living/simple_mob/vore/catgirl)
 
 /obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time.
-	starts_with = list(pick(/mob/living/simple_mob/retaliate/bee,
-						/mob/living/simple_mob/catgirl;3,
-						/mob/living/simple_mob/hostile/frog,
+	starts_with = list(pick(/mob/living/simple_mob/vore/bee,
+						/mob/living/simple_mob/vore/catgirl;3,
+						/mob/living/simple_mob/vore/frog,
 						/mob/living/simple_mob/horse,
-						/mob/living/simple_mob/hostile/panther,
-						/mob/living/simple_mob/hostile/giant_snake,
-						/mob/living/simple_mob/hostile/wolf,
-						/mob/living/simple_mob/hostile/bear;0.5,
-						/mob/living/simple_mob/hostile/bear/brown;0.5,
-						/mob/living/simple_mob/hostile/carp,
-						/mob/living/simple_mob/hostile/mimic,
-						/mob/living/simple_mob/hostile/rat,
-						/mob/living/simple_mob/hostile/rat/passive,
-						/mob/living/simple_mob/otie;0.5))
+						/mob/living/simple_mob/vore/panther,
+						/mob/living/simple_mob/vore/giant_snake,
+						/mob/living/simple_mob/vore/wolf,
+						/mob/living/simple_mob/animal/space/bear;0.5,
+						/mob/living/simple_mob/animal/space/carp,
+						/mob/living/simple_mob/animal/space/mimic,
+						/mob/living/simple_mob/vore/rat,
+						/mob/living/simple_mob/vore/rat/passive,
+//						/mob/living/simple_mob/otie;0.5
+						))
 	return ..()
 
 /obj/structure/largecrate/animal/dangerous
 	name = "Dangerous Predator carrier"
-	starts_with = list(/mob/living/simple_mob/hostile/alien)
+	starts_with = list(/mob/living/simple_mob/animal/space/alien)
 
 /obj/structure/largecrate/animal/dangerous/initialize()
 	starts_with = list(pick(/mob/living/simple_mob/hostile/carp/pike,
 						/mob/living/simple_mob/hostile/deathclaw,
 						/mob/living/simple_mob/hostile/dino,
-						/mob/living/simple_mob/hostile/alien,
-						/mob/living/simple_mob/hostile/alien/drone,
-						/mob/living/simple_mob/hostile/alien/sentinel,
-						/mob/living/simple_mob/hostile/alien/queen,
-						/mob/living/simple_mob/otie/feral,
-						/mob/living/simple_mob/otie/red,
-						/mob/living/simple_mob/hostile/corrupthound))
+						/mob/living/simple_mob/animal/space/alien,
+						/mob/living/simple_mob/animal/space/alien/drone,
+						/mob/living/simple_mob/animal/space/alien/sentinel,
+						/mob/living/simple_mob/animal/space/alien/queen,
+//						/mob/living/simple_mob/otie/feral,
+//						/mob/living/simple_mob/otie/red,
+						/mob/living/simple_mob/vore/corrupthound))
 	return ..()
-
+/*
 /obj/structure/largecrate/animal/guardbeast
 	name = "VARMAcorp autoNOMous security solution"
 	desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs."
@@ -114,7 +112,7 @@
 		icon_state = "otiecrate"
 		taped = 0
 	..()
-
+*/ //VORESTATION AI REMOVAL, Oties are still fucking broken.
 /obj/structure/largecrate/animal/catgirl
 	name = "Catgirl Crate"
 	desc = "A sketchy looking crate with airholes that seems to have had most marks and stickers removed. You can almost make out 'genetically-engineered subject' written on it."

From f95e5bae685cd1a669ab72c1cf9930e6c7043b71 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 10:42:23 +0100
Subject: [PATCH 04/21] Fixes up science cargo packs, Oties disabled.

---
 code/datums/supplypacks/science_vr.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm
index 3f2268bc5bb..e0e4ea2e683 100644
--- a/code/datums/supplypacks/science_vr.dm
+++ b/code/datums/supplypacks/science_vr.dm
@@ -8,7 +8,7 @@
 	containertype = /obj/structure/largecrate
 	containername = "Exploration Dune Buggy Crate"
 */
-/datum/supply_pack/sci/pred //VORESTATION AI TEMPORARY REMOVAL. File commented out until vore mobs fixed.
+/datum/supply_pack/sci/pred
 	name = "Dangerous Predator crate"
 	cost = 40
 	containertype = /obj/structure/largecrate/animal/pred
@@ -22,7 +22,7 @@
 	containername = "EXTREMELY Dangerous Predator crate"
 	access = access_xenobiology
 	contraband = 1
-
+/*
 /datum/supply_pack/sci/otie
 	name = "VARMAcorp adoptable reject (Dangerous!)"
 	cost = 100
@@ -35,4 +35,5 @@
 	cost = 200
 	containertype = /obj/structure/largecrate/animal/otie/phoron
 	containername = "VARMAcorp adaptive beta subject (Experimental)"
-	access = access_xenobiology
\ No newline at end of file
+	access = access_xenobiology
+*/ //VORESTATION AI TEMPORARY REMOVAL. Oties commented out cuz broke.

From b6b4980ea839345bf5c7246c1ac9626d51f3c0b4 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 10:46:07 +0100
Subject: [PATCH 05/21] Fixes largecrates for real, i'm a fucking brainlet.

---
 .../game/objects/structures/crates_lockers/largecrate_vr.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
index 324e72c7662..5483480e898 100644
--- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
@@ -113,7 +113,7 @@
 		taped = 0
 	..()
 */ //VORESTATION AI REMOVAL, Oties are still fucking broken.
-/obj/structure/largecrate/animal/catgirl
+/mob/living/simple_mob/vore/catgirl
 	name = "Catgirl Crate"
 	desc = "A sketchy looking crate with airholes that seems to have had most marks and stickers removed. You can almost make out 'genetically-engineered subject' written on it."
 	starts_with = list(/mob/living/simple_mob/catgirl)
@@ -121,7 +121,7 @@
 /obj/structure/largecrate/animal/wolfgirl
 	name = "Wolfgirl Crate"
 	desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out."
-	starts_with = list(/mob/living/simple_mob/retaliate/wolfgirl)
+	starts_with = list(/mob/living/simple_mob/vore/wolfgirl)
 
 /obj/structure/largecrate/animal/fennec
 	name = "Fennec Crate"
@@ -130,5 +130,5 @@
 
 /obj/structure/largecrate/animal/fennec/initialize()
 	starts_with = list(pick(/mob/living/simple_mob/fennec,
-						/mob/living/simple_mob/retaliate/fennix;0.5))
+						/mob/living/simple_mob/vore/fennix;0.5))
 	return ..()

From 0ad302c3d15436f83aa051b99445fb863bc79f7c Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 10:47:39 +0100
Subject: [PATCH 06/21] Re-adds birbs and fennecs to the hydro crates.

---
 code/datums/supplypacks/hydroponics_vr.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm
index b22b96b2ebf..9ccbdf2d9e5 100644
--- a/code/datums/supplypacks/hydroponics_vr.dm
+++ b/code/datums/supplypacks/hydroponics_vr.dm
@@ -1,10 +1,10 @@
-/*/datum/supply_pack/hydro/birds //VORESTATION AI TEMPORARY REMOVAL
+/datum/supply_pack/hydro/birds
 	name = "Birds Crate"
 	cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
 	containertype = /obj/structure/largecrate/birds
 	containername = "Bird crate"
 	access = access_hydroponics
-*/
+
 /datum/supply_pack/hydro/sobaka
 	name = "Sobaka crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes)
@@ -32,10 +32,9 @@
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Wolpin crate"
-/*
+
 /datum/supply_pack/hydro/fennec
 	name = "Fennec crate"
 	cost = 60 //considering a corgi crate is 50, and you get two fennecs
 	containertype = /obj/structure/largecrate/animal/fennec
 	containername = "Fennec crate"
-*/ //VORESTATION AI TEMPORARY REMOVAL
\ No newline at end of file

From fcd866563220ab4e77f1d1be37e31ec8e2437179 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 10:49:08 +0100
Subject: [PATCH 07/21] re-adds wolfgirls and catgirls to crates.

---
 code/datums/supplypacks/contraband_vr.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/datums/supplypacks/contraband_vr.dm b/code/datums/supplypacks/contraband_vr.dm
index ceeec8780ca..3d13903d47a 100644
--- a/code/datums/supplypacks/contraband_vr.dm
+++ b/code/datums/supplypacks/contraband_vr.dm
@@ -5,7 +5,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Stolen crate"
 	contraband = 1
-/* //VORESTATION AI TEMPORARY REMOVAL
+
 /datum/supply_pack/supply/wolfgirl
 	name = "Wolfgirl Crate"
 	cost = 200 //I mean, it's a whole wolfgirl
@@ -19,4 +19,3 @@
 	containertype = /obj/structure/largecrate/animal/catgirl
 	containername = "Catgirl crate"
 	contraband = 1
-*/
\ No newline at end of file

From d329ad5fe8141c5321d9e798427f7496b80d4128 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 10:55:57 +0100
Subject: [PATCH 08/21] Re-adds mouse because someone lazy comment.

---
 code/game/objects/structures/trash_pile.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm
index 01c0554170d..8fa3867b36a 100644
--- a/code/game/objects/structures/trash_pile.dm
+++ b/code/game/objects/structures/trash_pile.dm
@@ -266,7 +266,7 @@
 	desc = "A small heap of trash, perfect for mice to nest in."
 	icon = 'icons/obj/trash_piles.dmi'
 	icon_state = "randompile"
-	spawn_types = list( /*/mob/living/simple_mob/mouse*/) //VORESTATION AI TEMPORARY REMOVAL
+	spawn_types = list(/mob/living/simple_mob/animal/passive/mouse)
 	simultaneous_spawns = 1
 	destructible = 1
 	spawn_delay = 1 HOUR
@@ -294,4 +294,4 @@
 
 /obj/structure/mob_spawner/mouse_nest/get_death_report(var/mob/living/L)
 	..()
-	last_spawn = rand(world.time - spawn_delay, world.time)
\ No newline at end of file
+	last_spawn = rand(world.time - spawn_delay, world.time)

From ad35326865a8321d390a03dcb1e58101e0d74030 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Mon, 18 Feb 2019 11:34:12 +0100
Subject: [PATCH 09/21] Un-edits and fixes mobpaths.

---
 code/modules/rogueminer_vr/asteroid.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/rogueminer_vr/asteroid.dm b/code/modules/rogueminer_vr/asteroid.dm
index 7eeed184022..fec6c4aa67d 100644
--- a/code/modules/rogueminer_vr/asteroid.dm
+++ b/code/modules/rogueminer_vr/asteroid.dm
@@ -113,7 +113,7 @@
 	New()
 		..()
 		spot_add(2,2,/obj/random/cargopod) //EXTRA loot!
-		//spot_add(2,2,/mob/living/simple_mob/hostile/alien) //GRRR //VORESTATION AI TEMPORARY REMOVAL
+		spot_add(2,2,/mob/living/simple_mob/animal/space/alien) //GRRR
 
 //Longer cargo container for higher difficulties
 /datum/rogue/asteroid/predef/cargo_large
@@ -146,5 +146,5 @@
 		spot_add(3,3,/obj/random/cargopod) //Mid loot
 		spot_add(4,3,/obj/random/cargopod) //Right loot
 
-		//if(prob(30))
-			//spot_add(3,3,/mob/living/simple_mob/hostile/alien) //And maybe a friend. //VORESTATION AI TEMPORARY REMOVAL
+		if(prob(30))
+			spot_add(3,3,/mob/living/simple_mob/animal/space/alien) //And maybe a friend.

From 47163d685d9e7a290397fa62c6b93b220d165fbc Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 20:37:44 +0100
Subject: [PATCH 10/21] Adds Carp since it was removed... for some reason.

---
 code/modules/xenoarcheaology/artifacts/autocloner.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm
index 5d70e62752c..4553361de30 100644
--- a/code/modules/xenoarcheaology/artifacts/autocloner.dm
+++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm
@@ -27,7 +27,7 @@
 		/mob/living/simple_mob/animal/space/bear,
 		/mob/living/simple_mob/creature,
 		/mob/living/simple_mob/slime/xenobio)
-	//	/mob/living/simple_mob/carp,	// Vorestation edit //VORESTATION AI TEMPORARY REMOVAL, REPLACE BACK IN LIST WHEN FIXED
+		/mob/living/simple_mob/animal/space/carp,	// Vorestation edit
 	else
 		spawn_type = pick(\
 		/mob/living/simple_mob/animal/passive/cat,

From dbc484b76a3a225f5f68d23d01008a3b2618e898 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:02:38 +0100
Subject: [PATCH 11/21] Re-paths the Aerostat mobs.

---
 maps/tether/submaps/aerostat/_aerostat.dm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/maps/tether/submaps/aerostat/_aerostat.dm b/maps/tether/submaps/aerostat/_aerostat.dm
index a41331fe2ff..9a1a34f5e0b 100644
--- a/maps/tether/submaps/aerostat/_aerostat.dm
+++ b/maps/tether/submaps/aerostat/_aerostat.dm
@@ -64,10 +64,10 @@
 	prob_fall = 50
 	guard = 20
 	mobs_to_pick_from = list(
-		/*/mob/living/simple_mob/hostile/hivebot/range = 3,
-		/mob/living/simple_mob/hostile/hivebot/range/ion = 3,
-		/mob/living/simple_mob/hostile/hivebot/range/laser = 3,
-		/mob/living/simple_mob/hostile/corrupthound = 1*/ //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 3,
+		/mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 3,
+		/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 3,
+		/mob/living/simple_mob/vore/corrupthound = 1
 	)
 
 /obj/tether_away_spawner/aerostat_surface
@@ -78,9 +78,9 @@
 	prob_fall = 50
 	guard = 20
 	mobs_to_pick_from = list(
-		/* /mob/living/simple_mob/hostile/jelly = 3,
-		/mob/living/simple_mob/hostile/viscerator = 2,
-		/mob/living/simple_mob/hostile/corrupthound = 1*/ //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/vore/corrupthound = 3,
+		/mob/living/simple_mob/mechanical/viscerator = 2,
+		/mob/living/simple_mob/vore/corrupthound = 1
 	)
 
 /obj/structure/old_roboprinter

From f49cc522a8a3a2d4a16daee90a2854d88a9298ea Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:41:05 +0100
Subject: [PATCH 12/21] Re-adds new paths for fancy new mobs on the beach.

---
 maps/tether/submaps/beach/_beach.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/maps/tether/submaps/beach/_beach.dm b/maps/tether/submaps/beach/_beach.dm
index bd43f82dde8..0f9def9eff3 100644
--- a/maps/tether/submaps/beach/_beach.dm
+++ b/maps/tether/submaps/beach/_beach.dm
@@ -95,7 +95,7 @@
 	prob_fall = 25 //Chance goes down by this much each time it spawns one (not defining and prob_spawn 100 means they spawn as soon as one dies)
 	guard = 40 //They'll stay within this range (not defining this disables them staying nearby and they will wander the map (and through step teleports))
 	mobs_to_pick_from = list(
-		///mob/living/simple_mob/snake //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/vore/giant_snake
 	)
 
 /obj/tether_away_spawner/beach_outside_friendly
@@ -106,7 +106,7 @@
 	prob_fall = 25
 	guard = 40
 	mobs_to_pick_from = list(
-		// /mob/living/simple_mob/fennec //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/fennec
 	)
 
 /obj/tether_away_spawner/beach_cave
@@ -117,11 +117,11 @@
 	prob_fall = 40
 	guard = 20
 	mobs_to_pick_from = list(
-		/*/mob/living/simple_mob/hostile/frog = 3, //Frogs are 3x more likely to spawn than,
+		/mob/living/simple_mob/vore/frog = 3, //Frogs are 3x more likely to spawn than,
 		/mob/living/simple_mob/hostile/deathclaw = 1, //these deathclaws are, with these values,
-		/mob/living/simple_mob/hostile/giant_spider = 3,
-		/mob/living/simple_mob/hostile/giant_snake = 1,
-		/mob/living/simple_mob/hostile/giant_spider/ion = 2*/ //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/animal/giant_spider = 3,
+		/mob/living/simple_mob/vore/giant_snake = 1,
+		/mob/living/simple_mob/animal/giant_spider/ion = 2
 	)
 
 // These are step-teleporters, for map edge transitions

From 12cf7bd44fbaad880a49f3a795ca6140bdf525ff Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:52:04 +0100
Subject: [PATCH 13/21] adds ION spiders.

---
 giant_spider_vr.dm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 giant_spider_vr.dm

diff --git a/giant_spider_vr.dm b/giant_spider_vr.dm
new file mode 100644
index 00000000000..831dfb831e8
--- /dev/null
+++ b/giant_spider_vr.dm
@@ -0,0 +1,23 @@
+// Slightly placeholder, mostly to replace ion hivebots on V4
+/mob/living/simple_mob/animal/giant_spider/ion
+	desc = "Furry and green, it makes you shudder to look at it. This one has brilliant green eyes and a hint of static discharge."
+	tt_desc = "X Brachypelma phorus ionus"
+	icon_state = "webslinger"
+	icon_living = "webslinger"
+	icon_dead = "webslinger_dead"
+
+	maxHealth = 90
+	health = 90
+
+	base_attack_cooldown = 10
+	projectilesound = 'sound/weapons/taser2.ogg'
+	projectiletype = /obj/item/projectile/ion/small
+
+	melee_damage_lower = 8
+	melee_damage_upper = 15
+
+	poison_chance = 15
+	poison_per_bite = 2
+	poison_type = "psilocybin"
+
+	ai_holder_type = /datum/ai_holder/simple_mob/ranged/electric_spider

From b0bc86103d2b7472182c0af765eb19f05461cfd0 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:55:16 +0100
Subject: [PATCH 14/21] WHY THE FUCK CAN'T I UPLOAD STRAIGHT INTO THE RIGHT
 FOLDER.

---
 .../simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename giant_spider_vr.dm => code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm (100%)

diff --git a/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
similarity index 100%
rename from giant_spider_vr.dm
rename to code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm

From 7cff378051e1672f3ca7ffea23f361944322a4d8 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 22:15:39 +0100
Subject: [PATCH 15/21] Adds back mobs with fancy new paths and AI.

---
 maps/tether/tether_things.dm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm
index 6702a8402d4..ed292bf4272 100644
--- a/maps/tether/tether_things.dm
+++ b/maps/tether/tether_things.dm
@@ -406,10 +406,10 @@ var/global/list/latejoin_tram   = list()
 	prob_fall = 50
 	guard = 20
 	mobs_to_pick_from = list(
-		/*/mob/living/simple_mob/hostile/jelly = 3,
-		/mob/living/simple_mob/hostile/giant_spider/hunter = 1,
-		/mob/living/simple_mob/hostile/giant_spider/phorogenic = 1,
-		/mob/living/simple_mob/hostile/giant_spider/lurker = 1,*/ //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/hostile/jelly = 3,
+		/mob/living/simple_mob/animal/giant_spider/hunter = 1,
+		/mob/living/simple_mob/animal/giant_spider/phorogenic = 1,
+		/mob/living/simple_mob/animal/giant_spider/lurker = 1,
 	)
 
 /obj/tether_away_spawner/underdark_hard
@@ -420,9 +420,9 @@ var/global/list/latejoin_tram   = list()
 	prob_fall = 50
 	guard = 20
 	mobs_to_pick_from = list(
-		/*/mob/living/simple_mob/hostile/corrupthound = 1,
-		/mob/living/simple_mob/hostile/rat = 1,
-		/mob/living/simple_mob/hostile/mimic = 1*/ //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/vore/corrupthound = 1,
+		/mob/living/simple_mob/vore/rat = 1,
+		/mob/living/simple_mob/animal/space/mimic = 1
 	)
 
 /obj/tether_away_spawner/underdark_boss
@@ -433,7 +433,7 @@ var/global/list/latejoin_tram   = list()
 	prob_fall = 100
 	guard = 70
 	mobs_to_pick_from = list(
-		// /mob/living/simple_mob/hostile/dragon = 1 //VORESTATION AI TEMPORARY REMOVAL
+		/mob/living/simple_mob/vore/dragon = 1
 	)
 
 // Used at centcomm for the elevator

From 420803122b726ba91fac35d9f0ae6fc6fb4d0b24 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Wed, 20 Feb 2019 23:50:07 +0100
Subject: [PATCH 16/21] re-fixes this file since it wasn't obvious I was a
 brainlet before.

---
 .../objects/structures/crates_lockers/largecrate_vr.dm   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
index 5483480e898..864d4c8d4d9 100644
--- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
@@ -62,9 +62,9 @@
 	starts_with = list(/mob/living/simple_mob/animal/space/alien)
 
 /obj/structure/largecrate/animal/dangerous/initialize()
-	starts_with = list(pick(/mob/living/simple_mob/hostile/carp/pike,
+	starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large,
 						/mob/living/simple_mob/hostile/deathclaw,
-						/mob/living/simple_mob/hostile/dino,
+						/mob/living/simple_mob/vore/dino,
 						/mob/living/simple_mob/animal/space/alien,
 						/mob/living/simple_mob/animal/space/alien/drone,
 						/mob/living/simple_mob/animal/space/alien/sentinel,
@@ -113,10 +113,11 @@
 		taped = 0
 	..()
 */ //VORESTATION AI REMOVAL, Oties are still fucking broken.
-/mob/living/simple_mob/vore/catgirl
+
+/obj/structure/largecrate/animal/catgirl
 	name = "Catgirl Crate"
 	desc = "A sketchy looking crate with airholes that seems to have had most marks and stickers removed. You can almost make out 'genetically-engineered subject' written on it."
-	starts_with = list(/mob/living/simple_mob/catgirl)
+	starts_with = list(/mob/living/simple_mob/vore/catgirl)
 
 /obj/structure/largecrate/animal/wolfgirl
 	name = "Wolfgirl Crate"

From dea8170bc074990e6492246a3aa2dc79463466e3 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Fri, 22 Feb 2019 17:14:02 +0100
Subject: [PATCH 17/21] Removes an indentation someone made.

---
 code/modules/xenoarcheaology/artifacts/autocloner.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm
index 4553361de30..3d12d6c1454 100644
--- a/code/modules/xenoarcheaology/artifacts/autocloner.dm
+++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm
@@ -27,7 +27,7 @@
 		/mob/living/simple_mob/animal/space/bear,
 		/mob/living/simple_mob/creature,
 		/mob/living/simple_mob/slime/xenobio)
-		/mob/living/simple_mob/animal/space/carp,	// Vorestation edit
+		/mob/living/simple_mob/animal/space/carp,// Vorestation edit
 	else
 		spawn_type = pick(\
 		/mob/living/simple_mob/animal/passive/cat,

From 855e9ecaf1a267e1aba4dacc81b7256ae8e1e3fd Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Fri, 22 Feb 2019 17:32:40 +0100
Subject: [PATCH 18/21] Checks stuff that was unchecked before.

---
 vorestation.dme | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/vorestation.dme b/vorestation.dme
index ccfbb116baf..8b3c6d09df3 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1220,6 +1220,7 @@
 #include "code\game\objects\structures\crates_lockers\crates.dm"
 #include "code\game\objects\structures\crates_lockers\crates_vr.dm"
 #include "code\game\objects\structures\crates_lockers\largecrate.dm"
+#include "code\game\objects\structures\crates_lockers\largecrate_vr.dm"
 #include "code\game\objects\structures\crates_lockers\vehiclecage.dm"
 #include "code\game\objects\structures\crates_lockers\closets\coffin.dm"
 #include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm"
@@ -2262,6 +2263,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\carrier.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\electric.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\frost.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\giant_spider_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\hunter.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\lurker.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\nurse.dm"
@@ -2344,7 +2346,25 @@
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\discipline.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\bee.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\catgirl.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\cookiegirl.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\corrupt_hounds.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\deathclaw.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\dino.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\dragon.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\fennec.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\fennix.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\frog.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\hippo.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\horse.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\jelly.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\panther.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\rat.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\snake.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm"
 #include "code\modules\mob\living\voice\voice.dm"
 #include "code\modules\mob\new_player\login.dm"
 #include "code\modules\mob\new_player\logout.dm"

From 71f42feefaf1e59e913a3b901d14d3856cb6a3fa Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Fri, 22 Feb 2019 17:37:48 +0100
Subject: [PATCH 19/21] dme version 2, conflict boogaloo

---
 vorestation.dme | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/vorestation.dme b/vorestation.dme
index 8b3c6d09df3..53fe9068d87 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2346,25 +2346,6 @@
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\discipline.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\bee.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\catgirl.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\cookiegirl.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\corrupt_hounds.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\deathclaw.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\dino.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\dragon.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\fennec.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\fennix.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\frog.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\hippo.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\horse.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\jelly.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\panther.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\rat.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\snake.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm"
 #include "code\modules\mob\living\voice\voice.dm"
 #include "code\modules\mob\new_player\login.dm"
 #include "code\modules\mob\new_player\logout.dm"

From b78faf5f6f88d7804104ec716887d5f60821279d Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Fri, 22 Feb 2019 17:43:36 +0100
Subject: [PATCH 20/21] more conflicting conflicts, this time with more
 redpandas.

---
 vorestation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vorestation.dme b/vorestation.dme
index 53fe9068d87..312c7e9e4e0 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2346,6 +2346,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\discipline.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm"
 #include "code\modules\mob\living\voice\voice.dm"
 #include "code\modules\mob\new_player\login.dm"
 #include "code\modules\mob\new_player\logout.dm"

From aabb168bf41d2f80eaf4b3697bc6aa95f3e05865 Mon Sep 17 00:00:00 2001
From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com>
Date: Fri, 22 Feb 2019 17:48:08 +0100
Subject: [PATCH 21/21] retries a fix I did before.

---
 code/modules/xenoarcheaology/artifacts/autocloner.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm
index 3d12d6c1454..cc7a6cce2b4 100644
--- a/code/modules/xenoarcheaology/artifacts/autocloner.dm
+++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm
@@ -26,8 +26,8 @@
 		/mob/living/simple_mob/animal/space/alien,
 		/mob/living/simple_mob/animal/space/bear,
 		/mob/living/simple_mob/creature,
-		/mob/living/simple_mob/slime/xenobio)
-		/mob/living/simple_mob/animal/space/carp,// Vorestation edit
+		/mob/living/simple_mob/slime/xenobio,
+		/mob/living/simple_mob/animal/space/carp)// Vorestation edit
 	else
 		spawn_type = pick(\
 		/mob/living/simple_mob/animal/passive/cat,