* 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 <milonpl.git@proton.me>
- 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
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
- 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
- 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
- ClothingHeadHatHopcap
- ClothingUniformJumpsuitHoP
- ClothingUniformJumpskirtHoP
+ # Generic
+ - ClothingHeadHatBeretCommand
+ - ClothingHeadHatCommandSoft
+ - ClothingUniformJumpskirtCommandGeneric
+ - ClothingUniformJumpsuitCommandGeneric
- type: latheRecipePack
id: ClothingEngineering
parent: BaseJumpsuitRecipe
id: ClothingUniformJumpskirtColorGrey
result: ClothingUniformJumpskirtColorGrey
-
+
- type: latheRecipe
parent: BaseJumpsuitRecipe
id: ClothingUniformJumpsuitLoungewear
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
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
--- /dev/null
+{
+ "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
+ }
+ ]
+}
--- /dev/null
+{
+ "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
+ }
+ ]
+}
--- /dev/null
+{
+ "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
+ }
+ ]
+}
--- /dev/null
+{
+ "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
+ }
+ ]
+}
projects / space-station-14.git / commitdiff
