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)

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 917826886b1614283347af0a1dcb168cf8bd3026..98ecb2cbfb570af88429bd593cf0551c0bc9a193 100644 (file)
--- 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 ba79ca4d46bf8c6502362636e4c2b46e2a22ef0e..6844177d7756f37b6e87e7e333810e227573628e 100644 (file)
--- 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 ae86a4214f7f4efbe93bd96bd0f23d818e6d2d67..535c2aacf3da15865f03cf99237e2afdc44d2355 100644 (file)
--- 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 f3a1b616951c61566f5e65bf24e32aad7a249df1..4d0328d7cb40ef49c0baf01ed22c4bcab89e8ff5 100644 (file)
--- 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 878c14dc70a04c46d3cd09e863b91b166f57cf1c..5c1616a33db3f8e6725590a78c53109576c9495e 100644 (file)
--- 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 (file)
index 0000000..41cfa30
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/equipped-NECK.png differ

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 (file)
index 0000000..d7b6b8e
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json
new file mode 100644 (file)
index 0000000..6a25a82
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "drawn by Pigeonpeas",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file