From 73794fcdeeee3ea051dbccbd146c55e0b64514ee Mon Sep 17 00:00:00 2001 From: Jakksergal Date: Fri, 7 Jul 2017 02:07:20 -0700 Subject: [PATCH 1/4] Adds sergal-specific bandanas. What it says on the tin. Missing sprite for the skull bandana, however. --- icons/mob/species/sergal/mask_vr.dmi | Bin 26007 -> 26670 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/species/sergal/mask_vr.dmi b/icons/mob/species/sergal/mask_vr.dmi index d39e1d1cf58239d4b2d8ddf09b31f2cd3906dfcc..75115dbf6fc1d8955b9f75019e10e9a70a11db0f 100644 GIT binary patch delta 7148 zcmZX2c|4Tu_y17QqVy!PFCkHqCHs)aURknce}se>`!>zoo)(hrF|rFqWEn&Dbwo_a zo+aDZvNmHG3}cq>t>^doeZH^P_n(>9b?$39*ZZ97obx`ZJxpZ-OyzG402}DQfhCgZPT-~Hf_{uwtiwE{|P9#w%C-Y#{} zZ;I&X9Qe*HlRN)zpqLwGdE>NCu1M*_%LWD_T{jJvLg?JtUFT2!(?f!1caf0jpLeo( z98c-tBweA?`S% z0fF4^p35&FQzja3?qoyGfs-G6mw~sYCa0wL*AS{|$SalJYQ3L^A>V7$~8th%cq&T{>ftyxwcEB9?4l4q#KmAA9*ow~%;GQOPaN!j!2(a5z#| zSTR=1`C^9EnXTx>0lU(Y=2RLZdzB2GHOgsnpZP(%^cEnVcaVFSCMFrOJ<_ad_n5K> z6*UAjd>=Sbt8K>On#;#(N9?q?wWW9-lK=p*R8rt)lDFNtSOosAS*Ok#`0R(flbym5cEtX@TVHo|LCEf~ zOi&xKf$9g@Z@=bWkf?V;I52HBl8+8_rnko(>5O&XzjzTeV(Vo(v-rIvVP2P{axM;F ze2MQGTqF@K>WAo&2|3k|3!+7 zW1c7MQJ-qxq|1hdfu=0%gvR~0sJt*)@o2G$OWx(AU)frT8ZSRAv)*~lB^&clcI?ArNml0vd#0ui_>QB?(_}N{Tow z1nm4s(e#!-R@9e%+>PI?yptKCtj2?6hd|7F^Re|)piv`)T9CwHJ(QfhKy`ITKW&e` z>*$4LAME73at-!wc)H?j-b9X)G+I``JDQ=ih&r%ZS7IF4$OrmnM4mGqp3PFY%w%ow(5v8|aIZ@**>4<1Mc|%75JWonO||BkqS3+C*c*)7IAZVjQ41GC26| zu|jc53KwE~&{S+613UO;FtjI~V{^3M%uHELjbg_`Sss@i%EWGS1LG+4(V&Wu zW8)|rP6_CbZ#HrwRV8g*w9qR5_(JH4Z4Bg`U1YGjTYLe2`ABURHP!t= zOFYoxey)oUcefv@N_=Mp%fyQZzLm0|DLv<>1Dq>Ib@j!|oD{Y#`?Ddb2-VTY`*r)D zXXoBpSMkRJ&^qmy&W*jDQ=vZw;rGTe?uzw(^EBA`?B#=&1|}XMfjP#&2KJ5LVa4MW zsWxSGU@mff)GE&f7i%lJC4IFb?ai%xQaHx-r*vRO0)U^oihyo-RMu`e;%I6}tL)T~ z1-)ub7;il5^sg9TmVc(DJO6{B4@(KYr8_oz*61V#Kf}{9JTxz%5r%&SL#VuwALALJ zH*NV}d(BstH~4X4axyt3rQpH!l#{uRkuXC*;^q3pbWrEg=q1UP-NiMpLS>YKH^stz z`Wl80=jVFwspn|(c0+ntPe@<*z0!zdD~aNjQr}Wp#N0CqmW zEzQkEqm{%Pa&*idJoq^JxKg6|YZvdsDdgQ9e&Go40kitfyoi1ifPeP#nn?)T2Gmvs z=Mkr<_VVS+PSCD(My6B;o5ltb+?_+P>+ z!-AV`snaf8ghdB3YTEJmyA7OmHb64%nh(3%b0>!sa2;7G@a5FZ<|L?UdX!@m&JRn0 z3Thq<9;2Mg*8o6d9pN8cD{O47x?@`X6e(K$e_V8SIM7J`(6OrLq%Muo-a5METL1$q zAwnqZur?jcAID8x^MrQz|K92t9wh^;$-TFqZW5e+NS$caKJE*-oj@gHIvBcrb1p0g z&^Nbz51o%eSy@=XB$caA->?qI>Zhj>4pL$)=Fac6d+qRZD~})hT{nF>o%ET@ANcFO z9t_xIG;hI^($kAdORu}Rx<0-$$7u|lV}nGLIdV6AHZZfb%6K@KCbrtBUuXlTNowwY zN>`&=6*ju?IjY0*qN}S)@~X8f@(39LeZ5xe*8E{3`Dc4g!;Kq;Sln0Qwaw8ZIi|Lc z#3b*U?d-cvUP^sXlH+LmNENjf1VC%%hLZc!ty}_s?E^;S-dbBta*=zlFm6y7cRzk% zg>-^cI^u-bd@5>qryr#{pAgX)1vsPW@{@Mo*d^G48`Ox=j_3$%OK`Jn=T)wlA~f2F zKp-^N^FSbdwz?$SVZVH%r3X=<{@*Ij1@U{BgEAK{wty)7TB!#B^coCh?2VO1!3_P| zYbO>$8mT3z=xK%yI+#O~>2U>_0vLOwt6VM8-P)YKygIwp;~n?T#V=ZZKD7A{jTc9& zLM+VgnT;luluk2BC9Koa=4qObVr}E9hivPI)8a+rUh9gQ>04Ah))CO>t@bZ$)}s2h z{pD`yosyVuSq<1Up93G&bzA$PJfTp+h|+}+1!-v`9v+?yMMN=aW{LgV$e6J+CqHCh z1L@_cgb!$0uu#C<>dRI5;8q|x%9W(THJl})q(a!dmwU}VZTtv#jn-!ZohZg}M0A2=l& zW&^kINcVVPKc8i8`{OECN;&8U%6|5wu2a@AV-wY0Q1-7Fj03C;OQ(F{PLXlS z-d}U1zs)Rw%du#Bg;*lX1A1QO%uOboj}JW=f+fp8J^Z81PyL0^vim;K>!e9NM1%gR zrI)$(TyXIt#OcOr*RBgrR*|5TH#4Yl6pkQ-%Rd>v38ud* z^qkk-{w6qi_tB{@XYlhKF}DEvQ^M4)&HDmE_I?}y5%f8}>3hZjlB(M74%TBu7=D8YVU)E9p*^-a_x=@ zZhLytJ$mWf!Wh2AJ>O+74iGr@wXq5{(phtU8@ijtloKmI z`yX0${$JiJ`kQNTRh&4HR3W60^p6%2FmcvDr^JWFfp>_=7Ktd#6^+X5O>FO7%5v7` z$Ko!CW&HzwvG`|>4565VrzhsCxla=fZ|+j|;Pbso_&52ju@YB7m5sQU@B%Rx!Ha68 zAsL|BvW(wkN2-qzVZ($eE>-O4=$Npx4rzN{sR;vM4sTz_#6W?1T6QR@SIJW8y>XDz zXpzqgC9={;9rR=4VB-P%9c+nI$ypNcelh!nGd(6I=9Y8Yi`(i#C$#)cnlc!R>;}P1YRhY@1~t8c;{mg7PtQ& z^8%gp-^NPOyT|rXtKmNi1XkmFDP6k_f|LAFhs^{Ea#W8Y0zw!eFU33N+@ex%I#?6v z=H_;kOw)M?D9_Rtv*s@eMruO>lOj#vCOn66J;~XL;yA;koxiIox(lk`+!hMIrlqM) z3kFfuJn35-x{V|L*{1#``k_*S$J(jx&b$((< z8r0jO3>kmXYH8Y4&OCWpu^?L}cCmgOHrEsSOCJ38pt;S|~*g=I;;Ni1? zf_2tsc7RZ*@*fbH?r+~0u>1Iy8N84t)w~jemiGJQ#)#<*N>l64DV;t@HAIyiOxlE# z$;qhvifT2>-42O&;|agYA~H)c9%e3;!3dgJ`h&(b`a1Ni#;6$wS58 z;1aOlsp7#SHGWuMvv@X1VD>cH(MC;WXT>?PZWed1ec>2|Nnij z?IvUT<*%DBHq5t3$jLGXg|c>gWXIVCVkfJ(Az*)4*Mb;M5I5Xts{>ns+^ZDvOPNZdQmKOIh)Py|NQA~$ z@PUn={-Wp=grh0MOVGW8KepHQ5TfEB#E|}J#6ZAC_JSC&F&6qP_i50}uD(9v*8E8( zelY%&zv}-tS%P^rN%Ddfm@Gwsqb?joI4dPNf#bxcRn~*Axs*F#O01o1-F;fT3x>H$@2f)~CwvTbv@E9m zxSJ?LV9%$%z8;m&_qwbyoPnR%iBHTgD7a#1HcnxOAao)6K=+SwWFC)_Pu7jPS!Mzr zi}!@waB^_gi{lMyI~4&xm}*>p!1w$R5gc42R#aYY3i?pzx~aXTjrZv@XF%?pSKRH% z5v_A!>_-CwJZgfn6)gYo%Si!cU*SLg^bYeHR=c9I84TTPLV3u`dv{N%vi`aE%}bv3^E4S(R# zrTwgP0|EkeM+-t?)l%rhj?skLobvg%P0RqGJs8y2TiY9Wat`9VN8xYvE~AP}O+nP> zI~yEO7L19G6QVw)lehjHYPqD(6)F&snUSFow(V+YhCm?Zx3@TO9@~pu6ZHXw)*npF zKvcF#B(Q;25<}egPrbPD_gIi<;@4BVpcGx&)Cg)=wHU{+Retn%*$p0lCjkM#x=-`% zKEI-*WX(?9d;YS$_kIw+rnvenwS6yK{>)p?ktGTmc zly*oS$)p{waa;rVMqvthdT~QbwVwAtsFJ9Ke!1BC5*X^@w0cD@Xtcpzjx)wV&6h4G zzFJ#f-`$F``<5uGui!nQ00^k~>j(jL9pA^sa>}KCeb^r1EC5&R?(RlQUp;i>w=uP_ z2pk$sqgOf8^vo?R-khZT`0=9{gRypYe)oh<%(6vk2YqSQS)%DQZu*Y*Z%%7u!0Cf;Px?mE^1MUUT=3Ze}6&tUP6a?^B(~_EBl78thMTn0ziMi$rJ3> z!r3&lWsS|LDf@aSZvrEDU1F@VoWR=T>n6IC8bBbOYkx3fv0!Fx|!imTaUDbMwNZaRkj(?DV`9~;!{9nz=`rh>xH zGB%(KENIZ}ks5-u#TJnfngz;0Y(9*g`Y}wZE9cp~_5RrlO0VwH7%cZ>ynyqqOfM`G znCrgRGq1Xj7lEZ)SBVoCXy4h=0_%mMB|5Zyy}U~N{rv+8XJ2OTJOs7sM9)PsKXMIPv+gl4PH`tzNF`c)PtYtpx h>g3BM`3bpmF@)kxY7?!Xl1DO#p{}t`*`I$s`yY>nyT||l delta 7486 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 From 6a633f6c51c25524ca235370b7355000f6c8b1a2 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 7 Jul 2017 17:07:15 +0300 Subject: [PATCH 2/4] 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 08ed1b6894..fb0db4ff31 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 0dc0698b23..c22698ce45 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 297541f593..42cf375dfc 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)!?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^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*iP18X 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?!#m^Wc^9@k z>-Z4uE$BK-F%M5iP$~x&xY-c~xOZ$psk|#I(DwBG^uE4l{}O>Wf(c5!J8Yk}>C#R?HPd`+Vq5An5NmP;g(GwL_)u4PNahR_9l0H;}@{z=h1m*wd zuM2h(f_D}&A517Yqfk*wFp+Kpn0#UGsu-!a7z@PJkKflQ!U{)fsToXP0tQz)bAD)io{1fK&LyKLJ`b(bF32tsDRV002ovPDHLkV1i}h7+C-S diff --git a/vorestation.dme b/vorestation.dme index f204cebb43..eb783b071a 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" From 3d7d207f7e4e37085aa28efcfdacdefd48de6d6a Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 7 Jul 2017 18:28:51 +0300 Subject: [PATCH 3/4] Fixes. -Fixed oties not switching to dead icon when dying in resting pose. -Made dino/lizard predthings able to survive the outdoors. (they were all slowly freezing to death) --- .../mob/living/simple_animal/vore/dino.dm | 2 +- .../mob/living/simple_animal/vore/otie.dm | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/dino.dm b/code/modules/mob/living/simple_animal/vore/dino.dm index 7084bf9437..fdc1b61ccd 100644 --- a/code/modules/mob/living/simple_animal/vore/dino.dm +++ b/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 diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index 42cf375dfc..7f0dec5536 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -261,6 +261,31 @@ 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) + // Activate Noms! /mob/living/simple_animal/otie From 45cf4a5d43173e353d56972e6038412f7714f5d2 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 7 Jul 2017 18:30:03 +0300 Subject: [PATCH 4/4] Missed file addition. --- code/datums/supplypacks/security_vr.dm | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 code/datums/supplypacks/security_vr.dm diff --git a/code/datums/supplypacks/security_vr.dm b/code/datums/supplypacks/security_vr.dm new file mode 100644 index 0000000000..e0ebe3440a --- /dev/null +++ b/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)