Skip to content

Commit 515885a

Browse files
EstKemranEstKemran
committed
Beer Update
1 parent 6c3aac5 commit 515885a

File tree

51 files changed

+307
-46
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+307
-46
lines changed

‎Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl

+3
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,6 @@ ent-ClothingHeadHatInterdyneFlipped = кепка парамедика Interdyne
6161
.desc = { ent-ClothingHeadHatInterdyneFlipped.desc }
6262
ent-ClothingHeadHatNewYearsCap = новогодний колпак
6363
.desc = Яркий новогодний колпак с пушистым помпоном, добавляющий волшебства и праздничного настроения!
64+
ent-ClothingHeadHatTophatHelmCorp = цилиндр Helm Corp
65+
.suffix = Helm Corp
66+
.desc = Стильный пивной цилиндр.

‎Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl

+4
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,7 @@ ent-ClothingUniformJumpsuitInterdyne = форма парамедика Interdyne
5050
5151
ent-ClothingUniformJumpsuitUssp = униформа СССП
5252
.desc = Форма, пропитанная кровью, потом и ненавистью к капитализму.
53+
54+
ent-ClothingUniformJumpsuitBartenderHelmCorp = униформа бармена Helm Corp.
55+
.desc = Специальная экипировка для подачи пива.
56+
.suffix = Helm Corp.

‎Resources/Locale/ru-RU/ss220/flavors/flavor-profiles.ftl

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flavor-complex-spacebeer = как хмель и космическая пыль

‎Resources/Locale/ru-RU/ss220/job/job-name.ftl

+2
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ job-name-ussp = СССП
1818
job-name-dq-operative = оперативник Эскадрона Смерти
1919
job-name-dq-commander = командир Эскадрона Смерти
2020
job-name-dq-specialist = специалист Эскадрона Смерти
21+
22+
job-name-bartender-helm = бармен Helm Corp.

‎Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/shuttleroles/roles.ftl

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ent-RandomHumanoidVisitorHelmBartender = посетитель бармен Helm Corp роль призрака
2+
.desc = { "" }

‎Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ ent-DrinkEggnogGlass = { ent-DrinkGlass }
1010
ent-DrinkBacchusGlass = { ent-DrinkGlass }
1111
.suffix = благославение бахуса
1212
.desc = { ent-DrinkGlass.desc }
13-
ent-DrinkBeerCan = банка пива
14-
.desc = Маленькая радость, великолепный вкус, никаких забот!
13+
ent-DrinkSpaceBeerCan = банка космического пива
14+
.desc = Маленькая радость в бескрайней вселенной.
15+
ent-DrinkSpaceBeerBottleFull = бутылка космического пива
16+
.desc = Великолепный вкус космической пыли без каких-либо дополнительных преимуществ.

‎Resources/Locale/ru-RU/ss220/prototypes/entities/structures/dispensers/beer.ftl

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ent-BeerDispenser = раздатчик пива
2+
.desc = Дозатор пивных напитков. Имеет один слот для ёмкостей.
3+
.suffix = Заполненный
4+
ent-BeerDispenserEmpty = { ent-BeerDispenser }
5+
.suffix = Пустой
6+
.desc = { ent-BeerDispenser.desc }

‎Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl

+2
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ reagent-name-ReaperSauce = соус "Тёмный жнец"
2020
reagent-desc-ReaperSauce = Этот соус оправдывает своё название. Используйте в блюдах на свой страх и риск.
2121
reagent-name-bacchus = благословение бахуса
2222
reagent-desc-bacchus = Ты был предупреждён.
23+
reagent-name-spacebeer = космическое пиво
24+
reagent-desc-spacebeer = Вкус — как у Большого взрыва, только хмельнее.

‎Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1983,4 +1983,4 @@
19831983
factor: 1
19841984
- !type:AdjustReagent
19851985
reagent: Ethanol
1986-
amount: 0.25
1986+
amount: 0.25

‎Resources/Prototypes/SS220/Catalog/ReagentDispensers/beverage.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- type: reagentDispenserInventory
2+
id: BeerDispenserInventory
3+
inventory:
4+
- DrinkBeerGrowler
5+
- DrinkAleBottleFullGrowler
6+
- DrinkMeadJug
7+
- DrinkSpaceBeerBottleFull

‎Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml

+12
Original file line numberDiff line numberDiff line change
@@ -597,3 +597,15 @@
597597
sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
598598
- type: Clothing
599599
sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
600+
601+
- type: entity
602+
parent: ClothingHeadHatTophat
603+
id: ClothingHeadHatTophatHelmCorp
604+
name: helm corp tophat
605+
description: A stylish beer tophat.
606+
suffix: Helm Corp.
607+
components:
608+
- type: Sprite
609+
sprite: SS220/Clothing/Head/Hats/tophat_helm.rsi
610+
- type: Clothing
611+
sprite: SS220/Clothing/Head/Hats/tophat_helm.rsi

‎Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml

