From 71d3689c421594bb8bd02e33d3937aefff7273b1 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 9 Aug 2023 19:17:37 -0600 Subject: [PATCH] qm turtleneck (#18909) * qm alt clothes your mom * textures * retrieve textures from the void * Update heads.yml * resprite to fit * fixe sides quick * fixe a hole * why is this hole here * why does this happen to me * fixed the weird hole thing --- .../Catalog/Fills/Lockers/heads.yml | 2 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../Entities/Structures/Machines/lathe.yml | 2 ++ .../Prototypes/Recipes/Lathes/clothing.yml | 14 ++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 427 bytes .../Jumpskirt/qmturtleskirt.rsi/icon.png | Bin 0 -> 497 bytes .../qmturtleskirt.rsi/inhand-left.png | Bin 0 -> 629 bytes .../qmturtleskirt.rsi/inhand-right.png | Bin 0 -> 635 bytes .../Jumpskirt/qmturtleskirt.rsi/meta.json | 26 ++++++++++++++++++ .../qmturtle.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1044 bytes .../Uniforms/Jumpsuit/qmturtle.rsi/icon.png | Bin 0 -> 330 bytes .../Jumpsuit/qmturtle.rsi/inhand-left.png | Bin 0 -> 563 bytes .../Jumpsuit/qmturtle.rsi/inhand-right.png | Bin 0 -> 542 bytes .../Uniforms/Jumpsuit/qmturtle.rsi/meta.json | 26 ++++++++++++++++++ 15 files changed, 92 insertions(+) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1a4eae885e..8221c7c02c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -7,6 +7,8 @@ contents: - id: ClothingNeckCloakQm - id: ClothingHeadsetCargo + - id: ClothingUniformJumpsuitQMTurtleneck + - id: ClothingUniformJumpskirtQMTurtleneck - id: ClothingHandsGlovesColorBrown - id: ClothingShoesColorBrown - id: ClothingHeadHatQMsoft diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 821760ae52..e5c7c97a01 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -281,6 +281,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/qm.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtQMTurtleneck + name: quartermasters's turtleneck + description: A sharp turtleneck made for the hardy work environment of supply. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index a869f596ac..40c62cd3cb 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -442,6 +442,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/qm.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitQMTurtleneck + name: quartermasters's turtleneck + description: A sharp turtleneck made for the hardy work environment of supply. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 012e2b5cba..526f4a209b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -675,6 +675,8 @@ - ClothingUniformJumpskirtPrisoner - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM + - ClothingUniformJumpsuitQMTurtleneck + - ClothingUniformJumpskirtQMTurtleneck - ClothingUniformJumpsuitResearchDirector - ClothingUniformJumpskirtResearchDirector - ClothingUniformJumpsuitScientist diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 9898142a91..6549640456 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -348,6 +348,20 @@ materials: Cloth: 300 +- type: latheRecipe + id: ClothingUniformJumpsuitQMTurtleneck + result: ClothingUniformJumpsuitQMTurtleneck + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtQMTurtleneck + result: ClothingUniformJumpskirtQMTurtleneck + completetime: 4 + materials: + Cloth: 300 + - type: latheRecipe id: ClothingUniformJumpsuitResearchDirector result: ClothingUniformJumpsuitResearchDirector diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1b58594e9e2707d53fd5bcf24f0ef94012286b33 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB}^H zAGHO=+MAkfc297!va-6j&Gyyp=EaK_Z{EDQCs}p+^y&3cI{*LwUz|R(0jQd0YvgNI;Bi^H!05yO{pGAjX7+q5*_9HRFkeO7ef@5#&)*3ag|F{uaXssces(V6(X;%<;4%lJ=bU%et@YS{J+J5%=Zo0J3bTmk z+w%%r@|)V23d=IKEjRi3N=E)z;T_IPS1sdmyWaocIL>^)(d*c(}Vc zF*$HE@q`73oMQh)eU~jiBxbvd7KE`(t2p-1IL?Rd<`>8uodJzV$}I{ z&wGzmg75##X>3oPI>reU{9DY*^u%6h%Af5;|B@L`)$dU_@aH}Eq5f;a4HvnV1S=W+ Q0R|m|r>mdKI;Vst0M1XtT>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7868175f99e4a48bbe4feded524955f3b13708a3 GIT binary patch literal 497 zcmVPx$t4TybR9J=WmA^{@VHn3hMTQO0s~$P1Q*aK=Qe%S(Px%FG)l}RCt{2*)dGpP!I;--&IqoLq)pKfiNK@L+1$QC=yb|kc|!*7%MR{BZe+4 zm9nrfF?cCc29_$>Y2}5bgINg!EM!Eo(6Ka@)7E~^eusn6|4EUR$i6(E&wjQKAR;0n zA|fIpBBCO8x0i;Uk#?(wUbiu~ z^PB6-2*L=xZUgOB4WmKFsuC)ffFzslvB|T0C1x_~3a_lDuM>n3g3zveT)7I+?jBbz z0os^=MGqjayxn7y%H0R#=^oqk4l7py+TG*IB_L1t*hb|}0U&?(m?+&N*Xd{h^Z_E{ P00000NkvXXu0mjfus$yU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f927e8a343ba640971578c46cdf028bf4635c134 GIT binary patch literal 635 zcmV->0)+jEP)Px%HAzH4RCt{2*)L4vP#g#FZ!e7G#D$#!!B8ZdKrf(|CL{zg$B7B#C5RJfg1}%% zX3n5aJOgUt4B0%88VsUm83N2rk~HLZ=4jSG+uqyT(Y?#}lPt}ew)^(i*X^x8fQX2Q zh=_=Yh=>5-V7Dph?K)4*=hP{_;cw zp6A6U|J(jNrlOlSZ{H8;72S42>a`M@ekF0R?agHbVT7h%LA_Q&x7`?9+4o|bH&cLN z^;!uZKP@JfX(Dq`2LO6`(-zVzI=wysV0CTuPC*zU2>bBAO&@kvO!DT*jDS)1%Cy`4 zYqojE-U5?&-dxncid6yr2blth2)6c)aD4fK^Xnz7S0n6v{etysg!Ahq9ACa*Ywsxj z@+*22nC4B(q!$q=rKDUgV=x$C)UwrTc>oHZ2bko|yI7eKpp=r=yVJ2B`g(T?rPN&f z{@Lcu6yWCKMC*fZE=~#`{%<*Kw#z+(ABP)pwce(Z01^|6{j>Xc-=e3&rg?{1U&7%( zK}8k7MrI~BPSOAPOr`VYU7$<>Tt7)7A|fIpBBB{{tz)c1`-zZi9b;WuPlUSdhCDtz zVRdZ?O=u-`tz&FLYXrE~F*c!90M|OkCbZMK)-fj1^9KpL VViFZB{+s{+002ovPDHLkV1k`KDJ}p2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json new file mode 100644 index 0000000000..cb8a2af087 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Derived from beestation qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ca28756915b1e8058afe11f402497a07a6ea524a GIT binary patch literal 1044 zcmV+v1nc{WP)Px&&PhZ;RCt{2n!igMVHn51*EXe^iW(#tJV(tC4$>h=MR1XZ11V0OI(N{$AXI2c z$AVKbbnYJ@A{;3$ff5N04#y3~u~)<(YN1LY$aQGnw{L#ud2@HM_Wdkxa>?EIdB69* zPmVkfpin3j3WY-PpQ2GuSYMg*03g3x)w&%E3Z|7wMsRRc=cBAX>4awS?0g)>N^RgE zWb~(J68QG@l#jCd4=CcR%R09AT*M|Okx5>F1rwW?1W?23vJL=V5GFAFzmshonJHBL zdsOk&WgW#z4Y7&IhEe>S-6_8i^`~bNe6r1>jDAl8)>r1dOfu4NER&32Wb9$X*!;O) zCbZM<1x3HF6)-)Mz}e{)-)EgTII8oz1M89G*|%aG$-a_I1HQ&Krh)R|CrBvefdGJ#QHLeI>!W49Vezg$4f8 z^6AZeJf3}qAIG2Z^8F3}j$e1bmwqRx`h7nM0zf*Q=C42O0>B9X1HxgH%Vo+XNu<+h z7>3dDbKADb`XmDYz%)(%+I3y%y3XHQmPNgs6im~yEFO>Rx>DC78z73=w%rm`7`U#> zwJpo)x+;1hodj*$Mn0d{L=(b5G`dhIXzh+uAg=&%nQNMcwY4?awvDiiXt&J<(I>9} z(==O_oM9LZxgkjW)+Za#DcQ&-p<(Njwt(X}a2%)Sv7i{XzCxi;C=?2XLZP@jNd1Ay z>Taw&o}G{5`R13vdjmvva*H0*E>>y){|II0s-|xfd5XtXWwRYOF6={+IZ1SuoKQi_ZQ;8_f zFE4y8iT4x3`Q-(s5>Z~BXE9M@Ag_St))eu0ScqC;EHW{W4QSVwGfc#u0GW!kbP{BJ zIm1S5(2_ygfZH&6#vrkf>jEG5$ASHy0LJm^>33;iKM`Yk5<4TEOE%!$i$}tqyB!9I zF>UYB&Q<*ZlrMLy&$E7k`0Qq&4@0%%oY&lw&hex9ad4a9ip}v69uUb5ix+U8ze;h(3UoU zi5rG7G!y*LmNtMTL7B|!2TW6pLk6kDwY0R<@H`-seEi_H#Gz39!~6o^GfXg(pgm;( O0000Px$1W80eR9J=Wls#(0KoCY>oX8MJKvI!v+gK+M0o5Ww;6ew;3FIrd^cAcVP|Aucqc6J98Mfq=xhJ(XsI5?c!Ys-~1IY1aV zynpO@d3s>J+}bt3boMFI>`9WRu>rt$J;K1DG2^=)0BLNH-b8By0PEF;G&anaTYT3$ z8q?UYUTq|Dasv%v;Bb52KN>GZWT2_@rRRS(&;_jxw0+&3{erGg1EP9GQDmFU+xVKh z$7gn53tlJRHl{2~k)|j(%d)dwF3)q3=8Ys6AW0HCuj?9Pj9nK+A(fLGI89Pjl{l%Q cD2no%9}#&>xs&b1HUIzs07*qoM6N<$f~6>jg8%>k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..090ddae8dc811963393d03a3830f7ec27cbc519a GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIRCt{2nL$p%Koo}ms+gE)0$sT3RyYAMVclp*So8p%0IuNDBPb{E2AU8& z010u)3S9yVSh#X$OkI#RLSpB&eK39YeVew-2#VOP!vT`6h%=KMNt$*QL@wP z)Wcq<9-4mJw^kAkmrzt#vr)n8^b6OQ=NOJx@ihQEJin2~%cJG~I{zSybwDY|M6Xj1 z1K(R0P_3car~p|10k>KM00h1V%H8ACqQGJR04!!p1ipvicm=mw+c*ZkhsA7ZMau-6 z0TInc1t(|68^_;-;omoIyDg6v6*dE+XESU2uCz?B&j4w#7;yhIC9Uq1ewz-u zu<|u188yIm0k&aT1YL8N!czJfpa$43z&2`t?E-95dIJix6;8W_<)ZX6Kn<{6KvuZI zQ;}-`XAmoH25^U`q6~<#K+f<~lmXkA!cz(&4d4t2Zul8?BFb3teE(M`3K7nEC{o9vm_TL|Uk6v)$-n{Bt_ZG@KxIjVi_Oo6Ux7V~}?w{$hJWV}Qfnh}` zcZGD_!(X3d?*7xc$JTIsdim3hyB9@&Zp>1+U(CqxG>LO-7URVOK$_t}wVux|;ZIlg zTw-9D(X;G>t@z!4JWrD{A71_*+|!JPA++tX5+m4KSm(~on{Up4uC*Q-C7 zruxBV3RP*7mi*n%z034}CHstXg`d_R*5<9Kkn3`r`ffXKWma5f!jQ`oP){<>qae|fvb-W`XYAJ@)%xBqc%)!uoM)BjJ; zJA2A=OVrvc(W~y}Nnd5SJF9$b7gkzsWIWBz!`8g# zYwnz0Q(-|cnD{WK=gj4f`>$_G%=GSv>%I-7I*S=+D}B}plHMTWI9qOJy6Qe=pd!_8 zN>ZntuP{g}7i$JGZ#r^*naZ)CmAo5rog)AKHg%|}%mu1B!U{4#W!YgZGq-1%My3rP dKg<1MO!WK7;~}^F3oybNJYD@<);T3K0RX@)^F;sv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json new file mode 100644 index 0000000000..f92fbbeffd --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Derived from qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}