From 231bd8f5d3964db3b71a80a139aef7a964c70864 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sat, 1 Jun 2024 21:59:19 +0300 Subject: [PATCH 1/2] Drinks-Cartons-Update --- .../ss14-ru/entities/objects/consumable/drinks-cartons.ftl | 2 +- .../Catalog/VendingMachines/Inventories/boozeomat.yml | 1 - .../Prototypes/Catalog/VendingMachines/Inventories/sec.yml | 1 + Resources/Prototypes/Reagents/fun.yml | 4 ++++ Resources/Prototypes/Starshine/Reagents/fun.yml | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl index ed6999956d25fb..e641f5eebe49f7 100644 --- a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl @@ -16,7 +16,7 @@ ent-DrinkJuiceCatDespairCarton = cat despair juice .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра? ent-DrinkJuiceMoffCarton = мофф сок .desc = Рекомендуется всеми мофф. Бззз! -ent-DrinkJuicelemonCarton = лимонный сок +ent-DrinkJuiceLemonCarton = лимонный сок .desc = Это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии. ent-DrinkJuiceWatermelonCarton = арбузный сок .desc = Это удивительный напиток, который сочетает в себе сладость спелого арбуза и таинственную энергию космоса. Его ярко-красный цвет напоминает о красоте красных планет, а сладкий вкус арбуза дарит ощущение летнего солнца и свежести. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index e6eda894402988..175cad26c6b4cd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -55,7 +55,6 @@ DrinkJuiceWatermelonCarton: 3 DrinkJuiceWehCarton: 1 DrinkJuiceMoffCarton: 1 - DrinkJuiceSecCarton: 1 # Starshine-end emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 619c5bb7d8432d..160229c9fc4c19 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -21,6 +21,7 @@ RiotLaserShield: 2 RiotBulletShield: 2 RadioHandheldSecurity: 5 + DrinkJuiceSecCarton: 1 # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index befa8d829688ed..b4e9f050ae07a6 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -330,6 +330,10 @@ Poison: metabolismRate: 0.25 effects: + - !type:HealthChange + damage: + types: + Poison: 0.25 - !type:Emote emote: Weh showInChat: true diff --git a/Resources/Prototypes/Starshine/Reagents/fun.yml b/Resources/Prototypes/Starshine/Reagents/fun.yml index 771154a4825fe6..8cf2740aae7a41 100644 --- a/Resources/Prototypes/Starshine/Reagents/fun.yml +++ b/Resources/Prototypes/Starshine/Reagents/fun.yml @@ -10,6 +10,10 @@ Poison: metabolismRate: 0.25 effects: + - !type:HealthChange + damage: + types: + Poison: 0.25 - !type:Emote emote: Buzzing showInChat: true From 02b4d544a82ef4dc1cf197ba386dc6fd5d0f2f14 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sun, 2 Jun 2024 13:58:31 +0300 Subject: [PATCH 2/2] Juice Sec remove --- Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 160229c9fc4c19..619c5bb7d8432d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -21,7 +21,6 @@ RiotLaserShield: 2 RiotBulletShield: 2 RadioHandheldSecurity: 5 - DrinkJuiceSecCarton: 1 # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12