From 6c9c8abb139372eb9de36fa425503125fb2d4acb Mon Sep 17 00:00:00 2001 From: Nairod <110078045+Nairodian@users.noreply.github.com> Date: Sun, 7 Jan 2024 17:51:17 -0600 Subject: [PATCH] Patch Cargo Lathe Abuse (#23698) * Reduce Several Prices * Several Fixes --- .../Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 -- .../Devices/Circuitboards/Machine/production.yml | 6 ++++++ .../Objects/Devices/Electronics/power_electronics.yml | 8 ++++++++ .../Prototypes/Entities/Objects/Devices/flatpack.yml | 2 +- .../Entities/Objects/Devices/holoprojectors.yml | 4 ++-- .../Objects/Fun/Instruments/instruments_percussion.yml | 2 ++ .../Prototypes/Entities/Objects/Shields/shields.yml | 2 +- .../Entities/Objects/Specific/Medical/defib.yml | 2 +- .../Entities/Objects/Specific/Medical/healing.yml | 4 ++-- .../Entities/Objects/Specific/Medical/surgery.yml | 4 +++- .../Objects/Specific/Robotics/borg_modules.yml | 2 +- .../Entities/Objects/Specific/chemical-containers.yml | 2 +- .../Prototypes/Entities/Objects/Specific/chemistry.yml | 2 +- .../Guns/Ammunition/Cartridges/base_cartridge.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/light_rifle.yml | 2 -- .../Weapons/Guns/Ammunition/Cartridges/magnum.yml | 2 -- .../Weapons/Guns/Ammunition/Cartridges/pistol.yml | 2 -- .../Weapons/Guns/Ammunition/Cartridges/rifle.yml | 2 -- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 10 ++++++++++ .../Prototypes/Entities/Objects/Weapons/security.yml | 4 ++-- .../Entities/Structures/Furniture/rollerbeds.yml | 2 +- 21 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index dd7ed674a8..880239b51e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -66,8 +66,6 @@ sprite: Clothing/Shoes/Boots/magboots-science.rsi - type: Magboots toggleAction: ActionToggleMagbootsSci - - type: StaticPrice - price: 400 - type: entity parent: ClothingShoesBootsMag diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index a16a69ee21..d6863d49a7 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -780,6 +780,8 @@ Glass: 200 chemicalComposition: Silicon: 20 + - type: StaticPrice + price: 40 - type: entity id: ThrusterMachineCircuitboard @@ -824,6 +826,8 @@ Glass: 200 chemicalComposition: Silicon: 20 + - type: StaticPrice + price: 40 - type: entity id: PortableGeneratorJrPacmanMachineCircuitboard @@ -843,6 +847,8 @@ Glass: 200 chemicalComposition: Silicon: 20 + - type: StaticPrice + price: 40 - type: entity id: ReagentGrinderMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml index 80c728aca7..9a806a6bf2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml @@ -27,6 +27,8 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: charger_APC + - type: StaticPrice + price: 40 - type: Tag tags: - DroneUsable @@ -42,6 +44,8 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: charger_APC + - type: StaticPrice + price: 20 - type: PhysicalComposition materialComposition: Glass: 90 @@ -60,6 +64,8 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: charger_APC + - type: StaticPrice + price: 40 - type: Tag tags: - DroneUsable @@ -75,6 +81,8 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: generic + - type: StaticPrice + price: 85 - type: Tag tags: - DroneUsable diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index 9d49d7e994..8c4a4a52c1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -34,7 +34,7 @@ cpu_science: "#D381C9" cpu_supply: "#A46106" - type: StaticPrice - price: 500 + price: 250 - type: Tag tags: - DroneUsable diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index 7edd788bf3..4924a46fe8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -72,7 +72,7 @@ tags: - HolofanProjector - type: StaticPrice - price: 250 + price: 130 - type: entity parent: Holoprojector @@ -90,7 +90,7 @@ tags: - HolofanProjector - type: StaticPrice - price: 80 + price: 50 - type: entity parent: HoloprojectorSecurity diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml index 9a464a5009..a255ab4a32 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml @@ -81,6 +81,8 @@ - type: Tag tags: - KeyedInstrument + - type: StaticPrice + price: 90 - type: entity parent: BaseHandheldInstrument diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index c7fda9779a..0016e25cf4 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -68,7 +68,7 @@ description: A large tower shield. Good for controlling crowds. components: - type: StaticPrice - price: 100 + price: 90 - type: entity name: riot laser shield diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 3c93a0a876..4a61074a8d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -38,7 +38,7 @@ - type: DoAfter - type: UseDelay - type: StaticPrice - price: 100 + price: 30 - type: GuideHelp guides: - Medical Doctor diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 25b9823175..0165557f83 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -44,7 +44,7 @@ stackType: Ointment count: 10 - type: StackPrice - price: 10 + price: 5 - type: entity id: Ointment1 @@ -130,7 +130,7 @@ stackType: Brutepack count: 10 - type: StackPrice - price: 10 + price: 5 - type: entity id: Brutepack1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index e157817ec4..0dc1116cf0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -7,7 +7,7 @@ components: - type: Sprite - type: StaticPrice - price: 60 + price: 20 # Cautery @@ -48,6 +48,8 @@ Piercing: 10 soundHit: path: /Audio/Items/drill_hit.ogg + - type: StaticPrice + price: 40 # Scalpel diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 10d89c591d..b3c0a779b8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -9,7 +9,7 @@ sprite: Objects/Specific/Robotics/borgmodule.rsi - type: BorgModule - type: StaticPrice - price: 250 + price: 100 - type: Tag tags: - BorgModuleGeneric diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index ba422313e3..139eecfe83 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -44,7 +44,7 @@ maxFillLevels: 6 fillBaseName: jug - type: StaticPrice - price: 80 + price: 60 - type: Label originalName: jug diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 2fad96411f..f9a843c4d4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -201,7 +201,7 @@ maxFillLevels: 6 fillBaseName: beakerlarge - type: StaticPrice - price: 40 + price: 20 - type: entity name: cryostasis beaker diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml index 1831db28e7..e188ee8c65 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml @@ -27,3 +27,5 @@ path: /Audio/Weapons/Guns/Casings/casing_fall_2.ogg params: volume: -1 + - type: StaticPrice + price: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index f12811939a..729b1e6fc0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -17,8 +17,6 @@ map: ["enum.AmmoVisualLayers.Base"] - type: Appearance - type: SpentAmmoVisuals - - type: StaticPrice - price: 10 - type: entity id: CartridgeLightRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index d233f42d5e..950b9c7563 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -17,8 +17,6 @@ map: ["enum.AmmoVisualLayers.Base"] - type: Appearance - type: SpentAmmoVisuals - - type: StaticPrice - price: 10 - type: entity id: CartridgeMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 80a6720cb2..50ca07cebc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -17,8 +17,6 @@ map: ["enum.AmmoVisualLayers.Base"] - type: Appearance - type: SpentAmmoVisuals - - type: StaticPrice - price: 10 - type: entity id: CartridgePistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index d70d863f22..98443d890d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -17,8 +17,6 @@ map: ["enum.AmmoVisualLayers.Base"] - type: Appearance - type: SpentAmmoVisuals - - type: StaticPrice - price: 10 - type: entity id: CartridgeRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 49c79bb8fc..bf9579d65b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -213,6 +213,8 @@ shader: unshaded - type: Clothing sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi + - type: StaticPrice + price: 420 - type: Gun selectedMode: SemiAuto availableModes: @@ -230,6 +232,8 @@ - type: HitscanBatteryAmmoProvider proto: RedLaserPractice fireCost: 62.5 + - type: StaticPrice + price: 300 - type: entity name: pulse pistol @@ -475,6 +479,8 @@ magState: mag steps: 5 zeroVisible: true + - type: StaticPrice + price: 260 - type: entity name: practice disabler @@ -495,6 +501,8 @@ quickEquip: false slots: - Belt + - type: StaticPrice + price: 100 - type: ProjectileBatteryAmmoProvider proto: BulletDisablerPractice fireCost: 100 @@ -649,6 +657,8 @@ - type: Construction graph: UpgradeWeaponPistolCHIMP node: start + - type: StaticPrice + price: 100 - type: entity name: experimental C.H.I.M.P. handcannon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 93bc0a2dd3..c8f2fd4d0e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -65,7 +65,7 @@ True: {state: stunbaton_on} False: {state: stunbaton_off} - type: StaticPrice - price: 100 + price: 80 - type: Riggable - type: SolutionContainerManager solutions: @@ -109,7 +109,7 @@ malus: 0.225 - type: Appearance - type: StaticPrice - price: 100 + price: 80 - type: GuideHelp guides: - Security diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index 406ff7fa48..53abcf592a 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -69,7 +69,7 @@ True: {visible: false} False: {visible: true} - type: StaticPrice - price: 200 + price: 120 - type: entity parent: RollerBed -- 2.51.2