From 1af61c5041230d81e0decc4e356d3808960643ee Mon Sep 17 00:00:00 2001 From: Ablankmann <103340990+Ablankmann@users.noreply.github.com> Date: Mon, 27 Jun 2022 19:25:22 -0400 Subject: [PATCH] Syndicate Shoulder Holster and the Outlaw's Hat (#9147) * Syndie Holster sprite * Outlaw Hat sprite * Outlaw Hat entity * Syndie Shoulder Holster entity * Tweaked sussy toolbox * Tweaked Syndie Holster * Outlaw Hat and Syndie Holster to the Uplink * it was a misinput, calm down * Tweaked holster so it can only hold weapons * and ammo too * fixing conflicts... from my OWN PR.... * Fixed another conlfict * fix --- .../Catalog/Fills/Items/toolboxes.yml | 2 +- .../Prototypes/Catalog/uplink_catalog.yml | 15 ++++++++++ .../Entities/Clothing/Belt/belts.yml | 19 +++++++++++++ .../Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Belt/syndieholster.rsi/equipped-BELT.png | Bin 0 -> 336 bytes .../Clothing/Belt/syndieholster.rsi/icon.png | Bin 0 -> 260 bytes .../Belt/syndieholster.rsi/inhand-left.png | Bin 0 -> 246 bytes .../Belt/syndieholster.rsi/inhand-right.png | Bin 0 -> 236 bytes .../Clothing/Belt/syndieholster.rsi/meta.json | 26 ++++++++++++++++++ .../Hats/outlawhat.rsi/equipped-HELMET.png | Bin 0 -> 486 bytes .../Clothing/Head/Hats/outlawhat.rsi/icon.png | Bin 0 -> 278 bytes .../Head/Hats/outlawhat.rsi/inhand-left.png | Bin 0 -> 437 bytes .../Head/Hats/outlawhat.rsi/inhand-right.png | Bin 0 -> 436 bytes .../Head/Hats/outlawhat.rsi/meta.json | 26 ++++++++++++++++++ 14 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 18bac6f837..0739060835 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -76,7 +76,7 @@ - id: Multitool - id: Wirecutter - id: ClothingHandsGlovesCombat - - id: ClothingBeltMilitaryWebbing + - id: ClothingBeltSyndieHolster - id: ClothingMaskGasSyndicate - type: entity diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c8f82e3c06..9f05adaf2c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -158,6 +158,15 @@ icon: /Textures/Objects/Misc/guardian_info.rsi/icon.png price: 14 +- type: uplinkListing + id: UplinkHolster + category: Utility + itemId: ClothingBeltSyndieHolster + listingName: Syndicate Shoulder Holster + description: A deep shoulder holster capable of holding many types of ballistics. + icon: /Textures/Clothing/Belt/syndieholster.rsi/icon.png + price: 2 + - type: uplinkListing id: UplinkEmag category: Utility @@ -406,6 +415,12 @@ itemId: ClothingBackpackDuffelSyndicatePyjamaBundle price: 4 +- type: uplinkListing + id: UplinkOutlawHat + category: Misc + itemId: ClothingHeadHatOutlawHat + price: 1 + - type: uplinkListing id: UplinkCatEars category: Misc diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 11bc837875..d89c258742 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -437,6 +437,25 @@ - type: Storage capacity: 20 +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltSyndieHolster + name: syndicate shoulder holster + description: A deep shoulder holster capable of holding many types of ballistics. + components: + - type: Sprite + sprite: Clothing/Belt/syndieholster.rsi + - type: Clothing + sprite: Clothing/Belt/syndieholster.rsi + - type: Storage + capacity: 60 + whitelist: + components: + - Gun + - MeeleeWeapon + - BallisticAmmoProvider + - CartridgeAmmo + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltSecurityWebbing diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index bc16137775..8961cec609 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -169,6 +169,17 @@ - type: Clothing sprite: Clothing/Head/Hats/hoshat.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatOutlawHat + name: outlaw's hat + description: A hat that makes you look like you carry a notched pistol, numbered one and nineteen more. + components: + - type: Sprite + sprite: Clothing/Head/Hats/outlawhat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/outlawhat.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatWitch1 diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..372ce46fe7ece22f1fbd8c325c46e62b079ec498 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;UsaSW-L^Y)f)UWo3o>iMDyt9eUoh$sOlc74bftax3f-!ydaj zo3(SV7w|dW%R9bGXVVqmCAZQOx>M~}Rp|sz>`VUMwoluNA^!dz*ME-LH#bFAI|_eX z_`ZwPP;mQH`M9f71&qJMZe&osZO4*ryBlaf1h`KR3E%EI^_bA@6Gx>|eugdD)TX-H zx;FpZq)m>CUiSP?DBk9rH&O6pxb8huhHE>LeqSozZ9M0D+lIZoDpm9DOMm^-9&xnR e6J%J!|0lv>_hJ@I{OfHC;(NOKxvX!lvI6;>1s;*b3=DjSL74G){)!Z!;7m^!$B+p3w-W=om<)MbiW~lZ;)%N;UBP)i zx^}`up>1oT7Iu7Iu*Gw-XV-lYy$0*&(y?yJah;HmbN%``Zzx1^FCP-blH$U5F z+4+TsGVRn4+*=DeI)KUCM>Ie0v#kNI1Nc;CstRjWIPVTC*qP;ag z)UXEW?y{acy%X=n-ZoasE)-2zHoZS;k-5Z6iJe>mdKI;Vst03z{S}3|Ln`LHz2(StSV5rm;q^pd2&-|PEa?-Pz>6(B2(~FB)`|Q@G>E-T@Jia*k?4Ei5o}Ssm#JQxNHSfOKp6M4q zANg}H?KC&UIEK&N8H-#@(`K2wDOr06W-ouw)9O*nns%7&3*Uv?i=QT4{4a3jYqXi| d<#2`xceqz^S-e`bHN6m|+0)g}Wt~$(696iRVafmi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json b/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json new file mode 100644 index 0000000000..af733b1b9d --- /dev/null +++ b/Resources/Textures/Clothing/Belt/syndieholster.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/94daddb1ac6625e2a7f7a88d62235ee44a480b5e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..429417d4441f33380bcea4b4c9f8d9bdd1e451f1 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|j3z;uumf=k2V6UPlZB+Lk|B zwLm~jjKAuO>nFC_Yx^AIjx3f-ab)7!ts9~5H}hTCOp}*R(p#mFvoX8{Aoc&HV7^;Ff@>|2oHgZoe)1 zH_w-|HZ{1kc(~=bhYFO7EU7w=uoBBCJAh53`Tr*R8u9 ziWv5@<}yU?J`m5q7$LoZjb!54ef9}4a_P&oOqN?I2Lx4zG2Ht-uX|$5D<+-bVT75;SKYkT`&W+Yfo^GSC@M_*} z*;4s@peIB3Sn2Gym0P0IYyI3qs-~_|XPd^ki)v4ATfVFKR*>4 zevC*R8e^jGl~N7>q?EAMhV{|=lv1R|K5H=|e!biP0K?d$KA$FMlnIL6S_2_vQEmBr zyMbZsziYr}?}>F_UXvr4mz2_lL*}#hP#x&*ZFmQ)wWLmNVBB0ZMkRz`8Of5DD`pm0fG8?y0+0~F8m5g zV6bTE%Az?(BrZoy53*tqa5@n6y8mVE+8Gs^PaDL{*G*njuduXa_uGYW@oVK@y{(-z zK}!C$)^|?l=ciX@)W}B~X|)vm3uJBh!1v2fCVu{*#|yWvTfcUSl#G3+V#3;7(_7r{ zAEfPFU*A6Wq~Ls|(*g#^Lh|1q&%d1?R=$??M@~(-j&$;>=hKfL{HVF9o^?u)-W_qf zTeVVh((|oY+TYiP5=a=XVX0-(+%wEY%Ugir-z|80xrVa?msNCdl{#?v&*N;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d96d6f196c06c47384071ffc616b42ca9e12b5c0 GIT binary patch literal 436 zcmV;l0ZaagP)rd(U91UT|5$D8Y^3K01#L|@ z4QUE~0f>l*h=_=YXl@b!D2k$XQfplTfKm$9T2#MDx;oHW|7X6ln%RNN^1Iw=SL2uG zSN}a*Kl$^g1|cRx^Dp{3I~@08=ewy(@}~e`j49nzk(Sx2)`^^2d7eiz8$$Av8@Hy6L808h=WG$7 ztNt#zf@7miBCZF-x}8>KXb7!!>57i7_U6vVTt<^d`AbaR{JjYt06Fy!$9?T+UXNMO z8sI9hj}M!Z?OeIqS{wDFFnA4+dvL@}`s>y13qLp(?VTGj89V?=DSUjs0qEZ^a4(Ml e5fKs5Z2bZ!+ptt6Uab}Y0000