From 18c146cc7ff292cbeae44e8e5abb1aebc42b6414 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 18 Aug 2024 23:28:46 -0400 Subject: [PATCH] increase material prices (#30869) * increase material prices * ack --- .../Catalog/Cargo/cargo_emergency.yml | 4 ++-- .../Catalog/Cargo/cargo_engineering.yml | 2 +- .../Prototypes/Catalog/Cargo/cargo_engines.yml | 2 +- .../Catalog/Cargo/cargo_materials.yml | 12 ++++++------ .../Catalog/Cargo/cargo_security.yml | 2 +- .../Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- .../Catalog/Fills/Crates/materials.yml | 3 +-- .../Prototypes/Entities/Clothing/Head/misc.yml | 2 ++ .../Clothing/Masks/base_clothingmask.yml | 2 ++ .../Entities/Clothing/Masks/masks.yml | 2 +- .../Objects/Devices/Circuitboards/misc.yml | 2 +- .../Objects/Devices/Electronics/timer.yml | 2 +- .../Entities/Objects/Materials/parts.yml | 2 +- .../Entities/Objects/Shields/shields.yml | 2 +- .../Entities/Objects/Tools/cable_coils.yml | 2 +- .../Entities/Objects/Tools/gas_tanks.yml | 2 +- .../Entities/Objects/Tools/t-ray.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 2 +- .../Objects/Weapons/Throwable/grenades.yml | 2 +- .../Structures/Doors/Airlocks/clockwork.yml | 4 +++- .../Structures/Doors/Airlocks/shuttle.yml | 2 ++ .../Structures/Doors/Shutter/blast_door.yml | 2 +- .../Doors/Windoors/base_structurewindoors.yml | 12 ++++++------ .../Structures/Doors/Windoors/clockwork.yml | 2 ++ .../Entities/Structures/Furniture/bench.yml | 2 +- .../Entities/Structures/Furniture/chairs.yml | 4 ++-- .../Entities/Structures/Furniture/toilet.yml | 2 +- .../Structures/Lighting/ground_lighting.yml | 6 ++---- .../Structures/Piping/Atmospherics/pipes.yml | 2 +- .../Structures/Piping/Disposal/pipes.yml | 2 +- .../Structures/Piping/Disposal/units.yml | 2 +- .../Entities/Structures/Power/chargers.yml | 2 +- .../Storage/Canisters/gas_canisters.yml | 2 +- .../Storage/Closets/base_structureclosets.yml | 4 ++-- .../Storage/Crates/base_structurecrates.yml | 2 +- .../Structures/Storage/Crates/crates.yml | 4 ++-- .../Structures/Storage/filing_cabinets.yml | 4 ++-- .../Entities/Structures/Storage/storage.yml | 2 +- .../Entities/Structures/Walls/girders.yml | 8 +++++--- .../Entities/Structures/Walls/walls.yml | 2 +- .../Entities/Structures/Windows/clockwork.yml | 2 +- .../Entities/Structures/Windows/plasma.yml | 4 ++-- .../Entities/Structures/Windows/reinforced.yml | 6 +++--- .../Entities/Structures/Windows/ruranium.yml | 4 ++-- .../Entities/Structures/Windows/shuttle.yml | 2 +- .../Entities/Structures/Windows/uranium.yml | 4 ++-- .../Entities/Structures/Windows/window.yml | 8 ++++---- .../Entities/Structures/plastic_flaps.yml | 2 +- .../Prototypes/Reagents/Materials/glass.yml | 14 +++++++------- .../Reagents/Materials/materials.yml | 18 +++++++++--------- .../Prototypes/Reagents/Materials/metals.yml | 10 +++++----- 51 files changed, 103 insertions(+), 94 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml index c04e49f413..6e91a37e2a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml @@ -24,7 +24,7 @@ sprite: Clothing/Mask/breath.rsi state: icon product: CrateEmergencyInternals - cost: 500 + cost: 600 category: cargoproduct-category-name-emergency group: market @@ -64,7 +64,7 @@ sprite: Objects/Tanks/red.rsi state: icon product: CrateSlimepersonLifeSupport - cost: 300 + cost: 350 category: cargoproduct-category-name-emergency group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index d4e2b4c60d..78e5468164 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -144,6 +144,6 @@ sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi state: sheaterOff product: CrateEngineeringSpaceHeater - cost: 300 + cost: 350 category: cargoproduct-category-name-engineering group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 8d3bea5075..72f9d3a59b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -66,7 +66,7 @@ sprite: Objects/Devices/flatpack.rsi state: solar-assembly-part product: CrateEngineeringSolar - cost: 500 + cost: 525 category: cargoproduct-category-name-engineering group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 6f945001d9..33582fea94 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -4,7 +4,7 @@ sprite: Objects/Materials/Sheets/glass.rsi state: glass_3 product: CrateMaterialGlass - cost: 1000 + cost: 1500 category: cargoproduct-category-name-materials group: market @@ -14,7 +14,7 @@ sprite: Objects/Materials/Sheets/metal.rsi state: steel_3 product: CrateMaterialSteel - cost: 1000 + cost: 1500 category: cargoproduct-category-name-materials group: market @@ -24,7 +24,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: plastic_3 product: CrateMaterialPlastic - cost: 1500 + cost: 2000 category: cargoproduct-category-name-materials group: market @@ -34,7 +34,7 @@ sprite: Objects/Materials/Sheets/metal.rsi state: brass_3 product: CrateMaterialBrass - cost: 2500 + cost: 3000 category: cargoproduct-category-name-materials group: market @@ -44,7 +44,7 @@ sprite: Objects/Materials/Sheets/metal.rsi state: plasteel_3 product: CrateMaterialPlasteel - cost: 3000 + cost: 4800 category: cargoproduct-category-name-materials group: market @@ -54,7 +54,7 @@ sprite: Objects/Materials/materials.rsi state: cloth_3 product: CrateMaterialTextiles - cost: 1000 + cost: 1500 category: cargoproduct-category-name-materials group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 040efebe7a..a5d4e5f70a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -4,7 +4,7 @@ sprite: Clothing/OuterClothing/Armor/security.rsi state: icon product: CrateSecurityArmor - cost: 700 + cost: 725 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index cf68d23dbf..a94a6b2189 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1300 + cost: 2500 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index bd47f98477..f425b48c07 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -79,12 +79,11 @@ id: CrateMaterialPlasma parent: CratePlasma name: solid plasma crate - description: 90 sheets of plasma. + description: 30 sheets of plasma. components: - type: StorageFill contents: - id: SheetPlasma - amount: 3 - type: entity id: CrateMaterialCardboard diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 1fb47c0439..22ea8ed6ba 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -153,6 +153,8 @@ - type: PhysicalComposition #you can't just pass up some free plastic! materialComposition: Plastic: 100 + - type: StaticPrice + price: 25 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index 00dcd8263f..de49de3054 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -9,6 +9,8 @@ size: Small - type: Clothing slots: [mask] + - type: StaticPrice + price: 25 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 3e4b16882d..94351cc126 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -181,7 +181,7 @@ Steel: 50 Plastic: 100 - type: StaticPrice - price: 12.5 # increases in price after decomposed into raw materials + price: 30 # increases in price after decomposed into raw materials - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml index cb35219eb0..a38aafa649 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml @@ -13,4 +13,4 @@ tags: - StationMapElectronics - type: StaticPrice - price: 15 + price: 30 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml index 8a74e1cee4..0d0f1a2111 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml @@ -15,7 +15,7 @@ tags: - TimerSignalElectronics - type: StaticPrice - price: 15 + price: 30 - type: entity id: ScreenTimerElectronics diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index 71adedab0e..1db564c3b3 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: 7.5 - type: Extractable grindableSolutionName: rod - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index e0e7eb1171..929ebac6dd 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -58,7 +58,7 @@ min: 2 max: 2 - type: StaticPrice - price: 50 + price: 100 #Security Shields diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 3f72fa10fa..7cc57faaa4 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -25,7 +25,7 @@ - type: StaticPrice price: 0 - type: StackPrice - price: 1 + price: 2.25 - type: PhysicalComposition materialComposition: Steel: 15 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index a8495cef01..7baf1f0b5d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -44,7 +44,7 @@ materialComposition: Steel: 185 - type: StaticPrice - price: 20 + price: 30 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml index 8872b98c18..091a345d77 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml @@ -24,4 +24,4 @@ Steel: 400 Glass: 150 - type: StaticPrice - price: 60 + price: 85 diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 83cfb331be..d985560ac2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -328,7 +328,7 @@ Steel: 600 Plastic: 100 - type: StaticPrice - price: 100 + price: 110 - type: UserInterface interfaces: enum.RcdUiKey.Key: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index e5627ea88d..fca6fea4f8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -328,7 +328,7 @@ Primed: { state: primed } # Unprimed: - type: StaticPrice - price: 25 + price: 75 - type: entity name: EMP grenade diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml index 2269358a30..f6eeb9ee37 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml @@ -22,4 +22,6 @@ graph: PinionAirlock node: glassAirlock containers: - - board \ No newline at end of file + - board + - type: StaticPrice + price: 165 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml index 34639e4335..81653e99ff 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml @@ -74,6 +74,8 @@ - type: Construction graph: AirlockShuttle node: airlock + - type: StaticPrice + price: 350 - type: entity id: AirlockGlassShuttle diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml index 0700a5a3e7..c59814a41c 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml @@ -37,7 +37,7 @@ containers: - board - type: StaticPrice - price: 280 + price: 500 - type: entity id: BlastDoorOpen diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index d15294cc46..341d1c6761 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -144,7 +144,7 @@ containers: - board - type: StaticPrice - price: 100 + price: 150 - type: PryUnpowered - type: entity @@ -200,7 +200,7 @@ graph: Windoor node: windoorSecure - type: StaticPrice - price: 200 + price: 350 #Plasma Windoors - type: entity @@ -253,7 +253,7 @@ graph: Windoor node: pwindoor - type: StaticPrice - price: 170 + price: 500 - type: RadiationBlocker resistance: 2 @@ -308,7 +308,7 @@ graph: Windoor node: pwindoorSecure - type: StaticPrice - price: 312 + price: 500 - type: RadiationBlocker resistance: 4 @@ -363,7 +363,7 @@ graph: Windoor node: uwindoor - type: StaticPrice - price: 180 + price: 560 - type: RadiationBlocker resistance: 3 @@ -418,6 +418,6 @@ graph: Windoor node: uwindoorSecure - type: StaticPrice - price: 462 + price: 750 - type: RadiationBlocker resistance: 5 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml index 196d45306c..4aa959455a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml @@ -32,3 +32,5 @@ node: windoorClockwork containers: - board + - type: StaticPrice + price: 240 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml index c61f103dda..ce8f8b5686 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml @@ -16,7 +16,7 @@ - type: Physics bodyType: Static - type: StaticPrice - price: 15 + price: 35 - type: entity id: BenchColorfulComfy diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index c1d767905c..52149de193 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -47,7 +47,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 10 + price: 50 #Starts unanchored, cannot be rotated while anchored - type: entity @@ -400,4 +400,4 @@ min: 2 max: 4 - type: StaticPrice - price: 20 + price: 50 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml index 76ddc1d1ec..8fbc01fbb9 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml @@ -73,7 +73,7 @@ - type: Drain autoDrain: false - type: StaticPrice - price: 25 + price: 100 - type: UserInterface interfaces: enum.DisposalUnitUiKey.Key: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 0771cb71bc..2bcbf09188 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -62,6 +62,8 @@ - !type:PlaySoundBehavior sound: collection: MetalGlassBreak + - type: StaticPrice + price: 75 - type: entity id: PoweredLightPostSmallEmpty @@ -124,8 +126,6 @@ enabled: true - type: PoweredLight hasLampOnSpawn: LightTube - - type: StaticPrice - price: 25 - type: AmbientOnPowered - type: AmbientSound volume: -15 @@ -155,8 +155,6 @@ color: "#EEEEFF" - type: PoweredLight hasLampOnSpawn: LedLightTube - - type: StaticPrice - price: 25 - type: AmbientOnPowered - type: AmbientSound volume: -15 diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index 142b5dacfd..df3b276652 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -61,7 +61,7 @@ canCollide: false bodyType: static - type: StaticPrice - price: 11 + price: 30 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index a0192b8685..af8cadee18 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -57,7 +57,7 @@ containers: DisposalTube: !type:Container - type: StaticPrice - price: 22 + price: 30 - type: entity id: DisposalHolder diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml index e7d3d3c997..9e14234af4 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml @@ -62,7 +62,7 @@ containers: disposals: !type:Container - type: StaticPrice - price: 62 + price: 70 - type: PowerSwitch - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index f5f0748b81..e529708abb 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -34,7 +34,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 25 + price: 75 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 147e9e5b37..5726b20874 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -692,7 +692,7 @@ materialComposition: Steel: 500 - type: StaticPrice - price: 60 + price: 125 - type: entity parent: GasCanisterBrokenBase diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 0ef99b9f47..d7af46701c 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -89,7 +89,7 @@ stateDoorOpen: generic_open stateDoorClosed: generic_door - type: StaticPrice - price: 50 + price: 75 # steel closet base (that can be constructed/deconstructed) - type: entity @@ -118,7 +118,7 @@ - type: WallMount arc: 175 - type: StaticPrice - price: 50 + price: 75 - type: Transform noRot: false - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 73871cbe9b..fa6a45fcba 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -83,7 +83,7 @@ paper_label: !type:ContainerSlot - type: ItemSlots - type: StaticPrice - price: 50 + price: 75 - type: Construction graph: CrateGenericSteel node: crategenericsteel diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 9b0558a411..4c540d7b77 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -28,7 +28,7 @@ containers: - entity_storage - type: StaticPrice - price: 80 + price: 100 - type: entity parent: CratePlastic @@ -417,7 +417,7 @@ layer: - LargeMobLayer - type: StaticPrice - price: 60 + price: 75 - type: entity parent: CrateGeneric diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml index cfda95fc2f..9feeb6c8fd 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml @@ -66,7 +66,7 @@ graph: FilingCabinet node: filingCabinet - type: StaticPrice - price: 20 + price: 60 - type: entity name: tall cabinet @@ -155,7 +155,7 @@ graph: FilingCabinet node: chestDrawer - type: StaticPrice - price: 15 + price: 100 - type: RequireProjectileTarget - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index d0b468ca53..c064db1c5b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -59,4 +59,4 @@ acts: [ "Destruction" ] - type: Climbable - type: StaticPrice - price: 22 + price: 30 diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml index f3e9c826d3..3ac9f1ddbf 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml @@ -53,7 +53,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 10 + price: 30 - type: entity id: ReinforcedGirder @@ -96,7 +96,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 66 + price: 130 - type: entity id: ClockworkGirder @@ -110,6 +110,8 @@ - type: Construction graph: ClockworkGirder node: clockGirder + - type: StaticPrice + price: 75 - type: Destructible thresholds: - trigger: @@ -137,4 +139,4 @@ acts: [ "Destruction" ] - !type:PlaySoundBehavior sound: - collection: MetalBreak \ No newline at end of file + collection: MetalBreak diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index c4c9af83b3..03593305eb 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -563,7 +563,7 @@ 5: { state: reinf_construct-5, visible: true} - type: ReinforcedWallReplacementMarker - type: StaticPrice - price: 150 + price: 250 - type: RadiationBlocker resistance: 5 diff --git a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml index d6b024bf36..89237c1bb6 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml @@ -98,7 +98,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 22 + price: 22.5 - type: entity parent: ClockworkWindow diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml index 36a12f2d84..9b8401112f 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -49,7 +49,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 60 + price: 100 - type: RadiationBlocker resistance: 2 @@ -96,7 +96,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 30 + price: 50 - type: entity parent: PlasmaWindow diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index d8b6c7d11d..503d2eec6e 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -73,7 +73,7 @@ node: tintedWindow - type: Occluder - type: StaticPrice - price: 44 + price: 45 - type: entity id: WindowReinforcedDirectional @@ -106,7 +106,7 @@ - type: RCDDeconstructable cost: 4 delay: 4 - fx: EffectRCDDeconstruct4 + fx: EffectRCDDeconstruct4 - type: Destructible thresholds: - trigger: @@ -133,7 +133,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 22 + price: 22.5 - type: entity parent: ReinforcedWindow diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml index e26fec65b7..ec3883fdfd 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml @@ -49,7 +49,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 140 + price: 215 - type: RadiationBlocker resistance: 5 @@ -99,7 +99,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 70 + price: 110 - type: entity parent: ReinforcedUraniumWindow diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index f1b840c143..1b4c96c170 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -52,7 +52,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 100 + price: 150 - type: entity parent: ShuttleWindow diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml index e5228bc593..7a721a166d 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml @@ -47,7 +47,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 80 + price: 200 - type: RadiationBlocker resistance: 3 @@ -94,7 +94,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 40 + price: 100 - type: entity parent: UraniumWindow diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 606c54e35b..e6f9cbd661 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -92,7 +92,7 @@ - type: StaticPrice price: 100 - type: BlockWeather - + - type: entity id: WindowRCDResistant parent: Window @@ -194,10 +194,10 @@ damageOverlay: sprite: Structures/Windows/cracks_directional.rsi - type: StaticPrice - price: 10 + price: 15 - type: entity - id: WindowDirectionalRCDResistant + id: WindowDirectionalRCDResistant parent: WindowDirectional abstract: true components: @@ -264,4 +264,4 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: Construction graph: WindowDiagonal - node: windowDiagonal \ No newline at end of file + node: windowDiagonal diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml index d418feefff..ab705c035b 100644 --- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml +++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml @@ -39,7 +39,7 @@ key: walls mode: NoSprite - type: StaticPrice - price: 83 + price: 100 - type: entity id: PlasticFlapsClear diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml index 30e7762a81..0ae218cfda 100644 --- a/Resources/Prototypes/Reagents/Materials/glass.yml +++ b/Resources/Prototypes/Reagents/Materials/glass.yml @@ -4,7 +4,7 @@ name: materials-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: glass } color: "#a8ccd7" - price: 0.075 + price: 0.15 # $15 for one unit - type: material id: ReinforcedGlass @@ -12,7 +12,7 @@ name: materials-reinforced-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass } color: "#549bb0" - price: 0.16 # 1-0.5 mix of glass and metal. + price: 0.225 # 1-0.5 mix of glass and metal. - type: material id: PlasmaGlass @@ -20,7 +20,7 @@ name: materials-plasma-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: pglass } color: "#b35989" - price: 0.30 # 1-1 mix of plasma and glass. + price: 0.50 # 1-1 mix of plasma and glass. - type: material id: ReinforcedPlasmaGlass @@ -28,7 +28,7 @@ name: materials-reinforced-plasma-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass } color: "#8c4069" - price: 0.40 # 1-1-0.5 mix of plasma, glass, and metal. + price: 0.575 # 1-1-0.5 mix of plasma, glass, and metal. - type: material id: BrassGlass @@ -36,7 +36,7 @@ name: materials-clockwork-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: cglass } color: "#9b6f07" - price: 0.0875 # average of glass and brass. + price: 0.225 # average of glass and brass. - type: material id: UraniumGlass @@ -44,7 +44,7 @@ name: materials-uranium-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: uglass } color: "#3cab38" - price: 0.32 # 1-1 mix of uranium and glass. + price: 1.0 # 1-1 mix of uranium and glass. - type: material id: ReinforcedUraniumGlass @@ -52,4 +52,4 @@ name: materials-reinforced-uranium-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass } color: "#2d872a" - price: 0.7 # 2-2-1 mix of uranium, glass, and metal. + price: 1.075 # 2-2-1 mix of uranium, glass, and metal. diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index 829ae46b93..96eaf136d3 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -13,7 +13,7 @@ name: materials-cardboard icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard } color: "#70736c" - price: 0.005 + price: 0.025 - type: material id: Cloth @@ -32,7 +32,7 @@ unit: materials-unit-sheet icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread } color: "#8291a1" - price: 0.15 # 1-1 mix of plastic and cloth. + price: 0.35 # 1-1 mix of plastic and cloth. - type: material id: Paper @@ -40,7 +40,7 @@ name: materials-paper icon: { sprite: Objects/Materials/Sheets/other.rsi, state: paper } color: "#d9d9d9" - price: 0.05 #same as wood + price: 0.01 # it's paper bro what do you expect? - type: material id: Plasma @@ -48,7 +48,7 @@ name: materials-plasma icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plasma } color: "#7e009e" - price: 0.2 + price: 0.35 # $35 for 1 unit - type: material id: Plastic @@ -56,7 +56,7 @@ name: materials-plastic icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plastic } color: "#d9d9d9" - price: 0.1 + price: 0.20 # $20 for 1 unit - type: material id: Wood @@ -65,7 +65,7 @@ unit: materials-unit-plank icon: { sprite: Objects/Materials/materials.rsi, state: wood } color: "#966F33" - price: 0.05 + price: 0.10 # $10 for 1 unit - type: material id: Uranium @@ -73,7 +73,7 @@ name: materials-uranium icon: { sprite: Objects/Materials/Sheets/other.rsi, state: uranium } color: "#32a852" - price: 0.2 + price: 0.85 # $85 for 1 unit - type: material id: Bananium @@ -82,7 +82,7 @@ unit: materials-unit-bunch icon: { sprite: Objects/Materials/materials.rsi, state: bananium } color: "#32a852" - price: 0.2 + price: 1.0 # $100 for 1 unit - type: material id: Meaterial # you can't take this pun from me @@ -115,7 +115,7 @@ unit: materials-unit-piece icon: { sprite: Objects/Materials/ore.rsi, state: coal } color: "#404040" - price: 0 + price: 0.1 # $10 for 1 unit - type: material id: Gunpowder diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index a2d2397dcd..7d08b71e56 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -3,7 +3,7 @@ stackEntity: SheetSteel1 name: materials-steel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: steel } - price: 0.05 + price: 0.15 # $15 for 1 unit - type: material id: Gold @@ -12,7 +12,7 @@ unit: materials-unit-bar icon: { sprite: Objects/Materials/ingots.rsi, state: gold } color: "#FFD700" - price: 0.2 + price: 0.75 # $75 for 1 unit - type: material id: Silver @@ -21,7 +21,7 @@ unit: materials-unit-bar icon: { sprite: Objects/Materials/ingots.rsi, state: silver } color: "#C0C0C0" - price: 0.15 + price: 0.60 # $60 for 1 unit - type: material id: Brass @@ -29,7 +29,7 @@ name: materials-brass icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: brass } color: "#b18b25" - price: 0.1 + price: 0.30 # $30 for 1 unit - type: material id: Plasteel @@ -37,4 +37,4 @@ name: materials-plasteel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel } color: "#696969" #Okay, this is epic - price: 0.28 # 1-1 mix of plasma and steel. + price: 0.5 # 1-1 mix of plasma and steel. -- 2.51.2