diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm
index 2b2cd396ffb..44c8ad4c34e 100644
--- a/code/game/objects/random/random_vr.dm
+++ b/code/game/objects/random/random_vr.dm
@@ -181,7 +181,7 @@
 	var/faction = "wild animal"
 
 /obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
-	var/mob = pick(prob(10);/mob/living/simple_animal/hostile/scarybat,
+	var/mob = pick(
 				prob(10);/mob/living/simple_animal/retaliate/gaslamp,
 				prob(10);/mob/living/simple_animal/otie/feral,
 				prob(5);/mob/living/simple_animal/hostile/dino,
@@ -189,7 +189,7 @@
 				prob(1);/mob/living/simple_animal/hostile/dragon)
 	if (istype(mob, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into this.
 		var/mob/living/simple_animal/this_mob = mob
-		this_mob.faction = faction
+		this_mob.faction = src.faction
 		if (this_mob.minbodytemp > 200) // Temporary hotfix. Eventually I'll add code to change all mob vars to fit the environment they are spawned in.
 			this_mob.minbodytemp = 200
 		return this_mob
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 1bfd559b9c3..09c763a86ea 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -4,7 +4,7 @@
 	anchored = 1
 	density = 1
 	pixel_x = -16
-	layer = 9
+	layer = 5 // Vorestation Edit
 
 /obj/structure/flora/tree/pine
 	name = "pine tree"
diff --git a/code/modules/mob/living/simple_animal/vore/deathclaw.dm b/code/modules/mob/living/simple_animal/vore/deathclaw.dm
index 6619ca499fd..93b0098f031 100644
--- a/code/modules/mob/living/simple_animal/vore/deathclaw.dm
+++ b/code/modules/mob/living/simple_animal/vore/deathclaw.dm
@@ -5,11 +5,17 @@
 	icon_dead = "deathclaw-dead"
 	icon_living = "deathclaw"
 	icon_state = "deathclaw"
-	attacktext = "mauled"
+
+	attacktext = "mauls"
+
+	faction = "deathclaw"
 
 	maxHealth = 200
 	health = 200
 
+	melee_damage_lower = 10
+	melee_damage_upper = 60
+
 	old_x = -16
 	old_y = 0
 	pixel_x = -16
@@ -19,8 +25,7 @@
 /mob/living/simple_animal/hostile/deathclaw
 	vore_active = 1
 	vore_capacity = 2
-	vore_escape_chance = 5
 	vore_max_size = RESIZE_HUGE
 	vore_min_size = RESIZE_SMALL
-	vore_pounce_chance = 50
+	vore_pounce_chance = 0 // Beat them into crit before eating.
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/dino.dm b/code/modules/mob/living/simple_animal/vore/dino.dm
index 7084bf9437c..1516960ec67 100644
--- a/code/modules/mob/living/simple_animal/vore/dino.dm
+++ b/code/modules/mob/living/simple_animal/vore/dino.dm
@@ -36,4 +36,7 @@
 /mob/living/simple_animal/hostile/dino
 	vore_active = 1
 	swallowTime = 1 SECOND // Hungry little bastards.
-	vore_icons = SA_ICON_LIVING
\ No newline at end of file
+	vore_icons = SA_ICON_LIVING
+
+/mob/living/simple_animal/hostile/dino/virgo3b
+	faction = "virgo3b"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/vore/dragon.dm b/code/modules/mob/living/simple_animal/vore/dragon.dm
index c6a2fb4477c..63ef2255e91 100644
--- a/code/modules/mob/living/simple_animal/vore/dragon.dm
+++ b/code/modules/mob/living/simple_animal/vore/dragon.dm
@@ -24,8 +24,6 @@
 	max_n2 = 0
 	minbodytemp = 0
 
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
-
 	old_x = -16
 	old_y = 0
 	pixel_x = -16
@@ -43,6 +41,10 @@
 /mob/living/simple_animal/hostile/dragon
 	vore_active = 1
 	vore_capacity = 2
-	vore_escape_chance = 5
-	vore_pounce_chance = 50
+	vore_pounce_chance = 0 // Beat them into crit before eating.
 	vore_icons = SA_ICON_LIVING
+
+/mob/living/simple_animal/hostile/dragon/virgo3b
+	maxHealth = 200
+	health = 200
+	faction = "virgo3b"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/vore/gaslamp.dm b/code/modules/mob/living/simple_animal/vore/gaslamp.dm
index cdef1e7fd5e..7df803113fe 100644
--- a/code/modules/mob/living/simple_animal/vore/gaslamp.dm
+++ b/code/modules/mob/living/simple_animal/vore/gaslamp.dm
@@ -18,7 +18,7 @@ TODO: Make them light up and heat the air when exposed to oxygen.
 	icon_living = "gaslamp"
 	icon_dead = "gaslamp-dead"
 
-	faction = "gaslamp"
+	faction = "virgo3b"
 	maxHealth = 100
 	health = 100
 	move_to_delay = 4
@@ -56,6 +56,5 @@ TODO: Make them light up and heat the air when exposed to oxygen.
 	vore_active = 1
 	vore_capacity = 2
 	vore_default_mode = DM_ABSORB
-	vore_escape_chance = 10
 	vore_pounce_chance = 0 // Beat them into crit before eating.
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm
index 297541f593f..d8222ae5591 100644
--- a/code/modules/mob/living/simple_animal/vore/otie.dm
+++ b/code/modules/mob/living/simple_animal/vore/otie.dm
@@ -45,6 +45,15 @@
 	var/tamed = 0
 	var/tame_chance = 50 //It's a fiddy-fiddy default you may get a buddy pal or you may get mauled and ate. Win-win!
 
+// Activate Noms!
+
+/mob/living/simple_animal/otie
+	vore_active = 1
+	vore_capacity = 1
+	vore_pounce_chance = 20
+	vore_icons = SA_ICON_LIVING
+
+
 /mob/living/simple_animal/otie/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
 	name = "feral otie"
 	desc = "The classic bioengineered longdog. No pets. Only bite. This one has mutated from too much time out on the surface of Virgo-3B."
@@ -52,6 +61,7 @@
 	icon_living = "siftusian"
 	icon_dead = "siftusian-dead"
 	icon_rest = "siftusian_rest"
+	faction = "virgo3b"
 	tame_chance = 5 // Only a 1 in 20 chance of success. It's feral. What do you expect?
 	melee_damage_lower = 10
 	melee_damage_upper = 25
@@ -259,13 +269,4 @@
 					faction = M.faction
 			sleep(1 SECOND)
 			return
-			..()
-
-// Activate Noms!
-
-/mob/living/simple_animal/otie
-	vore_active = 1
-	vore_capacity = 1
-	vore_escape_chance = 15
-	vore_pounce_chance = 20
-	vore_icons = SA_ICON_LIVING
+			..()
\ No newline at end of file