Merge remote-tracking branch 'refs/remotes/origin/master' into wilderness-additions

# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm

code/datums/supplypacks/science_vr.dm

@@ -58,11 +58,9 @@
 	access = access_xenobiology
 	contraband = 1
 
-/datum/supply_packs/sci/guardbeast
-	name = "V.A.R.M.A.corp autoNOMous security solution"
-	cost = 199
-	containertype = /obj/structure/largecrate/animal/guardbeast
-	containername = "V.A.R.M.A.corp autoNOMous security solution crate"
-	access = list(
-			access_security,
-			access_xenobiology)
+/datum/supply_packs/sci/otie
+	name = "V.A.R.M.A.corp adoptable reject (Dangerous!)"
+	cost = 100
+	containertype = /obj/structure/largecrate/animal/otie
+	containername = "V.A.R.M.A.corp adoptable reject (Dangerous!)"
+	access = access_xenobiology

code/datums/supplypacks/security_vr.dm

@@ -0,0 +1,8 @@
+/datum/supply_packs/security/guardbeast
+	name = "V.A.R.M.A.corp autoNOMous security solution"
+	cost = 199
+	containertype = /obj/structure/largecrate/animal/guardbeast
+	containername = "V.A.R.M.A.corp autoNOMous security solution crate"
+	access = list(
+			access_security,
+			access_xenobiology)

code/game/objects/random/random_vr.dm

@@ -184,9 +184,9 @@
 	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,
+				prob(5);/mob/living/simple_animal/hostile/dino/virgo3b,
 				prob(1);/mob/living/simple_animal/hostile/bear,
-				prob(1);/mob/living/simple_animal/hostile/dragon)
+				prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b)
 	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 = src.faction

code/game/objects/structures/crates_lockers/largecrate_vr.dm

@@ -53,8 +53,7 @@
 						/mob/living/simple_animal/hostile/bear;0.5,
 						/mob/living/simple_animal/hostile/bear/brown;0.5,
 						/mob/living/simple_animal/hostile/carp,
-						/mob/living/simple_animal/otie/friendly;0.5,
-						/mob/living/simple_animal/otie/friendly/cotie;0.5,
+						/mob/living/simple_animal/otie/friendly,
 						/mob/living/simple_animal/hostile/mimic)
 	..()
 
@@ -79,4 +78,19 @@
 	desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs."
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "sotiecrate"
-	held_type = /mob/living/simple_animal/otie/friendly/security
+	held_type = /mob/living/simple_animal/otie/friendly/security
+
+/obj/structure/largecrate/animal/otie
+	name = "V.A.R.M.A.corp adoptable reject (Dangerous!)"
+	desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!"
+	icon = 'icons/obj/storage_vr.dmi'
+	icon_state = "otiecrate2"
+	held_type = /mob/living/simple_animal/otie/friendly/cotie
+	var/taped = 1
+
+/obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao
+	if(taped == 1)
+		playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
+		icon_state = "otiecrate"
+		taped = 0
+	..()

code/modules/mob/living/simple_animal/vore/dino.dm

@@ -16,7 +16,7 @@
 	melee_damage_upper = 25
 	attacktext = "bitten"
 	attack_sound = 'sound/weapons/bite.ogg'
-	minbodytemp = 270
+	minbodytemp = 200
 	maxbodytemp = 370
 	heat_damage_per_tick = 15
 	cold_damage_per_tick = 10

code/modules/mob/living/simple_animal/vore/otie.dm

@@ -53,7 +53,6 @@
 	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."
@@ -66,7 +65,7 @@
 	melee_damage_lower = 10
 	melee_damage_upper = 25
 	// Lazy way of making sure this otie survives outside.
-	min_oxy = 0.5
+	min_oxy = 0
 	max_oxy = 0
 	min_tox = 0
 	max_tox = 0
@@ -269,4 +268,29 @@
 					faction = M.faction
 			sleep(1 SECOND)
 			return
-			..()
+			..()
+
+/mob/living/simple_animal/otie/death()
+	resting = 0
+	icon_state = icon_dead
+	..()
+
+/mob/living/simple_animal/otie/death(gibbed, deathmessage = "dies!")
+	density = 0 //We don't block even if we did before
+	walk(src, 0) //We stop any background-processing walks
+	resting = 0
+	icon_state = icon_dead
+
+	if(faction_friends.len)
+		faction_friends -= src
+
+	if(loot_list.len) //Drop any loot
+		for(var/path in loot_list)
+			if(prob(loot_list[path]))
+				new path(get_turf(src))
+
+	spawn(3) //We'll update our icon in a sec
+		icon_state = icon_dead //Goddamn triple check. If this ain't working Imma be PISSED!
+		update_icon()
+
+	return ..(gibbed,deathmessage)

vorestation.dme

@@ -267,6 +267,7 @@
 #include "code\datums\supplypacks\science.dm"
 #include "code\datums\supplypacks\science_vr.dm"
 #include "code\datums\supplypacks\security.dm"
+#include "code\datums\supplypacks\security_vr.dm"
 #include "code\datums\supplypacks\supply.dm"
 #include "code\datums\supplypacks\supplypacks.dm"
 #include "code\datums\supplypacks\voidsuits.dm"