From 2412b4f63442e74d3457dd22f66e5b001ca09b26 Mon Sep 17 00:00:00 2001 From: Momo Date: Sat, 8 Mar 2025 10:21:21 -0500 Subject: [PATCH] Aroace pride pin, scarf, and cloak (#35718) cloak, pin, and scarf added yayyyy --- .../VendingMachines/Inventories/pride.yml | 2 ++ .../Entities/Clothing/Neck/cloaks.yml | 9 ++++++ .../Entities/Clothing/Neck/pins.yml | 11 ++++++++ .../Entities/Clothing/Neck/scarfs.yml | 11 ++++++++ .../Markers/Spawners/Random/maintenance.yml | 2 ++ .../Loadouts/Miscellaneous/trinkets.yml | 6 ++++ .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Neck/Cloaks/aroace.rsi/equipped-NECK.png | Bin 0 -> 928 bytes .../Clothing/Neck/Cloaks/aroace.rsi/icon.png | Bin 0 -> 594 bytes .../Neck/Cloaks/aroace.rsi/inhand-left.png | Bin 0 -> 681 bytes .../Neck/Cloaks/aroace.rsi/inhand-right.png | Bin 0 -> 678 bytes .../Clothing/Neck/Cloaks/aroace.rsi/meta.json | 26 ++++++++++++++++++ .../Misc/pins.rsi/aroace-equipped-NECK.png | Bin 0 -> 423 bytes .../Clothing/Neck/Misc/pins.rsi/aroace.png | Bin 0 -> 518 bytes .../Clothing/Neck/Misc/pins.rsi/meta.json | 9 +++++- .../PrideScarfs/aroace.rsi/equipped-NECK.png | Bin 0 -> 634 bytes .../Scarfs/PrideScarfs/aroace.rsi/icon.png | Bin 0 -> 636 bytes .../PrideScarfs/aroace.rsi/inhand-left.png | Bin 0 -> 527 bytes .../PrideScarfs/aroace.rsi/inhand-right.png | Bin 0 -> 518 bytes .../Scarfs/PrideScarfs/aroace.rsi/meta.json | 26 ++++++++++++++++++ 20 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index c31ba95565..80c1408c53 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -5,6 +5,7 @@ ClothingNeckAllyPin: 3 ClothingNeckAromanticPin: 3 ClothingNeckAsexualPin: 3 + ClothingNeckAroacePin: 3 ClothingNeckBisexualPin: 3 ClothingNeckGayPin: 3 ClothingNeckIntersexPin: 3 @@ -21,6 +22,7 @@ PlushieSharkGrey: 2 ClothingNeckScarfStripedAce: 2 ClothingNeckScarfStripedAro: 2 + ClothingNeckScarfStripedAroace: 2 ClothingNeckScarfStripedBiSexual: 2 ClothingNeckScarfStripedGay: 2 ClothingNeckScarfStripedInter: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 02a8ec62b1..facafd0458 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -226,6 +226,15 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/aro.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakAroace + name: aeropilot's cloak # thank you happyman442 this was the best name idea ever + description: Cloak awarded to Nanotrasen's finest pilots on planets with inhabitable atmospheres. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/aroace.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckCloakBi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index ea781fb3f3..563a94779b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -45,6 +45,17 @@ - type: Clothing equippedPrefix: aro +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckAroacePin + name: aroace pin + description: Be aroace do crime. + components: + - type: Sprite + state: aroace + - type: Clothing + equippedPrefix: aroace + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAsexualPin diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index 659bce9964..22f92c4f21 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -153,6 +153,17 @@ - type: Clothing sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi +- type: entity + parent: ClothingScarfBase + id: ClothingNeckScarfStripedAroace + name: striped aroace scarf + description: A stylish striped aroace scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. + components: + - type: Sprite + sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi + - type: Clothing + sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi + - type: entity parent: ClothingScarfBase id: ClothingNeckScarfStripedBiSexual diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 78f7aed89d..289fee8596 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -104,6 +104,7 @@ - id: ClothingNeckCloakGoliathCloak - id: ClothingNeckCloakAce - id: ClothingNeckCloakAro + - id: ClothingNeckCloakAroace - id: ClothingNeckCloakBi - id: ClothingNeckCloakIntersex - id: ClothingNeckCloakLesbian @@ -144,6 +145,7 @@ - id: ClothingNeckAllyPin - id: ClothingNeckAromanticPin - id: ClothingNeckAsexualPin + - id: ClothingNeckAroacePin - id: ClothingNeckBisexualPin - id: ClothingNeckGayPin - id: ClothingNeckIntersexPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 51a96c06d3..68eea05131 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -124,6 +124,12 @@ back: - ClothingNeckAsexualPin +- type: loadout + id: ClothingNeckAroacePin + storage: + back: + - ClothingNeckAroacePin + - type: loadout id: ClothingNeckBisexualPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index fc73ffb9b9..bcdd592007 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -22,6 +22,7 @@ - ClothingNeckAllyPin - ClothingNeckAromanticPin - ClothingNeckAsexualPin + - ClothingNeckAroacePin - ClothingNeckBisexualPin - ClothingNeckGayPin - ClothingNeckIntersexPin diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..a4dcaedee72b38ade9fd253a1973e2763c95abae GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}zo@o+!&@c97j>Pr7VsFli{eLXBbmg{p@7|q0d$FXjDSykIv?V8^ zCvCFy&(O0EQ8us#>iaqMh%S&4ED7=p{*MM2RM*Z-0!nfgctjR6Fz_7)VaDV6D^h@h z5+$w?CBgY=CFO}lsSE*$nRz98ey$-3rh0~Y#yz`@6@Y5CrABzBd3tIwZ~!^13{s4& z42(dQ7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41QLK4q#s73S;_zms|oB3 zEI<_oM#ct=3m~R~bg(Xfm^1~*1_36ZIZR-cL6#Ok7F3s^fdNRCZo<!_8=p_^F<*B;{=^*C$8XI(x_j8)&0BoLnAxLJ z;i6YV@Qyb5M?sG|XD$+!efr13dym+W7e1%M3?79g%z85S^Dps9rDk=GES$~;C%<<_ zigKvzQ1>}l6rWlt^SaiOQ_NCE^QTIL)Ip`wM{aQx6$-66?aV2+)FI)ZauQcT#_g1y zxn9#Eo|Y_mvN_?toXU-l39jpA{1b2f6FW4gN3e~kq1f#8FiKc6hnT_Lrdwfv{|!LBEtxg|_{ z9m?y3dpNH*C9kyF&)Lg)^+z!0gg<=>zD7RE6{Yid{aMzZpZqW?flo~R)he$KeD!e! aGV%MkpD&*|Xa8eRQt)*3b6Mw<&;$UD=1|c9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9128954cb6638ee67f547426e14a346e393e3365 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUAM}fzX%hJ|N8)D3@^&MXt?gpd;OM?7@|Dyp0)wMH|fRdaA9+AZi419+{nDKc2iWH!r zM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**panEjJ1)!R3sS%!Oo}O9^96$~$gA^kx z10#^-1;o-&Hpr(MjLcwhCLr68k%>V7NJjy2W;+X5JPXJMfdn81>4(v1mNEdtY63e0 z3s8lDk+A{e0*I*~9jpr=CQSjdL4XNp4ii{qkfjBX1=VF}U;vWknJtf*Y~d5upmb#{!o=**pu{!cVBR&y57D~Ega;w{7K6fl^GNBSu}Q) mv`ktRLZ$|uHY3g*45XLNaj9PjDs=d#Wzp$Pz-wX~W5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1d96f7504892ab7944ab7925e6388dd825f71548 GIT binary patch literal 681 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%x_H=fhK6|mExb4~=;nU|YuUxtE|6{RN=S1JXe}B72^jN)cR#uj> zfxVu6$d@@1mi`$_*6spoUGt*)0gw_Z3Gxg6j}90f?cXm1l;te&h%9Dc;5!V$jK}j= zqyPmaN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hildv+Tu0M%?ujqptK^weVD0CHFv zq!?Kl7=bJ=AeM%*LB7>sWCn{f0ojI(Obh}*Itqw0+gZTkSwJ=jBmgl;Ka57RlmQrC z6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7EG>X6s4hbT1CT7=Eb-($r<*?k znLj*T977`9-%h*BcSwQ9EznFYR`T`l{cBjYJ97RVIWpr$@y4yZ)`@p&Bz_5qu25LW zB&t#ul)(40^2}FOYo4I5Uzm*38aMCszVTAF(bB+Wxz>lt&6O%nFQcs()f^q3+nhL} zuVawhb7}jRCV^y!In$PMF*GdK=i*3qIi?@S_9XJaJ%wCv{RI=ke|`G9^w@_-l6$(j zLM8+>atUeuaBhsFVdQ&MBb@0N$YAE&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..21fb10e4fced8c29b049df9594e833dccac936ee GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xRus3LK6|mJv-9-%%h&b@|9>pDa^=cb=S1JXf3Iv{pOuw$tX}wb zkEot~h^2qVmpKwk*6spoecG##45Wlgg8YL2qXULV`}Ye0WjPBxB8wRq_zr_G*AN9$JwrX?p54X@KsDP^BRtbQJ+&A(fE-o^ zDMnTXMj*=zh^3)ykZ&~@nZe>rK(-+x6N3PdjsoJ$b{4RB7LW}B2|x_e52Mj6WngAt zn841!0#spOWNg5=0Aeag2kQceNmGDq5MTnD!vt0tWN86pL3J4#7=UE?W{D^7Iocn)bYSRW zU<#;XJK=r(d2RF*sZUW2j+fKZ^*FqGBO@BruO;7N;Z9In?%w~K$720fUX};`yqy=n zaHy~aNv-8IYztFhdoIIlSJ~aUajhKFy%vV6*Udjv$~*o0WI63$=E{`^dN~vrTp1WO znEt3Qcy?)9^k=>++iC^Euiu$BU54S8Pr`u>8(5uKW~eRwDmmd5o6ml(XolOy+pbHp zv+v8EeW}mz+6S2p%%=?fxQ{dJczWlP!iMVRqORt{oChLb-#C;#tJ|++fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^+AG#Ht|;!HrcAtMum0FaIX z;>>myuy_`b4FU;34AKvy(JW(fr!h&1i@=B19xwb^!}(} z8PR^krH*xHhXwQLW?!J%5{>5;*QZ|F@lW-6%&coW>{2_*qQ7U)-1ay#24pG>=zG0n XW0@j#Oi5ou2_)v}>gTe~DWM4fz({UU|NoDkv@vbTiTo{hR1NL) z972K0RXQV0J5OE3=IrGvV60|llPo%{sd&Edb&7d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index a9e20917af..a25719fabe 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer by centcomofficer24, ally by FairlySadPanda", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer by centcomofficer24, ally by FairlySadPanda, aroace by momochitters", "size": { "x": 32, "y": 32 @@ -21,6 +21,13 @@ "name": "aro-equipped-NECK", "directions": 4 }, + { + "name": "aroace" + }, + { + "name": "aroace-equipped-NECK", + "directions": 4 + }, { "name": "asex" }, diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..b361d171878df02dec659f4422d137f05df48b10 GIT binary patch literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yrY$*f=knG6kHzx0-1+wA{hRY*Kp9&G9gwl?B|(0{|G|Jk%A45@ zD8yOd5n0T@z;_sg8IR|$NC65;l(KW=8_v|)S z0IJ!R8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6UD$P5-|0!MXrq(i9*Y1ek#4Fo9JDSy}*D zP+f)w1|V6!S>nliPB(u7GQWDdIEF;HznylP?}!42tK*UX|DOnY3x5cFToNYi=M$Z? zw_vxx!aXW1P7WKG8s3)0roX73eubseh}kGbZSF^g^n^9xNpl5z7=qVH89m#l@wECy zPXa5$?W`@FIz3t&)-)Vxauc2~tM#e9#*ELu*tsrnePGLFaryVuLEB-z=Ba2#M3-3HCzwf`kDFGyLYVbzO8-O zFi-x@wbz?3-q@!*X&+y&-k;+K=3F}b>|8SQ`^~xMIc)bH_}6p6u%`CbJhsNmeAXOu n%5Lo6azI~qju4Y#fS0DcS6(a|&n6ogP+)kv`njxgN@xNAMqa|z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..40da622c6b2d1bbf44fcbea8fc376db9afd633c5 GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU?_9q6?alk^d&S{q|e`QVpoy(q($WzWw9bKH@tx}N_`QKfC>-d-&hcD`rPiXRWJXgYkva&=bd zhl{}-f%O7gghf{~To7QZ2`znod5yZ<<3Ac(Dh2Ds7PS@_<~1@09n`eD=C-;(BF1S) z#z`#0gt!>LIxTVWpKiFJdMtrOfA2 l=2r|#eA2z)`Tj$tdl~#=#ouJcdb|S#gQu&X%Q~loCIAv1!x;bo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d21cedcbcbc8edfa3ddf6de697524ef29c5de27e GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yrY$*mEI<_oM#ct=3m~R~bg(Xfm^1~*1_36ZIZR-cL6#Ok z7F3s^fdNRCZSOh2jx4$_hg#WFWqFURGxx$;y z&ak~067R&w%ET(d(am+q>|N{R%JWrKZ2wouxcZBK`_0B()4oA;-#6JqVTVQU^lr*( z<LzpTfXIS8y{;+@UpxP!}N f-wFeE)~)l7ImKQ7wBr4KkPAIs{an^LB{Ts5ZDEVl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c4a3982d904ef014a2a61a55f209b787e062a6 GIT binary patch literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yrY$*mEI<_oM#ct=3m~R~bg(Xfm^1~*1_36ZIZR-cL6#Ok z7F3s^fdNRCZSVq)UxaA+#|5%YI-%`>yN2b+qfn(bYjzd2!jgTe~DWM4f@k)x~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json new file mode 100644 index 0000000000..b226dc0349 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14, recoloured by momochitters", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2