diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index d2e13f35e9..8585bae168 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -84,3 +84,7 @@ prob: 0.8 - id: TomatoSeeds prob: 1 + - id: ClothingUniformOveralls + prob: 1 + - id: ClothingHeadHatTrucker + prob: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 783c4e9186..fb84c0f136 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -23,7 +23,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretEngineering - name: engineering beret + name: engineering beret description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety. components: - type: Sprite @@ -360,3 +360,14 @@ sprite: Clothing/Head/Hats/xmascrown.rsi - type: Clothing sprite: Clothing/Head/Hats/xmascrown.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatTrucker + name: truckers hat + description: Formerly Chucks, this hat is yours now. + components: + - type: Sprite + sprite: Clothing/Head/Hats/truckershat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/truckershat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 77f7eb264e..f71364f361 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -571,3 +571,14 @@ sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformOveralls + name: overalls + description: Great for working outdoors. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8e0362d8dd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png new file mode 100644 index 0000000000..95a2ca01f5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png new file mode 100644 index 0000000000..7e2ef801dc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png new file mode 100644 index 0000000000..db26e66334 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json new file mode 100644 index 0000000000..48deea96a8 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation12 and modified by Swept at commit https://github.com/Baystation12/Baystation12/commit/80b2ded014aa871e6bceb6913b2961a23109aa23", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..42ea220dba Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png new file mode 100644 index 0000000000..6f2f21e14b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png new file mode 100644 index 0000000000..ef474f95ad Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png new file mode 100644 index 0000000000..79468f3b60 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json new file mode 100644 index 0000000000..c35ec06fb5 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/ac792e3226d48e5b3aaccff165ce100f7636a040", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}