+12
Original file line numberDiff line numberDiff line change
@@ -758,3 +758,15 @@
758758
sprite: SS220/Clothing/Uniforms/Jumpsuit/ussp_uniform.rsi
759759
- type: Clothing
760760
sprite: SS220/Clothing/Uniforms/Jumpsuit/ussp_uniform.rsi
761+
762+
- type: entity
763+
parent: ClothingUniformBase
764+
id: ClothingUniformJumpsuitBartenderHelmCorp
765+
name: helm corp. bartender's uniform
766+
description: Special equipment for serving beer
767+
suffix: Helm Corp.
768+
components:
769+
- type: Sprite
770+
sprite: SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi
771+
- type: Clothing
772+
sprite: SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi

‎Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/roles.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,14 @@
66
sprite: Markers/jobs.rsi
77
state: passenger
88
- type: RandomHumanoidSpawner
9-
settings: VisitorTourist
9+
settings: VisitorTourist
10+
11+
- type: entity
12+
id: RandomHumanoidVisitorBartenderHelm
13+
name: visiting bartender ghost role
14+
components:
15+
- type: Sprite
16+
sprite: SS220/Markers/jobs.rsi
17+
state: bartender_helm
18+
- type: RandomHumanoidSpawner
19+
settings: VisitorBartenderHelm

‎Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/settings.yml

+11
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,14 @@
88
- type: Loadout
99
prototypes: [ VisitorTourist ]
1010
roleLoadout: [ RoleSurvivalStandard ]
11+
12+
- type: randomHumanoidSettings
13+
id: VisitorBartenderHelm
14+
speciesBlacklist: [ Arachnid, Skeleton, Felinid, Tajaran, Diona, Moth, Reptilian, Slime, Vox]
15+
parent: VisitorCivilian
16+
components:
17+
- type: GhostRole
18+
name: job-name-bartender-helm
19+
- type: Loadout
20+
prototypes: [ VisitorBartenderHelm ]
21+
roleLoadout: [ RoleSurvivalStandard ]

‎Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml

+19-1
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,22 @@
9494
Quantity: 30
9595
- type: Icon
9696
sprite: SS220/Objects/Consumable/Drinks/bacchus_blessing.rsi
97-
state: icon
97+
state: icon
98+
99+
- type: entity
100+
parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
101+
id: DrinkSpaceBeerBottleFull
102+
name: space beer bottle
103+
description: Great taste of cosmic dust without any additional benefits.
104+
components:
105+
- type: SolutionContainerManager
106+
solutions:
107+
drink:
108+
reagents:
109+
- ReagentId: SpaceBeer
110+
Quantity: 100
111+
- type: Label
112+
currentLabel: reagent-name-spacebeer
113+
- type: Sprite
114+
sprite: SS220/Objects/Consumable/Drinks/space_beer.rsi
115+
- type: Sealable

‎Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks_cans.yml

+23-33
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,13 @@
11
- type: entity
22
id: DrinkCanPackBeer
3-
parent: BaseStorageItem
3+
parent: DrinkCanPack
44
name: держатель для напитков
55
suffix: Пиво
66
description: Служит для удобного хранения сразу нескольких банок пива.
77
components:
88
- type: Sprite
99
sprite: SS220/Objects/Misc/6pack.rsi
10-
layers:
11-
- state: plastic-thingy
12-
- state: 6pack1
13-
map: ["6pack1"]
14-
visible: false
15-
- state: 6pack2
16-
map: ["6pack2"]
17-
visible: false
18-
- state: 6pack3
19-
map: ["6pack3"]
20-
visible: false
21-
- state: 6pack4
22-
map: ["6pack4"]
23-
visible: false
24-
- state: 6pack5
25-
map: ["6pack5"]
26-
visible: false
27-
- state: 6pack6
28-
map: ["6pack6"]
29-
visible: false
30-
- type: Item
31-
size: Normal
3210
- type: Storage
33-
grid:
34-
- 0,0,2,3
3511
whitelist:
3612
tags:
3713
- Beer
@@ -43,11 +19,25 @@
4319
- type: ItemCounter
4420
count:
4521
tags: [Beer]
46-
composite: true
47-
layerStates:
48-
- 6pack1
49-
- 6pack2
50-
- 6pack3
51-
- 6pack4
52-
- 6pack5
53-
- type: Appearance
22+
23+
- type: entity
24+
parent: DrinkCanBaseFull
25+
id: DrinkSpaceBeerCan
26+
name: space beer can
27+
description: A small joy in the boundless universe.
28+
components:
29+
- type: SolutionContainerManager
30+
solutions:
31+
drink:
32+
maxVol: 30
33+
reagents:
34+
- ReagentId: SpaceBeer
35+
Quantity: 30
36+
- type: Drink
37+
- type: Sprite
38+
sprite: SS220/Objects/Consumable/Drinks/space_beer_can.rsi
39+
- type: Item
40+
sprite: SS220/Objects/Consumable/Drinks/space_beer_can.rsi
41+
- type: Tag
42+
tags:
43+
- Beer

