From cce072d50f642f282839a258bbf3224958641d2b Mon Sep 17 00:00:00 2001 From: BubblegumBlue <63939723+BubblegumBlue@users.noreply.github.com> Date: Sun, 9 Jan 2022 13:20:30 +1000 Subject: [PATCH] Rebalance of YouTool and Salvage crate (#6053) * Quick inventory changes * Fully removed the Salvage Crate from Cargo's order list Co-authored-by: Starm4ncer <63939723+Starm4ncer@users.noreply.github.com> --- Resources/Prototypes/Catalog/Cargo/cargo_salvage.yml | 11 ----------- Resources/Prototypes/Catalog/Fills/Crates/salvage.yml | 4 ++-- .../Catalog/VendingMachines/Inventories/youtool.yml | 5 +++-- .../Structures/Machines/Computers/computers.yml | 3 +-- 4 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 Resources/Prototypes/Catalog/Cargo/cargo_salvage.yml diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_salvage.yml b/Resources/Prototypes/Catalog/Cargo/cargo_salvage.yml deleted file mode 100644 index d7687b32ad..0000000000 --- a/Resources/Prototypes/Catalog/Cargo/cargo_salvage.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: cargoProduct - name: "salvage equipment crate" - id: SalvageEquipment - description: "Gear up a new recruit for salvage missions with this crate full of all the equipment you'll need while salvaging wrecks!" - icon: - sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi - state: icon - product: CrateSalvageEquipment - cost: 8000 - category: Salvage - group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 67f67e6273..5e8edbae8e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -14,12 +14,12 @@ - id: FireExtinguisher - id: ClothingShoesBootsMag - id: Pickaxe - # bare-minimum for cutting apart walls - # not giving them wirecutters/etc. for balance reasons - id: Welder - id: Wrench - id: Screwdriver - id: Crowbar + - id: Wirecutter + - id: ClothingBeltUtility - type: entity id: CrateSalvageAssortedGoodies diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 815b80e8b7..aa20024c79 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -4,11 +4,12 @@ animationDuration: 1.1 spriteName: youtool startingInventory: - CableApcStack1: 10 + CableApcStack: 5 Crowbar: 5 Welder: 3 Wirecutter: 5 Wrench: 5 Screwdriver: 5 trayScanner: 5 - ClothingHandsGlovesColorYellowBudget: 5 \ No newline at end of file + ClothingHandsGlovesColorYellowBudget: 5 + ClothingBeltUtility: 3 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 1c88dd7f61..3b98beb836 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: ComputerBase id: ComputerAlert name: alerts computer @@ -313,7 +313,6 @@ - ServiceLightsReplacement - ServiceSmokeables - ServiceCustomSmokable - - SalvageEquipment - ServiceBureaucracy - EngineeringCableLv - EngineeringCableMv