diff --git a/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl index 7fd87ac4fe..6e5667ac2f 100644 --- a/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl @@ -22,5 +22,5 @@ cp14-flavor-complex-zellasian-pleasure = like aristocratic and vinous cp14-flavor-complex-leeks = like fruity and mystical cp14-flavor-complex-durandate = like cheap and tart cp14-flavor-complex-ale = like bread -cp14-flavor-complex-bloodytear = like sad and alcoholic +cp14-flavor-complex-bloody-tear = like sad and alcoholic cp14-flavor-complex-bottomless = like semi-divine and dangerous diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/consumable/drink/alcohol.ftl index 7713aef288..64439ef9a2 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/consumable/drink/alcohol.ftl @@ -11,7 +11,7 @@ cp14-reagent-name-dwarfbeer = Beer Joy of the Deep cp14-reagent-name-gerbil = Beer Gerbil cp14-reagent-name-breeze = Beer Breeze cp14-reagent-name-blowlaw = Beer Blow Law -cp14-reagent-name-bloodytear = Ale Bloody Tear +cp14-reagent-name-bloody-tear = Ale Bloody Tear cp14-reagent-name-bottomless = Ale Bottomless cp14-reagent-name-zellasian-pleasure = Wine Zellasian Pleasure cp14-reagent-name-leeks = Wine Leeks diff --git a/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl index 14126738cc..b693dc48a1 100644 --- a/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl @@ -22,5 +22,5 @@ cp14-flavor-complex-zellasian-pleasure = аристократично и вин cp14-flavor-complex-leeks = фруктово и мистически cp14-flavor-complex-durandate = дешёвое и терпкое cp14-flavor-complex-ale = как хлеб -cp14-flavor-complex-bloodytear = печально и алкогольно +cp14-flavor-complex-bloody-tear = печально и алкогольно cp14-flavor-complex-bottomless = полубожественно и опасно diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/drink/alcohol.ftl index 1d85436c71..fa6882f5bc 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/drink/alcohol.ftl @@ -11,7 +11,7 @@ cp14-reagent-name-dwarfbeer = Пиво Радость глубин cp14-reagent-name-gerbil = Пиво Песчянка cp14-reagent-name-breeze = Пиво Ветерок cp14-reagent-name-blowlaw = Пиво Удар закона -cp14-reagent-name-bloodytear = Эль Кровавая слеза +cp14-reagent-name-bloody-tear = Эль Кровавая слеза cp14-reagent-name-bottomless = Эль Бездоннка cp14-reagent-name-zellasian-pleasure = Вино Услада Зелласиан cp14-reagent-name-leeks = Вино Ликс diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml index 45b528d1e6..7b2a618162 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml @@ -128,7 +128,7 @@ - ReagentId: CP14AleBloodyTear Quantity: 500 - type: Label - currentLabel: cp14-reagent-name-bloodytear + currentLabel: cp14-reagent-name-bloody-tear - type: entity parent: CP14CraneBarrel @@ -209,6 +209,8 @@ anchored: true noRot: true - type: Pullable + - type: Physics + bodyType: Static - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_CP14/Flavors/flavor.yml b/Resources/Prototypes/_CP14/Flavors/flavor.yml index 300f93d6bc..b15104404e 100644 --- a/Resources/Prototypes/_CP14/Flavors/flavor.yml +++ b/Resources/Prototypes/_CP14/Flavors/flavor.yml @@ -100,7 +100,7 @@ - type: flavor id: CP14bloodyTear flavorType: Complex - description: cp14-flavor-complex-bloodytear + description: cp14-flavor-complex-bloody-tear - type: flavor id: CP14bottomless diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml index b5b40cf1ba..a9db89820b 100644 --- a/Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml @@ -2,7 +2,7 @@ - type: reagent id: CP14DwarfBeer - name: cp14-reagent-name-beer + name: cp14-reagent-name-dwarfbeer parent: BaseAlcohol desc: cp14-reagent-desc-beer slippery: true @@ -76,7 +76,7 @@ - type: reagent id: CP14BeerGerbil - name: cp14-reagent-name-beer + name: cp14-reagent-name-gerbil parent: BaseAlcohol desc: cp14-reagent-desc-beer physicalDesc: reagent-physical-desc-bubbly @@ -93,7 +93,7 @@ - type: reagent id: CP14BeerBreeze - name: cp14-reagent-name-beer + name: cp14-reagent-name-breeze parent: BaseAlcohol desc: cp14-reagent-desc-beer physicalDesc: reagent-physical-desc-bubbly @@ -110,7 +110,7 @@ - type: reagent id: CP14BeerBlowLaw - name: cp14-reagent-name-beer + name: cp14-reagent-name-blowlaw parent: BaseAlcohol desc: cp14-reagent-desc-beer physicalDesc: reagent-physical-desc-bubbly @@ -142,7 +142,7 @@ - type: reagent id: CP14WineZellasianPleasure - name: cp14-reagent-name-wine + name: cp14-reagent-name-zellasian-pleasure parent: BaseAlcohol desc: cp14-reagent-desc-wine physicalDesc: reagent-physical-desc-translucent @@ -160,7 +160,7 @@ - type: reagent id: CP14WineLeeks - name: cp14-reagent-name-wine + name: cp14-reagent-name-leeks parent: BaseAlcohol desc: cp14-reagent-desc-wine physicalDesc: reagent-physical-desc-translucent @@ -177,7 +177,7 @@ - type: reagent id: CP14WineDurandate - name: cp14-reagent-name-wine + name: cp14-reagent-name-durandate parent: BaseAlcohol desc: cp14-reagent-desc-wine physicalDesc: reagent-physical-desc-translucent @@ -213,9 +213,9 @@ - type: reagent id: CP14AleBloodyTear - name: cp14-reagent-name-ale + name: cp14-reagent-name-bloody-tear parent: BaseAlcohol - desc: cp14-reagent-desc-ale-bloody-tear + desc: cp14-reagent-desc-ale physicalDesc: reagent-physical-desc-bubbly flavor: CP14bloodyTear color: "#993333" @@ -230,7 +230,7 @@ - type: reagent id: CP14AleBottomless - name: cp14-reagent-name-ale + name: cp14-reagent-name-bottomless parent: BaseAlcohol desc: cp14-reagent-desc-ale physicalDesc: reagent-physical-desc-bubbly