Rename Goldschläger to Gildlager (#23223)

* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Ubaser
2024-01-07 02:34:15 +11:00
committed by GitHub
parent d8cbddf1f4
commit 172fcaf2d4
13 changed files with 23 additions and 19 deletions

View File

@@ -133,8 +133,8 @@ reagent-desc-gin-fizz = Refreshingly lemony, deliciously dry.
reagent-name-gin-tonic = gin and tonic
reagent-desc-gin-tonic = An all time classic, mild cocktail.
reagent-name-goldschlager = Goldschlager
reagent-desc-goldschlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
reagent-name-gildlager = gildlager
reagent-desc-gildlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
reagent-name-grog = grog
reagent-desc-grog = Watered-down rum, pirate approved!

View File

@@ -15,7 +15,7 @@
DrinkColaBottleFull: 4
DrinkCreamCarton: 5
DrinkGinBottleFull: 3
DrinkGoldschlagerBottleFull: 1
DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
DrinkGrenadineBottleFull: 2
DrinkJuiceLimeCarton: 3
DrinkJuiceOrangeCarton: 3

View File

@@ -19,7 +19,7 @@
- DrinkCognacBottleFull
- DrinkGrenadineBottleFull
- DrinkGinBottleFull
- DrinkGoldschlagerBottleFull
- DrinkGildlagerBottleFull
- DrinkCoffeeLiqueurBottleFull
- DrinkMelonLiquorBottleFull
- DrinkPatronBottleFull

View File

@@ -44,7 +44,7 @@
- DrinkGinFizzGlass
- DrinkGinGlass
- DrinkGinTonicglass
- DrinkGoldschlagerGlass
- DrinkGildlagerGlass
- DrinkGrapeJuice
- DrinkGreenTeaGlass
- DrinkGrogGlass

View File

@@ -786,8 +786,8 @@
- type: entity
parent: DrinkGlassBase
id: DrinkGoldschlagerGlass
name: goldschlager glass
id: DrinkGildlagerGlass
name: gildlager glass
description: 100 proof that teen girls will drink anything with gold in it.
components:
- type: SolutionContainerManager
@@ -795,11 +795,11 @@
drink:
maxVol: 30
reagents:
- ReagentId: Goldschlager
- ReagentId: Gildlager
Quantity: 30
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
- type: entity
parent: DrinkGlassBase

View File

@@ -200,18 +200,18 @@
- type: entity
parent: DrinkBottleGlassBaseFull
id: DrinkGoldschlagerBottleFull
name: goldschlager bottle
id: DrinkGildlagerBottleFull
name: gildlager bottle
description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: Goldschlager
- ReagentId: Gildlager
Quantity: 100
- type: Sprite
sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi
sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi
- type: entity
parent: DrinkBottleGlassBaseFull

View File

@@ -796,15 +796,15 @@
amount: 0.07
- type: reagent
id: Goldschlager
name: reagent-name-goldschlager
id: Gildlager
name: reagent-name-gildlager
parent: BaseAlcohol
desc: reagent-desc-goldschlager
desc: reagent-desc-gildlager
physicalDesc: reagent-physical-desc-strong-smelling
flavor: alcohol
color: "#FFFF91"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
state: icon
metabolisms:
Drink:

View File

@@ -324,14 +324,14 @@
GinTonic: 3
- type: reaction
id: Goldschlager
id: Gildlager
reactants:
Gold:
amount: 1
Vodka:
amount: 10
products:
Goldschlager: 10
Gildlager: 10
- type: reaction
id: Grog

View File

@@ -123,3 +123,7 @@ WarpPointBeaconService: null
# 2023-12-30
ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses
SpawnPointAssistant: SpawnPointPassenger
# 2024-01-05
DrinkGoldschlagerBottleFull: DrinkGildlagerBottleFull
DrinkGoldschlagerGlass: DrinkGildlagerGlass