From 329a0a875bf3bb1b2be616e62baddcf0a43017cb Mon Sep 17 00:00:00 2001 From: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Date: Tue, 13 Aug 2024 05:20:12 -0400 Subject: [PATCH] Grey mantle in winterdrobe (#29774) * add the mantle * fix a few things * fix merge conflict stuff, remove from winterdrobe and lathe. * Add mantle to loadouts (20 hour requirement) --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Entities/Clothing/Neck/mantles.yml | 11 ++++++++ .../Loadouts/Jobs/Civilian/passenger.yml | 24 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 6 +++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Neck/mantles/mantle.rsi/equipped-NECK.png | Bin 0 -> 478 bytes .../Clothing/Neck/mantles/mantle.rsi/icon.png | Bin 0 -> 286 bytes .../Neck/mantles/mantle.rsi/meta.json | 18 +++++++++++++ 8 files changed, 61 insertions(+) create mode 100644 Resources/Textures/Clothing/Neck/mantles/mantle.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/mantles/mantle.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 917826886b..98ecb2cbfb 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -35,6 +35,7 @@ loadout-group-passenger-mask = Passenger mask loadout-group-passenger-gloves = Passenger gloves loadout-group-passenger-outerclothing = Passenger outer clothing loadout-group-passenger-shoes = Passenger shoes +loadout-group-passenger-neck = Passenger neck loadout-group-bartender-head = Bartender head loadout-group-bartender-jumpsuit = Bartender jumpsuit diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index ba79ca4d46..6844177d77 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -74,3 +74,14 @@ sprite: Clothing/Neck/mantles/qmmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/qmmantle.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckMantle + name: mantle + description: A soft mantle, made with the same 'synthetic' animal furs of the iconic winter coat. + components: + - type: Sprite + sprite: Clothing/Neck/mantles/mantle.rsi + - type: Clothing + sprite: Clothing/Neck/mantles/mantle.rsi diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index ae86a4214f..535c2aacf3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -8,6 +8,16 @@ role: JobPassenger time: 36000 #10 hrs, silly reward for people who play passenger a lot +# Head of Greytide (for grey mantle) +- type: loadoutEffectGroup + id: MasterGrey + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobPassenger + time: 72000 #20 hrs, fun mantle for the most experienced greytiders + # Face - type: loadout id: PassengerFace @@ -47,6 +57,20 @@ equipment: jumpsuit: ClothingUniformJumpsuitAncient +# Neck +- type: loadout + id: Mantle + equipment: + neck: ClothingNeckMantle + effects: + - !type:GroupLoadoutEffect + proto: MasterGrey + +- type: startingGear + id: Mantle + equipment: + neck: ClothingNeckMantle + # Back - type: loadout id: CommonBackpack diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index f3a1b61695..4d0328d7cb 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -173,6 +173,12 @@ - CommonSatchel - CommonDuffel +- type: loadoutGroup + id: PassengerNeck + name: loadout-group-passenger-neck + loadouts: + - Mantle + - type: loadoutGroup id: PassengerOuterClothing name: loadout-group-passenger-outerclothing diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 878c14dc70..5c1616a33d 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -32,6 +32,7 @@ - GroupTankHarness - PassengerJumpsuit - CommonBackpack + - PassengerNeck - PassengerFace - PassengerGloves - PassengerOuterClothing diff --git a/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..41cfa306bb1171e405ddf62d655f880fc2657dc8 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw9@(*M^~^dSZ;!}`5PLftQxhXA3j?5}_tyWLfD}hbkYDhB2w=F^ zyf+dk##!JISEaj?;r@2o>%JBRo>p$L+W+SB=3Sa9#@2H) ze)q!(JQq$c5AK<|E(k_CKBtZsK6z2TTPH7R(uAC8D|#3Nn)WjunQd&W z{6^aG)0739Z@QQ(96lW5Fkx%t>??fyM{=&Qd0dV2QcVdttUXasA#LrnSL_a+@8)?= zYCIa?xvK1}+nu-h+=>U*O^o+D#Gy6)eV2!4+w5x7rt{?tDQ!Ea3p8jb-e;CmP0=hm zUeC;s_@jP3gT>i@HStVtxd+%Bq&F~L*w6f6Y4+((xqGL6IL+81I@RL$J^4jng%jVL z*}kQ}T9 zU{@FB&oqzePE)QTyTdx3+rB0&KPz_R> O89ZJ6T-G@yGywoTkG}H& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b6b8e624f61a4432575fa0aee60737d2d0a0ef GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUkL+0HB9}F0zyqVpA zLYxI2k;M!Qe1}1p@p%4<6rfjLS&0){AM?ZbN&)l1RFh=+}ml?nEw^@?z42w?6t#~Qga;kt~(k%H#mqZut z6?5$GPd910w%s{y@ps>X!=kda;%5{>w{9&mXg(6GIrC&*^}FyIj{AF@KCR#Io%y)D W=x5_Rj>|x&FnGH9xvX