diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml index 4854df983ba..905ff574906 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml @@ -15,7 +15,7 @@ Steel: 200 Glass: 100 - type: StaticPrice - price: 50 + price: 5 #N14 - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index ae42cf55c05..e12b47b6aca 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -55,7 +55,7 @@ enum.StorageUiKey.Key: type: StorageBoundUserInterface - type: StaticPrice - price: 70 + price: 20 #N14 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index 3fbf14a6d60..39893736d8a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -49,7 +49,7 @@ - type: Damageable damageContainer: Inorganic - type: StaticPrice - price: 50 + price: 5 #N14 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml index 90d1fff0bcc..2e83dfec89e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml @@ -13,7 +13,7 @@ - Trash - type: SpaceGarbage - type: StaticPrice - price: 5 + price: 0 #N14 - type: InjectableSolution solution: smokable diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 4aab2efdb97..6df7b8aae98 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -32,7 +32,7 @@ - ReagentId: MindbreakerToxin Quantity: 2 - type: StaticPrice - price: 5 + price: 0 #N14 - type: entity parent: Crayon @@ -287,3 +287,5 @@ tags: - CrayonWhite - type: Appearance + - type: StaticPrice + price: 0 diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index cfbb3ff3869..54c29e61aed 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -57,7 +57,7 @@ - type: StaticPrice price: 0 - type: StackPrice - price: 5 + price: 0 - type: Extractable grindableSolutionName: rod - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index e852b217cba..fe2652c63df 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -220,7 +220,7 @@ stackType: Bloodpack count: 15 #Was 10, Buffed due to limb damage changes - type: StackPrice - price: 20 #Was 10, Buffed due to limb damage changes + price: 0 #N14 - type: entity parent: Bloodpack diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index e09997720d2..f4a52e0c22f 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -70,7 +70,7 @@ True: {visible: false} False: {visible: true} - type: StaticPrice - price: 120 + price: 20 #N14 - type: entity parent: RollerBed diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index c9625c663ca..a1124ebbf34 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -16,7 +16,7 @@ amount: 1.5 - !type:PlantAdjustHealth amount: 0.75 - pricePerUnit: 2 + pricePerUnit: 0 #N14 - type: reagent id: Vitamin #Anything "healthy" @@ -45,7 +45,7 @@ amount: 0.5 - !type:PlantAdjustHealth amount: 1.5 - pricePerUnit: 2.5 + pricePerUnit: .625 - type: reagent id: Protein #Meat and beans @@ -66,7 +66,7 @@ - !type:ModifyBloodLevel amount: 1 # weaker than iron but pretty good all things considered - !type:SatiateHunger - pricePerUnit: 3 + pricePerUnit: 0 - type: reagent id: Sugar #Candy and grains diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml index 7fe69453137..7086ef02892 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml @@ -1,9 +1,190 @@ + - type: cargoProduct - id: SmallGameRifleCrate + id: WebleyPistolCrate icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi + sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/webleypistol.rsi state: base - product: N14CrateArmyFilledSmallGameRifle - cost: 100 + product: N14CrateBreakPlainFilledWebley9mmPistol + cost: 70 category: Armory - group: market \ No newline at end of file + group: market + +- type: cargoProduct + id: WebleyRevolverCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/webley_revolver.rsi + state: base + product: N14CrateBreakPlainFilledWebley44revolver + cost: 280 + category: Armory + group: market + +- type: cargoProduct + id: C70RifleCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/canadianrifle.rsi + state: base + product: N14CrateBreakPlainFilledC70 + cost: 600 + category: Armory + group: market + +- type: cargoProduct + id: F2RifleCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/canadianmarksman.rsi + state: base + product: N14CrateBreakPlainFilledF2 + cost: 600 + category: Armory + group: market + +- type: cargoProduct + id: F1RifleCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/canadiansniper.rsi + state: base + product: N14CrateRedFilledF1 + cost: 375 + category: Armory + group: market + +- type: cargoProduct + id: RossRifleCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/ross.rsi + state: base + product: N14CrateRedFilledRoss + cost: 340 + category: Armory + group: market + +- type: cargoProduct + id: FrenchiShotgunCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Shotguns/canadian_shotgun.rsi + state: icon + product: N14CrateBreakPlainFilledFrenchi + cost: 550 + category: Armory + group: market + +- type: cargoProduct + id: StenSMGCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/canadianSMG.rsi + state: base + product: N14CrateBreakPlainFilledSten + cost: 190 + category: Armory + group: market + +- type: cargoProduct + id: DouglasSMGCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/canadianadvanceSMG.rsi + state: base + product: N14CrateBreakPlainFilledDouglas + cost: 500 + category: Armory + group: market + +- type: cargoProduct + id: CanadianHMGCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/canadianhmg.rsi + state: base + product: N14CrateBreakPlainFilledHMG + cost: 775 + category: Armory + group: market + +- type: cargoProduct + id: BrenHMGCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/bren.rsi + state: base + product: N14CrateBreakPlainFilledBren + cost: 750 + category: Armory + group: market + +- type: cargoProduct + id: C4Crate + icon: + sprite: Objects/Weapons/Bombs/c4.rsi + state: icon + product: N14CrateBreakPlainFilledC4 + cost: 400 + category: Armory + group: market + +- type: cargoProduct + id: EnergyCellCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/EC.rsi + state: o2 + product: N14CrateBreakPlainFilledEnergyCell + cost: 230 + category: Armory + group: market + +- type: cargoProduct + id: MFCellCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi + state: empty + product: N14CrateBreakPlainFilledMFCell + cost: 260 + category: Armory + group: market + +- type: cargoProduct + id: CombatArmorMK1Crate + icon: + sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutcombat.rsi + state: icon + product: N14CrateRedFilledMk1 + cost: 500 + category: Armory + group: market + +- type: cargoProduct + id: CombatArmorMK2Crate + icon: + sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutcombatmk2.rsi + state: icon + product: N14CrateRedFilledMk2 + cost: 700 + category: Armory + group: market + +- type: cargoProduct + id: PoliceVestCrate + icon: + sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi + state: icon + product: N14CrateBreakPlainFilledPoliceVest + cost: 400 + category: Armory + group: market + +- type: cargoProduct + id: CarrierCrate + icon: + sprite: Clothing/Belt/salvagewebbing.rsi + state: icon + product: N14CrateRedFilledCarrier + cost: 160 + category: Armory + group: market + +- type: cargoProduct + id: GrenadierCrate + icon: + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + state: frag + product: N14CrateBreakPlainFilledGrenadier + cost: 150 + category: Armory + group: market diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml index 9c8fab8dd68..a719863defe 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml @@ -24,7 +24,7 @@ sprite: _Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi state: closed product: N14CrateBreakPlainFilledCigarettesRepublic - cost: 220 + cost: 75 category: Consumables group: market @@ -37,3 +37,103 @@ cost: 80 category: Consumables group: market + +- type: cargoProduct + id: WhiskyCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: whisky + product: N14CrateBreakPlainFilledWhisky + cost: 100 + category: Consumables + group: market + +- type: cargoProduct + id: RumCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: roentgen + product: N14CrateBreakPlainFilledRum + cost: 100 + category: Consumables + group: market + +- type: cargoProduct + id: WineCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: nappavalleywine + product: N14CrateBreakPlainFilledWine + cost: 80 + category: Consumables + group: market + +- type: cargoProduct + id: GammagulpCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: gammagulp + product: N14CrateBreakPlainFilledGammagulp + cost: 90 + category: Consumables + group: market + +- type: cargoProduct + id: BeerCrate + icon: + sprite: Objects/Consumable/Drinks/beer.rsi + state: icon + product: N14CrateBreakPlainFilledBeer + cost: 90 + category: Consumables + group: market + +- type: cargoProduct + id: AleCrate + icon: + sprite: Objects/Consumable/Drinks/alebottle.rsi + state: icon + product: N14CrateBreakPlainFilledAle + cost: 90 + category: Consumables + group: market + +- type: cargoProduct + id: GinCrate + icon: + sprite: Objects/Consumable/Drinks/ginbottle.rsi + state: icon + product: N14CrateBreakPlainFilledGin + cost: 80 + category: Consumables + group: market + +- type: cargoProduct + id: VodkaCrate + icon: + sprite: Objects/Consumable/Drinks/vodkabottle.rsi + state: icon + product: N14CrateBreakPlainFilledVodka + cost: 80 + category: Consumables + group: market + +- type: cargoProduct + id: TonicCrate + icon: + sprite: Objects/Consumable/Drinks/tonic.rsi + state: icon + product: N14CrateBreakPlainFilledTonic + cost: 80 + category: Consumables + group: market + +- type: cargoProduct + id: GlasswareCrate + icon: + sprite: Objects/Consumable/Drinks/glass_clear.rsi + state: icon + product: N14CrateBreakPlainFilledGlassware + cost: 30 + category: Consumables + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_fun.yml new file mode 100644 index 00000000000..c9b41a4bbe7 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_fun.yml @@ -0,0 +1,49 @@ +- type: cargoProduct + id: JukeboxDelivery + icon: + sprite: Structures/Machines/jukebox.rsi + state: on + product: Jukebox + cost: 150 + category: Fun + group: market + +- type: cargoProduct + id: CrayonCrate + icon: + sprite: Objects/Fun/crayons.rsi + state: box + product: N14CrateBreakPlainFilledCrayons + cost: 50 + category: Fun + group: market + +- type: cargoProduct + id: DiceCrate + icon: + sprite: Objects/Fun/dice.rsi + state: dicebag + product: N14CrateBreakPlainFilledDice + cost: 50 + category: Fun + group: market + +- type: cargoProduct + id: DartBoardDelivery + icon: + sprite: Objects/Fun/Darts/target.rsi + state: target_dart + product: N14CrateBreakPlainFilledDartboard + cost: 50 + category: Fun + group: market + +- type: cargoProduct + id: DartboardCrate + icon: + sprite: Objects/Fun/Darts/dart_red.rsi + state: icon + product: TargetDarts + cost: 30 + category: Fun + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml index 4191e6952cb..ae56d135a62 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml @@ -37,3 +37,13 @@ cost: 250 category: Medical / Aid group: market + +- type: cargoProduct + id: HealthAnalyzerCrate + icon: + sprite: _Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi + state: icon + product: N14CrateBreakPlainFilledHealthAnalyzer + cost: 200 + category: Medical / Aid + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_misc.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_misc.yml new file mode 100644 index 00000000000..9b99cd2113e --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_misc.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: UniformCrate + icon: + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi + state: icon + product: N14CrateRedFilledBluelineUniforms + cost: 100 + category: Misc + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_tools.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_tools.yml new file mode 100644 index 00000000000..d9b2aa9165b --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_tools.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: HandheldCrate + icon: + sprite: Objects/Devices/communication.rsi + state: walkietalkie + product: N14CrateBreakPlainFilledHandheld + cost: 250 + category: Tools + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml index 2893a24d38b..6cf854bf76b 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml @@ -25,10 +25,10 @@ prob: 0.4 - id: N14CigarettePackCustom prob: 0.4 - + - type: entity parent: N14CrateBreakPlain - id: N14CrateBreakPlainFilledCigarettesRepublic + id: N14CrateBreakPlainFilledCigarettesRepublic #Would be nice to replace these with some sort of Blue Line smoke brand later suffix: republics name: Republic cigarette crate description: Crate containing 6 republic cig packs @@ -221,7 +221,7 @@ contents: - id: Ointment amount: 6 - + - type: entity parent: N14CrateBreakPlain id: N14CrateBreakPlainFilledAntidote @@ -232,3 +232,417 @@ contents: - id: N14Antidote amount: 2 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWebley9mmPistol + name: Webley pistol crate + description: Crate containing 3 Webley 9mm pistols + components: + - type: StorageFill + contents: + - id: N14WeaponPistolWebley + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWebley44revolver + name: Webley revolver crate + description: Crate containing 3 Webley .44 revolvers + components: + - type: StorageFill + contents: + - id: N14WeaponRevolverWebley + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledC70 + name: C70 rifle crate + description: Crate containing 3 C70 7.62mm rifles + components: + - type: StorageFill + contents: + - id: N14WeaponRifle762Canadian + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledF2 + name: F2 marksman rifle crate + description: Crate containing 3 F2 7.62mm marksman rifles + components: + - type: StorageFill + contents: + - id: N14WeaponRifle762MarksmanCanadian + amount: 3 + +- type: entity + parent: N14CrateRed + id: N14CrateRedFilledF1 + name: F1 sniper rifle crate + description: Crate containing 2 F1 .308 sniper rifles + components: + - type: StorageFill + contents: + - id: N14WeaponSniper308Canadian + amount: 2 + +- type: entity + parent: N14CrateRed + id: N14CrateRedFilledRoss + name: Ross rifle crate + description: Crate containing 3 .308 Ross service rifles + components: + - type: StorageFill + contents: + - id: N14WeaponSniper308Ross + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledFrenchi + name: Frenchi shotgun crate + description: Crate containing 3 12 gauge Frenchi shotguns + components: + - type: StorageFill + contents: + - id: N14WeaponShotgunCanadian + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledSten + name: Sten SMG crate + description: Crate containing 3 9mm Sten SMGs + components: + - type: StorageFill + contents: + - id: N14WeaponSMG9mmCanadian + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledDouglas + name: Douglas SMG crate + description: Crate containing 3 12.7mm Douglas advanced SMGs + components: + - type: StorageFill + contents: + - id: N14WeaponSMG12mmAdvancedCanadian + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledHMG + name: HMG crate + description: Crate containing 1 7.62mm HMG, let the good times roll. + components: + - type: StorageFill + contents: + - id: N14WeaponHMGcanadian + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledBren + name: Bren crate + description: Crate containing the mighty .308 Bren HMG. + components: + - type: StorageFill + contents: + - id: N14WeaponLMGBren + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledCrayons + name: Crayon crate + description: Unleash your inner artist with 2 boxes of crayons + components: + - type: StorageFill + contents: + - id: CrayonBox + amount: 2 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWhisky + name: Whisky restock + description: Crate containing 3 bottles of whisky + components: + - type: StorageFill + contents: + - id: N14DrinkWhisky + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWine + name: Whisky restock + description: Crate containing 3 bottles of wine + components: + - type: StorageFill + contents: + - id: N14DrinkWine + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledVodka + name: Vodka restock + description: Crate containing 3 bottles of vodka + components: + - type: StorageFill + contents: + - id: DrinkVodkaBottleFull + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledRum + name: Rum restock + description: Crate containing 3 bottles of rum + components: + - type: StorageFill + contents: + - id: N14DrinkRoentgenRum + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGin + name: Gin restock + description: Crate containing 3 bottles of gin + components: + - type: StorageFill + contents: + - id: DrinkGinBottleFull + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledTonic + name: Tonic water restock + description: Crate containing 3 bottles of tonic water + components: + - type: StorageFill + contents: + - id: DrinkTonicWaterBottleFull + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledBeer + name: Beer restock + description: 12 pack of beer, perfect for any party. + components: + - type: StorageFill + contents: + - id: DrinkBeerBottleFull + amount: 12 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledAle + name: Ale restock + description: 12 pack of ale, perfect for any party. + components: + - type: StorageFill + contents: + - id: DrinkAleBottleFull + amount: 12 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGammagulp + name: Gamma gulp restock + description: 12 pack of gamma gulps, perfect for any party. + components: + - type: StorageFill + contents: + - id: N14DrinkGammagulpBeer + amount: 12 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledHealthAnalyzer + name: Health analyzer + description: A sophisticated piece of tech used to accurately diagnose patients. + components: + - type: StorageFill + contents: + - id: N14HandheldHealthAnalyzer + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledEnergyCell + name: Energy cell crate + description: Crate containing 4 energy cells. + components: + - type: StorageFill + contents: + - id: N14PowerCellSmall + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledMFCell + name: MF cell crate + description: Crate containing 4 MF cells. + components: + - type: StorageFill + contents: + - id: N14PowerCellHigh + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledC4 + name: C4 crate + description: Crate containing 2 bundles of C4 . + components: + - type: StorageFill + contents: + - id: C4 + amount: 2 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledHandheld + name: Handheld crate + description: Crate containing 4 handheld radios. + components: + - type: StorageFill + contents: + - id: RadioHandheld + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledDice + name: Dice crate + description: Crate containing 2 bags of dice. + components: + - type: StorageFill + contents: + - id: DiceBag + amount: 2 + +- type: entity + parent: N14CrateRed + id: N14CrateRedFilledMk1 + name: Bulk Mk1 combat armor crate + description: Crate containing 3 sets of Blue Line branded Mk1 combat armor. + components: + - type: StorageFill + contents: + - id: N14ClothingOuterCombatArmorCargo + amount: 3 + - id: N14ClothingHeadHatCombatHelmetCargo + amount: 3 + - id: N14ClothingBootsCombat + amount: 3 + +- type: entity + parent: N14CrateRed + id: N14CrateRedFilledMk2 + name: Bulk Mk2 combat armor crate + description: Crate containing 3 sets of Blue Line branded Mk2 combat armor. + components: + - type: StorageFill + contents: + - id: N14ClothingOuterCombatArmorMK2Cargo + amount: 3 + - id: N14ClothingHeadHatCombatHelmetMK2Cargo + amount: 3 + - id: N14ClothingBootsCombatMK2 + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledPoliceVest + name: Bulk police vest armor crate + description: Crate containing 3 sets of Blue Line branded armored vests. + components: + - type: StorageFill + contents: + - id: N14ClothingOuterPoliceVestCargo + amount: 3 + +- type: entity + parent: N14CrateRed + id: N14CrateRedFilledCarrier + name: Bulk military carrier crate + description: Crate containing 3 military carriers. + components: + - type: StorageFill + contents: + - id: ClothingBeltMilitary + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledDartboard + name: Dart box crate + description: Crate containing the needed board to play the game of darts. + components: + - type: StorageFill + contents: + - id: TargetDarts + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledDartBox + name: Dart box crate + description: Crate containing the needed darts to play the game of darts. + components: + - type: StorageFill + contents: + - id: BoxDarts + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGlassware + name: Glassware crate + description: Crate containing 5 glass cups, 5 coupe glasses, and 4 shotglasses. + components: + - type: StorageFill + contents: + - id: DrinkGlass + amount: 5 + - id: DrinkGlassCoupeShaped + amount: 5 + - id: DrinkShotGlass + amount: 4 + +- type: entity + parent: N14CrateRed + id: N14CrateRedFilledBluelineUniforms + name: Uniform crate + description: Enterprising are we? Crate contains 3 Blue Line worker uniforms. + components: + - type: StorageFill + contents: + - id: N14ClothingUniformJumpsuitCaravanOveralls + amount: 3 + - id: N14ClothingHeadHatCaravanUniform + amount: 3 + - id: N14ClothingShoesBrown + amount: 3 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGrenadier + name: Grenadier crate + description: Dangerous! Contains 4 40mm grenades for the grenade launcher. + components: + - type: StorageFill + contents: + - id: 40mmGrenadeFrag + amount: 4 + + diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml index f27abaa8df4..f1cc4b49c33 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml @@ -435,6 +435,7 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 + priceMultiplier: 0.4 - type: Butcherable butcheringType: Knife spawned: @@ -502,6 +503,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 # Craftable - type: entity @@ -521,8 +523,7 @@ Slash: 0.9 Piercing: 0.95 Heat: 0.95 - # - type: ClothingSpecialModifier - # strengthModifier: 1 + priceMultiplier: 0.5 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index d3a1fb51fef..930fd03e192 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -80,6 +80,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.95 @@ -97,6 +98,7 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.9 @@ -110,6 +112,29 @@ sprite: _Nuclear14/Clothing/Head/FalloutHelmets/combathelmet.rsi - type: Clothing sprite: _Nuclear14/Clothing/Head/FalloutHelmets/combathelmet.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + priceMultiplier: 0.5 + +- type: entity + parent: N14ClothingHeadHatCombatHelmet + id: N14ClothingHeadHatCombatHelmetCargo + name: combat helmet + description: A ballistic helmet of the pre-war era. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + priceMultiplier: 0 - type: entity parent: N14ClothingHeadHatBaseHelmetMK2 @@ -122,6 +147,21 @@ - type: Clothing sprite: _Nuclear14/Clothing/Head/FalloutHelmets/combathelmetmk2.rsi +- type: entity + parent: N14ClothingHeadHatCombatHelmetMK2 + id: N14ClothingHeadHatCombatHelmetMK2Cargo + name: combat helmet MK2 + description: An advanced ballistic helmet of the pre-war era. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + priceMultiplier: 0 + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatBaseHelmetmarine @@ -139,6 +179,7 @@ Slash: 0.8 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.9 @@ -525,7 +566,7 @@ sprite: _Nuclear14/Clothing/Head/FalloutHelmets/chinesespecialhelmet.rsi - type: Clothing sprite: _Nuclear14/Clothing/Head/FalloutHelmets/chinesespecialhelmet.rsi - + - type: entity parent: N14ClothingHeadHatBaseHelmetMetal id: N14ClothingHeadHatPressHelmet diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hoods.yml index 84f20c75fcf..f53253eb57f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hoods.yml @@ -30,6 +30,7 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 + priceMultiplier: 0.6 - type: Tag tags: - HidesHair @@ -52,6 +53,7 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 + priceMultiplier: 0.5 - type: Tag tags: - HidesHair diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml index bd86e952753..25e431db558 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml @@ -18,6 +18,7 @@ Slash: 0.9 Piercing: 0.95 Heat: 0.95 + priceMultiplier: 0.5 - type: entity parent: ClothingMaskGas @@ -38,6 +39,7 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 + priceMultiplier: 0.5 - type: entity parent: ClothingMaskGas @@ -58,6 +60,7 @@ Slash: 0.95 Heat: 0.95 Radiation: 0.95 + priceMultiplier: 0.5 # NCR Rangers, Vets diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml index a54e92da032..9ea2551773e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/masks.yml @@ -16,6 +16,7 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 + priceMultiplier: 0.5 - type: Tag tags: - WhitelistChameleon @@ -38,6 +39,7 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 + priceMultiplier: 0.5 - type: Tag tags: - WhitelistChameleon @@ -60,6 +62,7 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 + priceMultiplier: 0.5 - type: Tag tags: - WhitelistChameleon @@ -114,6 +117,7 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 + priceMultiplier: 0.5 - type: Tag tags: - WhitelistChameleon 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 1cc67b547ab..9a5813b1dc5 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml @@ -145,6 +145,7 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 + priceMultiplier: 0.5 - type: Butcherable butcheringType: Knife spawned: @@ -170,6 +171,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.95 + priceMultiplier: 0.5 - type: Butcherable butcheringType: Knife spawned: @@ -195,8 +197,7 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.9 - # - type: ClothingSpecialModifier - # strengthModifier: 1 + priceMultiplier: 0.5 - type: Butcherable butcheringType: Knife spawned: @@ -222,6 +223,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.95 + priceMultiplier: 0.5 - type: Butcherable butcheringType: Knife spawned: @@ -245,6 +247,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase # balance this? @@ -263,6 +266,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase # balance this? @@ -281,6 +285,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase # balance this? @@ -299,6 +304,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageFoldableBase @@ -318,8 +324,7 @@ Piercing: 0.95 Heat: 0.9 Caustic: 0.75 - # - type: ClothingSpecialModifier - # intelligenceModifier: 1 + priceMultiplier: 0.5 - type: entity parent: [ClothingOuterStorageFoldableBaseOpened, N14ClothingOuterCoatLab] @@ -346,6 +351,7 @@ Slash: 0.9 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase @@ -364,9 +370,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.85 - # - type: ClothingSpecialModifier - # charismaModifier: 1 - # enduranceModifier: 1 + priceMultiplier: 0.5 - type: Butcherable butcheringType: Knife spawned: @@ -402,6 +406,7 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.8 + priceMultiplier: 0.5 #MARK: Brotherhood - type: entity @@ -541,6 +546,7 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.8 - type: ToggleableClothing @@ -574,6 +580,7 @@ Slash: 0.85 Piercing: 0.70 Heat: 0.70 + priceMultiplier: 0.5 #MARK: Washington BoS - type: entity @@ -627,6 +634,7 @@ Slash: 0.7 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.5 #MARK: Town - type: entity @@ -646,6 +654,7 @@ Slash: 0.9 Piercing: 0.95 Heat: 0.95 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase @@ -664,6 +673,7 @@ Slash: 0.8 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase @@ -682,6 +692,7 @@ Slash: 0.7 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.5 - type: entity parent: ClothingOuterStorageBase @@ -700,8 +711,7 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 - # - type: ClothingSpecialModifier - # charismaModifier: 1 + priceMultiplier: 0.5 #MARK: Vancouver preventor - type: entity @@ -721,3 +731,4 @@ Slash: 0.7 Piercing: 0.6 Heat: 0.6 + priceMultiplier: 0.5 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index a1ac456f2eb..7e8f6356267 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -15,6 +15,7 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 # - type: ClothingSpecialModifier @@ -37,6 +38,7 @@ Slash: 0.7 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 - type: Reflect @@ -63,6 +65,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 # - type: ClothingSpecialModifier @@ -85,6 +88,7 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.75 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 - type: Butcherable @@ -110,6 +114,7 @@ Slash: 0.8 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.9 @@ -130,6 +135,7 @@ Slash: 0.7 Piercing: 0.75 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 - type: Reflect @@ -156,9 +162,25 @@ Slash: 0.75 Piercing: 0.7 Heat: 0.7 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.8 +- type: entity + parent: N14ClothingOuterCombatArmor + id: N14ClothingOuterCombatArmorCargo + name: combat armor + description: A suit of combat armor that's used in combat. This one bears a hastily added trade mark of the Blue Line Caravan corp. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.7 + Heat: 0.7 + priceMultiplier: 0 + - type: entity parent: ClothingOuterBase id: N14ClothingOuterCombatArmorMK2 @@ -176,9 +198,25 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.75 +- type: entity + parent: N14ClothingOuterCombatArmorMK2 + id: N14ClothingOuterCombatArmorMK2Cargo + name: combat armor mk2 + description: A suit of combat armor that's used in combat. It looks stronger than basic combat armor. This one bears a hastily added trade mark of the Blue Line Caravan corp. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.65 + priceMultiplier: 0 + - type: entity parent: ClothingOuterBase id: N14ClothingOuterMarineArmor @@ -196,6 +234,7 @@ Slash: 0.6 Piercing: 0.55 Heat: 0.55 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.75 @@ -227,6 +266,7 @@ Slash: 0.75 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.8 @@ -247,6 +287,7 @@ Slash: 0.9 Piercing: 0.4 Heat: 0.5 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.8 @@ -268,6 +309,7 @@ Slash: 0.8 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.85 @@ -291,6 +333,7 @@ Slash: 0.7 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.8 @@ -311,6 +354,7 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.8 # - type: ClothingSpecialModifier @@ -335,6 +379,7 @@ Slash: 0.9 Piercing: 0.95 Heat: 0.95 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.9 # - type: ClothingSpecialModifier @@ -357,6 +402,7 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.85 # - type: ClothingSpecialModifier @@ -390,6 +436,7 @@ Slash: 0.75 Piercing: 0.7 Heat: 0.7 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.8 @@ -410,6 +457,7 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.8 @@ -430,6 +478,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.85 @@ -472,6 +521,7 @@ Slash: 0.9 Piercing: 0.85 Heat: 0.85 + priceMultiplier: 0.4 - type: ExplosionResistance damageCoefficient: 0.85 @@ -492,6 +542,7 @@ Slash: 1.1 Piercing: 1.2 Heat: 1.2 + priceMultiplier: 0 - type: ClothingSpeedModifier walkModifier: 1.2 sprintModifier: 1.2 @@ -516,14 +567,30 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.8 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 +- type: entity + parent: N14ClothingOuterPoliceVest + id: N14ClothingOuterPoliceVestCargo + name: cargo vest + description: A protective vest used for the pre-war police. This one has a Blue Line Caravan corp trade mark sewn into the breast. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.8 + priceMultiplier: 0 + - type: entity parent: ClothingOuterStorageBase id: N14ClothingOuterSheriffVest name: sheriff vest - description: The sheriff needs a good piece of armo to protect themselves from the dangers of the wasteland. + description: The sheriff needs a good piece of armor to protect themselves from the dangers of the wasteland. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi @@ -536,6 +603,7 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -558,6 +626,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -578,6 +647,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -598,6 +668,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -618,6 +689,7 @@ Slash: 0.7 Piercing: 0.75 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.75 - type: Reflect @@ -644,6 +716,7 @@ Slash: 0.7 Piercing: 0.75 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.75 - type: Reflect @@ -670,6 +743,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -690,6 +764,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -730,6 +805,7 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -774,6 +850,7 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -805,6 +882,7 @@ Slash: 0.7 Piercing: 0.7 Heat: 0.7 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -825,6 +903,7 @@ Slash: 0.75 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 - type: ClothingSpeedModifier @@ -850,6 +929,7 @@ Slash: 0.75 Piercing: 0.75 Heat: 0.75 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -870,6 +950,7 @@ Slash: 0.65 Piercing: 0.6 Heat: 0.6 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -923,6 +1004,7 @@ Slash: 0.65 Piercing: 0.6 Heat: 0.6 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -943,6 +1025,7 @@ Slash: 0.65 Piercing: 0.6 Heat: 0.6 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -963,6 +1046,7 @@ Slash: 0.65 Piercing: 0.6 Heat: 0.6 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 @@ -1029,6 +1113,7 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.8 @@ -1049,6 +1134,7 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.8 @@ -1069,6 +1155,7 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.75 @@ -1114,6 +1201,7 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.6 - type: ExplosionResistance damageCoefficient: 0.8 @@ -1136,6 +1224,7 @@ Slash: 0.75 Piercing: 0.8 Heat: 0.8 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1156,6 +1245,7 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.9 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1176,6 +1266,7 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1196,6 +1287,7 @@ Slash: 0.75 Piercing: 0.8 Heat: 0.9 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1218,6 +1310,7 @@ Slash: 0.75 Piercing: 0.7 Heat: 0.75 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1238,6 +1331,7 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.8 @@ -1260,6 +1354,7 @@ Slash: 0.7 Piercing: 0.65 Heat: 0.65 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.8 @@ -1280,6 +1375,7 @@ Slash: 0.75 Piercing: 0.7 Heat: 0.75 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 @@ -1301,5 +1397,6 @@ Slash: 0.85 Piercing: 0.8 Heat: 0.85 + priceMultiplier: 0.5 - type: ExplosionResistance damageCoefficient: 0.85 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index a6f42aaac81..77d6c73c15d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -117,6 +117,8 @@ collection: N14LaserPistolGunshot - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 80 - type: entity name: makeshift laser revolver @@ -159,6 +161,8 @@ collection: N14LaserPistolGunshot - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 60 - type: entity name: plasma pistol @@ -196,6 +200,8 @@ fireRate: 1.5 - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 80 - type: entity name: plasma defender @@ -233,6 +239,8 @@ fireRate: 2.5 - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 100 # MARK: Recharger @@ -270,6 +278,8 @@ fireCost: 50 - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 175 - type: entity name: recharger pistol @@ -306,6 +316,8 @@ - Sidearm - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 175 # MARK: Fullauto @@ -356,6 +368,8 @@ - FullAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 225 - type: entity name: plasma automatic rifle @@ -404,6 +418,8 @@ - FullAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 225 - type: entity name: prototype AER-14 laser rifle @@ -452,6 +468,8 @@ - FullAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 250 # MARK: Semiauto @@ -502,6 +520,8 @@ - SemiAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 250 - type: entity name: makeshift laser rifle @@ -550,6 +570,8 @@ - SemiAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 50 - type: entity name: plasma rifle @@ -598,6 +620,8 @@ - SemiAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 275 - type: entity name: urban plasma rifle @@ -646,6 +670,8 @@ - SemiAuto - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 225 # MARK: Shotguns @@ -697,6 +723,8 @@ - Burst - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 225 #MARK: Focused # (just a different looking laser rifle until we get more options) @@ -748,6 +776,8 @@ - SemiAuto - type: FollowDistance backStrength: 4 + - type: StaticPrice + price: 300 - type: entity name: wattz 2000 laser rifle @@ -796,6 +826,8 @@ - SemiAuto - type: FollowDistance backStrength: 4 + - type: StaticPrice + price: 400 #MARK: Heavy @@ -854,6 +886,8 @@ - type: HeldSpeedModifier - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 500 - type: entity name: laser gatling gun @@ -910,3 +944,5 @@ - type: HeldSpeedModifier - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 400 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml index 95c0d7293ec..8d17bc2b3b5 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml @@ -40,6 +40,8 @@ path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 200 - type: entity name: grenade rifle @@ -85,3 +87,5 @@ path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 175 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml index a77d16b30ba..8717489714c 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml @@ -64,6 +64,8 @@ walkModifier: 0.9 sprintModifier: 0.9 - type: HeldSpeedModifier + - type: StaticPrice + price: 800 - type: entity name: avenger minigun @@ -88,4 +90,6 @@ fireRate: 8 - type: HeldSpeedModifier walkModifier: 0.8 - sprintModifier: 0.8 \ No newline at end of file + sprintModifier: 0.8 + - type: StaticPrice + price: 850 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/missile.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/missile.yml index dc280efba0e..fe0a8c7d3d6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/missile.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/missile.yml @@ -42,3 +42,5 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 500 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml index cada7eb1084..a5502119762 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml @@ -61,6 +61,8 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 300 - type: entity name: canadian HMG @@ -125,6 +127,8 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 600 - type: entity name: chinese LMG @@ -186,6 +190,8 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 500 - type: entity name: light machine gun @@ -203,7 +209,7 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: Huge + size: Huge sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi - type: Wieldable - type: GunRequiresWield @@ -250,6 +256,8 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 475 - type: entity name: bren machine gun @@ -310,3 +318,5 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 600 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 6aa6585a7b0..f26368dec15 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -154,6 +154,8 @@ whitelist: tags: - N14CartridgePistol9 + - type: StaticPrice + price: 10 - type: entity name: 10mm Pistol @@ -189,6 +191,9 @@ whitelist: tags: - N14CartridgePistol10 + - type: StaticPrice + price: 30 + - type: entity name: .45 colt handgun parent: N14BaseWeaponPistol @@ -230,6 +235,8 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 45 - type: entity name: 12.7mm handgun @@ -272,6 +279,8 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 50 - type: entity name: 10mm pipe pistol @@ -311,7 +320,9 @@ whitelist: tags: - N14CartridgePistol10 - + - type: StaticPrice + price: 15 + - type: entity parent: N14WeaponPistol10mmPipe id: N14WeaponPistol10mmPipeEmpty @@ -365,6 +376,8 @@ whitelist: tags: - N14CartridgePistol9 + - type: StaticPrice + price: 20 - type: entity name: the spy @@ -397,6 +410,8 @@ whitelist: tags: - N14CartridgePistol9 + - type: StaticPrice + price: 75 - type: entity name: 22lr Pistol @@ -432,6 +447,8 @@ whitelist: tags: - N14CartridgePistol22 + - type: StaticPrice + price: 15 - type: entity name: webley pistol @@ -467,3 +484,5 @@ whitelist: tags: - N14CartridgePistol9 + - type: StaticPrice + price: 15 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 6891232b322..007320ab994 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -5,6 +5,8 @@ components: - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 20 - type: entity name: 9mm revolver @@ -35,6 +37,8 @@ fireRate: 3 soundGunshot: collection: N14Revolver9mmGunshot + - type: StaticPrice + price: 15 - type: entity name: 10mm revolver @@ -56,6 +60,8 @@ fireRate: 3 soundGunshot: collection: N14Revolver10mmGunshot + - type: StaticPrice + price: 25 - type: entity name: webley revolver @@ -77,7 +83,9 @@ fireRate: 3 soundGunshot: collection: N14RevolverMagnunGunshot - + - type: StaticPrice + price: 75 + - type: entity parent: N14WeaponRevolver10mm id: N14WeaponRevolver10mmEmpty @@ -113,6 +121,8 @@ - type: Gun soundGunshot: collection: N14RevolverMagnunGunshot + - type: StaticPrice + price: 50 - type: entity name: captain revolver @@ -135,6 +145,8 @@ - N14Cartridge44Magnum - SpeedLoader44 proto: N14Cartridge44Magnum + - type: StaticPrice + price: 75 - type: entity name: hunting revolver @@ -155,6 +167,8 @@ - N14Cartridge45-70 - SpeedLoader45-70 proto: N14Cartridge45-70 + - type: StaticPrice + price: 90 - type: entity name: wild whisper @@ -177,6 +191,8 @@ - N14Cartridge45-70 - SpeedLoader45-70 proto: N14Cartridge45-70 + - type: StaticPrice + price: 90 - type: entity name: ranger sequoia @@ -199,6 +215,8 @@ - N14Cartridge45-70 - SpeedLoader45-70 proto: N14Cartridge45-70 + - type: StaticPrice + price: 90 - type: entity name: tribal handgun @@ -221,6 +239,8 @@ soundGunshot: collection: N14RevolverMagnunGunshot fireRate: 1 + - type: StaticPrice + price: 40 - type: entity name: tribal revolver @@ -243,6 +263,8 @@ soundGunshot: collection: N14RevolverMagnunGunshot fireRate: 1.5 + - type: StaticPrice + price: 50 - type: entity name: tribal revolver @@ -265,6 +287,8 @@ soundGunshot: collection: N14RevolverMagnunGunshot fireRate: 2 + - type: StaticPrice + price: 60 - type: entity name: handcannon @@ -288,6 +312,8 @@ - SpeedLoader45-70 proto: N14Cartridge45-70 capacity: 4 + - type: StaticPrice + price: 75 - type: entity name: decorated handcannon @@ -311,3 +337,5 @@ - SpeedLoader45-70 proto: N14Cartridge45-70 capacity: 6 + - type: StaticPrice + price: 80 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 1ef27434190..6c037dcf5ed 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -23,6 +23,8 @@ - type: Appearance - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 100 - type: entity name: R-91 Rifle @@ -68,6 +70,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 100 - type: entity name: chinese assault rifle @@ -114,6 +118,8 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 125 - type: entity name: assault carbine @@ -163,6 +169,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 100 - type: entity name: marksman carbine @@ -212,6 +220,8 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 125 - type: entity name: service rifle @@ -261,6 +271,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 100 - type: entity name: scout rifle @@ -312,6 +324,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 150 - type: entity name: battle rifle @@ -368,6 +382,8 @@ - N14Cartridge308Rifle - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 150 - type: entity name: old carbine @@ -417,6 +433,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 100 - type: entity name: C70 rifle @@ -466,6 +484,8 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 175 - type: entity name: EM2 rifle @@ -516,6 +536,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 150 - type: entity name: FAL rifle @@ -565,12 +587,14 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 175 - type: entity name: M14 rifle parent: N14WeaponRifleBase id: N14WeaponRifle762M14 - description: A pre-war battle rifle chambered in 7.62mm, build to remplace the old M1 garand of the US military, it didnt last for long and got remplaced by the R-91 after a few years of service. + description: A pre-war battle rifle chambered in 7.62mm, build to replace the old M1 garand of the US military, it didnt last for long and got remplaced by the R-91 after a few years of service. components: - type: Clothing sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/m14.rsi @@ -614,6 +638,8 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 175 - type: entity name: F2 marksman rifle @@ -666,6 +692,8 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 175 - type: entity name: chinese marksman rifle @@ -718,6 +746,8 @@ whitelist: tags: - N14Cartridge308Rifle + - type: StaticPrice + price: 175 - type: entity name: SKS chinese carbine @@ -767,6 +797,8 @@ whitelist: tags: - N14Cartridge762Rifle + - type: StaticPrice + price: 175 - type: entity name: pipe assault rifle @@ -816,6 +848,8 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 20 - type: entity name: tribal rifle @@ -847,6 +881,8 @@ proto: N14Cartridge556Rifle - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 50 - type: entity name: tribal assault rifle @@ -878,12 +914,14 @@ proto: N14Cartridge556Rifle - type: FollowDistance backStrength: 5 + - type: StaticPrice + price: 75 - type: entity name: butchered service rifle parent: N14WeaponRifleBase id: N14WeaponRifle556Butchered - description: A cheaply mass-produced post-war rifle made by the NCR, this one has been torture horribly and converted into a "carbine", chambered in 5.56 ammo. + description: A cheaply mass-produced post-war rifle made by the NCR, this one has been tortured horribly and converted into a "carbine", chambered in 5.56 ammo. components: - type: Clothing sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/butcheredrifle.rsi @@ -930,3 +968,5 @@ whitelist: tags: - N14Cartridge556Rifle + - type: StaticPrice + price: 75 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 79dc94775e5..6ff05ee20c8 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -11,6 +11,8 @@ - type: Appearance - type: FollowDistance backStrength: 6 + - type: StaticPrice + price: 100 - type: entity name: 10mm SMG @@ -65,6 +67,8 @@ whitelist: tags: - N14CartridgePistol10 + - type: StaticPrice + price: 75 - type: entity name: 12.7mm SMG @@ -120,7 +124,9 @@ whitelist: tags: - N14CartridgePistol127 - + - type: StaticPrice + price: 100 + - type: entity name: 12.7mm pipe SMG parent: N14WeaponSMGBase @@ -175,7 +181,9 @@ whitelist: tags: - N14CartridgePistol127 - + - type: StaticPrice + price: 10 + - type: entity parent: N14WeaponSMG12mmPipe id: N14WeaponSMG12mmPipeEmpty @@ -254,7 +262,9 @@ whitelist: tags: - N14CartridgePistol10 - + - type: StaticPrice + price: 10 + - type: entity parent: N14WeaponSMG10mmPipe id: N14WeaponSMG10mmPipeEmpty @@ -333,6 +343,8 @@ whitelist: tags: - N14CartridgePistol127 + - type: StaticPrice + price: 175 - type: entity name: 9mm SMG @@ -387,6 +399,8 @@ whitelist: tags: - N14CartridgePistol9 + - type: StaticPrice + price: 50 - type: entity name: .45 SMG @@ -441,6 +455,8 @@ whitelist: tags: - N14CartridgePistol45 + - type: StaticPrice + price: 90 - type: entity name: sten SMG @@ -495,6 +511,8 @@ whitelist: tags: - N14CartridgePistol9 + - type: StaticPrice + price: 50 - type: entity name: douglas advanced SMG @@ -550,6 +568,8 @@ whitelist: tags: - N14CartridgePistol127 + - type: StaticPrice + price: 150 - type: entity name: chinese advanced SMG @@ -605,6 +625,8 @@ whitelist: tags: - N14CartridgePistol127 + - type: StaticPrice + price: 175 - type: entity name: chinese SMG @@ -659,3 +681,5 @@ whitelist: tags: - N14CartridgePistol10 + - type: StaticPrice + price: 100 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 02fd970da78..236ee7f6f56 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -71,6 +71,8 @@ - type: Construction graph: PumpShotgunSawed node: start + - type: StaticPrice + price: 75 - type: entity name: double-barrel shotgun @@ -105,6 +107,8 @@ - type: Construction graph: ShotgunSawed node: start + - type: StaticPrice + price: 45 - type: entity name: sawed-off shotgun @@ -140,6 +144,8 @@ - type: Construction graph: ShotgunSawed node: shotgunsawed + - type: StaticPrice + price: 45 - type: entity name: sawed-off shotgun @@ -212,6 +218,8 @@ steps: 1 zeroVisible: true - type: Appearance + - type: StaticPrice + price: 100 - type: entity name: caravan shotgun @@ -242,6 +250,8 @@ soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg proto: N14ShellShotgun20 + - type: StaticPrice + price: 30 - type: entity name: lever action shotgun @@ -278,6 +288,8 @@ fireRate: 1 soundGunshot: collection: N14LeverShotgunGunshot + - type: StaticPrice + price: 45 - type: entity name: riot shotgun @@ -338,6 +350,8 @@ steps: 1 zeroVisible: true - type: Appearance + - type: StaticPrice + price: 90 - type: entity name: stockless shotgun @@ -373,6 +387,8 @@ - type: Construction graph: PumpShotgunSawed node: pumpshotgunsawed + - type: StaticPrice + price: 75 - type: entity name: blowback shotgun @@ -404,6 +420,8 @@ proto: N14ShellShotgun12 soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: StaticPrice + price: 125 - type: entity name: chinese shotgun @@ -435,6 +453,8 @@ proto: N14ShellShotgun12 soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: StaticPrice + price: 100 - type: entity name: frenchi shotgun @@ -466,6 +486,8 @@ proto: N14ShellShotgun12 soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: StaticPrice + price: 150 - type: entity name: boom stick @@ -497,6 +519,8 @@ proto: N14ShellShotgun12 soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: StaticPrice + price: 60 - type: entity name: bloody stick @@ -528,6 +552,8 @@ proto: N14ShellShotgun12 soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: StaticPrice + price: 60 - type: entity name: pipe shotgun @@ -559,3 +585,5 @@ proto: N14ShellShotgun12 soundInsert: path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: StaticPrice + price: 10 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 88dff158d1f..c496a2270de 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -28,6 +28,8 @@ proto: N14Cartridge308Rifle - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 75 - type: entity name: lee enfield rifle @@ -59,6 +61,8 @@ proto: N14Cartridge308Rifle - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 100 - type: entity name: Anti-Materiel rifle @@ -126,6 +130,8 @@ - type: HeldSpeedModifier walkModifier: 0.75 sprintModifier: 0.75 + - type: StaticPrice + price: 200 - type: entity name: .50 NCR rifle @@ -163,6 +169,8 @@ - type: HeldSpeedModifier walkModifier: 0.75 sprintModifier: 0.75 + - type: StaticPrice + price: 175 - type: entity name: lever action carbine @@ -197,6 +205,8 @@ - type: Construction graph: LeverCarbineSawed node: start + - type: StaticPrice + price: 75 - type: entity name: lever action rifle @@ -214,6 +224,8 @@ collection: N14LeverRifleGunshot - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 90 - type: entity name: brush gun @@ -238,6 +250,8 @@ proto: N14Cartridge45-70 - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 100 - type: entity name: pipe rifle @@ -261,6 +275,8 @@ collection: N14PipeRifleGunshot - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 25 - type: entity name: varmint rifle @@ -292,6 +308,8 @@ proto: N14Cartridge556Rifle - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 50 - type: entity name: stockless lever action carbine @@ -329,6 +347,8 @@ - type: Construction graph: LeverCarbineSawed node: levercarbinesawed + - type: StaticPrice + price: 75 - type: entity name: .50 pipe rifle @@ -366,6 +386,8 @@ sprintModifier: 0.75 - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 10 - type: entity name: huntstick @@ -383,6 +405,8 @@ collection: N14LeverRifleGunshot - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 80 - type: entity name: master huntstick @@ -400,6 +424,8 @@ collection: N14LeverRifleGunshot - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 90 - type: entity name: F1 sniper rifle @@ -417,6 +443,8 @@ collection: N14SniperHuntingGunshot - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 150 - type: entity name: ross rifle @@ -442,3 +470,5 @@ proto: N14Cartridge308Rifle - type: FollowDistance backStrength: 3 + - type: StaticPrice + price: 75 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/axes.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/axes.yml index be7484a3130..c8ff8838057 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/axes.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/axes.yml @@ -34,6 +34,8 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/hatchet.rsi size: Normal + - type: StaticPrice + price: 20 - type: entity name: tribal hatchet @@ -71,6 +73,8 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi size: Normal + - type: StaticPrice + price: 25 - type: entity name: fireaxe @@ -96,6 +100,8 @@ - Prying - type: ToolTileCompatible - type: Prying + - type: StaticPrice + price: 30 - type: entity name: axe @@ -132,3 +138,5 @@ - suitStorage - type: Item size: Large + - type: StaticPrice + price: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml index 90645034b26..7993cc34e94 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml @@ -17,13 +17,15 @@ sprite: _Nuclear14/Objects/Weapons/Melee/policebaton.rsi state: icon - type: Item - size: Normal + size: Normal - type: Clothing sprite: _Nuclear14/Objects/Weapons/Melee/policebaton.rsi quickEquip: false slots: - belt - suitStorage + - type: StaticPrice + price: 30 - type: entity name: tribal club @@ -46,6 +48,8 @@ slots: - belt - suitStorage + - type: StaticPrice + price: 20 - type: entity name: broken pipe @@ -69,6 +73,8 @@ slots: - belt - suitStorage + - type: StaticPrice + price: 10 - type: entity name: training sword @@ -91,7 +97,9 @@ state: icon - type: Item size: Large - + - type: StaticPrice + price: 0 + - type: entity name: trench club parent: BaseItem @@ -113,3 +121,5 @@ slots: - belt - suitStorage + - type: StaticPrice + price: 30 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml index 12052a86e97..9c48edd6630 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml @@ -32,6 +32,8 @@ # - Crushing # useSound: # path: /Audio/Items/eating_2.ogg # TODO: Crushing noise + - type: StaticPrice + price: 60 - type: entity name: super sledge hammer @@ -60,6 +62,8 @@ slots: - back - suitStorage + - type: StaticPrice + price: 100 - type: entity name: tribal heavy club @@ -86,6 +90,8 @@ slots: - back - suitStorage + - type: StaticPrice + price: 60 - type: entity name: tribal decorated heavy club @@ -114,6 +120,8 @@ slots: - back - suitStorage + - type: StaticPrice + price: 60 - type: entity name: nail board @@ -136,3 +144,5 @@ quickEquip: false slots: - belt + - type: StaticPrice + price: 0 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml index 0e7dfcae5cf..8150395ec91 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml @@ -50,6 +50,8 @@ sprite: _Nuclear14/Objects/Weapons/Melee/kitchen_knife.rsi - type: DisarmMalus malus: 0.225 + - type: StaticPrice + price: 0 - type: entity name: butcher's cleaver @@ -79,6 +81,8 @@ sprite: _Nuclear14/Objects/Weapons/Melee/cleaver.rsi - type: DisarmMalus malus: 0.225 + - type: StaticPrice + price: 0 - type: entity name: combat knife @@ -107,6 +111,8 @@ sprite: _Nuclear14/Objects/Weapons/Melee/combat_knife.rsi - type: DisarmMalus malus: 0.225 + - type: StaticPrice + price: 30 - type: entity name: tribal knife @@ -135,6 +141,8 @@ sprite: _Nuclear14/Objects/Weapons/Melee/tribalknife.rsi - type: DisarmMalus malus: 0.225 + - type: StaticPrice + price: 25 - type: entity name: brass Knife @@ -148,3 +156,5 @@ state: icon - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/brass_knife.rsi + - type: StaticPrice + price: 20 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 14ba09d5410..602f807327f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -24,6 +24,8 @@ - type: Item size: Normal sprite: _Nuclear14/Objects/Weapons/Melee/machete.rsi + - type: StaticPrice + price: 30 - type: entity name: tribal machete @@ -52,6 +54,8 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi + - type: StaticPrice + price: 30 - type: entity name: scrap machete @@ -80,6 +84,8 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi + - type: StaticPrice + price: 15 - type: entity name: ripper @@ -135,6 +141,8 @@ qualities: - Sawing speedModifier: 3.0 + - type: StaticPrice + price: 50 - type: entity name: ceremonial sword @@ -163,6 +171,8 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/ceremonialsword.rsi + - type: StaticPrice + price: 70 - type: entity name: chinese officer sword @@ -190,6 +200,8 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/chinesesword.rsi + - type: StaticPrice + price: 70 - type: entity name: longsword @@ -208,3 +220,5 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/long_sword.rsi + - type: StaticPrice + price: 70 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml index 531a0b8fdb3..5621e5161a6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml @@ -77,6 +77,8 @@ - type: SolutionContainerVisuals maxFillLevels: 1 fillBaseName: spear + - type: StaticPrice + price: 30 - type: entity name: spear @@ -235,6 +237,8 @@ types: Piercing: 16 Slash: 6 + - type: StaticPrice + price: 30 - type: entity name: javelin diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/sports.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/sports.yml index a7a580bb4a0..fa5aafa7ceb 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/sports.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/sports.yml @@ -37,6 +37,8 @@ - type: Tag tags: - BaseballBat + - type: StaticPrice + price: 0 - type: entity @@ -86,6 +88,8 @@ slots: - back - suitStorage + - type: StaticPrice + price: 0 - type: entity name: golf club @@ -115,3 +119,5 @@ slots: - back - suitStorage + - type: StaticPrice + price: 0