Skip to content

Commit

Permalink
Merge pull request #94 from dvir001/Restocks-Changes
Browse files Browse the repository at this point in the history
Restock Fix
  • Loading branch information
Cheackraze authored Jul 27, 2023
2 parents e4d404d + 707eee5 commit 02945a8
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 185 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate
.desc = Contains two restock boxes for the AstroVend vendor.
ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate
.desc = Contains two restock boxes for the Liberation vending machine.
ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate
.desc = Contains two restock boxes for a CircuitVend vending machine.
Original file line number Diff line number Diff line change
@@ -1,77 +1,68 @@
ent-CrateVendingMachineRestockBoozeFilled = Booze-O-Mat restock crate
.desc = Contains a restock box for the Booze-O-Mat.
.desc = Contains two restock boxes for the Booze-O-Mat.
ent-CrateVendingMachineRestockClothesFilled = Clothing restock crate
.desc = Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe.
.desc = Contains eight restock boxes, one for the ClothesMate and one for the AutoDrobe.
ent-CrateVendingMachineRestockDinnerwareFilled = Plasteel Chef restock crate
.desc = Contains a restock box for the Plasteel Chef vending machine.
.desc = Contains two restock boxes for the Plasteel Chef vending machine.
ent-CrateVendingMachineRestockEngineeringFilled = EngiVend restock crate
.desc = Contains a restock box for the EngiVend. Also supports the YouTool.
.desc = Contains two restock boxes for the EngiVend. Also supports the YouTool.
ent-CrateVendingMachineRestockGamesFilled = Good Clean Fun restock crate
.desc = Contains a restock box for the Good Clean Fun vending machine.
.desc = Contains two restock boxes for the Good Clean Fun vending machine.
ent-CrateVendingMachineRestockHotDrinksFilled = Solar's Best restock crate
.desc = Contains two restock boxes for Solar's Best Hot Drinks vending machine.
.desc = Contains eight restock boxes for Solar's Best Hot Drinks vending machine.
ent-CrateVendingMachineRestockMedicalFilled = NanoMed restock crate
.desc = Contains a restock box, compatible with the NanoMed and NanoMedPlus.
.desc = Contains two restock boxes, compatible with the NanoMed and NanoMedPlus.
ent-CrateVendingMachineRestockNutriMaxFilled = NutriMax restock crate
.desc = Contains a restock box for the NutriMax vending machine.
.desc = Contains two restock boxes for the NutriMax vending machine.
ent-CrateVendingMachineRestockPTechFilled = PTech restock crate
.desc = Contains a restock box for the PTech bureaucracy dispenser.
.desc = Contains two restock boxes for the PTech bureaucracy dispenser.
ent-CrateVendingMachineRestockRobustSoftdrinksFilled = Robust Softdrinks restock crate
.desc = Contains two restock boxes for the Robust Softdrinks LLC vending machine.
.desc = Contains eight restock boxes for the Robust Softdrinks LLC vending machine.
ent-CrateVendingMachineRestockSalvageEquipmentFilled = Salvage restock crate
.desc = Contains a restock box for the salvage vendor.
ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate
.desc = Contains a restock box for the AstroVend vendor.
.desc = Contains two restock boxes for the salvage vendor.
ent-CrateVendingMachineRestockSecTechFilled = SecTech restock crate
.desc = Contains a restock box for the SecTech vending machine.
ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate
.desc = Contains a restock box for the Liberation vending machine.
.desc = Contains two restock boxes for the SecTech vending machine.
ent-CrateVendingMachineRestockSeedsFilled = MegaSeed restock crate
.desc = Contains a restock box for the MegaSeed vending machine.
.desc = Contains two restock boxes for the MegaSeed vending machine.
ent-CrateVendingMachineRestockSmokesFilled = ShadyCigs restock crate
.desc = Contains two restock boxes for the ShadyCigs vending machine.
.desc = Contains eight restock boxes for the ShadyCigs vending machine.
ent-CrateVendingMachineRestockVendomatFilled = Vendomat restock crate
.desc = Contains a restock box for a Vendomat vending machine.
ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate
.desc = Contains a restock box for a CircuitVend vending machine.
.desc = Contains two restock boxes for a Vendomat vending machine.
ent-CrateVendingMachineRestockRoboticsFilled = Robotech Deluxe restock crate
.desc = Contains a restock box for a Robotech Deluxe vending machine.
.desc = Contains two restock boxes for a Robotech Deluxe vending machine.
ent-CrateVendingMachineRestockTankDispenserFilled = Tank dispenser restock crate
.desc = Contains a restock box for an Engineering or Atmospherics tank dispenser.
.desc = Contains two restock boxes for an Engineering or Atmospherics tank dispenser.
ent-CrateVendingMachineRestockHappyHonkFilled = Happy honk restock crate
.desc = Contains a restock box for a happy honk dispenser.
.desc = Contains two restock boxes for a happy honk dispenser.
ent-CrateVendingMachineRestockGetmoreChocolateCorpFilled = Getmore Chocolate Corp restock crate
.desc = Contains a restock box for a Getmore Chocolate Corp dispenser.
.desc = Contains two restock boxes for a Getmore Chocolate Corp dispenser.
ent-CrateVendingMachineRestockChangFilled = Chang restock crate
.desc = Contains a restock box for a Mr. Chang dispenser.
.desc = Contains two restock boxes for a Mr. Chang dispenser.
ent-CrateVendingMachineRestockDiscountDansFilled = Discount Dans restock crate
.desc = Contains a restock box for a Discount Dan's dispenser.
.desc = Contains two restock boxes for a Discount Dan's dispenser.
ent-CrateVendingMachineRestockDonutFilled = Donut restock crate
.desc = Contains a restock box for a Monkin' Donuts dispenser.
.desc = Contains two restock boxes for a Monkin' Donuts dispenser.
ent-CrateVendingMachineRestockChemVendFilled = ChemVend restock crate
.desc = Contains a restock box for the ChemVend.
.desc = Contains two restock boxes for the ChemVend.
46 changes: 23 additions & 23 deletions Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockBoozeFilled
cost: 3500
cost: 400
category: Service
group: market