‎Resources/Prototypes/SS220/Entities/Structures/Dispensers/beer.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
- type: entity
2+
id: BeerDispenser
3+
name: beer dispenser
4+
suffix: Filled
5+
description: A beer dispenser with a single slot for a container to be filled.
6+
parent: ReagentDispenserBase
7+
components:
8+
- type: Rotatable
9+
- type: Sprite
10+
sprite: Structures/smalldispensers.rsi
11+
drawdepth: SmallObjects
12+
state: booze
13+
- type: ReagentDispenser
14+
storageWhitelist:
15+
tags:
16+
- DrinkBottle
17+
pack: BeerDispenserInventory
18+
- type: Transform
19+
noRot: false
20+
- type: GuideHelp
21+
guides:
22+
- Bartender
23+
- Drinks
24+
25+
- type: entity
26+
id: BeerDispenserEmpty
27+
suffix: Empty
28+
parent: BeerDispenser
29+
components:
30+
- type: ReagentDispenser
31+
storageWhitelist:
32+
tags:
33+
- DrinkBottle
34+
pack: EmptyInventory

‎Resources/Prototypes/SS220/Flavors/flavors.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,9 @@
5151
- type: flavor
5252
id: Bacchus
5353
flavorType: Complex
54-
description: flavor-complex-bacchus
54+
description: flavor-complex-bacchus
55+
56+
- type: flavor
57+
id: spacebeer
58+
flavorType: Complex
59+
description: flavor-complex-spacebeer

‎Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml

+29-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- type: reagent
44
id: Glintwine
5-
name: reagent-name-glintwine
5+
name: reagent-name-glintwine
66
parent: BaseAlcohol
77
desc: reagent-desc-glintwine
88
physicalDesc: reagent-physical-desc-piquant
@@ -126,3 +126,31 @@
126126
types:
127127
Poison: 2
128128
fizziness: 0.2
129+
130+
- type: reagent
131+
id: SpaceBeer
132+
name: reagent-name-spacebeer
133+
parent: BaseAlcohol
134+
desc: reagent-desc-spacebeer
135+
physicalDesc: reagent-physical-desc-bubbly
136+
flavor: beer
137+
color: "#154e96"
138+
recognizable: true
139+
metamorphicSprite:
140+
sprite: Objects/Consumable/Drinks/beerglass.rsi
141+
state: icon_empty
142+
metamorphicMaxFillLevels: 6
143+
metamorphicFillBaseName: fill-
144+
metamorphicChangeColor: true
145+
fizziness: 0.6
146+
metabolisms:
147+
Drink:
148+
effects:
149+
- !type:SatiateThirst
150+
factor: 2
151+
- !type:AdjustReagent
152+
reagent: Ethanol
153+
amount: 0.08
154+
- !type:AdjustReagent
155+
reagent: Cryoxadone
156+
amount: 0.03

‎Resources/Prototypes/SS220/Roles/Jobs/Fun/visitors_startinggear.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,19 @@
2121
back: ClothingBackpack
2222
ears: ClothingHeadsetGrey
2323
pocket1: TapeRecorder
24-
pocket2: CassetteTape
24+
pocket2: CassetteTape
25+
26+
- type: startingGear
27+
id: VisitorBartenderHelm
28+
equipment:
29+
jumpsuit: ClothingUniformJumpsuitBartenderHelmCorp
30+
shoes: ClothingShoesBootsLaceup
31+
head: ClothingHeadHatTophatHelmCorp
32+
id: VisitorPDA
33+
back: ClothingBackpack
34+
suitstorage: WeaponShotgunDoubleBarreledRubber
35+
ears: ClothingHeadsetService
36+
eyes: ClothingEyesHudBeer
37+
outerClothing: ClothingOuterArmorBasicSlim
38+
pocket1: DrinkBeerGrowler
39+
pocket2: BarSpoon

‎Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET-hamster.png

740 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET.png

726 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/icon.png

507 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-left.png

289 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-right.png

298 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/meta.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprited by vimenant2 (discord), color editor by Estkemran (Github)",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "icon"
12+
},
13+
{
14+
"name": "equipped-HELMET",
15+
"directions": 4
16+
},
17+
{
18+
"name": "equipped-HELMET-hamster",
19+
"directions": 4
20+
},
21+
{
22+
"name": "inhand-left",
23+
"directions": 4
24+
},
25+
{
26+
"name": "inhand-right",
27+
"directions": 4
28+
}
29+
]
30+
}

‎Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING-monkey.png

1.65 KB
Loading

‎Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING.png

1.9 KB
Loading

‎Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/icon.png

886 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-left.png

1019 Bytes
Loading

‎Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-right.png

1.03 KB
Loading

‎Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/meta.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprited by vimenant2 (discord), color editor by Estkemran (Github)",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "icon"
12+
},
13+
{
14+
"name": "equipped-INNERCLOTHING",
15+
"directions": 4
16+
},
17+
{
18+
"name": "equipped-INNERCLOTHING-monkey",
19+
"directions": 4
20+
},
21+
{
22+
"name": "inhand-left",
23+
"directions": 4
24+
},
25+
{
26+
"name": "inhand-right",
27+
"directions": 4
28+
}
29+
]
30+
}

‎Resources/Textures/SS220/Markers/jobs.rsi/bartender_helm.png

1.04 KB
Loading

0 commit comments

Comments
 (0)