diff --git a/Resources/Maps/_CP14/Frigid_Coast.yml b/Resources/Maps/_CP14/Frigid_Coast.yml index 205b19ce36..5c8efa04f0 100644 --- a/Resources/Maps/_CP14/Frigid_Coast.yml +++ b/Resources/Maps/_CP14/Frigid_Coast.yml @@ -36043,7 +36043,7 @@ entities: - type: Transform pos: -15.482462,17.62666 parent: 1 -- proto: CP14ClothingOuterClothingCopperArmor +- proto: CP14ClothingOuterClothingFish entities: - uid: 17 components: diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 8b642dab45..52563a69b5 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -39251,7 +39251,7 @@ entities: - type: Transform pos: -1.5383277,-16.33084 parent: 1 -- proto: CP14ClothingOuterClothingCopperArmor +- proto: CP14ClothingOuterClothingFish entities: - uid: 7468 components: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml index a378cf1416..f60dabf7b2 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml @@ -1,30 +1,3 @@ -- type: entity - parent: CP14ClothingOuterClothingBase - id: CP14ClothingOuterClothingCopperArmor - name: copper armor - description: Quality copper armour, has good protection and is not too heavy. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/brass_armor.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/brass_armor.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.92 - Piercing: 0.95 - Heat: 0.94 - Caustic: 0.90 - - type: ClothingSpeedModifier - walkModifier: 0.96 - sprintModifier: 0.96 - - type: CP14MagicManacostModify - globalModifier: 1.1 - - type: PhysicalComposition - materialComposition: - CP14Copper: 40 - - type: entity parent: CP14ClothingOuterClothingBase id: CP14ClothingOuterClothingBoneArmor diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 24927cc470..e92e8cf5f6 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -69,19 +69,6 @@ count: 1 result: CP14Scissors -- type: CP14Recipe - id: CP14ClothingOuterClothingCopperArmor - tag: CP14RecipeAnvil - category: Armor - craftTime: 4 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 4 - result: CP14ClothingOuterClothingCopperArmor - - type: CP14Recipe id: CP14ClothingGlovesGirdles tag: CP14RecipeAnvil diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index acde4deeb7..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/icon.png deleted file mode 100644 index 3310b18956..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/inhand-left.png deleted file mode 100644 index 6f56c1b8ce..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/inhand-right.png deleted file mode 100644 index 6a2b48f849..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/meta.json deleted file mode 100644 index ea651e45aa..0000000000 --- a/Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by Pato Grone(discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/migration.yml b/Resources/migration.yml index 89dbde1d78..8caca2a0cb 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -131,7 +131,7 @@ CP14BaseTwoHandedSword: null CP14TwoHandedSwordScythe: null #2025-17-01 -CP14ClothingCloakBrassArmor: CP14ClothingOuterClothingCopperArmor +CP14ClothingCloakBrassArmor: null CP14ClothingCloakCuirass: CP14ArmorIronCuirass CP14ClothingCloakInfantryCuirass: CP14ArmorIronCuirass CP14ClothingCloakCuirassLoincloth: CP14ArmorIronCuirass @@ -397,6 +397,7 @@ CP14ClothingWarriorsGarbDress: CP14ClothingShirtWarriorsGarbDress CP14LongLeatherBoots: CP14ClothingShoesLongLeatherBoots #2025-07-27 +CP14ClothingOuterClothingCopperArmor: null CP14DemiplanEnterRoomMarker: null CP14CandleRed: CP14Candle