Expand All @@ -22,7 +22,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 4350
cost: 100
category: Service
group: market

Expand All @@ -32,7 +32,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockDinnerwareFilled
cost: 2000
cost: 100
category: Service
group: market

Expand All @@ -42,7 +42,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockEngineeringFilled
cost: 3200
cost: 100
category: Engineering
group: market

Expand All @@ -52,7 +52,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockGamesFilled
cost: 750
cost: 100
category: Service
group: market

Expand All @@ -62,7 +62,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockHotDrinksFilled
cost: 1200
cost: 400
category: Service
group: market

Expand All @@ -72,7 +72,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockMedicalFilled
cost: 1750
cost: 100
category: Medical
group: market

Expand All @@ -82,7 +82,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockChemVendFilled
cost: 3820
cost: 100
category: Medical
group: market

Expand All @@ -92,7 +92,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockNutriMaxFilled
cost: 2400
cost: 100
category: Hydroponics
group: market

Expand All @@ -102,7 +102,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockPTechFilled
cost: 1200
cost: 100
category: Service
group: market

Expand All @@ -112,7 +112,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockRobustSoftdrinksFilled
cost: 1200
cost: 400
category: Service
group: market

Expand All @@ -122,7 +122,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockSalvageEquipmentFilled
cost: 1000
cost: 100
category: Engineering
group: market

Expand All @@ -132,7 +132,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockSecTechFilled
cost: 2200
cost: 100
category: Security
group: market

Expand All @@ -142,7 +142,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockSeedsFilled
cost: 3000
cost: 100
category: Hydroponics
group: market

Expand All @@ -152,7 +152,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockSmokesFilled
cost: 1200
cost: 400
category: Service
group: market

Expand All @@ -162,7 +162,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockVendomatFilled
cost: 1200
cost: 100
category: Service
group: market

Expand All @@ -172,7 +172,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockRoboticsFilled
cost: 1600
cost: 100
category: Science
group: market

Expand All @@ -182,7 +182,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockTankDispenserFilled
cost: 1000
cost: 100
category: Atmospherics
group: market

Expand All @@ -192,7 +192,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockHappyHonkFilled
cost: 2100
cost: 400
category: Service
group: market

Expand All @@ -202,7 +202,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
cost: 1200
cost: 400
category: Service
group: market

Expand All @@ -212,7 +212,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockChangFilled
cost: 1200
cost: 400
category: Service
group: market

Expand All @@ -222,7 +222,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockDiscountDansFilled
cost: 1200
cost: 400
category: Service
group: market

Expand All @@ -232,6 +232,6 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockDonutFilled
cost: 1200
cost: 400
category: Service
group: market
Loading

0 comments on commit 02945a8

Please sign in to comment.