diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml index 78f5d7e554f..3dea0e1cc94 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml @@ -77,6 +77,9 @@ - id: N14ClothingOuterBattlecoatCoat prob: 0.07 orGroup: Clothing + - id: N14ClothingOuterZealotDuster + prob: 0.6 + orGroup: Clothing - id: N14ClothingHeadHatBaseball prob: 0.12 orGroup: Clothing @@ -864,6 +867,9 @@ - id: N14ClothingOuterRaiderCombat2 prob: 0.12 orGroup: Clothing + - id: N14ClothingOuterZealotDuster + prob: 0.6 + orGroup: Clothing - id: N14ClothingBootsCowboy prob: 0.07 orGroup: Clothing @@ -2470,6 +2476,9 @@ - id: N14ClothingBootsFire prob: 0.07 orGroup: Clothing + - id: N14ClothingOuterZealotDuster + prob: 0.07 + orGroup: Clothing - id: N14EmptySlot prob: 0.75 orGroup: Ammunition diff --git a/Resources/Prototypes/_Nuclear14/CharacterItemGroups/neckGroup.yml b/Resources/Prototypes/_Nuclear14/CharacterItemGroups/neckGroup.yml index 229fe478bbe..991ddb3dd0d 100644 --- a/Resources/Prototypes/_Nuclear14/CharacterItemGroups/neckGroup.yml +++ b/Resources/Prototypes/_Nuclear14/CharacterItemGroups/neckGroup.yml @@ -4,4 +4,6 @@ - type: loadout id: N14LoadoutNeckCloakLeather - type: loadout - id: N14LoadoutNeckMantleLeather \ No newline at end of file + id: N14LoadoutNeckMantleLeather + - type: loadout + id: N14LoadoutNeckCloakDarkCloak \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/CharacterItemGroups/outerwearGroup.yml b/Resources/Prototypes/_Nuclear14/CharacterItemGroups/outerwearGroup.yml index 970254e2b53..4ca239fbc6a 100644 --- a/Resources/Prototypes/_Nuclear14/CharacterItemGroups/outerwearGroup.yml +++ b/Resources/Prototypes/_Nuclear14/CharacterItemGroups/outerwearGroup.yml @@ -44,4 +44,6 @@ - type: loadout id: N14LoadoutOuterRaiderBadlands - type: loadout - id: N14LoadoutOuterRaiderBlastmaster \ No newline at end of file + id: N14LoadoutOuterRaiderBlastmaster + - type: loadout + id: N14LoadoutOuterHarperCoat \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml index 9a5813b1dc5..eedd6da3e6c 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml @@ -112,6 +112,9 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi + - type: Tag #For crafting + tags: + - FollowerLabcoat # - type: ClothingSpecialModifier # intelligenceModifier: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 7e8f6356267..48df29ad8b3 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -68,6 +68,9 @@ priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 + - type: Construction + graph: CoatFollowersArmoredGraph + node: followercoat # - type: ClothingSpecialModifier # intelligenceModifier: 1 @@ -570,6 +573,9 @@ priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 + - type: Tag #For crafting + tags: + - PoliceVest - type: entity parent: N14ClothingOuterPoliceVest diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml index f63b2c3645a..4d8f2d0a61e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml @@ -181,6 +181,7 @@ - N14ClothingOuterTribalArmorHeavy - N14ClothingOuterInsectArmor - N14ClothingOuterMetalArmor + - N14ClothingOuterZealotDuster # Shield's - N14InsectShield - MakeshiftShield diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml index 909bf84e348..86dfd36d41d 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml @@ -237,3 +237,4 @@ group: N14LoadoutOuter items: - N14ClothingOuterHarperCoat + diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml index 5be75a25dd1..3299cc6e1be 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml @@ -13,6 +13,28 @@ - node: rags entity: N14ClothingUniformJumpsuitRags +- type: constructionGraph + id: CoatFollowersArmoredGraph + start: start + graph: + - node: start + edges: + - to: followercoat + steps: + - tag: FollowerLabcoat + name: follower's labcoat + icon: + sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi + state: icon + - tag: PoliceVest + name: police vest + icon: + sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi + state: icon + doAfter: 8 + - node: followercoat + entity: N14ClothingOuterCoatFollowersArmored + #MARK: Mantie's - type: constructionGraph id: LeatherMantleGraph diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml index 9a3fa96e63b..a029d93d6ba 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml @@ -126,6 +126,20 @@ state: icon hide: false +- type: construction + name: Followers armored coat + id: CoatFollowersArmored + graph: CoatFollowersArmoredGraph + startNode: start + targetNode: followercoat + category: construction-category-clothing + objectType: Item + description: Protection for the followers. + icon: + sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutfoaarmoredcoat.rsi + state: icon + hide: false + #MARK: Mantle's - type: construction id: LeatherMantle diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml index 57816bfc1fb..fd0f40184e0 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml @@ -76,6 +76,17 @@ Cloth: 1000 Steel: 2000 +- type: latheRecipe + id: N14ClothingOuterZealotDuster + result: N14ClothingOuterZealotDuster + category: N14Armor + completetime: 8 + materials: + Cloth: 1000 + Steel: 1000 + Leather: 300 + Thread: 200 + # Shield's - type: latheRecipe id: N14InsectShield diff --git a/Resources/Prototypes/_Nuclear14/tags.yml b/Resources/Prototypes/_Nuclear14/tags.yml index fb63c56f4e1..6bb1b29e858 100644 --- a/Resources/Prototypes/_Nuclear14/tags.yml +++ b/Resources/Prototypes/_Nuclear14/tags.yml @@ -150,6 +150,12 @@ - type: Tag id: Transistor2 +- type: Tag + id: PoliceVest + +- type: Tag + id: FollowerLabcoat + #MARK: Guns types. - type: Tag id: Revolver