diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 64f82f8fee2..62ec134d5a3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -20,6 +20,8 @@ - id: ClothingOuterHardsuitWarden - id: HoloprojectorSecurity - id: BookSpaceLaw + - id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion + - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion - id: ClothingBackpackElectropack amount: 2 - id: RemoteSignaller @@ -34,6 +36,7 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler + - id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity @@ -42,6 +45,7 @@ - id: ClothingShoesBootsJack - id: ClothingOuterCoatWarden - id: ClothingOuterWinterWarden + - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml index 313e5b68f3d..d6c2e05dfd1 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml @@ -53,6 +53,17 @@ - type: Clothing sprite: Corvax/Clothing/Head/Hats/hoshat.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCapWardenAlt + name: warden's police hat + description: It's a special blue hat issued to the Warden of a security force. + components: + - type: Sprite + sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi + - type: Clothing + sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretSecurityMedic diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 0853771396d..126847d5938 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -34,6 +34,24 @@ Piercing: 0.6 Heat: 0.9 +- type: entity + parent: ClothingOuterCoatWarden + id: ClothingOuterCoatWardenAlt + name: warden's jacket + description: A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets. + components: + - type: Sprite + sprite: Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi + - type: Clothing + sprite: Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.4 + Heat: 0.8 + - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatSecurityOvercoat diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml index 5513d852e98..4b47a675679 100644 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml @@ -13,6 +13,14 @@ Cloth: 100 Durathread: 50 +- type: latheRecipe + id: ClothingHeadHatCapWardenAlt + result: ClothingHeadHatCapWardenAlt + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + - type: latheRecipe id: ClothingUniformJumpsuitCapTurtleneck result: ClothingUniformJumpsuitCapTurtleneck diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0e994bdea88..b5b3f770e57 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1125,6 +1125,7 @@ # Corvax-Clothing-Start - ClothingHeadHatCapHoS - ClothingHeadHatBeretSecurityMedic + - ClothingHeadHatCapWardenAlt - ClothingUniformJumpsuitCapTurtleneck - ClothingUniformJumpskirtCapTurtleneck - ClothingUniformJumpsuitHoSBlack diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/equipped-HELMET.png b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..91b4af3aeba Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/icon.png new file mode 100644 index 00000000000..84edf585268 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..5e2021c209a Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..20aac727203 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.rsi/meta.json new file mode 100644 index 00000000000..6abc85f19bd --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Head/Hats/warden_alt.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/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, rehued by lzk228(github)", + "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/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/equipped-OUTERCLOTHING-digi.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/equipped-OUTERCLOTHING-digi.png new file mode 100644 index 00000000000..c78c865076a Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/equipped-OUTERCLOTHING-digi.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..3b9268a2e17 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/icon.png new file mode 100644 index 00000000000..ab2b26dcfa3 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..bdadf36653b Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..584fa3bdbbc Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/meta.json new file mode 100644 index 00000000000..1d21b442ec3 --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, digi made by kuro(388673708753027083), rehued by lzk228(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-digi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/migration.yml b/Resources/migration.yml index 34e21c119bf..ad5d71433ac 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -441,7 +441,3 @@ OverlordCircuitBoard: null # 2024-09-08 HatBase: null - -# 2024-09-21 - Corvax -ClothingHeadHatCapWardenAlt: null -ClothingOuterCoatWardenAlt: null