From: Golden Can Date: Tue, 22 Apr 2025 18:35:43 +0000 (+0200) Subject: Command uniform (#32103) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=106a31410f52580381fa693d4f318ff256ce7a56;p=space-station-14.git Command uniform (#32103) * Added generic command jumpskirt, jumpsuit and cap, and made them available in the HoP's clothing printer. * fixed generic command jumpskirt and jumpsuit. * Updated generic command jumpskirt/-suit textures, added generic command beret. * Fixed game-breaking bug in previous commit relating to the command beret. * altered generic command soft cap/baseball cap sprites. * Update Resources/Prototypes/Entities/Clothing/Head/hats.yml Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * review * whoopsie --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Milon --- diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index b665708eba..260a1c385f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -192,6 +192,22 @@ - type: Clothing sprite: Clothing/Head/Hats/beret_merc.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretCommand + name: command beret + description: A beret with a Command insignia emblazoned on it. It has an aura of authority. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_command.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_command.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBowlerHat diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index d2eec63232..db50463978 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -99,6 +99,22 @@ id: ClothingHeadHatQMsoftFlipped name: quartermaster's cap +- type: entity + parent: ClothingHeadHeadHatBaseFlippable + id: ClothingHeadHatCommandSoft + name: command cap + description: It's a baseball hat painted in Command colours. + components: + - type: Sprite + sprite: Clothing/Head/Soft/commandsoft.rsi + - type: Clothing + sprite: Clothing/Head/Soft/commandsoft.rsi + +- type: entity + parent: [ ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCommandSoft ] + id: ClothingHeadHatCommandSoftFlipped + name: command cap + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatCorpsoft diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 13f8cc5767..8fd5b5a831 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -221,6 +221,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi +- type: entity + parent: [ClothingUniformSkirtBase, BaseCommandContraband] + id: ClothingUniformJumpskirtCommandGeneric + name: command jumpskirt + description: A generic Command-colored jumpsuit not associated with any particular department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtHydroponics diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 3ecfad5f39..0caa9c6c1d 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -396,6 +396,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi +- type: entity + parent: [ ClothingUniformBase, BaseCommandContraband ] + id: ClothingUniformJumpsuitCommandGeneric + name: command jumpsuit + description: A generic Command-colored jumpsuit not associated with any particular department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHydroponics diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml index 728082036e..aa95781729 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml @@ -35,6 +35,11 @@ - ClothingHeadHatHopcap - ClothingUniformJumpsuitHoP - ClothingUniformJumpskirtHoP + # Generic + - ClothingHeadHatBeretCommand + - ClothingHeadHatCommandSoft + - ClothingUniformJumpskirtCommandGeneric + - ClothingUniformJumpsuitCommandGeneric - type: latheRecipePack id: ClothingEngineering diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 4558809e94..c5f81153e2 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -82,7 +82,7 @@ parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtColorGrey result: ClothingUniformJumpskirtColorGrey - + - type: latheRecipe parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitLoungewear @@ -245,6 +245,18 @@ id: ClothingUniformJumpskirtCMOTurtle result: ClothingUniformJumpskirtCMOTurtle +## Command (Generic) + +- type: latheRecipe + parent: BaseCommandJumpsuitRecipe + id: ClothingUniformJumpsuitCommandGeneric + result: ClothingUniformJumpsuitCommandGeneric + +- type: latheRecipe + parent: BaseCommandJumpsuitRecipe + id: ClothingUniformJumpskirtCommandGeneric + result: ClothingUniformJumpskirtCommandGeneric + ## Detective - type: latheRecipe @@ -823,6 +835,16 @@ id: ClothingHeadHatBeretCmo result: ClothingHeadHatBeretCmo +- type: latheRecipe + parent: BaseCommandHatRecipe + id: ClothingHeadHatBeretCommand + result: ClothingHeadHatBeretCommand + +- type: latheRecipe + parent: BaseCommandHatRecipe + id: ClothingHeadHatCommandSoft + result: ClothingHeadHatCommandSoft + # Non-command hats - type: latheRecipe diff --git a/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..776465d408 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..1daddef9a1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/icon.png new file mode 100644 index 0000000000..d0e062cbf8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/inhand-left.png new file mode 100644 index 0000000000..5394ff75cc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/inhand-right.png new file mode 100644 index 0000000000..aff7da3196 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/meta.json new file mode 100644 index 0000000000..df45fd1c6e --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_command.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by GoldenCan(github) by modifying beret_engineering.rsi which was taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..02c11333d0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..313c637d9a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-equipped-HELMET-hamster.png new file mode 100644 index 0000000000..b1da595e5c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000..b35ef1002f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-inhand-left.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..98f6144b97 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-inhand-right.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..f2e8c8553a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/icon.png new file mode 100644 index 0000000000..b82f02a745 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/icon_flipped.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/icon_flipped.png new file mode 100644 index 0000000000..e9c9703ee6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/icon_flipped.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/inhand-left.png new file mode 100644 index 0000000000..70f7879f06 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/inhand-right.png new file mode 100644 index 0000000000..6e03576467 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/meta.json new file mode 100644 index 0000000000..173439b130 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Soft/commandsoft.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by GoldenCan(github) based on cargosoft.rsi which was taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, repaletted for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_flipped" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..2c91f62170 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..bfcf0ccf7c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/icon.png new file mode 100644 index 0000000000..6787e7a790 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/inhand-left.png new file mode 100644 index 0000000000..858a54c107 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/inhand-right.png new file mode 100644 index 0000000000..3a6e374a72 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/meta.json new file mode 100644 index 0000000000..e3f1b0fffa --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/commandgeneric.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made GoldenCan(github) based on both the medical jumpskirt and medical jumpsuit, both of which were taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite by GoldenCan(github) based on medical.rsi in hand sprite which was scaled down from the sprites from tgstation by potato1234_x. Monkey sprite made by GoldenCan(github) based on medical.rsi monkey sprite made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..363eb6614c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..95f7c55592 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/icon.png new file mode 100644 index 0000000000..3258a2a7a6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/inhand-left.png new file mode 100644 index 0000000000..858a54c107 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/inhand-right.png new file mode 100644 index 0000000000..3a6e374a72 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/meta.json new file mode 100644 index 0000000000..6d0322eabf --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/commandgeneric.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made GoldenCan(github) based on medical taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite by GoldenCan(github) based on medical.rsi in hand sprite which was scaled down from the sprites from tgstation by potato1234_x. Monkey sprite made by GoldenCan(github) based on medical.rsi monkey sprite made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}