From c1558f689f5ab7648f80305a2b8d842c0fa10373 Mon Sep 17 00:00:00 2001 From: RedBookcase Date: Wed, 18 Dec 2024 07:13:40 -0800 Subject: [PATCH] Mercenary gear contraband tweaks. (#33647) * Mercenary gear contraband tweaks. * Fixed Mercenary Combat Gloves to have basic Combat Gloves as a parent again. * Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml --------- Co-authored-by: RedBookcase Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Back/backpacks.yml | 2 +- Resources/Prototypes/Entities/Clothing/Hands/gloves.yml | 2 +- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 2 +- Resources/Prototypes/Entities/Clothing/Head/helmets.yml | 2 +- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 2 +- .../Prototypes/Entities/Clothing/OuterClothing/vests.yml | 4 ++-- Resources/Prototypes/Entities/Clothing/Shoes/boots.yml | 2 +- Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index b589b2bbc082dd..679e1e2a7baacb 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -184,7 +184,7 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackMerc - name: merc bag + name: mercenary bag description: A backpack that has been in many dangerous places, a reliable combat backpack. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 1dd1e0ba04261d..cb4f8689b331ab 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -285,7 +285,7 @@ fiberColor: fibers-black - type: entity - parent: ClothingHandsGlovesCombat + parent: [ BaseSecurityCargoContraband, ClothingHandsGlovesCombat ] id: ClothingHandsMercGlovesCombat name: mercenary combat gloves description: High-quality combat gloves to protect hands from mechanical damage during combat. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 97145a0f00d8ca..6c0d405b4df8eb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -182,7 +182,7 @@ sprite: Clothing/Head/Hats/beret_brigmedic.rsi - type: entity - parent: [ ClothingHeadBase, BaseRestrictedContraband ] + parent: [ ClothingHeadBase ] id: ClothingHeadHatBeretMerc name: mercenary beret description: Olive beret, the badge depicts a jackal on a rock. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index f06f20249b466f..65ad2d523e84ae 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -39,7 +39,7 @@ #Mercenary Helmet - type: entity - parent: [ ClothingHeadHelmetBase, BaseRestrictedContraband ] + parent: [ ClothingHeadHelmetBase, BaseMajorContraband ] id: ClothingHeadHelmetMerc name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 0dd16dceb14731..8317f8af897fdd 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -385,7 +385,7 @@ Heat: 0.95 - type: entity - parent: [ ClothingMaskGas, BaseRestrictedContraband ] + parent: [ ClothingMaskGas, BaseSecurityCargoContraband ] id: ClothingMaskGasMerc name: mercenary gas mask description: Slightly outdated, but reliable military-style gas mask. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 545f46cc8cb9cc..994e86b548cc8c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -21,9 +21,9 @@ #Mercenary web vest - type: entity - parent: [ClothingOuterVestWeb, BaseMinorContraband] #web vest so it should have some pockets for ammo + parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo id: ClothingOuterVestWebMerc - name: merc web vest + name: mercenary web vest description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index e5ef7e23bb6233..3358176cc237e1 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -73,7 +73,7 @@ sprite: Clothing/Shoes/Boots/highheelboots.rsi - type: entity - parent: [ ClothingShoesMilitaryBase, BaseRestrictedContraband ] + parent: [ ClothingShoesMilitaryBase ] id: ClothingShoesBootsMerc name: mercenary boots description: Boots that have gone through many conflicts and that have proven their combat reliability. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index ef5c1164cfdd26..aed199d9c779ab 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -860,7 +860,7 @@ mode: SensorOff - type: entity - parent: [ ClothingUniformBase, BaseRestrictedContraband ] + parent: [ ClothingUniformBase ] id: ClothingUniformJumpsuitMercenary name: mercenary jumpsuit description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index b62f9047b9ab36..c307d0ffbe3370 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -129,7 +129,7 @@ - type: entity name: kukri knife - parent: [CombatKnife, BaseMinorContraband] + parent: [CombatKnife, BaseSecurityCargoContraband] id: KukriKnife description: Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet. components: