From 855d795357994c7fd2c78fcf6994eaf91a42f230 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 1 Oct 2019 10:30:29 +0300 Subject: [PATCH] Some Protean fixes -Fixes protean regeneration not working at all. -Fixes not being able to get metal as blob. -Fixes unblobbing as custom size breaking vertical offset. -Adds a general use loadout fluff vest planned for a prottie char. -Fixes blobmob being slow due to mob update movement delays. -Gives protties trasheat verb. --- .../loadout/loadout_uniform_vr.dm | 6 +++++- .../station/protean_vr/protean_blob.dm | 6 +++--- .../station/protean_vr/protean_species.dm | 4 ++-- .../vore/fluffstuff/custom_clothes_vr.dm | 10 +++++++++- icons/vore/custom_clothes_vr.dmi | Bin 209128 -> 210391 bytes 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 652253176b7..be65b874a61 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -168,4 +168,8 @@ Swimsuits //Tron Siren outfit /datum/gear/uniform/siren display_name = "jumpsuit, Siren" - path = /obj/item/clothing/under/fluff/siren \ No newline at end of file + path = /obj/item/clothing/under/fluff/siren + +/datum/gear/uniform/suit/v_nanovest + display_name = "Varmacorp nanovest" + path = /obj/item/clothing/under/fluff/v_nanovest \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index ae012790cc9..6e829897803 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -36,6 +36,7 @@ max_n2 = 0 minbodytemp = 0 maxbodytemp = 900 + movement_cooldown = 0 var/mob/living/carbon/human/humanform var/obj/item/organ/internal/nano/refactory/refactory @@ -200,7 +201,7 @@ target.forceMove(vore_selected) to_chat(target,"\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") -/mob/living/simple_mob/protean_blob/attack_hand(var/atom/A) //VORESTATION AI TEMPORARY REMOVAL (Marking this as such even though it was an edit.) +/mob/living/simple_mob/protean_blob/attack_target(var/atom/A) if(refactory && istype(A,/obj/item/stack/material)) var/obj/item/stack/material/S = A var/substance = S.material.name @@ -346,8 +347,7 @@ var/atom/reform_spot = blob.drop_location() //Size update - transform = matrix()*blob.size_multiplier - size_multiplier = blob.size_multiplier + resize(blob.size_multiplier, FALSE) //Move them back where the blob was forceMove(reform_spot) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 0d9ad6bd933..0d2000fa01a 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -96,7 +96,8 @@ /mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/shapeshifter_select_wings, /mob/living/carbon/human/proc/shapeshifter_select_tail, - /mob/living/carbon/human/proc/shapeshifter_select_ears + /mob/living/carbon/human/proc/shapeshifter_select_ears, + /mob/living/proc/eat_trash ) var/global/list/abilities = list() @@ -296,7 +297,6 @@ material_name = MAT_STEEL /datum/modifier/protean/steel/tick() - ..() holder.adjustBruteLoss(-10,include_robo = TRUE) //Looks high, but these ARE modified by species resistances, so this is really 20% of this holder.adjustFireLoss(-1,include_robo = TRUE) //And this is really double this var/mob/living/carbon/human/H = holder diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index d85feea3700..1ba3941bbe6 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1520,6 +1520,14 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "gnshorts" +/obj/item/clothing/under/fluff/v_nanovest + name = "Varmacorp nanovest" + desc = "A nifty little vest optimized for nanite contact." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "nanovest" + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "nanovest" + //General use /obj/item/clothing/suit/storage/fluff/loincloth name = "Loincloth" @@ -1906,4 +1914,4 @@ Departamental Swimsuits, for general use return 1 /obj/item/clothing/under/fluff/slime_skeleton/digest_act(var/atom/movable/item_storage = null) - return FALSE //Indigestible \ No newline at end of file + return FALSE //Indigestible diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 4ae6f9cef4114e311672e31e39099832d10607f0..2a487aab35f52ca0674502d8c43c67c78dadcb38 100644 GIT binary patch delta 4371 zcmYjUc|4Tg_kV;avddU!>_nErkbRki?CVI@3<**8n8y+$QI;$bW66?zt+9`Nr&6IT zSwi+L>)vf;!Ip;k0-uJop+;h%doTeUGrjF$!S*+myLIEX_jo`e+q8OU& zc2c)bSjg|lS8f_Vp%u_ZtyD|Yu7uH0VrVEyi0#5B8cI?+POz*+H{F*FkL4X36^j?& zX9%Q!W$fx+`$!14-%BhVMQMvC2qvO)lpQmAyK~+?%n_M%y+`Rtbs^G$8&2ua9%@0gK6w8{H^6gV5htdN&;dl0hxKSEwa3_LY+?V&j~!)98A71-VC-Nr#SlL z=pU}7{kn%}UY=#e>JQ>>E@cl?WB)3VL7Kyro9waPU^sR;j;&e0Wc;7TYV}&dn1VSE zk+RvZP{D{(osrjsP9(ns@uLD&X*r`vey0CwpvD=dbFL=-AZ-C~pGk@Rmbw04zgaHW z8;`qYFIj_iCFeYTz&}k09c*T_x%!>{*YnGaFevfHfC)Y|?2ga+qU+bN&HPlBO{Tbq z1Lb!Ll!qedw57($5+frc7du<|CEhr@0 zY-9{Mowm^6;k?WTw+ZS@GdA~OmxJ&(>#ZE+oYUa@HsP zf5hl8Qi8gZr&P_S;*y_zsjW|$2qD6Jf`4O^iq(w_<ACQv5$wjFOPnmvc-vXS*>&FML@CVIK-O!g7@S zj*TH4|G0?^QTF>xXW1Y2zcJ-igr@Jn$9;%4%D17JEa%!D)TGQdZ027Ho`)uXs_7!x)?KLy;=6Y@ypU)i0Ls+mt_r*{+e zV)b7WEc&(6!X_pJR_eeYp`63?+n&ZR7+D&X#_P7a3ca&94mSKHZ(e6D+hv-jAlD;w z)^mVqyG~L&Y2};qO4QGeEe>K>OjkoaGYaUZloBxC-yZvcIACgEr7JC{V_1pyx=Hh} zkdig{?d4tsmD*FJ{3*v>oloUd=a!+`FHrK6C4A?3Tq!Kx;sH1(?B>K`6XY4}t?4NH zXjeh*n7-GheONm&H-RF=8=27W?|NM5=|wfhfPYhar9&*Xds`%;TfUi!5-$va6FlG5 z1Nm5|{`NfOh1n*lWS0ZpNuYO&8b7uR{?&iyrn$B%x7a9=XDI{V8cF6*dDCxySwXmT zJC6_bK^F8I0H8)|X{egSB`Hu0jnB8f5x=xXWo^1mg0J>^xsj9GvhLmG6S>eS5SKh- ztO&QVj-p*?NU%uw{u=S;UO0d1Q1H16&?npBG+!hMo}3q+q51 zIaH`NAP%!{u?gF{X;fYiC?cJv56k!J5ATGBrp%m1b zkZdd@qf8wXRcr_JDa?K7pG?>=RM+QTq><0QHDBQvDBnQ#Y>;WX_!q`=NC>bUzZq5K z4n6vQa!YLD1G`tTu`b{$XxEeN9Sr=nj#|Ak%1T!zWfUzr>hg_U@vS}lpmk@ z5fL^6Hl?CHAGN6xTZ_es^eD&2AxtGHSuYLUK`3M@8nf_8ZaIyU$bML)|4F4$VjtWv zuKDw*oqOndF{3&as$(55ny$^5nr4|r>jXw6w|EyrTl%RZ}tMvVCQc&3J%lb+mM`vPNc!V_iWcU7&!Eh;fx0$rcJnL1G~VY zw(*Q;l2gy|g)5|Rhi$eZR5~PW#3DQ*B+ahpSgq*JS@^2cD+kmJMJ5gSweLe_4oyvg z;Laog6JNL1O5;QepF)Nsm&3AJO8ZL7v*`J3l!4ZfB2uw|R3jiA6lz>ct>Zy;!$oem zMb)M-m%Y?N^BGmB*HT0(uv~{bxEVJ*mK({Nx8{4)d`i_KeN{zI@1j6uZ{`U3>GIcQ zuaxd<>h5|MtsF>-k59x+(%Mc)^0`Bzj}UgQP$NnGnBTKHM8R#IA;Jbmq}a(+*+gwbg3^w z#y4nU#r=K z$LqNViU3SbZhv1yH~`WVUu-4?WWt__bv9aaC`ktqHiYrZ|FU7vN(&EksG{%uxP)6| zk(goa`dv=Jo8f7-L$z@vP+pBMa6#i5qD`V>{J$){Eqf>iR0qsExc0v!$_A=l5KR&C zBpw~m@R94o%R$Y#Bd=!3p$<-3oOAAU%+K{$;*#!-zUPN&wsG0`H1;0I#B3#w_3{f; zeIO-^%9WGc+YJ%ykeaY5%V*u;nN-TO)>K(_x+tqBuF=^r{&1Fc`^mIyBV7%a73JsX z+Ax_Ie$3mqac|@TVT#b)qN&xlsr3WCN#wy5Xd`Etuj7YQ=o;yi5yumjmSxk&vtw`l z8fRta#9Aqua#NkoGOFRsj3mwrLCod=%-cz8VwC7+DxgP09`5QP8eUirR~ac%*Y$K1 zbx7UPB9Tf6uIQ&tK1&@qRnOtfgyP%<;c7sZnYy_0ATMC&W%`jY0@L($M4NwCp>ddw8yxf7a zqVv=c0{x0r$|Yu0Tz7#AUR;aIdj}75p{+ln7_Y{kU9A!Gyy7i}Onl#X)>UT=yuzwg zbNQ9EPY)NH`}ZH;%1Ea?ujAgxk~sx!GuseiIPYnMapS&Bc6U=685>I~DZSd+@dEIR z1?*7w62n#0+_SOweYP*m$$v3C#oGgUXKYa&U3o z4hXnKKtna?vlhNRSsz@@h5?L>j47!Mac|$g2vZI)i^Z}-pQtz%@;m&$Fk7J7*pQQa>XMgH&u+gW8f0n1(j z=n=Mq@8ocPn>;%KiqscL320>nF51eC_RELm4y@3}Rn zCA5%pdrwmVfvfQCM$jHeG1Wq{{B+rQu*6!iDXD|9Cb=;XDRTyl-cT(vfHpQGgX>LV zV#}W=cFxX}V#!pFj*g3e{~Fo_++0XbOym|35!q=pJK!v9;-{ve0WSc=$t7iF3y_=Y zyJs8VK7^Q7Iv^Y` zsmPK8yLB9h#R}wRwaA5bd8kUktlD6-Cb!z4RMpY{id9t;a=K5yVxpohQ&Uspou#rJ z@5R_kfozfz62U|vZo<80-XDo}auTE=Y!9nBIpw1cZsbVfs0-e|C+q0wNPTeI$jT}@ zK0f~8)2Q$u>EoG;zv{E>JBZKh9v3Yv-1}x>y^I|(G*vIJ;}x^keTmtj^y@^{Ber{~ zpGUtw?+K<)2pR4Ff}9!`@I?|2%<9$_1T1NnS9TSnY5xGUwo;t0B7b~A622Qg78DdT z?2bD+JdDL+p~Gn#V<}})zH3(1A3tU{G;nae)~vG1_1~V)s;OZn!b?d>iR>8~Hy;+~ zBCZUanXH*2nCN_6E~36YDRqsoF9(jgn14Mo=1!9B05tNG9aGIj|$=I)AD_XHmic?2+cQPba@3QpO=spb5J=s zY0WgY$NMkIC{n(;1X+5Q3Gv?YgcKoC|M}jLN`I8{@<%4hf{^{4o_s(myz|*|DjBf9 z$1-lu7A@=DLJpLJ?AWf33hrWya!9be$^K%=BZl1-kC)JQE+jy=4YYO7{)YZJ8lG%t z4O4)XjjdHPZC%CC(9pT`J^YcMJBj{*SO>wdXku$zLa)g~n+ zh5QVp=J<1c+*iSQf`ooO@W1tmG9uzga+6Lz4p;t~VmXrz9qJ#G#mK(>J4aul$488=(;q4q z?Jg#V(4D*4fQzATFrD$kfd@6;u5sP+IA~&&0ciesZ%Nij_QG{odjt8OS~RKWM%za^F_-$UlKR&PLygskCt-g)gT4G}oK&Vo?e1PXT~y$FVIGM)zpDKR>+)Wz z#v>bdJ-a%zsM6!-&mvf>lkmaBOE0c@)yJ50o<(g>HJld^%Jn*03*M(^Y`n&lJ*`V0 zXG4M9=w2TH%Gl@*p(TM;o-Rfmqn37(T~>mEe*+Xz=pnt&W8@lOr($USmjl5KMF)ZM zNR3F%uhs02p{VbR>urncj+0aU(lRnFi<}2|)XqzE;D{<2aMw>$y=@gkul?#bkl7~d z_IGs{36Li9J7RydZ<~pr%z;Q1hp@-FS!qYffOQFq`FUG_c8&U41q1>G;opGva90or z`A~JySd*g{${e%Y@;xRp39= zl|u$rz)eRa%WmbqAWT0^TL4UlGNVWxD7xsxupV!V2{j)S>*6gUKIN`}tQ8eKo}(!s z6{&Znx%2HnH#RtFka!WHw4dLG=i9sINnSoe;N+R|;50sV|AEe5MkR{}Kmo*a*^0sT_7l?aDp zwW6DikzD?si5;guID44?B3j|J5@r3D^KxB7sh3pe30|QwMVI*Y>b@&39DW!P(KqyY zF)u7HqMNr?gpAb%heP5;5SHf+OeW_*8mF;r#258wdvXT_>TU4aJ@@u0cg=OOVnP`|#9@HXll-G}EW*_FpQHvcJx`e2=Xlvg6$_5% zoM!@i1bb3SErE!W?GKoMspur_u!6r+egr~ z1;YNak%soI_sGIBLlWUSVKEtJ?zz(Vgm@v+eVq#qnFMeJWDGwLHP27yoy(~Z zO62gyb?AT8HR3Vq^ZpN20U>(dGmq!8&mal}_~E*T4R!O^){1mpBuEY%QrmJ;>8rlU z+cDFvwt3NmT32oY$$n41Zp?XYVJ7B4{Mm`o=71>==Zg^ziN9^&Gqmo;^j??zAuD3)l`$CNn=iO}AnXwJ#_&CHH7 zX4bqp9}Xj8Rnke<#V;#4#y?ed%uCcqXZ4T#8{D8FkOpA0lO7!4)mLN-my_qp)ukr9 z*eYAU0J=Ssy6`2W*m#G7jb7S%u1TTE#!n}c2i|5aFGjA(Fv_aNoR`>QhC44fuaoK~ zb5~arff{|`758HIvg+?C^jvThQ&)6CvW+O)oj8fQVO?cR>kpu5jTKzmaUs%Kw_0!Rp)EHw@pn=_=&9Fi_rB_zhyAH(Za#hG|u?` zvQ92!YpI`HUdx&g)j4<07rBtHYQgRwS#cUW+eUwJ_9iKh{lFq(+4Iwu{bwETzVf1AU-mzI)=(WsyIQR{!U zD=eKilQQy@6tLs%+l89{B_j|BY>RjA;NXYfl$07Eb#!9cz`&p)_)jb6hg;*$+6(=j+_6gwRNNeN1eyQ*uX#ruCS2W-F*U{nUfP+5^vk%@_E$={7Vk795*TrZVc;D3(ckmJ}0mXYaN1U6y=y}cXCSTOn2 z8-l%~qlC)JbJm`Rd;0otYinx)dN02}8inIeZ$#HRbsdTt6M@w~$4`-qxa9Zt8-M!6 z5n82jenjf8`C3y(IeOe?Q~}%pY+k7egtBcP1Y4fQDE0WHSwXxI50V{~<;e1{NXqu0 zH%mOAdFj~ly-g$D)|Qs4r16}L3>!N;JLkZ9yhd%$Gf5R~L&J{;j-I;{9^O|*vcfwQ zcP}k{8X6i39j|{}ikjlWVsKj?jrw}i8FS2iJ@r_>sf^vX_uM`Ubq;Fe+z?nX8tZxZcj2l}OGl+s;p5wK@{;J?m%%9(BO;F}pKFQe-B^0B83*kI z`#t|!=)=%|M@zx#eD+NaOioF`>#XG*=?iO~jqEKWJ@Ik&72dHb9+Rft-+AGqvh6?E zHD_1yQ3`FOb{9|wP$-X|r{Ux%9lt0uzHC+?3?m`>VJrz7TF3_enCwDDhx#w4patd($Y|&5k zZV@-#U0ffzxMr#NKkJ(>TfEC3uFi6ZmZ#q0aHq13BKuxK@CvnBVsQQ7$)`Ydb+xvp z<^+7CUbe5qy<~iR9A)gr9kX7E=G?%vZ)9cp3LW8v{MPYyQb9dQQs#@YvAurn`1&R{ zxQZ=D9R`E-_Vz+rHW?+K>d`_a2J*^sVBQX!d@fa7IlHYwIgRMg1>MUkGG#|X-lsN( zA6xb{$7BTaTW8-gOG$MS+?_bD7f&7(|K?YBnKZVnO~BKwE-5r-)Bg+bZIgg{Q-Ycz zL?jzhBFlA