diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 44e2fbe4b0..d8cf14b343 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -6,6 +6,7 @@ ClothingBackpackEngineering: 3 ClothingUniformJumpsuitEngineering: 3 ClothingUniformJumpskirtEngineering: 3 + ClothingUniformJumpsuitEngineeringHazard: 3 ClothingShoesColorBlack: 3 ClothingOuterVestHazard: 3 ClothingShoesBootsWork: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 5e1d7d4384..696976dfc3 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -197,6 +197,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitEngineeringHazard + name: hazard jumpsuit + description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoP diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png index b30ea919fc..17e322a695 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png index 37a4b2f1b6..57fe7a1def 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json index e482264df5..05ec90135e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png index 5340e856fa..a94840421a 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png index 8a28a8fd4a..d0337e0323 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..4fbcd00264 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png new file mode 100644 index 0000000000..1432e6bea1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-left.png new file mode 100644 index 0000000000..cf69e2e3cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-right.png new file mode 100644 index 0000000000..2ff1950af2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json new file mode 100644 index 0000000000..a0e86f87fd --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}