Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/_HL/reagents/drinks.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
reagent-name-nanolight = NanoLight
reagent-desc-nanolight = NanoLight, a beer made by NT

reagent-name-monster = Monster Energy
reagent-desc-monster = The drink of champions.

reagent-name-monster-white = Monster Energy White
reagent-desc-monster-white = The drink of titans.
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
ClothingUnderSocksMusician: 2
ClothingUniformMusicianThong: 2
ClothingUniformJulianneVA11HALLA: 1 # Hardlight
ClothingOuterBeerJacket: 2 # Hardlight
contrabandInventory:
ToyFigurineBartender: 1
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
JugCaramexinin: 1 # Frontier ## Hardlight: Why was this emag only.
DrinkRootBeerJug: 2 # Coyote
DrinkAngobittersBottleFull: 3 # DeltaV - Angostura Bitters Bottle
EnergyDrinkMonster: 5
EnergyDrinkMonsterWhite: 5
contrabandInventory:
ChemistryBottleEthanol: 3
DrinkBottleOfNothingFull: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
BunnysuitBoxLawBlack: 6
BunnysuitBoxClown: 6
BunnysuitBoxMime: 6
ClothingOuterBeerJacket: 2
contrabandInventory:
# ClothingMaskNeckGaiter: 2 - HL
ClothingUniformJumpsuitTacticool: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkNNNCan: 3 #Floofstation
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
contrabandInventory:
DrinkColaBottleFull: 2
emaggedInventory:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkNNNCan: 3 #Floofstation
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
contrabandInventory:
ClothingNeckStethoscope: 2
Saw: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkNNNCan: 3 #Floofstation
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
contrabandInventory:
DrinkDrGibbCan: 3
emaggedInventory:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkNNNCan: 3 #Floofstation
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
contrabandInventory:
DrinkChangelingStingCan: 2
emaggedInventory:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
DrinkLemonLimeCranberryCan: 3
DrinkFourteenLokoCan: 3
DrinkNNNCan: 3 #Floofstation
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
contrabandInventory:
DrinkColaBottleFull: 2
emaggedInventory:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
DrinkSolDryCan: 2
DrinkFourteenLokoCan: 2
DrinkNNNCan: 3 #Floofstation
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
contrabandInventory:
DrinkSpaceMountainWindBottleFull: 2
DrinkSpaceUpBottleFull: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
DrinkNNNCan: 3 #Floofstation
# contrabandInventory: # Frontier
# FoodBurgerCarp: 2 # Frontier
EnergyDrinkMonster: 2 #HL
EnergyDrinkMonsterWhite: 2 #HL
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
33 changes: 33 additions & 0 deletions Resources/Prototypes/_HL/Clothing/beerjacket.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: entity
parent: [ClothingOuterStorageBase, DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: ClothingOuterBeerJacket
name: beer jacket
description: A plastic jacket full of warm beer, what could go wrong?z
components:
- type: Item
size: Small
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Beer
Quantity: 150
- type: Label
currentLabel: reagent-name-beer
- type: Drink
- type: Sprite
sprite: _HL/Clothing/OuterClothing/beerjacket.rsi
layers:
- state: icon
map: ["enum.OpenableVisuals.Layer"]
- state: icon-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 5
fillBaseName: icon-
- type: Sealable
- type: Clothing
sprite: _HL/Clothing/OuterClothing/beerjacket.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,40 @@
Quantity: 30
- type: Icon
sprite: _HL/Objects/Consumable/Drinks/nebuladream.rsi
state: icon
state: icon

- type: entity
parent: DrinkCanBaseFull
id: EnergyDrinkMonster
name: Monster Energy Original
description: Free the beast. Holding this can makes you feel powerful, like the monster is inside you.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: MonsterEnergy
Quantity: 30
- type: Sprite
sprite: _HL/Objects/Consumable/Drinks/blackmonster.rsi
- type: Item
sprite: _HL/Objects/Consumable/Drinks/blackmonster.rsi

- type: entity
parent: DrinkCanBaseFull
id: EnergyDrinkMonsterWhite
name: Monster Energy White
description: Free the beast. Holding this can makes you feel at the peak of humanity, in touch with your true self. With it, anything is possible.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: MonsterEnergyWhite
Quantity: 30
- type: Sprite
sprite: _HL/Objects/Consumable/Drinks/whitemonster.rsi
- type: Item
sprite: _HL/Objects/Consumable/Drinks/whitemonster.rsi
13 changes: 12 additions & 1 deletion Resources/Prototypes/_HL/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,15 @@
- type: flavor
id: nebuladream
flavorType: Complex
description: flavor-complex-nebula-dream
description: flavor-complex-nebula-dream

- type: flavor
id: monsterblack
flavorType: Complex
description: like liquid power

- type: flavor
id: monsterwhite
flavorType: Complex
description: like raw electric charge

33 changes: 33 additions & 0 deletions Resources/Prototypes/_HL/Reagents/Consumable/Drink/monster.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: reagent
id: MonsterEnergy
name: reagent-name-monster
parent: BaseDrink
desc: reagent-desc-monster
physicalDesc: reagent-physical-desc-strong-smelling
flavor: monsterblack
color: "#009B20"
recognizable: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:SatiateHunger
factor: 2

- type: reagent
id: MonsterEnergyWhite
name: reagent-name-monster-white
parent: BaseDrink
desc: reagent-desc-monster-white
physicalDesc: reagent-physical-desc-strong-smelling
flavor: monsterwhite
color: "#E8FFFB"
recognizable: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:SatiateHunger
factor: 2
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by @stickycheZ101 on discord",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "icon-1"
},
{
"name": "icon-2"
},
{
"name": "icon-3"
},
{
"name": "icon-4"
},
{
"name": "icon-5"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "From https://discord.com/channels/1148992175347089468/1276112272690774017/1276112272690774017",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Based on the standard ST14 monster can, modified by CaramelKitten",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
}
]
}
Loading