Added the golden shaker (playtime reward for Bartenders) (#40762)

* Added a golden shaker (playtime reward for Bartenders)

* Removed redundant icon line

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 077462e73bcb4651072ee86b0801b9619d80e059..452b726ee27d2220d15ad80f9f7acf484448c703 100644 (file)
--- 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 b9929b6704b9b40b05a4de953c90133b429117a8..931620b665d09a6905fca6b087247bd3a77dff82 100644 (file)
--- 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 c8c80c7895d7c3cda33a316f0c4f517209d98259..b8a8744915db46e71bb9737ead126acfe8bd1219 100644 (file)
--- 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 085fcb5bbfb675da6ccc54e4f225db729acb5321..59e57739cee02bf9bf81388735d69a5ee19e89a4 100644 (file)
--- 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 f0a782361ca8a01a1a2eca7ab98df7365802fe4a..30b1cb17d25bfeda82c0a3c944accc502c555fd3 100644 (file)
--- 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 (file)
index 0000000..ff1cc87
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..d7d2828
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png differ

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 (file)
index 0000000..a03626d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png differ

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 (file)
index 0000000..3a5c625
--- /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
+        }
+    ]
+}