diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/items/clothing/hats.yml index 8aac885ef1..e5888b251a 100644 --- a/Resources/Prototypes/Entities/items/clothing/hats.yml +++ b/Resources/Prototypes/Entities/items/clothing/hats.yml @@ -23,3 +23,20 @@ sprite: Clothing/chef_hat.rsi Slots: - helmet + +- type: entity + parent: HatBase + id: HatCaptain + name: Captain's Hat + description: It's good being the king. + components: + - type: Sprite + sprite: Clothing/captain_hat.rsi + state: captain + - type: Icon + sprite: Clothing/captain_hat.rsi + state: captain + - type: Clothing + sprite: Clothing/captain_hat.rsi + Slots: + - helmet \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/shoes.yml b/Resources/Prototypes/Entities/items/clothing/shoes.yml index 59c970247b..1d7d2a03be 100644 --- a/Resources/Prototypes/Entities/items/clothing/shoes.yml +++ b/Resources/Prototypes/Entities/items/clothing/shoes.yml @@ -83,3 +83,21 @@ - type: Sound - type: FootstepModifier footstepSoundCollection: footstep_heavy + + +- type: entity + parent: ShoesBase + id: ShoesBrown + name: Brown Shoes + description: A pair of brown shoes. + components: + - type: Sprite + sprite: Clothing/shoes_brown.rsi + state: brown + + - type: Icon + sprite: Clothing/shoes_brown.rsi + state: brown + + - type: Clothing + sprite: Clothing/shoes_brown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml index 2e36d893f5..fa65553d34 100644 --- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml +++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml @@ -124,4 +124,21 @@ state: chef - type: Clothing - sprite: Clothing/chef_uniform.rsi + sprite: Clothing/chef_uniform.rsi + +- type: entity + parent: UniformBase + id: UniformCaptain + name: Captain's Jumpsuit + description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain". + components: + - type: Sprite + sprite: Clothing/captain_uniform.rsi + state: captain + + - type: Icon + sprite: Clothing/captain_uniform.rsi + state: captain + + - type: Clothing + sprite: Clothing/captain_uniform.rsi diff --git a/Resources/Textures/Clothing/captain_hat.rsi/captain.png b/Resources/Textures/Clothing/captain_hat.rsi/captain.png new file mode 100644 index 0000000000..c546f5370b Binary files /dev/null and b/Resources/Textures/Clothing/captain_hat.rsi/captain.png differ diff --git a/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..93a7d44571 Binary files /dev/null and b/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/captain_hat.rsi/meta.json b/Resources/Textures/Clothing/captain_hat.rsi/meta.json new file mode 100644 index 0000000000..5bdf16c43d --- /dev/null +++ b/Resources/Textures/Clothing/captain_hat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "states": [ + { + "name": "equipped-HELMET", + "directions": 4, + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] + }, + { + "name": "captain", + "directions": 1, + "delays": [ [ 1.0 ] ] + } + ] +} diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/captain.png b/Resources/Textures/Clothing/captain_uniform.rsi/captain.png new file mode 100644 index 0000000000..153195f561 Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/captain.png differ diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..f64c76e54c Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png new file mode 100644 index 0000000000..c48c84c07f Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png new file mode 100644 index 0000000000..6b5de1dfa5 Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/meta.json b/Resources/Textures/Clothing/captain_uniform.rsi/meta.json new file mode 100644 index 0000000000..dd23dd26be --- /dev/null +++ b/Resources/Textures/Clothing/captain_uniform.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "captain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/brown.png b/Resources/Textures/Clothing/shoes_brown.rsi/brown.png new file mode 100644 index 0000000000..13c6a7cdaf Binary files /dev/null and b/Resources/Textures/Clothing/shoes_brown.rsi/brown.png differ diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png new file mode 100644 index 0000000000..36572038de Binary files /dev/null and b/Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/meta.json b/Resources/Textures/Clothing/shoes_brown.rsi/meta.json new file mode 100644 index 0000000000..d58bf644cd --- /dev/null +++ b/Resources/Textures/Clothing/shoes_brown.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/mob/feet.dmi", "states": [{"name": "brown", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}