From 9d851af0f33e9f3e20e56e8505b54b7f6cc588e6 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 15:02:14 +0200 Subject: [PATCH 1/9] Magboots --- Resources/Prototypes/_NF/Alerts/magboots.yml | 4 +- .../_NF/Catalog/Fills/Items/misc.yml | 4 +- .../_NF/Entities/Clothing/Shoes/magboots.yml | 74 +++++++++--------- .../equipped-FEET.png | Bin .../icon-on.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../on-equipped-FEET.png | Bin .../on-inhand-left.png | Bin .../on-inhand-right.png | Bin Resources/_NF/migration.yml | 6 +- 13 files changed, 46 insertions(+), 42 deletions(-) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/equipped-FEET.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/icon-on.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/icon.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/meta.json (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/on-equipped-FEET.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/on-inhand-left.png (100%) rename Resources/Textures/_NF/Clothing/Shoes/Boots/{magboots-combat.rsi => magboots-security.rsi}/on-inhand-right.png (100%) diff --git a/Resources/Prototypes/_NF/Alerts/magboots.yml b/Resources/Prototypes/_NF/Alerts/magboots.yml index 52b8cb3dada..f24479f577b 100644 --- a/Resources/Prototypes/_NF/Alerts/magboots.yml +++ b/Resources/Prototypes/_NF/Alerts/magboots.yml @@ -1,7 +1,7 @@ - type: alert - id: MagbootsCombat + id: MagbootsSecurity icons: - - sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + - sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi state: icon-on name: alerts-magboots-name description: alerts-magboots-desc diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index 2dc75b0e9f3..303f55f2f16 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -1,6 +1,6 @@ - type: entity - id: ClothingShoesBootsMagCombatFilled - parent: [ClothingShoesBootsMagCombat, ClothingShoesBootsCombatFilled] + id: ClothingShoesBootsMagSecurityFilled + parent: [ClothingShoesBootsMagCombat, ClothingShoesBootsSecurityFilled] - type: entity id: ClothingShoesBootsMagNfsdFilled diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml index 5c196d9c834..71357bfff16 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml @@ -1,49 +1,19 @@ - type: entity parent: [ClothingShoesBootsMag, ClothingShoesBootsCombat] - id: ClothingShoesBootsMagCombat - name: combat magboots - description: Combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + id: ClothingShoesBootsMagSecurity + name: security magboots + description: Security magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. components: - type: Sprite - sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi state: icon - type: Clothing - sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi - type: Magboots - magbootsAlert: MagbootsCombat - - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.9 - -- type: entity - parent: ClothingShoesBootsMagCombat - id: ClothingShoesBootsMagNfsd - name: nfsd magboots - components: - - type: Sprite - sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi - state: icon - - type: Clothing - sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi - - type: Magboots - magbootsAlert: MagbootsNfsd - -- type: entity - parent: [BaseC3PirateContraband, ClothingShoesBootsMagCombat] - id: ClothingShoesBootsMagPirate - name: pirate magboots - description: Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. - components: - - type: Sprite - sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi - state: icon - - type: Clothing - sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi - - type: Magboots - magbootsAlert: MagbootsPirate + magbootsAlert: MagbootsSecurity - type: entity - parent: ClothingShoesBootsMagCombat + parent: ClothingShoesBootsMagSecurity id: ClothingShoesBootsMagMercenary name: mercenary magboots description: Mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. @@ -70,3 +40,33 @@ - type: Magboots magbootsAlert: MagbootsGaloshes - type: NoSlip + +- type: entity + parent: ClothingShoesBootsMagSecurity + id: ClothingShoesBootsMagNfsd + name: nfsd magboots + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi + state: icon + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi + - type: Magboots + magbootsAlert: MagbootsNfsd + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.9 + +- type: entity + parent: [BaseC3PirateContraband, ClothingShoesBootsMagNfsd] + id: ClothingShoesBootsMagPirate + name: pirate magboots + description: Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi + state: icon + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi + - type: Magboots + magbootsAlert: MagbootsPirate \ No newline at end of file diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-left.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-inhand-right.png rename to Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index bcb3a474867..ea1b167dfc6 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -101,4 +101,8 @@ XenoAISpawnerHard: SpawnMobXenoT3 XenoAISpawnerQueen: SpawnMobXenoQueenDungeon # 2024-11-16 Canister -SpawnDungeonLootCanister: SalvageCanisterSpawner \ No newline at end of file +SpawnDungeonLootCanister: SalvageCanisterSpawner + +# 2024-11-22 Magboots +ClothingShoesBootsMagCombat: ClothingShoesBootsMagSecurity +ClothingShoesBootsMagCombatFilled: ClothingShoesBootsMagSecurityFilled \ No newline at end of file From b77e4c85ee69ebe1c8ed33abb20920ad7169e5a1 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 15:06:19 +0200 Subject: [PATCH 2/9] Update masks.yml --- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index a038fd3d426..b53c0268aa7 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -397,8 +397,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.90 - Slash: 0.90 + Blunt: 0.95 # Frontier 0.90<0.95 + Slash: 0.95 # Frontier 0.90<0.95 Piercing: 0.95 Heat: 0.95 From eaff446619fc9e461ebda7aaa5253ac6fdc16eda Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 15:12:04 +0200 Subject: [PATCH 3/9] Update armor.yml --- .../Prototypes/Entities/Clothing/OuterClothing/armor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 4c757ea4cad..ad7e0948abd 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -19,7 +19,7 @@ Slash: 0.70 Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. Heat: 0.80 - Caustic: 0.9 + Caustic: 0.9 # Frontier - type: ExplosionResistance damageCoefficient: 0.90 @@ -53,7 +53,7 @@ Slash: 0.4 Piercing: 0.7 Heat: 0.9 - Caustic: 0.9 # Frontier + Caustic: 0.9 - type: ExplosionResistance damageCoefficient: 0.9 - type: GroupExamine From 4a070d0643034259fc7ed1969f99e19387753ef2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 15:14:28 +0200 Subject: [PATCH 4/9] Update armor.yml --- .../Entities/Clothing/OuterClothing/armor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index ad7e0948abd..fef7e2b99ab 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -204,16 +204,15 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.7 + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.5 + Radiation: 0 Caustic: 0.75 - type: GroupExamine - type: ProtectedFromStepTriggers slots: WITHOUT_POCKET - - type: ExplosionResistance - damageCoefficient: 0.7 - type: entity parent: ClothingOuterArmorHeavy From 072872d42cda8df6f54707c93d2e612b3c2978be Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 15:38:43 +0200 Subject: [PATCH 5/9] Magboots Fix --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml | 4 ++-- .../Catalog/VendingMachines/Inventories/secdrobe.yml | 2 +- .../Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml | 2 +- Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml | 2 +- .../Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml | 2 +- .../Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 4 ++-- Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml | 4 ++-- Resources/Prototypes/_NF/Research/arsenal.yml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 5b0ae943892..915b61cc6cb 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -361,7 +361,7 @@ - id: JetpackSecurityFilled # - id: OxygenTankFilled # Frontier - id: AirTankFilled # Frontier - - id: ClothingShoesBootsMagCombatFilled # Frontier + - id: ClothingShoesBootsMagSecurityFilled # Frontier # No hardsuit locker - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 146d7a615c7..202bb614289 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -174,7 +174,7 @@ - id: ClothingOuterHardsuitSecurity - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier - - id: ClothingShoesBootsMagCombatFilled # Frontier + - id: ClothingShoesBootsMagSecurityFilled # Frontier - type: AccessReader access: [["Security"]] @@ -244,7 +244,7 @@ - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier - - id: ClothingShoesBootsMagCombatFilled # Frontier + - id: ClothingShoesBootsMagSecurityFilled # Frontier - type: AccessReader access: [["Armory"]] diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 1926dd3dac6..90f4739074b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -35,7 +35,7 @@ ClothingHeadHelmetJustice: 1 ClothingShoesBootsCowboyBlack: 1 # Frontier ClothingHeadHatCowboyBlack: 1 # Frontier -# ClothingShoesBootsMagCombat: 1 # Frontier + ClothingShoesBootsMagSecurity: 1 # Frontier contrabandInventory: ClothingUniformJumpskirtOfLife: 1 # Frontier ClothingMaskClownSecurity: 1 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml index 193a1f619c9..b590b61218a 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml @@ -376,7 +376,7 @@ - type: StorageFill contents: - id: DoubleEmergencyAirTankFilled - - id: ClothingShoesBootsMagCombat + - id: ClothingShoesBootsMagSecurity - id: ClothingOuterHardsuitPrivateSecurity - id: ClothingMaskGasSecurity - id: JetpackMiniFilled diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index 303f55f2f16..8318dffed5d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -1,6 +1,6 @@ - type: entity id: ClothingShoesBootsMagSecurityFilled - parent: [ClothingShoesBootsMagCombat, ClothingShoesBootsSecurityFilled] + parent: [ClothingShoesBootsMagSecurity, ClothingShoesBootsSecurityFilled] - type: entity id: ClothingShoesBootsMagNfsdFilled diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index 78a61cbf37d..0f7cdc6c1ef 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -234,7 +234,7 @@ - id: ClothingOuterHardsuitPrivateSecurity - id: ClothingMaskGasSecurity - id: JetpackMiniFilled - - id: ClothingShoesBootsMagCombat + - id: ClothingShoesBootsMagSecurity - type: AccessReader access: [["Captain"], ["Mercenary"]] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 5c3ae584d87..bfcb9fe2a43 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -733,7 +733,7 @@ - ClothingOuterHardsuitMercenary - ClothingOuterHardsuitPrivateSecurity - ClothingOuterHardsuitScaf - - ClothingShoesBootsMagCombat + - ClothingShoesBootsMagSecurity - ClothingShoesBootsMagMercenary ## Utilities - ForensicPad @@ -925,7 +925,7 @@ - ClothingOuterHardsuitMercenary - ClothingOuterHardsuitPrivateSecurity - ClothingOuterHardsuitScaf - - ClothingShoesBootsMagCombat + - ClothingShoesBootsMagSecurity - ClothingShoesBootsMagMercenary ## Utilities - PinpointerUniversalNF diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml index 6dea094ada7..d212fa66329 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml @@ -378,9 +378,9 @@ result: ClothingShoesBootsMagAdv - type: latheRecipe - id: ClothingShoesBootsMagCombat + id: ClothingShoesBootsMagSecurity parent: NFBaseMagBootsRecipe - result: ClothingShoesBootsMagCombat + result: ClothingShoesBootsMagSecurity - type: latheRecipe id: ClothingShoesBootsMagMercenary diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 287333c35ed..c9ba89144b6 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -36,7 +36,7 @@ tier: 1 cost: 9000 recipeUnlocks: - - ClothingShoesBootsMagCombat + - ClothingShoesBootsMagSecurity - ClothingShoesBootsMagMercenary technologyPrerequisites: - MagnetsTech From a3a99863b6afd22089bab4ac2ac032863e3ebdb6 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 15:47:51 +0200 Subject: [PATCH 6/9] Update misc.yml --- Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index 8318dffed5d..5a3dc14e832 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -1,6 +1,6 @@ - type: entity id: ClothingShoesBootsMagSecurityFilled - parent: [ClothingShoesBootsMagSecurity, ClothingShoesBootsSecurityFilled] + parent: [ClothingShoesBootsMagSecurity, ClothingShoesBootsCombatFilled] - type: entity id: ClothingShoesBootsMagNfsdFilled From 79eb43869ee2c6ab8d9eb78984aaef5000791faf Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 22 Nov 2024 16:01:30 +0200 Subject: [PATCH 7/9] Armor pass --- .../Entities/Clothing/OuterClothing/armor.yml | 31 ++++++++++--------- .../Entities/Clothing/OuterClothing/vests.yml | 21 ++++++------- .../Entities/Clothing/OuterClothing/armor.yml | 19 ++---------- 3 files changed, 28 insertions(+), 43 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index fef7e2b99ab..8399a60d43e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -3,7 +3,7 @@ #Basic armor vest - type: entity - parent: [RecyclableItemClothArmor, ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband Date: Fri, 22 Nov 2024 16:15:28 +0200 Subject: [PATCH 8/9] Update arsenal.yml --- Resources/Prototypes/_NF/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index c9ba89144b6..7e7a355cff3 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -30,7 +30,7 @@ id: MagnetsTechCombat name: research-technology-magnets-tech-combat icon: - sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi state: icon discipline: Experimental tier: 1 From 2e83ce9557183ec8fa86d31421f0f863ff5c4558 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:54:07 +0200 Subject: [PATCH 9/9] Update armor.yml --- Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 8399a60d43e..008f7557658 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -208,7 +208,7 @@ Slash: 0.2 Piercing: 0.2 Heat: 0.5 - Radiation: 0 + Radiation: 0.5 # Frontier 0<0.5 Caustic: 0.75 - type: GroupExamine - type: ProtectedFromStepTriggers