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

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

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)