-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Description This PR adds in new sprites for vending machines, imported from Baystation12. These sprites are notably different from /tg/station sprites in that they include directional facings, and aren't just mono direction. This allows mappers to have more variety in how they can arrange rooms. But more importantly, it's also something that is desperately wanted by #395 so that hostile vending machines actually face people that they're trying to attack. ![ShareX_YQkAjaj4s8](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/a97b51e6-df31-4cb5-ba1f-47ce76eb7461) --------- Co-authored-by: Pspritechologist <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
- Loading branch information
1 parent
fcea083
commit 53b5b3a
Showing
1,061 changed files
with
8,323 additions
and
335 deletions.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
Resources/Locale/en-US/advertisements/vending/bay12Vendors.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,23 @@ | ||
advertisement-solsnack-1 = We cut all the red-tape so that you can have diarrhea! | ||
advertisement-solsnack-2 = Food safety standards are merely a suggestion if you know the right people! | ||
advertisement-solsnack-3 = Snacks from home, corruption included! | ||
advertisement-solsnack-4 = A taste of home! | ||
advertisement-weebvend-1 = Konnichiwa gaijin senpai! | ||
advertisement-weebvend-2 = Notice me senpai! | ||
advertisement-weebvend-3 = Kawaii-desu! | ||
advertisement-hotfood-1 = Get your stale, crumbling food here! Sol's national dish has never tasted better! | ||
advertisement-hotfood-2 = If this is the food waiting for you at home, it's no wonder you're hiding here. | ||
advertisement-hotfood-3 = Solarian food products, served with a side of diarrhea as always! | ||
advertisement-hotfood-4 = Revenge is a dish best served warm. | ||
advertisement-fitness-1 = SweatMAX, get robust! | ||
advertisement-fitness-2 = Pain is just weakness leaving the body! | ||
advertisement-fitness-3 = Run! Your fat is catching up to you! | ||
advertisement-fitness-4 = Never forget leg day! | ||
advertisement-fitness-5 = Push out! | ||
advertisement-fitness-6 = This is the only break you get today. | ||
advertisement-fitness-7 = Don't cry, sweat! | ||
advertisement-fitness-8 = Healthy is an outfit that looks good on everybody. | ||
advertisement-fitness-9 = Want to hide from the Solarian authorities? Don't worry, they don't know what the inside of a gym looks like. |
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,2 @@ | ||
reagent-name-milk-choco = chocolate milk | ||
reagent-desc-milk-choco = A milk drink flavored with chocolate. |
14 changes: 14 additions & 0 deletions
14
Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml
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,14 @@ | ||
- type: advertisementsPack | ||
id: FitnessVendAds | ||
advertisements: | ||
- advertisement-fitness-1 | ||
- advertisement-fitness-2 | ||
- advertisement-fitness-3 | ||
- advertisement-fitness-4 | ||
- advertisement-fitness-5 | ||
- advertisement-fitness-6 | ||
- advertisement-fitness-7 | ||
- advertisement-fitness-8 | ||
- advertisement-fitness-9 | ||
thankyous: | ||
- vending-machine-thanks |
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml
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,9 @@ | ||
- type: advertisementsPack | ||
id: HotfoodAds | ||
advertisements: | ||
- advertisement-hotfood-1 | ||
- advertisement-hotfood-2 | ||
- advertisement-hotfood-3 | ||
- advertisement-hotfood-4 | ||
thankyous: | ||
- vending-machine-thanks |
8 changes: 8 additions & 0 deletions
8
Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml
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 @@ | ||
- type: advertisementsPack | ||
id: SolsnackAds | ||
advertisements: | ||
- advertisement-solsnack-1 | ||
- advertisement-solsnack-2 | ||
- advertisement-solsnack-3 | ||
thankyous: | ||
- vending-machine-thanks |
8 changes: 8 additions & 0 deletions
8
Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml
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 @@ | ||
- type: advertisementsPack | ||
id: WeebVendAds | ||
advertisements: | ||
- advertisement-weebvend-1 | ||
- advertisement-weebvend-2 | ||
- advertisement-weebvend-3 | ||
thankyous: | ||
- vending-machine-thanks |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/Catalog/VendingMachines/Inventories/fitness.yml
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,11 @@ | ||
- type: vendingMachineInventory | ||
id: FitnessVendInventory | ||
startingInventory: | ||
FoodSnackProteinbar: 3 | ||
FoodCondimentPacketProtein: 3 | ||
DrinkMilkCartonMini: 3 | ||
DrinkMilkCartonMiniChocolate: 3 | ||
DrinkWaterBottleFull: 3 | ||
DrinkFitnessShakerBlack: 2 | ||
DrinkFitnessShakerRed: 2 | ||
DrinkFitnessShakerBlue: 2 |
8 changes: 8 additions & 0 deletions
8
Resources/Prototypes/Catalog/VendingMachines/Inventories/hotfood.yml
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 @@ | ||
- type: vendingMachineInventory | ||
id: HotfoodInventory | ||
startingInventory: | ||
FoodSnackAncientBurger: 1 | ||
FoodSnackAncientPizza: 1 | ||
FoodSnackAncientFries: 1 | ||
FoodSnackAncientHotdog: 1 | ||
FoodSnackAncientTaco: 1 |
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/Catalog/VendingMachines/Inventories/solsnack.yml
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,13 @@ | ||
- type: vendingMachineInventory | ||
id: SolsnackInventory | ||
startingInventory: | ||
FoodSnackLunacakeWrapped: 3 | ||
FoodSnackMochicakeWrapped: 3 | ||
FoodSnackMooncakeWrapped: 3 | ||
FoodSnackTidegobs: 3 | ||
FoodSnackSaturnos: 3 | ||
FoodSnackJoveGello: 3 | ||
FoodSnackPlutoniumrods: 3 | ||
FoodSnackMarsFrouka: 3 | ||
FoodSnackVenusianhotcakes: 3 | ||
FoodSnackOortrocks: 3 |
8 changes: 8 additions & 0 deletions
8
Resources/Prototypes/Catalog/VendingMachines/Inventories/weebvend.yml
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 @@ | ||
- type: vendingMachineInventory | ||
id: WeebVendInventory | ||
startingInventory: | ||
FoodSnackRedalertnuts: 3 | ||
FoodSnackRicecake: 3 | ||
FoodSnackPokeysticks: 3 | ||
FoodSnackChocobanana: 3 | ||
FoodSnackDango: 3 |
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
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
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
Oops, something went wrong.