Skip to content

Commit

Permalink
Directional Animated Vendors (#400)
Browse files Browse the repository at this point in the history
# 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
3 people authored Jun 25, 2024
1 parent fcea083 commit 53b5b3a
Show file tree
Hide file tree
Showing 1,061 changed files with 8,323 additions and 335 deletions.
23 changes: 23 additions & 0 deletions Resources/Locale/en-US/advertisements/vending/bay12Vendors.ftl
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.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/reagents/bay12reagents.ftl
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.
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
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
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
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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,47 @@
Quantity: 100
- type: Sprite
sprite: Objects/Consumable/Drinks/oatmilk.rsi

- type: entity
parent: DrinkCartonBaseFull
id: DrinkCartonBaseSmallFull
abstract: true
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 25

- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
id: DrinkMilkCartonMini
name: mini milk
description: An opaque white liquid produced by the mammary glands of mammals.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 25
reagents:
- ReagentId: Milk
Quantity: 25
- type: Sprite
sprite: Objects/Consumable/Drinks/milkmini.rsi
state: icon

- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
id: DrinkMilkCartonMiniChocolate
name: mini choco milk
description: A milk drink flavored with chocolate.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 25
reagents:
- ReagentId: MilkChoco
Quantity: 25
- type: Sprite
sprite: Objects/Consumable/Drinks/milkminichoco.rsi
state: icon
59 changes: 59 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2121,3 +2121,62 @@
- type: Icon
sprite: Objects/Consumable/Drinks/bloodglass.rsi
state: icon

- type: entity
parent: DrinkBase
id: DrinkBasePlastic
abstract: true
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50
- type: PhysicalComposition
materialComposition:
Plastic: 100

- type: entity
parent: DrinkBasePlastic
id: DrinkFitnessShakerBlack
name: fitness shaker
description: Big enough to contain enough protein to get perfectly swole. Don't mind the bits.
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/shakerblack.rsi
state: icon

- type: entity
parent: DrinkFitnessShakerBlack
id: DrinkFitnessShakerRed
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/shakerred.rsi
state: icon

- type: entity
parent: DrinkFitnessShakerBlack
id: DrinkFitnessShakerBlue
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/shakerblue.rsi
state: icon

- type: reagent
id: MilkChoco
name: reagent-name-milk-choco
group: Drinks
desc: reagent-desc-milk-choco
physicalDesc: reagent-physical-desc-opaque
flavor: chocolate
color: "#664300"
recognizable: true
plantMetabolism:
- !type:PlantAdjustNutrition
amount: 0.1
- !type:PlantAdjustWater
amount: 0.9
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 4
Original file line number Diff line number Diff line change
Expand Up @@ -648,3 +648,23 @@
reagents:
- ReagentId: CocoaPowder
Quantity: 2

- type: entity
parent: BaseFoodCondimentPacket
id: FoodCondimentPacketProtein
name: protein powder packet
description: Contains 10u of powdered protein. Mix with 20u of water
components:
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Protein
Quantity: 10
- type: Icon
state: packet-greygoo
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 2
fillBaseName: packet-solid-
Loading

0 comments on commit 53b5b3a

Please sign in to comment.