Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduces size of smaller cartons and fix size discrepancies with empty containers #26430

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Reduces size of smaller cartons and fix size discrepancies with empty containers #26430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7848691
Reduces size of smaller cartons
BurningRash Mar 25, 2024
0ea318b
Fix trash bottles/cartons
BurningRash Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- type: Sprite
state: icon
- type: Item
size: Normal
size: Small
- type: MeleeWeapon
soundNoDamage:
path: "/Audio/Effects/Fluids/splat.ogg"
Expand All @@ -39,6 +39,18 @@
- type: TrashOnSolutionEmpty
solution: drink

- type: entity
parent: DrinkCartonBaseFull
id: DrinkCartonBaseLargeFull
abstract: true
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100
- type: Item
size: Normal

- type: entity
id: DrinkCartonVisualsOpenable
abstract: true
Expand Down Expand Up @@ -116,47 +128,44 @@
sprite: Objects/Consumable/Drinks/cream.rsi

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

- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
id: DrinkSoyMilkCarton
name: soy milk
description: White and nutritious soy goodness!
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100
reagents:
- ReagentId: MilkSoy
Quantity: 100
- type: Sprite
sprite: Objects/Consumable/Drinks/soymilk.rsi

- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
id: DrinkOatMilkCarton
name: oat milk
description: It's oat milk. Tan and nutritious goodness!
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100
reagents:
- ReagentId: MilkOat
Quantity: 100
Expand Down
59 changes: 33 additions & 26 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
components:
- type: Sprite
state: icon
- type: Item
size: Normal
- type: SolutionContainerManager
solutions:
drink:
Expand Down Expand Up @@ -72,6 +74,19 @@
Glass: 100
- type: SpaceGarbage

- type: entity
name: base empty bottle
id: DrinkBottleBaseSmallEmpty
parent: DrinkBottleBaseEmpty
abstract: true
components:
- type: Item
size: Small
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50

- type: entity
name: base empty carton
id: DrinkCartonBaseEmpty
Expand Down Expand Up @@ -122,6 +137,19 @@
Cardboard: 20
- type: SpaceGarbage

- type: entity
name: base empty bottle
id: DrinkCartonBaseLargeEmpty
parent: DrinkCartonBaseEmpty
abstract: true
components:
- type: Item
size: Normal
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100

# Containers
- type: entity
name: Jailbreaker Verte bottle
Expand All @@ -143,28 +171,20 @@

- type: entity
name: ale bottle
parent: DrinkBottleBaseEmpty
parent: DrinkBottleBaseSmallEmpty
id: DrinkBottleAle
components:
- type: Sprite
sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50


- type: entity
name: beer bottle
parent: DrinkBottleBaseEmpty
parent: DrinkBottleBaseSmallEmpty
id: DrinkBottleBeer
components:
- type: Sprite
sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50


- type: entity
Expand Down Expand Up @@ -322,37 +342,24 @@

- type: entity
name: milk carton
parent: DrinkCartonBaseEmpty
parent: DrinkCartonBaseLargeEmpty
id: DrinkCartonMilk
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/milk.rsi
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100


- type: entity
name: soy milk carton
parent: DrinkCartonBaseEmpty
parent: DrinkCartonBaseLargeEmpty
id: DrinkCartonSoyMilk
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/soymilk.rsi
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100

- type: entity
name: oat milk carton
parent: DrinkCartonBaseEmpty
parent: DrinkCartonBaseLargeEmpty
id: DrinkCartonOatMilk
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/oatmilk.rsi
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100
Loading