From 63c17b151d46953de6f57347ccaad749e1354c95 Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Tue, 7 Oct 2025 19:26:56 -0400 Subject: [PATCH] Added the golden shaker (playtime reward for Bartenders) (#40762) * Added a golden shaker (playtime reward for Bartenders) * Removed redundant icon line --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Consumable/Drinks/drinks_special.yml | 15 ++++++++++++ .../Loadouts/Jobs/Civilian/bartender.yml | 19 +++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 ++++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Drinks/shaker_gold.rsi/icon.png | Bin 0 -> 715 bytes .../Drinks/shaker_gold.rsi/inhand-left.png | Bin 0 -> 525 bytes .../Drinks/shaker_gold.rsi/inhand-right.png | Bin 0 -> 534 bytes .../Drinks/shaker_gold.rsi/meta.json | 22 ++++++++++++++++++ 9 files changed, 65 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 077462e73b..452b726ee2 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -43,6 +43,7 @@ loadout-group-passenger-neck = Passenger neck loadout-group-bartender-head = Bartender head loadout-group-bartender-jumpsuit = Bartender jumpsuit loadout-group-bartender-outerclothing = Bartender outer clothing +loadout-group-bartender-shaker = Bartender shaker loadout-group-chef-head = Chef head loadout-group-chef-mask = Chef mask diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index b9929b6704..931620b665 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -137,6 +137,21 @@ reactionTypes: - Shake +- type: entity + parent: DrinkShaker + id: DrinkShakerGold + name: golden shaker + description: A gold-plated shaker given as a token of appreciation for years of service. It doesn't make the drinks taste any different. + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/shaker_gold.rsi + - type: Item + sprite: Objects/Consumable/Drinks/shaker_gold.rsi + - type: PhysicalComposition + materialComposition: + Gold: 10 # Gold plated, not solid gold + Steel: 40 + - type: entity parent: [DrinkBaseMaterialMetal, DrinkBase] id: DrinkJigger diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index c8c80c7895..b8a8744915 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -1,3 +1,12 @@ +- type: loadoutEffectGroup + id: SeniorBar + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBartender + time: 52h # 1 hour per week for 1 year + # Head - type: loadout id: BartenderHead @@ -40,3 +49,13 @@ id: BartenderWintercoat equipment: outerClothing: ClothingOuterWinterBar + +# Misc +- type: loadout + id: BartenderGoldenShaker + effects: + - !type:GroupLoadoutEffect + proto: SeniorBar + storage: + back: + - DrinkShakerGold diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 085fcb5bbf..59e57739ce 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -270,6 +270,13 @@ - BartenderApron - BartenderWintercoat +- type: loadoutGroup + id: BartenderGoldenShaker + name: loadout-group-bartender-shaker + minLimit: 0 + loadouts: + - BartenderGoldenShaker + - type: loadoutGroup id: ChefHead name: loadout-group-chef-head diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index f0a782361c..30b1cb17d2 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -61,6 +61,7 @@ - BartenderJumpsuit - CommonBackpack - BartenderOuterClothing + - BartenderGoldenShaker - Glasses - Survival - Trinkets diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff1cc87098887a2c9b490f0ae0782b7e8ae8258d GIT binary patch literal 715 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo@GwnEjyr^ZK)BSX`Y^13>-iXD}xjxD+42tQV0J5OE3=IrGvOebzc&PSYUjVeN%G1R$B*Oje)Qwq(93&d{Us0895)eG7n{v^S z>Doq*xCNVKe=)S$xy3K)zp(D@s{)JLO~Jc5W_x>zvB!4FUJ|Jm-TQyb)F$~m1>fa& zzW;aU?{kf%7Aoq$4#YoxGl?-@KtKHV=5ErV3d0!k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zo^4|Izfa@aYSGOZKp_SNyT2AdinS!jFZe$YF#O)e7Yr2OEbxdd zW?%FBlnrvZ1|u_AoC(M_WMpCx0Mb!FoY~F-7S95*K_CH$ zLHc1dnxzatzfWLiU;(NyFfuk^TmUf@q=R(<#H1-eHV7~Q&0zwo46?KUvY@&Q4GciC zKIad3sP z%ONm9a05fn)-6vOc#q$zNjS+kJ8ko{iK>=9jPmcc@|2gYR}I)LV&$;*TMS#09z)HH z?F}>DXy}SNs57youyCB<_@Nq*?j+vu_5w?RbqV7QKJ$i4GWO@2ZZG6~u>OBBLz<@Wt~$(69B`3hL`{V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a03626d8b0e29b33222feaa551966010c56fdc63 GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zo^4|Iwp#T6K8?*8Kp}>8<*)UC6l+P4U+{k*VEDa_FBmAmS>O>_ z%)r2R7=#&*=dVZs3QCl?MwA5SrRIOG-LeC!*_ImN znda%K#lQhFmO+Y!K*4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgFpfh zgY?5_G)ozPexJb3zyefZU}S8-xBy}*NC)czh)Gj`Y!F}qn!^NE8DwbzWI=Tq8W@0N zea;{7Q0>3I0LYx_>Eaj?;r@1-BVU672g~$p|M%aVu*IP|Lm}%?;&YZX>syn%Un|~_ z4_Vm2)Y_!sa8GoxnN!rY2DOKKi(fdLms}8d|Cxf&UUdcEBj&Tcnl}855IA!7_%m_q z%l1NF-uyJ3wfh?*mqvib0*8eU+MAp_CDyQWsU~iE_F45{#N(fn5^_EsZz}OL_*U^t n-o7$AK!daSFZZbchsGl2UC#C*F%hEuAP0N8`njxgN@xNAiN=v_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json new file mode 100644 index 0000000000..3a5c625df4 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon taken from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi ; inhand sprites made by Failed (Discord: greetings_). Color adjustments by Hitlinemoss.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2