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:
@@ -133,8 +133,8 @@ reagent-desc-gin-fizz = Refreshingly lemony, deliciously dry.
|
|||||||
reagent-name-gin-tonic = gin and tonic
|
reagent-name-gin-tonic = gin and tonic
|
||||||
reagent-desc-gin-tonic = An all time classic, mild cocktail.
|
reagent-desc-gin-tonic = An all time classic, mild cocktail.
|
||||||
|
|
||||||
reagent-name-goldschlager = Goldschlager
|
reagent-name-gildlager = gildlager
|
||||||
reagent-desc-goldschlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
|
reagent-desc-gildlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
|
||||||
|
|
||||||
reagent-name-grog = grog
|
reagent-name-grog = grog
|
||||||
reagent-desc-grog = Watered-down rum, pirate approved!
|
reagent-desc-grog = Watered-down rum, pirate approved!
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
DrinkColaBottleFull: 4
|
DrinkColaBottleFull: 4
|
||||||
DrinkCreamCarton: 5
|
DrinkCreamCarton: 5
|
||||||
DrinkGinBottleFull: 3
|
DrinkGinBottleFull: 3
|
||||||
DrinkGoldschlagerBottleFull: 1
|
DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
|
||||||
DrinkGrenadineBottleFull: 2
|
DrinkGrenadineBottleFull: 2
|
||||||
DrinkJuiceLimeCarton: 3
|
DrinkJuiceLimeCarton: 3
|
||||||
DrinkJuiceOrangeCarton: 3
|
DrinkJuiceOrangeCarton: 3
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
- DrinkCognacBottleFull
|
- DrinkCognacBottleFull
|
||||||
- DrinkGrenadineBottleFull
|
- DrinkGrenadineBottleFull
|
||||||
- DrinkGinBottleFull
|
- DrinkGinBottleFull
|
||||||
- DrinkGoldschlagerBottleFull
|
- DrinkGildlagerBottleFull
|
||||||
- DrinkCoffeeLiqueurBottleFull
|
- DrinkCoffeeLiqueurBottleFull
|
||||||
- DrinkMelonLiquorBottleFull
|
- DrinkMelonLiquorBottleFull
|
||||||
- DrinkPatronBottleFull
|
- DrinkPatronBottleFull
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
- DrinkGinFizzGlass
|
- DrinkGinFizzGlass
|
||||||
- DrinkGinGlass
|
- DrinkGinGlass
|
||||||
- DrinkGinTonicglass
|
- DrinkGinTonicglass
|
||||||
- DrinkGoldschlagerGlass
|
- DrinkGildlagerGlass
|
||||||
- DrinkGrapeJuice
|
- DrinkGrapeJuice
|
||||||
- DrinkGreenTeaGlass
|
- DrinkGreenTeaGlass
|
||||||
- DrinkGrogGlass
|
- DrinkGrogGlass
|
||||||
|
|||||||
@@ -786,8 +786,8 @@
|
|||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: DrinkGlassBase
|
parent: DrinkGlassBase
|
||||||
id: DrinkGoldschlagerGlass
|
id: DrinkGildlagerGlass
|
||||||
name: goldschlager glass
|
name: gildlager glass
|
||||||
description: 100 proof that teen girls will drink anything with gold in it.
|
description: 100 proof that teen girls will drink anything with gold in it.
|
||||||
components:
|
components:
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
@@ -795,11 +795,11 @@
|
|||||||
drink:
|
drink:
|
||||||
maxVol: 30
|
maxVol: 30
|
||||||
reagents:
|
reagents:
|
||||||
- ReagentId: Goldschlager
|
- ReagentId: Gildlager
|
||||||
Quantity: 30
|
Quantity: 30
|
||||||
- type: Drink
|
- type: Drink
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
|
sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: DrinkGlassBase
|
parent: DrinkGlassBase
|
||||||
|
|||||||
@@ -200,18 +200,18 @@
|
|||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: DrinkBottleGlassBaseFull
|
parent: DrinkBottleGlassBaseFull
|
||||||
id: DrinkGoldschlagerBottleFull
|
id: DrinkGildlagerBottleFull
|
||||||
name: goldschlager bottle
|
name: gildlager bottle
|
||||||
description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
|
description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
|
||||||
components:
|
components:
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
drink:
|
drink:
|
||||||
reagents:
|
reagents:
|
||||||
- ReagentId: Goldschlager
|
- ReagentId: Gildlager
|
||||||
Quantity: 100
|
Quantity: 100
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi
|
sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: DrinkBottleGlassBaseFull
|
parent: DrinkBottleGlassBaseFull
|
||||||
|
|||||||
@@ -796,15 +796,15 @@
|
|||||||
amount: 0.07
|
amount: 0.07
|
||||||
|
|
||||||
- type: reagent
|
- type: reagent
|
||||||
id: Goldschlager
|
id: Gildlager
|
||||||
name: reagent-name-goldschlager
|
name: reagent-name-gildlager
|
||||||
parent: BaseAlcohol
|
parent: BaseAlcohol
|
||||||
desc: reagent-desc-goldschlager
|
desc: reagent-desc-gildlager
|
||||||
physicalDesc: reagent-physical-desc-strong-smelling
|
physicalDesc: reagent-physical-desc-strong-smelling
|
||||||
flavor: alcohol
|
flavor: alcohol
|
||||||
color: "#FFFF91"
|
color: "#FFFF91"
|
||||||
metamorphicSprite:
|
metamorphicSprite:
|
||||||
sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
|
sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
|
||||||
state: icon
|
state: icon
|
||||||
metabolisms:
|
metabolisms:
|
||||||
Drink:
|
Drink:
|
||||||
|
|||||||
@@ -324,14 +324,14 @@
|
|||||||
GinTonic: 3
|
GinTonic: 3
|
||||||
|
|
||||||
- type: reaction
|
- type: reaction
|
||||||
id: Goldschlager
|
id: Gildlager
|
||||||
reactants:
|
reactants:
|
||||||
Gold:
|
Gold:
|
||||||
amount: 1
|
amount: 1
|
||||||
Vodka:
|
Vodka:
|
||||||
amount: 10
|
amount: 10
|
||||||
products:
|
products:
|
||||||
Goldschlager: 10
|
Gildlager: 10
|
||||||
|
|
||||||
- type: reaction
|
- type: reaction
|
||||||
id: Grog
|
id: Grog
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 500 B After Width: | Height: | Size: 500 B |
|
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 286 B |
@@ -123,3 +123,7 @@ WarpPointBeaconService: null
|
|||||||
# 2023-12-30
|
# 2023-12-30
|
||||||
ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses
|
ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses
|
||||||
SpawnPointAssistant: SpawnPointPassenger
|
SpawnPointAssistant: SpawnPointPassenger
|
||||||
|
|
||||||
|
# 2024-01-05
|
||||||
|
DrinkGoldschlagerBottleFull: DrinkGildlagerBottleFull
|
||||||
|
DrinkGoldschlagerGlass: DrinkGildlagerGlass
|
||||||
|
|||||||
Reference in New Issue
Block a user