From 6a633f6c51c25524ca235370b7355000f6c8b1a2 Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Fri, 7 Jul 2017 17:07:15 +0300
Subject: [PATCH] More otie stuff. -Took out the minimum oxygen requirement
 from space oties. They all died outside as oxygen was not one of the gases
 there. -Moved guard otie to security category in cargo. -Moved the collared
 otie from pred crate to its own crate. Bare one is still in the pred crate
 chances. -

---
 code/datums/supplypacks/science_vr.dm         |  14 ++++++------
 .../crates_lockers/largecrate_vr.dm           |  20 +++++++++++++++---
 .../mob/living/simple_animal/vore/otie.dm     |   2 +-
 icons/obj/storage_vr.dmi                      | Bin 1235 -> 4537 bytes
 vorestation.dme                               |   1 +
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm
index 08ed1b68944..fb0db4ff31e 100644
--- a/code/datums/supplypacks/science_vr.dm
+++ b/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)
\ No newline at end of file
+/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
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
index 0dc0698b23d..c22698ce458 100644
--- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm
+++ b/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
\ No newline at end of file
+	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
+	..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm
index 297541f593f..42cf375dfcb 100644
--- a/code/modules/mob/living/simple_animal/vore/otie.dm
+++ b/code/modules/mob/living/simple_animal/vore/otie.dm
@@ -56,7 +56,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
diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi
index 161d35f236af8b052126cd47de5d91462280ba51..46e37980923ecf81eda3ccc3f9c8a7ff0457ef0d 100644
GIT binary patch
literal 4537
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
Xv6c2}$TU5U00000NkvXXu0mjfpl=DP

literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0003sP)t-s#l^+J
zJv+BEF|#8es2mxQ4GKU$J~1yZT2@x3qM}7XL1SKCFfJ~0ZEe1~x>!?FNJd3PEEvIs
zS4luKf_!}7-rj+Gd+y%QKs`NHA^^2W0A4&G^y=ZojAJh`D>peJY(*%7GytVS0NlKs
zq-Z>2CjcWQAl<~V=FYi5KtLQG8YLVPzkpG^c}K&Uc(igs)T@loq<EfWIFw#C$e)3M
zQ7(~MGk}1Aj$1X@!LYH5ZoZ<6*1@m9qKtr1FVeoQrh{shZc)3SiqpQWmu^v~gK9c7
zD#gXc8yg!K7#I~56%!K^MMXs`D=R-gKTl6jDk>^6GBP+gI4mqIBqSs=Gc!a)L`q6Z
zIyyQzIXNXIB{VcNF)=Z2Zf;>=VNg&|6ciLDCMHu;Qx_K(At51DR8%4&A|TzCCjbBd
z0d!JMQvg8b*k%9#0E2o|Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$
zQ?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AXBM0F(oA@H7PM&iHkEOv#1y-
zX2`{vR+N~V3SlEu=9grqCKmyD1eF%$CzTeLK#azvSXsf<&jsvc08uD59l|mH+W-Ip
zy-7qtR9J=WlnrmvKp4l_)X7BVU??K9E4vOlguRrpfiJ^3HFvjO5l+T{Ifu@D|Bv8v
zZHdrA?9s%;=)Y<2f#mngbI(yCkw2M*MSms5-?@9wTLsM$L{RsaCaU0kbU7-h2T>8X
zT8_pZ2Ib=`aX~$bi@4QFJhqw$$tQyeX7g)-1WT#Msn{Z5u_vjNTgB2b!3XQ$>FV?V
z@97}(Y?RFS*V*Lyb34k0s%|Jwy`EIpyd7k6n=ZeZ%S;H6=0wS66}Lo56?m_}HEiZ)
z2*!d$2VTJz7$CV^ZflkxpLZXk1Ha%`yn;fZpcMesZ2>%|2wZ;KXRrkV|D6CjA7x?)
zlO5z?2Qvj@@d!pEP!z?!<ps_j1gy*@C^&{<aiM76(@$YM(~nUvz9=ei>#m^Wc^9@k
z>-Z4uE$BK-F%M5iP$~x&xY-c~xOZ$psk|#I(DwBG^uE4l{}O>Wf(c5<Fbu7tRSZo#
zKsq{r3YApgtHA_iRPhCsRp1XN1xH6m6YEH@i)!_k^$J|CUf18iQmfU_uIl4~^sG)2
z20A`&95>!J8Yk}>C#R?HPd`+Vq5An5NmP;g(GwL_)u4PNahR_9l0H;}@{z=h1m*wd
zuM2h(f_D}&A517Yqfk*wFp+Kpn<i!gg;2_{Wy%?_*|f;nr&g=o;+%h`#A?bJuw``^
zZk>0#UGsu-!a7z@PJkKflQ!U{)fsToXP0tQz)bAD)io{1fK&Ly<OCh)KurJ3)mKW$
zb)T`0oS+8=I^_83+d1aLYsPw#GY~_hd|T{<4fr(-(UR-{1caN=2ZJGgmp_He9-IP)
zUxPhFIE9|v5aAg5Hz4@Yw2zVA^d)&PP<l3Oo94w}z=v=U^SqLj+z#!Kxn4&R;$&VN
xf^Xmo!AEX6Tww$l1fe<zy@g1aztn#>KLJ`b(bF32tsDRV002ovPDHLkV1i}h7+C-S

diff --git a/vorestation.dme b/vorestation.dme
index f204cebb431..eb783b071a1 100644
--- a/vorestation.dme
+++ b/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"