-
Notifications
You must be signed in to change notification settings - Fork 473
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-frontiers-14:master' into EMP-Guns
- Loading branch information
Showing
17 changed files
with
11,325 additions
and
2,271 deletions.
There are no files selected for viewing
File renamed without changes.
8 changes: 8 additions & 0 deletions
8
Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
55 changes: 23 additions & 32 deletions
55
Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
Oops, something went wrong.