diff --git a/Resources/Locale/en-US/_Nuclear14/construction.ftl b/Resources/Locale/en-US/_Nuclear14/construction.ftl index e1294ed6cef..94977abb74e 100644 --- a/Resources/Locale/en-US/_Nuclear14/construction.ftl +++ b/Resources/Locale/en-US/_Nuclear14/construction.ftl @@ -1,6 +1,15 @@ construction-category-medical = Medical +lathe-category-ammo-box = Ammo box +lathe-category-ammo-magazines = Magazines +lathe-category-armor = Armor lathe-category-containers = Containers lathe-category-chemistry = Chemistry +lathe-category-cleaning = Cleaning lathe-category-kitchen = Kitchen -lathe-category-misc = Misc \ No newline at end of file +lathe-category-misc = Misc +lathe-category-shields = Shields +lathe-category-weapons-melee = Melee +lathe-category-weapons-pistols = Pistols +lathe-category-weapons-rifles = Rifles +lathe-category-weapons-smgs = Smgs \ No newline at end of file diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index 33de561803f..a5530e0578b 100644 --- a/Resources/Locale/en-US/_Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/_Nuclear14/reagents.ftl @@ -273,14 +273,19 @@ reagent-name-antiseptic = Antiseptic reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some Rubbing Alcohol. # Ores, Metals, Materials -materials-gunpowder = gunpowder -materials-lead = lead materials-aluminum = aluminum -materials-sulfur = sulfur +materials-antchitin = chitin materials-charcoal = charcoal +materials-exoskeleton = exoskeleton +materials-gunpowder = gunpowder +materials-leather = leather +materials-lead = lead materials-raw-lead = raw lead +materials-raw-leather = raw leather materials-raw-aluminum = raw aluminum materials-raw-sulfur = raw sulfur +materials-sulfur = sulfur + reagent-name-gunpowder = gunpowder reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead. reagent-name-fertilizer = fertilizer diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/base_butcherable_leather_gloves.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/base_butcherable_leather_gloves.yml new file mode 100644 index 00000000000..bac8fca8977 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/base_butcherable_leather_gloves.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14ClothingHandsButcherableLeather + parent: ClothingHandsButcherable + abstract: true + components: + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml index 63d7d224513..c9e3afaaaf3 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml @@ -33,7 +33,7 @@ # strengthModifier: 1 - type: entity - parent: ClothingHandsButcherable + parent: N14ClothingHandsButcherableLeather id: N14ClothingHandsGlovesBlackLeather name: black leather gloves description: A pair of long black leather gloves. @@ -48,7 +48,7 @@ - type: FingerprintMask - type: entity - parent: ClothingHandsButcherable + parent: N14ClothingHandsButcherableLeather id: N14ClothingHandsGlovesLeather name: leather gloves description: A pair of brown leather gloves. @@ -126,7 +126,7 @@ - type: FingerprintMask - type: entity - parent: ClothingHandsButcherable + parent: N14ClothingHandsButcherableLeather id: N14ClothingHandsGlovesTribal name: tribal gloves description: A piece of soft leather to tie around the hand. @@ -154,9 +154,12 @@ fiberMaterial: fibers-leather fiberColor: fibers-white - type: FingerprintMask + - type: Construction + graph: GlovesClothGraph + node: gloves - type: entity - parent: ClothingHandsButcherable + parent: N14ClothingHandsButcherableLeather id: N14ClothingHandsGlovesNCR name: fingerless leather gloves description: Gloves made out of wasteland animal hides, tanned and stitched together without any fingers. @@ -171,7 +174,7 @@ - type: FingerprintMask - type: entity - parent: ClothingHandsButcherable + parent: N14ClothingHandsButcherableLeather id: N14ClothingHandsGlovesPatrol name: leather patrol gloves description: Gloves made out of brahmin leather, tanned and stitched for the purpose of patrolling around the Mojave desert. @@ -183,4 +186,4 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-brown - - type: FingerprintMask + - type: FingerprintMask \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml index 59893df9c77..d5ed55dec22 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml @@ -382,6 +382,11 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 # Vault - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/cloaks.yml index 910331457a6..487026754e5 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/cloaks.yml @@ -64,7 +64,6 @@ sprite: _Nuclear14/Clothing/Neck/tribal.rsi # Neutral - - type: entity parent: ClothingNeckBase id: N14ClothingNeckCloakLeather @@ -81,6 +80,14 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} + - type: Construction + graph: LeatherCloakGraph + node: cloak + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 - type: entity parent: ClothingNeckBase @@ -89,4 +96,12 @@ description: A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai. components: - type: Sprite - sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi \ No newline at end of file + sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi + - type: Construction + graph: YaoguaiCloakGraph + node: cloak + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialYaoguaiHide + amount: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml index 4d5b0657197..a38f53d1467 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml @@ -38,3 +38,11 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} + - type: Construction + graph: LeatherMantleGraph + node: mantle + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 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 c4a9c2f5441..c57f138c128 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml @@ -119,6 +119,13 @@ Slash: 0.95 Piercing: 0.9 Heat: 0.85 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 1 + - id: MaterialCloth1 + amount: 1 - type: entity parent: ClothingOuterStorageBase @@ -137,6 +144,13 @@ Slash: 0.95 Piercing: 0.9 Heat: 0.85 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 + - id: MaterialCloth1 + amount: 1 - type: entity parent: ClothingOuterBase @@ -157,6 +171,13 @@ Heat: 0.9 - type: ClothingSpecialModifier strengthModifier: 1 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 1 + - id: MaterialCloth1 + amount: 1 - type: entity parent: ClothingOuterStorageBase @@ -175,6 +196,11 @@ Slash: 0.95 Piercing: 0.9 Heat: 0.85 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 - type: entity parent: ClothingOuterStorageBase @@ -286,6 +312,13 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 + - id: MaterialCloth1 + amount: 1 - type: entity parent: N14ClothingOuterBattlecoatCoat @@ -352,6 +385,13 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutarmoredofficer.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutarmoredofficer.rsi + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 + - id: MaterialCloth1 + amount: 1 #MARK: NCR - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 47b5f8d844b..c01a8a6c42f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -15,6 +15,11 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.75 + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 4 - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml index 896120f5c36..bc1df73b5a8 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml @@ -8,6 +8,14 @@ sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/blackboots.rsi - type: Clothing sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/blackboots.rsi + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 1 + - id: MaterialCloth1 + amount: 1 + - type: entity parent: ClothingShoesMilitaryBase @@ -41,6 +49,11 @@ sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/cowboyboots.rsi - type: Clothing sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/cowboyboots.rsi + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 - type: entity parent: ClothingShoesBase @@ -63,3 +76,8 @@ sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/leatherboots.rsi - type: Clothing sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/leatherboots.rsi + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialLeather1 + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml index 67d8c3aa72c..2f7d57d6c66 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml @@ -65,6 +65,9 @@ sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/wastelanderrags.rsi - type: ClothingSpecialModifier charismaModifier: -1 + - type: Construction + graph: WastelanderRagsGraph + node: rags - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index 6bc5eba678a..821b8db8955 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -188,6 +188,8 @@ spawned: - id: N14FoodMeatGecko amount: 3 + - id: N14MaterialRawLeather1 + amount: 1 - type: Reproductive breedChance: 0.05 birthPopup: reproductive-laid-egg-popup @@ -588,6 +590,12 @@ - type: Tag tags: - Deathclaw + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 8 + - id: N14MaterialRawLeather1 + amount: 6 #MARK: Albino Deathclaw - type: entity @@ -709,7 +717,7 @@ spawned: - id: N14FoodMeatBrahmin amount: 4 - - id: N14MaterialBrahminHide + - id: N14MaterialBrahminHide1 amount: 1 prob: 0.95 - type: SolutionContainerManager @@ -775,6 +783,8 @@ spawned: - id: N14FoodMeatBighorner amount: 4 + - id: N14MaterialRawLeather1 + amount: 4 - type: MeleeWeapon altDisarm: false hidden: true @@ -844,6 +854,8 @@ spawned: - id: N14FoodMeatRadstag amount: 4 + - id: N14MaterialRawLeather1 + amount: 4 - type: MeleeWeapon altDisarm: false hidden: true diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml index 6fa8176e022..317c4a37d21 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml @@ -53,6 +53,8 @@ spawned: - id: N14FoodMeatRadRaw amount: 1 + - id: N14MaterialRawLeather1 + amount: 1 - type: Bloodstream bloodMaxVolume: 50 bloodReagent: WastelandBlood diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml index 9b02099bf2a..95f9b508aa1 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml @@ -53,7 +53,7 @@ useKey: false - type: Butcherable spawned: - - id: N14MaterialAntChitin + - id: N14MaterialAntChitin1 amount: 1 - id: N14FoodMeatRadRaw amount: 1 @@ -100,8 +100,8 @@ Base: dead - type: Butcherable spawned: - - id: N14MaterialAntChitin - amount: 1 + - id: N14MaterialAntChitin1 + amount: 2 - id: N14FoodMeatRadRaw amount: 3 - type: Bloodstream diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml index f36031b9fc2..f7af87fe56d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -1,12 +1,39 @@ # See specific/hydroponics for fertilizer. +#MARK: Base - type: entity - parent: BaseItem - id: Gunpowder - name: gunpowder + abstract: true + parent: MaterialBase + id: N14MaterialBase suffix: Full, 30 + description: A raw material. components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/materials.rsi - type: Material + - type: Appearance + +- type: entity + parent: N14MaterialBase + id: N14MaterialBasePowder + abstract: true + components: + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: powder_lead + - type: ExaminableSolution + solution: powder + - type: Extractable + grindableSolutionName: powder + +# Other +#MARK: Gunpowder +- type: entity + parent: N14MaterialBasePowder + id: Gunpowder + name: gunpowder + description: Explosive. + components: - type: PhysicalComposition materialComposition: Gunpowder: 100 @@ -21,39 +48,32 @@ map: ["base"] - type: Item heldPrefix: powder_lead - - type: Appearance - type: SolutionContainerManager solutions: powder: reagents: - ReagentId: Gunpowder Quantity: 10 - - type: ExaminableSolution - solution: powder - - type: Tag - tags: - - RawMaterial - - type: Extractable - grindableSolutionName: powder - type: entity parent: Gunpowder - id: Gunpowder1 - suffix: Single + id: Gunpowder10 + suffix: 10 components: - type: Stack - count: 1 + count: 10 - type: entity parent: Gunpowder - id: Gunpowder10 - suffix: 10 + id: Gunpowder1 + suffix: Single components: - type: Stack - count: 10 + count: 1 +#MARK: Sulfur - type: entity - parent: Gunpowder + parent: N14MaterialBasePowder id: SulfurPowder name: sulfur components: @@ -71,7 +91,6 @@ map: ["base"] - type: Item heldPrefix: powder_brass - - type: Appearance - type: SolutionContainerManager solutions: powder: @@ -81,25 +100,26 @@ - type: entity parent: SulfurPowder - id: SulfurPowder1 - suffix: Single + id: SulfurPowder10 + suffix: 10 components: - type: Stack - count: 1 + count: 10 - type: entity parent: SulfurPowder - id: SulfurPowder10 - suffix: 10 + id: SulfurPowder1 + suffix: Single components: - type: Stack - count: 10 + count: 1 +#MARK: Sheet paper - type: entity - parent: SheetPaper + parent: SheetOtherBase id: N14Paper name: paper - suffix: 10 + suffix: Full, 10 components: - type: Stack stackType: N14Paper @@ -107,6 +127,7 @@ baseLayer: base layerStates: - paper + - type: Material - type: Sprite sprite: /Textures/_Nuclear14/Objects/Misc/clutter.rsi state: paper @@ -118,25 +139,37 @@ - type: Construction graph: N14Paper node: paper + - type: PhysicalComposition + materialComposition: + Paper: 100 + - type: Extractable + grindableSolutionName: paper + - type: SolutionContainerManager + solutions: + paper: + reagents: + - ReagentId: Cellulose + Quantity: 3 - type: entity parent: N14Paper - id: N14Paper1 - suffix: Single + id: N14Paper10 + suffix: 10 components: - type: Stack - count: 1 + count: 10 - type: entity parent: N14Paper - id: N14Paper10 - suffix: 10 + id: N14Paper1 + suffix: Single components: - type: Stack - count: 10 + count: 1 +#MARK: Charcoal - type: entity - parent: Gunpowder + parent: N14MaterialBasePowder id: Charcoal name: charcoal components: @@ -163,6 +196,14 @@ - ReagentId: Charcoal Quantity: 10 +- type: entity + parent: Charcoal + id: Charcoal10 + suffix: 10 + components: + - type: Stack + count: 10 + - type: entity parent: Charcoal id: Charcoal1 @@ -171,82 +212,168 @@ - type: Stack count: 1 +#MARK: Circuitry - type: entity - parent: Charcoal - id: Charcoal10 + parent: N14MaterialBase + id: N14MaterialCircuitry + name: circuitry + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Circuitry: 100 + - type: Stack + stackType: Circuitry + baseLayer: base + layerStates: + - circuits + - circuits_2 + - circuits_3 + count: 15 + - type: Sprite + state: circuits_3 + layers: + - state: circuits_3 + map: ["base"] + - type: Appearance + +- type: entity + parent: N14MaterialCircuitry + id: N14MaterialCircuitry10 suffix: 10 components: + - type: Sprite + state: circuits_2 - type: Stack count: 10 - type: entity - parent: BaseItem - id: N14Dung - name: dung pile - description: flip those cowpats for free fertilizer! + parent: N14MaterialCircuitry + id: N14MaterialCircuitry1 + suffix: Single + components: + - type: Sprite + state: circuits + - type: Stack + count: 1 + +# Organic +#MARK: Leather +- type: entity + parent: N14MaterialBase + id: N14MaterialLeather + name: leather + description: A piece of leather, just non-special leather. + suffix: Full, 15 components: - type: Sprite - sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi - noRot: true + state: leather_3 layers: - - state: dung - - state: dung-flies -# N14:TODO: Add creampie ing but worse and it makes you throw up. - - type: SolutionContainerManager - solutions: - dung: - maxVol: 25 - reagents: - - ReagentId: Dung - Quantity: 25 - - type: DrainableSolution - solution: dung - - type: SolutionTransfer - canChangeTransferAmount: false - - type: DeleteOnSolutionEmpty - solution: dung - - type: TimedDespawn - lifetime: 300 - -- type: entity - parent: N14Dung - id: N14BrahminDung - name: brahmin dung - description: A dung pile more acrid and vile than the rest, rancher's gold. + - state: leather_3 + map: ["base"] + - type: Stack + stackType: Leather + count: 15 + baseLayer: base + layerStates: + - leather_1 + - leather_2 + - leather_3 + - type: PhysicalComposition + materialComposition: + Leather: 100 + +- type: entity + parent: N14MaterialLeather + id: N14MaterialLeather1 + suffix: Single components: - - type: SolutionContainerManager - solutions: - dung: - maxVol: 25 - reagents: - - ReagentId: Dung - Quantity: 15 - - ReagentId: Ammonia - Quantity: 10 + - type: Stack + count: 1 +#MARK: Raw leather - type: entity - parent: BaseItem - id: N14CompostRotted - name: compost - description: Rotting remains, like a compost. Good for fertilizing. + parent: N14MaterialBase + id: N14MaterialRawLeather + name: raw leather + description: A piece of raw, unusable skin. Nothing special. + suffix: Full, 15 components: - type: Sprite - sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi - state: compost - - type: SolutionContainerManager - solutions: - compost: - maxVol: 25 - reagents: - - ReagentId: Fertilizer - Quantity: 25 - - type: DrainableSolution - solution: compost - - type: SolutionTransfer - canChangeTransferAmount: false - - type: DeleteOnSolutionEmpty - solution: compost - - type: Material + state: raw_leather_2 + layers: + - state: raw_leather_2 + map: ["base"] + - type: Stack + stackType: RawLeather + count: 15 + baseLayer: base + layerStates: + - raw_leather_1 + - raw_leather_2 + - type: PhysicalComposition + materialComposition: + RawLeather: 100 + +- type: entity + parent: N14MaterialRawLeather + id: N14MaterialRawLeather1 + suffix: Single + components: - type: Stack - stackType: Compost count: 1 + +#MARK: Ant-chitin +- type: entity + parent: N14MaterialBase + id: N14MaterialAntChitin + name: ant chitin + description: A strong and resistent piece of ant "skin". + suffix: Full, 3 + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/mob_drops.rsi + state: chitin_3 + layers: + - state: chitin_3 + map: ["base"] + - type: Stack + stackType: AntChitin + count: 3 + baseLayer: base + layerStates: + - chitin_1 + - chitin_1 + - chitin_2 + - chitin_3 + - type: PhysicalComposition + materialComposition: + AntChitin: 100 + - type: Item + size: Small + +- type: entity + parent: N14MaterialAntChitin + id: N14MaterialAntChitin1 + suffix: Single + components: + - type: Stack + count: 1 + +#MARK: Exoskeleton +- type: entity + parent: N14MaterialBase + id: N14MaterialExoskeleton + name: radscorpion exoskeleton piece + description: A strong and resistent piece of radscorpion exoskeleton. + suffix: "" + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/mob_drops.rsi + state: rad_exo + - type: PhysicalComposition + materialComposition: + Exoskeleton: 100 + - type: Item + size: Small \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml index 87388bb7f7f..b479975f863 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml @@ -1,5 +1,5 @@ - type: entity - parent: OreBase + parent: OreBase # From Entities\Objects\Materials\ore.yml id: LeadOre name: lead ore suffix: Full diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml index a00de12e076..bba4c034276 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml @@ -1,4 +1,4 @@ -# Animal Parts +#MARK: Animal Parts - type: entity parent: BaseItem id: N14MaterialRadscorpionTail @@ -21,66 +21,80 @@ - ReagentId: ScorpionTail Quantity: 10 +#MARK: Hide's - type: entity parent: BaseItem - id: N14MaterialBrahminHide - name: brahmin hide - description: The flesh of a brahmin. Leather-like and tough. + id: N14MaterialBaseHide + abstract: true components: - type: Sprite sprite: _Nuclear14/Objects/Misc/mob_drops.rsi state: hide_brahmin - - type: Stack - stackType: BrahminHide + - type: Tag + tags: + - RawLeather + - type: PhysicalComposition + materialComposition: + RawLeather: 400 + - type: Material + - type: Item + size: Normal - type: entity - parent: BaseItem - id: N14MaterialAntChitin - name: ant chitin - description: A strong and resistent piece of ant "skin". + parent: N14MaterialBaseHide + id: N14MaterialBrahminHide + name: brahmin hide + description: The flesh of a brahmin. Leather-like and tough. + suffix: Full, 4 components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi - state: chitin + state: hide_brahmin_2 + layers: + - state: hide_brahmin_2 + map: ["base"] + - type: Stack + stackType: BrahminHide + count: 4 + baseLayer: base + layerStates: + - hide_brahmin_1 + - hide_brahmin_1 + - hide_brahmin_2 + - type: Appearance - type: entity - parent: BaseItem - id: N14MaterialExoskeleton - name: radscorpion exoskeleton piece - description: A strong and resistent piece of radscorpion exoskeleton. + parent: N14MaterialBrahminHide + id: N14MaterialBrahminHide1 + suffix: Single components: - - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi - state: rad_exo + - type: Stack + stackType: BrahminHide + count: 1 - type: entity - parent: BaseItem + parent: N14MaterialBaseHide id: N14MaterialNightstalkerPelt name: nightstalker pelt description: A pelt of fresh nightstalker leather. components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi state: pelt_nightstalker + - type: PhysicalComposition + materialComposition: + RawLeather: 300 - type: entity - parent: BaseItem + parent: N14MaterialBaseHide id: N14MaterialYaoguaiHide name: yaoguai hide description: A big hide of yaoguai, heavy and strong. components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi state: hide_yaoguai - -# Materials - -- type: entity - parent: BaseItem - id: N14MaterialLeather - name: leather - description: A piece of leather, just non-special leather. - components: - - type: Sprite - sprite: _Nuclear14/Objects/Misc/materials.rsi - state: leather \ No newline at end of file + - type: Tag + tags: + - YaoguaiHide + - RawLeather + - type: PhysicalComposition + materialComposition: + RawLeather: 600 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml index ccf2304811e..9fa7b811583 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml @@ -7,7 +7,8 @@ - type: Sprite sprite: _Nuclear14/Objects/Misc/storage.rsi state: wallet - scale: 0.6, 0.6 + offset: "0.0,-0.02" + # scale: 0.8, 0.8 - type: Item storedRotation: -90 - type: Clothing @@ -28,6 +29,7 @@ - type: Construction graph: N14Wallet node: wallet + # Caps # Scroll down for other currencies - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml index 4e021fa4488..1ff4c58189f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml @@ -1,70 +1,73 @@ # There may be some overlap with the Junk.yml so look there for other crafting components. -- type: entity - abstract: true - parent: BaseItem - id: N14MaterialBase - description: A raw material. - components: - - type: Sprite - sprite: _Nuclear14/Objects/Misc/materials.rsi - - type: Item - sprite: _Nuclear14/Objects/Misc/materials.rsi - size: Normal - - type: Tag - tags: - - RawMaterial - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: entity - parent: N14MaterialBase - id: N14MaterialCircuitry - name: circuitry - suffix: Full + parent: BaseItem + id: N14Dung + name: dung pile + description: flip those cowpats for free fertilizer! components: - - type: Material -# - type: PhysicalComposition -# materialComposition: -# Circuitry: 100 - - type: Stack - stackType: Circuitry - baseLayer: base - layerStates: - - circuits - - circuits_2 - - circuits_3 - count: 15 - type: Sprite - state: circuits_3 + sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi + noRot: true layers: - - state: circuits_3 - map: ["base"] - - type: Appearance - + - state: dung + - state: dung-flies +# N14:TODO: Add creampie ing but worse and it makes you throw up. + - type: SolutionContainerManager + solutions: + dung: + maxVol: 25 + reagents: + - ReagentId: Dung + Quantity: 25 + - type: DrainableSolution + solution: dung + - type: SolutionTransfer + canChangeTransferAmount: false + - type: DeleteOnSolutionEmpty + solution: dung + - type: TimedDespawn + lifetime: 300 + - type: entity - parent: N14MaterialCircuitry - id: N14MaterialCircuitry10 - suffix: 10 + parent: N14Dung + id: N14BrahminDung + name: brahmin dung + description: A dung pile more acrid and vile than the rest, rancher's gold. components: - - type: Sprite - state: circuits_2 - - type: Stack - count: 10 + - type: SolutionContainerManager + solutions: + dung: + maxVol: 25 + reagents: + - ReagentId: Dung + Quantity: 15 + - ReagentId: Ammonia + Quantity: 10 - type: entity - parent: N14MaterialCircuitry - id: N14MaterialCircuitry1 - suffix: Single + parent: BaseItem + id: N14CompostRotted + name: compost + description: Rotting remains, like a compost. Good for fertilizing. components: - type: Sprite - state: circuits + sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi + state: compost + - type: SolutionContainerManager + solutions: + compost: + maxVol: 25 + reagents: + - ReagentId: Fertilizer + Quantity: 25 + - type: DrainableSolution + solution: compost + - type: SolutionTransfer + canChangeTransferAmount: false + - type: DeleteOnSolutionEmpty + solution: compost + - type: Material - type: Stack + stackType: Compost count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml index 8584d67fcb3..13fcf924e5e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml @@ -42,6 +42,22 @@ components: - type: Sprite state: weaponbench + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + - type: Lathe + idleState: icon + runningState: icon # change this + staticRecipes: # Guns or melee weapons related only. + # Guns + - BowImprovised + # Melee + - N14ScrapMachete + - N14WastelandSpear + - N14WastelandTribalJavelin - type: entity parent: N14WorkbenchBase @@ -141,6 +157,34 @@ components: - type: Sprite state: armorbench + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + - RawLeather # move it to the tanning machine + - type: Lathe + idleState: icon + runningState: icon # change this + staticRecipes: + # Armor + - N14ClothingOuterCoatLeatherDuster + - N14ClothingOuterCoatWinterArmored + - N14ClothingOuterLeatherArmor + - N14ClothingOuterChitinArmor + - N14ClothingOuterPainspike + - N14ClothingOuterTribalArmorHeavy + - N14ClothingOuterInsectArmor + - N14ClothingOuterMetalArmor + # Shield's + - N14InsectShield + - MakeshiftShield + - WoodenBuckler + # Other + - N14MaterialLeather + - ClothingBeltQuiver # In misc.yml + - ClothingBeltQuiverSpear - type: entity parent: N14WorkbenchBase @@ -150,6 +194,27 @@ components: - type: Sprite state: tinkerbench + - type: PointLight + color: "#fffbeb" + energy: 2 + offset: 0.5, 0 + radius: 1.5 + - type: Lathe + idleState: icon + runningState: icon # change this + staticRecipes: + #Tools + - N14Multitool + - N14NetworkConfigurator + - N14PowerDrill + - N14HandheldGPSBasic + - N14TRayScanner + - N14GasAnalyzer + - N14RPED + - N14MiningDrill + #Misc + - N14FlashlightLantern + - N14GlowstickRed - type: entity parent: BaseStructure @@ -235,12 +300,6 @@ description: A workbench with metal working tools for crafting. name: workbench components: - - type: PointLight - radius: 2 - energy: 1 - softness: 0.5 - color: "#f05e1b" - offset: "0.5, 0" - type: Construction graph: N14WorkbenchMetal node: WorkbenchMetal @@ -265,15 +324,7 @@ - N14Crowbar - N14Pickaxe - N14Shovel - - N14Multitool - - N14NetworkConfigurator - - N14PowerDrill - - N14HandheldGPSBasic - - N14TRayScanner - - N14GasAnalyzer - N14SprayPainter - - N14RPED - - N14MiningDrill - N14ClothingEyesGlassesWelding # Kitchen - N14ButchersCleaver @@ -324,10 +375,10 @@ - N14ExteriorLightTube - N14LightBulb - N14LedLightBulb - - N14GlowstickRed - N14Flare - - N14FlashlightLantern - N14Matchbox + # Ammo + - ArrowRegular - type: entity parent: N14WorkbenchBase @@ -369,8 +420,10 @@ sprite: _Nuclear14/Structures/Misc/forgeworkbench.rsi state: forge - type: PointLight - energy: 2 - offset: "-0.65, 0" + offset: "-0.13, 0" + color: "#f05e1b" + radius: 3 + energy: 3 - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index ceacac48407..31cb474d244 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -131,3 +131,35 @@ icon: { sprite: _Nuclear14/Structures/Decoration/flora.rsi, state: tree_timber } color: "#1D3B3E" price: 0.15 + +- type: material + id: Leather + stackEntity: N14MaterialLeather1 + name: materials-leather + unit: materials-unit-roll + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: leather_3 } + price: 0.15 + +- type: material + id: Exoskeleton + stackEntity: N14MaterialExoskeleton + name: materials-exoskeleton + unit: materials-unit-piece + icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: rad_exo } + price: 0.05 + +- type: material + id: AntChitin + stackEntity: N14MaterialAntChitin1 + name: materials-antchitin + unit: materials-unit-piece + icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: chitin_3 } + price: 0.05 + +- type: material + id: RawLeather + stackEntity: N14MaterialRawLeather1 + name: materials-raw-leather + unit: materials-unit-roll + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: raw_leather_2 } + price: 0.10 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml new file mode 100644 index 00000000000..a8728020b98 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml @@ -0,0 +1,111 @@ +- type: constructionGraph + id: blackbandana + start: start + graph: + - node: start + edges: + - to: bandanablack + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanablack + entity: ClothingMaskBandBlack + +- type: constructionGraph + id: bluebandana + start: start + graph: + - node: start + edges: + - to: bandanablue + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanablue + entity: ClothingMaskBandBlue + +- type: constructionGraph + id: brownbandana + start: start + graph: + - node: start + edges: + - to: bandanabrown + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanabrown + entity: ClothingMaskBandBrown + +- type: constructionGraph + id: goldbandana + start: start + graph: + - node: start + edges: + - to: bandanagold + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanagold + entity: ClothingMaskBandGold + +- type: constructionGraph + id: greenbandana + start: start + graph: + - node: start + edges: + - to: bandanagreen + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanagreen + entity: ClothingMaskBandGreen + +- type: constructionGraph + id: greybandana + start: start + graph: + - node: start + edges: + - to: bandanagrey + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanagrey + entity: ClothingMaskBandGrey + +- type: constructionGraph + id: redbandana + start: start + graph: + - node: start + edges: + - to: bandanared + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanared + entity: ClothingMaskBandRed + +- type: constructionGraph + id: skullbandana + start: start + graph: + - node: start + edges: + - to: bandanaskull + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanaskull + entity: ClothingMaskBandSkull \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml new file mode 100644 index 00000000000..850d2d999af --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml @@ -0,0 +1,75 @@ +#MARK: Uniform's +- type: constructionGraph + id: WastelanderRagsGraph + start: start + graph: + - node: start + edges: + - to: rags + steps: + - material: Cloth + amount: 4 + doAfter: 8 + - node: rags + entity: N14ClothingUniformJumpsuitRags + +#MARK: Mantie's +- type: constructionGraph + id: LeatherMantleGraph + start: start + graph: + - node: start + edges: + - to: mantle + steps: + - material: Leather + amount: 2 + doAfter: 4 + - node: mantle + entity: N14ClothingNeckMantleLeather + +- type: constructionGraph + id: LeatherCloakGraph + start: start + graph: + - node: start + edges: + - to: cloak + steps: + - material: Leather + amount: 2 + doAfter: 4 + - node: cloak + entity: N14ClothingNeckCloakLeather + +- type: constructionGraph + id: YaoguaiCloakGraph + start: start + graph: + - node: start + edges: + - to: cloak + steps: + - tag: YaoguaiHide + name: yaoguai hide + icon: + sprite: _Nuclear14/Objects/Misc/mob_drops.rsi + state: hide_yaoguai + doAfter: 8 + - node: cloak + entity: N14ClothingNeckCloakYaoguai + +#MARK: Gloves +- type: constructionGraph + id: GlovesClothGraph + start: start + graph: + - node: start + edges: + - to: gloves + steps: + - material: Cloth + amount: 2 + doAfter: 4 + - node: gloves + entity: N14ClothingHandsGlovesCloth \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml new file mode 100644 index 00000000000..c1846375b65 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml @@ -0,0 +1,24 @@ +- type: constructionGraph + id: N14BedrollItem + start: start + graph: + - node: start + edges: + - to: bedroll + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: bedroll + entity: N14BedrollItem + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:DeleteEntity \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml new file mode 100644 index 00000000000..b3629a2813a --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: N14Cardboard + start: start + graph: + - node: start + edges: + - to: cardboard + steps: + - material: N14Paper + amount: 2 + doAfter: 2 + - node: cardboard + entity: MaterialCardboard1 + +- type: constructionGraph + id: N14Paper + start: start + graph: + - node: start + edges: + - to: paper + steps: + - material: WoodPlank + doAfter: 2 + - node: paper + entity: N14Paper \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml new file mode 100644 index 00000000000..30bb19abf97 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml @@ -0,0 +1,158 @@ +# Mortar and pestle +- type: constructionGraph + id: N14MortarPestle + start: start + graph: + - node: start + edges: + - to: mortarpestle + steps: + - material: WoodPlank + amount: 2 + doAfter: 5 + + - node: mortarpestle + entity: N14MortarpestleGrinder + + +# Healing Powder +- type: constructionGraph + id: N14HealingPowder + start: start + graph: + - node: start + edges: + - to: healingpowder + steps: + - material: BrocFlower + - material: XanderRoot # TODO: Find out if we can add a tool step for crushing. Tests fail for now with it in. Slap crafting doesn't like tool steps. + + - node: healingpowder + entity: N14HealingPowder + +# Stimpaks +- type: constructionGraph + id: N14Stimpak + start: start + graph: + - node: start + edges: + - to: stimpak + steps: + - material: BrocFlower + - material: XanderRoot + - tag: Syringe + name: a syringe + icon: + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: stimpak + doAfter: 1 + - material: Bloodpack + doAfter: 1 + + - node: stimpak + entity: N14Stimpak + +# RadAway Inhaler +- type: constructionGraph + id: N14RadAwayInhaler + start: start + graph: + - node: start + edges: + - to: empty + steps: + - tag: Jet + name: jet + icon: + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: jet + - material: Glass + amount: 1 + doAfter: 3 + - node: empty + entity: N14RadAwayInhalerTrash + edges: + - to: refill + steps: + - tag: Phial + name: RadAway Phial + icon: + sprite: _Nuclear14/Objects/Specific/Medical/radinhaler.rsi + state: radawayphial_icon + doAfter: 2 + - node: refill + entity: N14RadAwayInhaler + edges: + - to: empty + steps: + - tool: Screwing + doAfter: 2 + +# RadAway Phial +- type: constructionGraph + id: N14RadAwayPhial + start: start + graph: + - node: start + edges: + - to: fill + conditions: + - !type:MinSolution + solution: beaker + reagent: + ReagentId: RadAway + quantity: 30 + steps: + - tool: Screwing + doAfter: 1 + - node: fill + entity: N14RadAwayPhial + +#TODO: Crashes game, needs a C# script to support it + +# - type: constructionGraph +# id: N14RadAwayPhialRefill +# start: start +# graph: +# - node: start +# edges: +# - to: phial +# steps: +# - material: CaveFungusRad +# - material: Plastic +# doAfter: 3 +# - node: phial +# entity: N14RadAwayPhialEmpty +# edges: +# - to: refill +# conditions: +# - !type:MinSolution +# solution: beaker +# reagent: +# ReagentId: Antiseptic +# quantity: 20 +# - !type:MinSolution +# solution: beaker +# reagent: +# ReagentId: Water +# quantity: 10 +# steps: +# - tool: Screwing +# doAfter: 1 +# - node: fill +# entity: N14RadAwayPhial + +# Jet +- type: constructionGraph + id: N14JetInhaler + start: start + graph: + - node: start + edges: + - to: jet + steps: + - material: Plastic + + - node: jet + entity: N14JetInhaler diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml new file mode 100644 index 00000000000..52653c70b53 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml @@ -0,0 +1,28 @@ +# Rolling Paper +- type: constructionGraph + id: N14RollingPaper + start: start + graph: + - node: start + edges: + - to: rollingpaper + steps: + - material: N14Paper + doAfter: 2 + - node: rollingpaper + entity: N14RollingPaper + +# Rollie +- type: constructionGraph + id: N14Cigarette + start: start + graph: + - node: start + edges: + - to: cigarette + steps: + - material: N14RollingPaper + - material: CoyoteTobacco + doAfter: 2 + - node: cigarette + entity: N14CigaretteRollie \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml new file mode 100644 index 00000000000..7165f8f3a19 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml @@ -0,0 +1,105 @@ +# Sacks +- type: constructionGraph + id: N14Sack + start: start + graph: + - node: start + edges: + - to: sack + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: sack + entity: N14Sack + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + +- type: constructionGraph + id: N14SackCompost + start: start + graph: + - node: start + edges: + - to: sack + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: sack + entity: N14SackCompost + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + +- type: constructionGraph + id: N14SackFertilizer + start: start + graph: + - node: start + edges: + - to: sack + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: sack + entity: N14SackFertilizer + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + +# Wallet +- type: constructionGraph + id: N14Wallet + start: start + graph: + - node: start + edges: + - to: wallet + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: wallet + entity: N14Wallet + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml index 5e989ba3855..b50405b0d7e 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml @@ -1,3 +1,4 @@ +#MARK: Bandanas - type: construction name: black bandana id: blackbandana @@ -12,20 +13,6 @@ state: icon_mask hide: false -- type: constructionGraph - id: blackbandana - start: start - graph: - - node: start - edges: - - to: bandanablack - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanablack - entity: ClothingMaskBandBlack - - type: construction name: blue bandana id: bluebandana @@ -38,21 +25,7 @@ icon: sprite: Clothing/Head/Bandanas/blue.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: bluebandana - start: start - graph: - - node: start - edges: - - to: bandanablue - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanablue - entity: ClothingMaskBandBlue + hide: true #MARK: Hide - type: construction name: gold bandana @@ -66,21 +39,7 @@ icon: sprite: Clothing/Head/Bandanas/gold.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: goldbandana - start: start - graph: - - node: start - edges: - - to: bandanagold - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanagold - entity: ClothingMaskBandGold + hide: true #MARK: Hide - type: construction name: green bandana @@ -94,21 +53,7 @@ icon: sprite: Clothing/Head/Bandanas/green.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: greenbandana - start: start - graph: - - node: start - edges: - - to: bandanagreen - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanagreen - entity: ClothingMaskBandGreen + hide: true #MARK: Hide - type: construction name: red bandana @@ -122,21 +67,7 @@ icon: sprite: Clothing/Head/Bandanas/red.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: redbandana - start: start - graph: - - node: start - edges: - - to: bandanared - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanared - entity: ClothingMaskBandRed + hide: true #MARK: Hide - type: construction name: skull bandana @@ -150,21 +81,7 @@ icon: sprite: Clothing/Head/Bandanas/skull.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: skullbandana - start: start - graph: - - node: start - edges: - - to: bandanaskull - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanaskull - entity: ClothingMaskBandSkull + hide: true #MARK: Hide - type: construction name: brown bandana @@ -180,20 +97,6 @@ state: icon_mask hide: false -- type: constructionGraph - id: brownbandana - start: start - graph: - - node: start - edges: - - to: bandanabrown - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanabrown - entity: ClothingMaskBandBrown - - type: construction name: grey bandana id: greybandana @@ -208,16 +111,74 @@ state: icon_mask hide: false -- type: constructionGraph - id: greybandana - start: start - graph: - - node: start - edges: - - to: bandanagrey - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanagrey - entity: ClothingMaskBandGrey \ No newline at end of file +#MARK: Uniform's +- type: construction + name: wastelander rags + id: WastelanderRags + graph: WastelanderRagsGraph + startNode: start + targetNode: rags + category: construction-category-clothing + objectType: Item + description: Hey, it's better than nothing. + icon: + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/wastelanderrags.rsi + state: icon + hide: false + +#MARK: Mantle's +- type: construction + id: LeatherMantle + name: leather mantle + description: A comfortable brown long mantle. + category: construction-category-clothing + objectType: Item + graph: LeatherMantleGraph + startNode: start + targetNode: mantle + icon: + sprite: _Nuclear14/Clothing/Neck/leathermantle.rsi + state: icon + hide: false + +- type: construction + id: LeatherCloak + name: leather cloak + description: A handmade cloak, comfy and warm. + category: construction-category-clothing + objectType: Item + graph: LeatherCloakGraph + startNode: start + targetNode: cloak + icon: + sprite: _Nuclear14/Clothing/Neck/leathercloak.rsi + state: icon + hide: false + +- type: construction + id: YaoguaiCloak + name: yaoguai cloak + description: A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai. + category: construction-category-clothing + objectType: Item + graph: YaoguaiCloakGraph + startNode: start + targetNode: cloak + icon: + sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi + state: icon + hide: false + +- type: construction + id: GlovesCloth + name: cloth gloves + description: A piece of cloth to tie around the hand. + category: construction-category-clothing + objectType: Item + graph: GlovesClothGraph + startNode: start + targetNode: gloves + icon: + sprite: _Nuclear14/Clothing/Hands/Gloves/clothgloves.rsi + state: icon + hide: false diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml index 87af83333a1..f7721cc06f8 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml @@ -11,29 +11,4 @@ icon: sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi state: bedroll_rolled - objectType: Item - -- type: constructionGraph - id: N14BedrollItem - start: start - graph: - - node: start - edges: - - to: bedroll - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: bedroll - entity: N14BedrollItem - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:DeleteEntity \ No newline at end of file + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml index 638b8576a51..2f3ecf86026 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml @@ -11,19 +11,6 @@ objectType: Item hide: false -- type: constructionGraph - id: N14Paper - start: start - graph: - - node: start - edges: - - to: paper - steps: - - material: WoodPlank - doAfter: 2 - - node: paper - entity: N14Paper - # Cardboard - type: construction name: cardboard @@ -35,18 +22,4 @@ description: "A sheet of cardboard." icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard } objectType: Item - hide: false - -- type: constructionGraph - id: N14Cardboard - start: start - graph: - - node: start - edges: - - to: cardboard - steps: - - material: N14Paper - amount: 2 - doAfter: 2 - - node: cardboard - entity: MaterialCardboard1 \ No newline at end of file + hide: false \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml index fbace340654..c88979fd858 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml @@ -13,22 +13,6 @@ state: mortar objectType: Item -- type: constructionGraph - id: N14MortarPestle - start: start - graph: - - node: start - edges: - - to: mortarpestle - steps: - - material: WoodPlank - amount: 2 - doAfter: 5 - - - node: mortarpestle - entity: N14MortarpestleGrinder - - # Healing Powder - type: construction name: healing powder @@ -44,20 +28,6 @@ state: healingpowder objectType: Item -- type: constructionGraph - id: N14HealingPowder - start: start - graph: - - node: start - edges: - - to: healingpowder - steps: - - material: BrocFlower - - material: XanderRoot # TODO: Find out if we can add a tool step for crushing. Tests fail for now with it in. Slap crafting doesn't like tool steps. - - - node: healingpowder - entity: N14HealingPowder - # Stimpaks - type: construction name: stimpak @@ -73,28 +43,6 @@ state: stimpak objectType: Item -- type: constructionGraph - id: N14Stimpak - start: start - graph: - - node: start - edges: - - to: stimpak - steps: - - material: BrocFlower - - material: XanderRoot - - tag: Syringe - name: a syringe - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: stimpak - doAfter: 1 - - material: Bloodpack - doAfter: 1 - - - node: stimpak - entity: N14Stimpak - # RadAway Inhaler - type: construction name: RadAway inhaler @@ -110,41 +58,6 @@ sprite: _Nuclear14/Objects/Specific/Medical/radinhaler.rsi state: radawayinhaler -- type: constructionGraph - id: N14RadAwayInhaler - start: start - graph: - - node: start - edges: - - to: empty - steps: - - tag: Jet - name: jet - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: jet - - material: Glass - amount: 1 - doAfter: 3 - - node: empty - entity: N14RadAwayInhalerTrash - edges: - - to: refill - steps: - - tag: Phial - name: RadAway Phial - icon: - sprite: _Nuclear14/Objects/Specific/Medical/radinhaler.rsi - state: radawayphial_icon - doAfter: 2 - - node: refill - entity: N14RadAwayInhaler - edges: - - to: empty - steps: - - tool: Screwing - doAfter: 2 - # RadAway Phial - type: construction @@ -161,25 +74,6 @@ state: radawayphial_icon objectType: Item -- type: constructionGraph - id: N14RadAwayPhial - start: start - graph: - - node: start - edges: - - to: fill - conditions: - - !type:MinSolution - solution: beaker - reagent: - ReagentId: RadAway - quantity: 30 - steps: - - tool: Screwing - doAfter: 1 - - node: fill - entity: N14RadAwayPhial - #TODO: Crashes game, needs a C# script to support it # RadAway phial simple refill # - type: construction @@ -196,38 +90,6 @@ # state: radawayphial_icon # objectType: Item -# - type: constructionGraph -# id: N14RadAwayPhialRefill -# start: start -# graph: -# - node: start -# edges: -# - to: phial -# steps: -# - material: CaveFungusRad -# - material: Plastic -# doAfter: 3 -# - node: phial -# entity: N14RadAwayPhialEmpty -# edges: -# - to: refill -# conditions: -# - !type:MinSolution -# solution: beaker -# reagent: -# ReagentId: Antiseptic -# quantity: 20 -# - !type:MinSolution -# solution: beaker -# reagent: -# ReagentId: Water -# quantity: 10 -# steps: -# - tool: Screwing -# doAfter: 1 -# - node: fill -# entity: N14RadAwayPhial - # Jet - type: construction name: jet inhaler @@ -241,17 +103,4 @@ icon: sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi state: jet - objectType: Item - -- type: constructionGraph - id: N14JetInhaler - start: start - graph: - - node: start - edges: - - to: jet - steps: - - material: Plastic - - - node: jet - entity: N14JetInhaler + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml index 10b14237e42..08e5eb4e0b0 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml @@ -11,19 +11,6 @@ objectType: Item hide: false -- type: constructionGraph - id: N14RollingPaper - start: start - graph: - - node: start - edges: - - to: rollingpaper - steps: - - material: N14Paper - doAfter: 2 - - node: rollingpaper - entity: N14RollingPaper - # Rollie - type: construction name: cigarette @@ -35,18 +22,4 @@ description: "A roll up cigarette filled with coyote tobacco" icon: { sprite: _Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi, state: unlit-icon } objectType: Item - hide: false - -- type: constructionGraph - id: N14Cigarette - start: start - graph: - - node: start - edges: - - to: cigarette - steps: - - material: N14RollingPaper - - material: CoyoteTobacco - doAfter: 2 - - node: cigarette - entity: N14CigaretteRollie \ No newline at end of file + hide: false \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml index 6074a4ac8bb..e00c9922e40 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml @@ -1,4 +1,3 @@ - #Sacks - type: construction name: sack @@ -14,32 +13,6 @@ state: icon objectType: Item -- type: constructionGraph - id: N14Sack - start: start - graph: - - node: start - edges: - - to: sack - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: sack - entity: N14Sack - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity - - type: construction name: sack compost id: N14SackCompost @@ -54,32 +27,6 @@ state: icon objectType: Item -- type: constructionGraph - id: N14SackCompost - start: start - graph: - - node: start - edges: - - to: sack - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: sack - entity: N14SackCompost - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity - - type: construction name: sack fertilizer id: N14SackFertilizer @@ -94,32 +41,6 @@ state: icon objectType: Item -- type: constructionGraph - id: N14SackFertilizer - start: start - graph: - - node: start - edges: - - to: sack - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: sack - entity: N14SackFertilizer - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity - # Wallet - type: construction name: wallet @@ -134,29 +55,3 @@ sprite: _Nuclear14/Objects/Misc/storage.rsi state: wallet objectType: Item - -- type: constructionGraph - id: N14Wallet - start: start - graph: - - node: start - edges: - - to: wallet - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: wallet - entity: N14Wallet - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml index 1f11e3bcf89..dda0506358a 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml @@ -1,6 +1,6 @@ # Cartride = 10 steel # Magazine = no. cartridges + 100 steel -# Box = no. cartridges + 10 cardboard +# Box = no. cartridges + 100 cardboard # Cartridges 1,2,3 lead, 2,3,4 steel, 2,3 gunpowder for: # Small: @@ -38,7 +38,7 @@ - type: latheRecipe id: Magazine556Rifle result: Magazine556Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 50 @@ -48,7 +48,7 @@ - type: latheRecipe id: LongMagazine556Rifle result: LongMagazine556Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 70 @@ -58,7 +58,7 @@ - type: latheRecipe id: LMGMagazine556Rifle result: LMGMagazine556Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 110 @@ -68,13 +68,13 @@ - type: latheRecipe id: MagazineBox556 result: MagazineBox556 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 150 Steel: 225 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # 5mm - type: latheRecipe @@ -90,7 +90,7 @@ - type: latheRecipe id: N14MagazineMinigun5mm result: N14MagazineMinigun5mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 500 @@ -111,7 +111,7 @@ - type: latheRecipe id: Magazine762Rifle result: Magazine762Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 60 @@ -121,13 +121,13 @@ - type: latheRecipe id: MagazineBox762 result: MagazineBox762 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 120 Steel: 180 Gunpowder: 120 - Cardboard: 10 + Cardboard: 100 # 9mm - type: latheRecipe @@ -143,7 +143,7 @@ - type: latheRecipe id: N14MagazinePistol9mm result: N14MagazinePistol9mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 24 @@ -153,7 +153,7 @@ - type: latheRecipe id: N14MagazineSMG9mm result: N14MagazineSMG9mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 31 @@ -173,13 +173,13 @@ - type: latheRecipe id: MagazineBox9mm result: MagazineBox9mm - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 80 Steel: 160 Gunpowder: 160 - Cardboard: 10 + Cardboard: 100 # 10mm - type: latheRecipe @@ -195,7 +195,7 @@ - type: latheRecipe id: N14MagazinePistol10mm result: N14MagazinePistol10mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 10 @@ -205,7 +205,7 @@ - type: latheRecipe id: N14MagazineSMG10mm result: N14MagazineSMG10mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 35 @@ -225,13 +225,13 @@ - type: latheRecipe id: MagazineBox10mm result: MagazineBox10mm - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 80 Steel: 160 Gunpowder: 160 - Cardboard: 10 + Cardboard: 100 # 12.7mm - type: latheRecipe @@ -247,7 +247,7 @@ - type: latheRecipe id: N14MagazinePistol12mm result: N14MagazinePistol12mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 20 @@ -257,7 +257,7 @@ - type: latheRecipe id: N14MagazineSMG12mm result: N14MagazineSMG12mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 56 @@ -267,7 +267,7 @@ - type: latheRecipe id: N14TopMagazineSMG12mm result: N14TopMagazineSMG12mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 80 @@ -277,13 +277,13 @@ - type: latheRecipe id: MagazineBox12 result: MagazineBox12 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 150 Steel: 225 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # 12ga - type: latheRecipe @@ -299,7 +299,7 @@ - type: latheRecipe id: N14MagazineShotgun12 result: N14MagazineShotgun12 - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 16 @@ -310,13 +310,13 @@ - type: latheRecipe id: MagazineBox12gauge result: MagazineBox12gauge - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 60 Paper: 90 Gunpowder: 60 - Cardboard: 10 + Cardboard: 100 # 20ga - type: latheRecipe @@ -332,7 +332,7 @@ - type: latheRecipe id: N14MagazineShotgun20 result: N14MagazineShotgun20 - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 20 @@ -343,13 +343,13 @@ - type: latheRecipe id: MagazineBox20gauge result: MagazineBox20gauge - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 30 Paper: 60 Gunpowder: 60 - Cardboard: 10 + Cardboard: 100 # 22lr - type: latheRecipe @@ -365,7 +365,7 @@ - type: latheRecipe id: N14MagazinePistol22lr result: N14MagazinePistol22lr - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 80 @@ -375,13 +375,13 @@ - type: latheRecipe id: MagazineBox22 result: MagazineBox22 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 75 Steel: 150 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # 44 magnmum - type: latheRecipe @@ -407,13 +407,13 @@ - type: latheRecipe id: MagazineBox44 result: MagazineBox44 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 44 Steel: 166 Gunpowder: 44 - Cardboard: 10 + Cardboard: 100 # .45 auto - type: latheRecipe @@ -429,7 +429,7 @@ - type: latheRecipe id: N14MagazinePistol45 result: N14MagazinePistol45 - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 18 @@ -439,7 +439,7 @@ - type: latheRecipe id: Magazine45SubMachineGun result: Magazine45SubMachineGun - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 25 @@ -449,13 +449,13 @@ - type: latheRecipe id: MagazineBox45 result: MagazineBox45 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 75 Steel: 150 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # .308 - type: latheRecipe @@ -471,7 +471,7 @@ - type: latheRecipe id: Magazine308Rifle result: Magazine308Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 33 @@ -481,7 +481,7 @@ - type: latheRecipe id: ClipMagazine308Rifle result: ClipMagazine308Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 24 @@ -491,13 +491,13 @@ - type: latheRecipe id: MagazineBox308 result: MagazineBox308 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 96 Steel: 128 Gunpowder: 96 - Cardboard: 10 + Cardboard: 100 # 45-70 gov't - type: latheRecipe @@ -523,19 +523,19 @@ - type: latheRecipe id: MagazineBox45-70 result: MagazineBox45-70 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 120 Steel: 150 Gunpowder: 100 - Cardboard: 10 + Cardboard: 100 # 50 - type: latheRecipe id: N14Magazine50AMR result: N14Magazine50AMR - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 25 @@ -545,10 +545,10 @@ - type: latheRecipe id: MagazineBox50 result: MagazineBox50 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 150 Steel: 200 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml new file mode 100644 index 00000000000..66d38af5a01 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml @@ -0,0 +1,105 @@ +# Armor +- type: latheRecipe + id: N14ClothingOuterCoatLeatherDuster + result: N14ClothingOuterCoatLeatherDuster + category: N14Armor + completetime: 4 + materials: + Cloth: 500 + Leather: 300 + +- type: latheRecipe + id: N14ClothingOuterCoatWinterArmored + result: N14ClothingOuterCoatWinterArmored + category: N14Armor + completetime: 4 + materials: + Cloth: 600 + Leather: 100 + +- type: latheRecipe + id: N14ClothingOuterLeatherArmor + result: N14ClothingOuterLeatherArmor + category: N14Armor + completetime: 4 + materials: + Leather: 500 + +- type: latheRecipe + id: N14ClothingOuterChitinArmor + result: N14ClothingOuterChitinArmor + category: N14Armor + completetime: 6 + materials: + AntChitin: 300 + Cloth: 450 + +- type: latheRecipe + id: N14ClothingOuterPainspike + result: N14ClothingOuterPainspike + category: N14Armor + completetime: 6 + materials: + Cloth: 400 + Steel: 600 + Leather: 100 + +- type: latheRecipe + id: N14ClothingOuterTribalArmorHeavy + result: N14ClothingOuterTribalArmorHeavy + category: N14Armor + completetime: 8 + materials: + Cloth: 500 + Leather: 500 + Wood: 2000 + +- type: latheRecipe + id: N14ClothingOuterInsectArmor + result: N14ClothingOuterInsectArmor + category: N14Armor + completetime: 8 + materials: + # AntChitin: 600 + Exoskeleton: 300 + Cloth: 350 + +- type: latheRecipe + id: N14ClothingOuterMetalArmor + result: N14ClothingOuterMetalArmor + category: N14Armor + completetime: 8 + materials: + Cloth: 1000 + Steel: 2000 + +# Shield's +- type: latheRecipe + id: N14InsectShield + result: N14InsectShield + category: N14Shield + completetime: 6 + materials: + # AntChitin: 150 + Exoskeleton: 50 + Wood: 400 + +- type: latheRecipe + id: MakeshiftShield + result: MakeshiftShield + category: N14Shield + completetime: 6 + materials: + Steel: 600 + Wood: 200 + +- type: latheRecipe + id: WoodenBuckler + result: WoodenBuckler + category: N14Shield + completetime: 6 + materials: + Steel: 200 + Wood: 800 + +# Accessories \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml index 35e134b1e02..6e9d8cd8f91 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml @@ -1,6 +1,18 @@ - type: latheCategory id: N14Ammo name: lathe-category-ammo + +- type: latheCategory + id: N14AmmoBox + name: lathe-category-ammo-box + +- type: latheCategory + id: N14AmmoMagazine + name: lathe-category-ammo-magazines + +- type: latheCategory + id: N14Armor + name: lathe-category-armor - type: latheCategory id: N14Containers @@ -13,10 +25,18 @@ - type: latheCategory id: N14Circuitry name: lathe-category-circuitry + +- type: latheCategory + id: N14Cleaning + name: lathe-category-cleaning - type: latheCategory id: N14Kitchen name: lathe-category-kitchen + +- type: latheCategory + id: N14Lights + name: lathe-category-lights - type: latheCategory id: N14Misc @@ -26,6 +46,10 @@ id: N14Parts name: lathe-category-parts +- type: latheCategory + id: N14Shield + name: lathe-category-shields + - type: latheCategory id: N14Tools name: lathe-category-tools @@ -33,3 +57,19 @@ - type: latheCategory id: N14Weapons name: lathe-category-weapons + +- type: latheCategory + id: N14WeaponMelee + name: lathe-category-weapons-melee + +- type: latheCategory + id: N14WeaponPistols + name: lathe-category-weapons-pistols + +- type: latheCategory + id: N14WeaponRifles + name: lathe-category-weapons-rifles + +- type: latheCategory + id: N14WeaponSMGs + name: lathe-category-weapons-smgs \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml index 364a30c1e64..a07fea10bcd 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml @@ -1,6 +1,7 @@ - type: latheRecipe id: N14Mop result: N14Mop + category: N14Cleaning completetime: 2 materials: Plastic: 100 @@ -8,6 +9,7 @@ - type: latheRecipe id: N14MopBucket result: N14MopBucket + category: N14Cleaning completetime: 2 materials: Steel: 100 @@ -16,6 +18,7 @@ - type: latheRecipe id: N14Bucket result: Bucket + category: N14Cleaning completetime: 2 materials: Steel: 100 @@ -23,6 +26,7 @@ - type: latheRecipe id: N14WetFloorSign result: WetFloorSign + category: N14Cleaning completetime: 2 materials: Plastic: 100 @@ -30,6 +34,7 @@ - type: latheRecipe id: N14SprayBottle result: SprayBottle + category: N14Cleaning completetime: 2 materials: Plastic: 100 @@ -37,6 +42,7 @@ - type: latheRecipe id: N14TrashBag result: TrashBag + category: N14Cleaning completetime: 1.2 materials: Plastic: 100 @@ -44,6 +50,7 @@ - type: latheRecipe id: N14LightReplacer result: LightReplacerEmpty + category: N14Misc completetime: 2.4 materials: Steel: 100 @@ -52,6 +59,7 @@ - type: latheRecipe id: N14Mousetrap result: Mousetrap + category: N14Misc completetime: 1 materials: Wood: 100 @@ -60,6 +68,7 @@ - type: latheRecipe id: N14Plunger result: Plunger + category: N14Cleaning completetime: 2 materials: Plastic: 50 @@ -68,6 +77,7 @@ - type: latheRecipe id: N14WeaponSprayNozzle result: WeaponSprayNozzle + category: N14Cleaning completetime: 5 materials: Steel: 1500 @@ -76,6 +86,7 @@ - type: latheRecipe id: N14ClothingBackpackWaterTank result: ClothingBackpackWaterTank + category: N14Cleaning completetime: 4 materials: Steel: 250 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Reactions/ores.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml similarity index 84% rename from Resources/Prototypes/_Nuclear14/Recipes/Reactions/ores.yml rename to Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml index aff51e258e0..3d611afd77c 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Reactions/ores.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml @@ -51,4 +51,12 @@ applyMaterialDiscount: false completetime: 2 materials: - RawQuartz: 100 \ No newline at end of file + RawQuartz: 100 + +- type: latheRecipe + id: N14MaterialLeather + result: N14MaterialLeather1 + category: N14Misc + completetime: 2 + materials: + RawLeather: 100 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml index 5353d323ddb..8e60a3a69ec 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml @@ -1,7 +1,7 @@ - type: latheRecipe id: N14LightTube result: LightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -10,7 +10,7 @@ - type: latheRecipe id: N14LedLightTube result: LedLightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -19,7 +19,7 @@ - type: latheRecipe id: N14SodiumLightTube result: SodiumLightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -28,7 +28,7 @@ - type: latheRecipe id: N14ExteriorLightTube result: ExteriorLightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -37,7 +37,7 @@ - type: latheRecipe id: N14LightBulb result: LightBulb - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -46,7 +46,7 @@ - type: latheRecipe id: N14LedLightBulb result: LedLightBulb - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -55,7 +55,7 @@ - type: latheRecipe id: N14GlowstickRed result: GlowstickRed - category: Lights + category: N14Lights completetime: 2 materials: Plastic: 50 @@ -63,15 +63,16 @@ - type: latheRecipe id: N14Flare result: Flare - category: Lights + category: N14Lights completetime: 2 materials: Plastic: 50 + Sulfur: 25 - type: latheRecipe id: N14FlashlightLantern result: EmptyFlashlightLantern - category: Lights + category: N14Lights completetime: 2 materials: Steel: 100 @@ -81,6 +82,36 @@ - type: latheRecipe id: N14Matchbox result: Matchbox + category: N14Misc completetime: 1 materials: - Wood: 100 \ No newline at end of file + Wood: 100 + +- type: latheRecipe + id: ClothingBeltQuiverSpear + result: ClothingBeltQuiverSpear + category: N14Containers + completetime: 4 + materials: + Steel: 100 + Leather: 300 + Cloth: 100 + +- type: latheRecipe + id: ClothingBeltQuiver + result: ClothingBeltQuiver + category: N14Containers + completetime: 4 + materials: + Leather: 400 + Cloth: 200 + +- type: latheRecipe + id: ArrowRegular + result: ArrowRegular + category: N14Ammo + completetime: 1 + materials: + Steel: 10 + Wood: 20 + Paper: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml index fa6e8225822..1894d51848d 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml @@ -42,17 +42,19 @@ id: N14CableStack result: CableApcStack1 category: N14Parts - completetime: 2 + completetime: 1 materials: - Steel: 30 + Steel: 10 + Cloth: 1 - type: latheRecipe id: N14CableMVStack result: CableMVStack1 category: N14Parts - completetime: 2 + completetime: 1 materials: - Steel: 30 + Steel: 20 + Cloth: 5 - type: latheRecipe id: N14CableHVStack @@ -61,6 +63,7 @@ completetime: 2 materials: Steel: 30 + Cloth: 10 - type: latheRecipe id: N14Crowbar @@ -95,7 +98,7 @@ completetime: 2 materials: Steel: 200 - Plastic: 200 + Plastic: 400 - type: latheRecipe id: N14NetworkConfigurator @@ -121,7 +124,7 @@ category: N14Tools completetime: 2 materials: - Steel: 800 + Plastic: 500 Glass: 300 - type: latheRecipe @@ -130,7 +133,7 @@ category: N14Tools completetime: 2 materials: - Steel: 800 + Plastic: 500 Glass: 300 - type: latheRecipe @@ -139,7 +142,7 @@ category: N14Tools completetime: 2 materials: - Steel: 800 + Plastic: 500 Glass: 300 - type: latheRecipe diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml new file mode 100644 index 00000000000..69a2294a0a1 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml @@ -0,0 +1,104 @@ +# MARK: Guns + +# - type: latheRecipe +# id: N14WeaponPipe10mm +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi +# state: icon +# result: N14WeaponPipe10mm +# category: N14WeaponPistols +# completetime: 6 +# materials: +# Steel: 500 +# Wood: 200 +# Cloth: 100 + +# - type: latheRecipe +# id: N14weapon10mmpipe +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi +# state: icon +# result: N14weapon10mmpipe +# category: N14WeaponSMGs +# completetime: 12 +# materials: +# Steel: 1000 +# Wood: 300 +# Cloth: 200 + +# - type: latheRecipe +# id: N14weapon12mmpipe +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi +# state: icon +# result: N14weapon12mmpipe +# category: N14WeaponSMGs +# completetime: 4 +# materials: +# Steel: 2000 +# Wood: 300 +# Cloth: 200 + +# - type: latheRecipe +# id: N14WeaponPipeRifle +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi +# state: base +# result: N14WeaponPipeRifle +# category: N14WeaponRifles +# completetime: 12 +# materials: +# Steel: 1000 +# Wood: 2000 +# Cloth: 300 + +- type: latheRecipe + id: BowImprovised + icon: + sprite: Objects/Weapons/Guns/Bow/bow.rsi + state: unwielded + result: BowImprovised + category: N14Weapons + completetime: 12 + materials: + Wood: 500 + Cloth: 200 + +# MARK: Melee +- type: latheRecipe + id: N14WastelandSpear + icon: + sprite: _Nuclear14/Objects/Weapons/Melee/spear.rsi + state: spear + result: N14WastelandSpear + category: N14WeaponMelee + completetime: 12 + materials: + Steel: 100 + Wood: 600 + Cloth: 100 + +- type: latheRecipe + id: N14WastelandTribalJavelin + icon: + sprite: _Nuclear14/Objects/Weapons/Melee/javelin.rsi + state: spear + result: N14WastelandTribalJavelin + category: N14WeaponMelee + completetime: 12 + materials: + Steel: 100 + Wood: 200 + Cloth: 100 + +- type: latheRecipe + id: N14ScrapMachete + icon: + sprite: _Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi + state: icon + result: N14ScrapMachete + category: N14WeaponMelee + completetime: 12 + materials: + Steel: 400 + Cloth: 200 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml index ab47a678bb0..c1768f2d05f 100644 --- a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml @@ -9,8 +9,9 @@ id: BrahminHide name: brahmin hides icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: hide_brahmin_2 } - spawn: N14MaterialBrahminHide - maxCount: 3 + spawn: N14MaterialBrahminHide1 + maxCount: 4 + itemSize: 1 - type: stack id: Gunpowder @@ -44,6 +45,30 @@ maxCount: 5 itemSize: 1 +- type: stack + id: Leather + name: leather + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: leather_3 } + spawn: N14MaterialLeather1 + maxCount: 15 + itemSize: 1 + +- type: stack + id: RawLeather + name: raw leather + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: raw_leather_2 } + spawn: N14MaterialRawLeather1 + maxCount: 15 + itemSize: 1 + +- type: stack + id: AntChitin + name: ant chitin + icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: chitin_3 } + spawn: N14MaterialAntChitin1 + maxCount: 3 + itemSize: 1 + # Ores - type: stack id: LeadOre diff --git a/Resources/Prototypes/_Nuclear14/tags.yml b/Resources/Prototypes/_Nuclear14/tags.yml index eadf60eb5a4..47f3c7c9110 100644 --- a/Resources/Prototypes/_Nuclear14/tags.yml +++ b/Resources/Prototypes/_Nuclear14/tags.yml @@ -26,6 +26,9 @@ - type: Tag id: Powder +- type: Tag + id: RawLeather + - type: Tag id: Saw @@ -54,6 +57,9 @@ - type: Tag id: Gear +- type: Tag + id: YaoguaiHide + - type: Tag id: GearSmall @@ -135,6 +141,7 @@ #MARK: Guns types. - type: Tag id: Revolver + #MARK: SpeedLoader #TODO: move to EE - type: Tag diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather.png deleted file mode 100644 index dcd84ddcb44..00000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png new file mode 100644 index 00000000000..40a89d1c10a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png new file mode 100644 index 00000000000..53d4bc1a609 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png new file mode 100644 index 00000000000..7dbeb76c0ba Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json index c8b16907f7e..aa848d7292c 100644 --- a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json @@ -224,7 +224,19 @@ "name": "militaryfiber" }, { - "name": "leather" + "name": "leather_1" + }, + { + "name": "leather_2" + }, + { + "name": "leather_3" + }, + { + "name": "raw_leather_1" + }, + { + "name": "raw_leather_2" }, { "name": "cloth" diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png new file mode 100644 index 00000000000..51eda91ecca Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png new file mode 100644 index 00000000000..806f5217c40 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png index fa927467034..47a126001d9 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png and b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin_1.png b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin_1.png new file mode 100644 index 00000000000..47a126001d9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin_1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin.png b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin_1.png similarity index 100% rename from Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin.png rename to Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/hide_brahmin_1.png diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/meta.json index f11278f23c9..558415b8258 100644 --- a/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "hide_brahmin" + "name": "hide_brahmin_1" }, { "name": "hide_brahmin_2" @@ -40,6 +40,9 @@ { "name": "chitin" }, + { + "name": "chitin_1" + }, { "name": "chitin_2" }, diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/coinpouch.png b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/coinpouch.png new file mode 100644 index 00000000000..54e8397892f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/coinpouch.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/meta.json index b5278f7b522..f512bf3e751 100644 --- a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/meta.json @@ -31,6 +31,9 @@ { "name": "wallet" }, + { + "name": "wallet_new" + }, { "name": "moneypouch" }, @@ -49,6 +52,9 @@ { "name": "c-ration-open" }, + { + "name": "coinpouch" + }, { "name": "box" }, diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag.png b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag.png index d0348b5f585..1cd9f555fda 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag.png and b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag_alt.png b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag_alt.png new file mode 100644 index 00000000000..d0348b5f585 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag_alt.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet.png b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet.png index fd0b8b97745..8321a0b9be8 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet.png and b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet_new.png b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet_new.png new file mode 100644 index 00000000000..78f16d98ca9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet_new.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe0.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe0.png new file mode 100644 index 00000000000..aab6af0a4d6 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe0.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe1.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe1.png new file mode 100644 index 00000000000..093aeafda63 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe1.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe2.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe2.png new file mode 100644 index 00000000000..bd902615056 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe2.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe3.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe3.png new file mode 100644 index 00000000000..ed804ac53d1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe3.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe4.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe4.png new file mode 100644 index 00000000000..95e3752c990 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe4.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/meta.json index ab03f233ce5..682ff61a546 100644 --- a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/meta.json @@ -25,6 +25,21 @@ { "name": "chemicalset" }, + { + "name": "weaponbenchframe0" + }, + { + "name": "weaponbenchframe1" + }, + { + "name": "weaponbenchframe2" + }, + { + "name": "weaponbenchframe3" + }, + { + "name": "weaponbenchframe4" + }, { "name": "workbenchframe0" }, @@ -58,6 +73,21 @@ { "name": "ammobenchframe5" }, + { + "name": "armorbenchframe0" + }, + { + "name": "armorbenchframe1" + }, + { + "name": "armorbenchframe2" + }, + { + "name": "armorbenchframe3" + }, + { + "name": "armorbenchframe4" + }, { "name": "chemicalsetframe0" }, diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe0.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe0.png new file mode 100644 index 00000000000..4c678d10d03 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe0.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe1.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe1.png new file mode 100644 index 00000000000..8ffe6cca27e Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe1.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe2.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe2.png new file mode 100644 index 00000000000..bb1422023be Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe2.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe3.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe3.png new file mode 100644 index 00000000000..8921255c037 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe3.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe4.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe4.png new file mode 100644 index 00000000000..ceac401fb0b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe4.png differ