diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs index 60b531caa5..85a0a92fcc 100644 --- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs @@ -3,6 +3,7 @@ using System.Text.RegularExpressions; using Content.Server.Speech.Components; using Content.Server.Speech.Prototypes; using Content.Shared.Speech; +using Content.Shared.StatusEffectNew; // Sunrise-Edit using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -25,6 +26,7 @@ namespace Content.Server.Speech.EntitySystems public override void Initialize() { SubscribeLocalEvent(OnAccent); + SubscribeLocalEvent>(OnAccentRelayed); // Sunrise-Edit _proto.PrototypesReloaded += OnPrototypesReloaded; } @@ -41,6 +43,11 @@ namespace Content.Server.Speech.EntitySystems args.Message = ApplyReplacements(args.Message, component.Accent); } + private void OnAccentRelayed(EntityUid uid, ReplacementAccentComponent component, ref StatusEffectRelayedEvent args) // Sunrise-Edit + { + args.Args.Message = ApplyReplacements(args.Args.Message, component.Accent); // Sunrise-Edit + } + /// /// Attempts to apply a given replacement accent prototype to a message. /// diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 737e7fdb11..f1140e6e6c 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -447,8 +447,11 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem if (TryComp(uid, out var dependentStockComponent)) { - restock = (uint)Math.Floor( - amount + Math.Pow(_player.PlayerCount, 0.8f) * dependentStockComponent.Coefficient); + var scale = 1f + Math.Pow(_player.PlayerCount, 0.8f) * dependentStockComponent.Coefficient; // Sunrise start + if (scale < 1f) + scale = 1f; + + restock = (uint)Math.Floor(amount * scale); // Sunrise end } restock = Math.Max(restock, 2); diff --git a/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs b/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs index 251f65293b..85c946a645 100644 --- a/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs +++ b/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs @@ -7,5 +7,5 @@ public sealed partial class PlayerCountDependentStockComponent : Component { [DataField("coefficient")] - public float Coefficient = 1f; + public float Coefficient = 0.025f; } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl index 6c5e2e60cc..e69de29bb2 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl @@ -1,4 +0,0 @@ -ent-DrinkFourteenLokoPlusCan = Fourteen Loko Plus can - .desc = A remake of the popular drink Fourteen Loko. But just like the original, drink responsibly. -ent-DrinkLukin = Lukin's drink - .desc = Brother Lukin's not very famous alcoholic drink. It has medicinal properties to heal bodily harm, but don't drink too much. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl index b4a188d355..f9867fcb67 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl @@ -1,6 +1,4 @@ ent-VendingMachineBarber = barberWend .desc = This is where you can buy items to fix a messed up hairstyle. -ent-VendingMachineMayson = MaysonMil & YanLu corp - .desc = A vending machine containing products of the company "MaysonMil & YanLu". ent-VendingMachineClown = HohohonkersVend .desc = Get your honk fix here! Surprise the station with HohohonkersVend — the ultimate machine for hilarious pranks. Hack it, and you'll unlock something special! diff --git a/Resources/Locale/en-US/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl index 8b2d2fa5e5..5d98ae8303 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl @@ -1,4 +1,16 @@ reagent-name-fourteenloko = фоуртин локо reagent-desc-fourteenloko = Сильно переработанная жидкая субстанция, едва ли соответствующая межгалактическим стандартам безопасности для безалкогольного напитка. -reagent-name-fourteen-loko-plus = фоуртин локо плюс -reagent-desc-fourteen-loko-plus = Сильно переработанная жидкая субстанция с элиментами стимулирующих веществ, едва ли соответствующая межгалактическим стандартам безопасности для безалкогольного напитка. + +reagent-name-cola-sunrise = Fresh Space Cola +reagent-name-changeling-sting-sunrise = Fresh Changeling Sting +reagent-name-dr-gibb-sunrise = Fresh Dr. Gibb +reagent-name-energy-drink-sunrise = Fresh Red Bool +reagent-name-pwr-game-sunrise = Fresh PWR Game +reagent-name-root-beer-sunrise = Fresh root beer +reagent-name-root-beer-float-sunrise = Fresh root beer float +reagent-name-sol-dry-sunrise = Fresh Sol Dry +reagent-name-space-mountain-wind-sunrise = Fresh Space Solar Wind +reagent-name-space-up-sunrise = Fresh Space-Up +reagent-name-starkist-sunrise = Fresh Starkist +reagent-name-fourteen-loko-sunrise = Fresh Fourteen Loko +reagent-name-shamblers-juice-sunrise = Fresh Shambler's Juice \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/reagents/drgibb.ftl b/Resources/Locale/en-US/_strings/reagents/drgibb.ftl new file mode 100644 index 0000000000..3582540dc1 --- /dev/null +++ b/Resources/Locale/en-US/_strings/reagents/drgibb.ftl @@ -0,0 +1,3 @@ +### Messages that pop up when metabolizing Dr. Gibb. + +dr-gibbs-presence = You feel the spirit of Dr. Gibb flow through you. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/actions/borg_actions.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/actions/borg_actions.ftl index 54d6b9f3f5..a1ff253985 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/actions/borg_actions.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/actions/borg_actions.ftl @@ -14,3 +14,5 @@ ent-PieThrow = { "" } .desc = { "" } ent-ActionViewCrewManifest = Просмотреть список экипажа станции .desc = Открывает список экипажа станции. +ent-ActionChangeBorgVoice = Изменить голос + .desc = Изменяет голос TTS. Киборги могут говорить любым голосом благодаря своим динамикам. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl index 5ac6eb3e24..e69de29bb2 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks_cans.ftl @@ -1,4 +0,0 @@ -ent-DrinkFourteenLokoPlusCan = банка Фоуртин Локо плюс - .desc = Ремейк от Мэйсона Миллера популярного напитка Фоуртин Локо, но также как и в оригинале, пожалуйста пейте ответственно. -ent-DrinkLukin = банка напитка Лукина - .desc = Не очень известный алкогольный напиток Лукина. Он обладает лечебными свойствами в деле телесных повреждений, но не стоит пить слишком много... diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl index 5ef17caa44..8dc0bd3be9 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/vending_machines.ftl @@ -1,6 +1,4 @@ ent-VendingMachineBarber = парикмахерВенд .desc = Тут вы можете купить предметы, чтоб починить испорченную прическу. -ent-VendingMachineMayson = МейсонМил & ЯнЛу корп - .desc = Торговый автомат с продукцией компании "МейсонМил & ЯнЛу". ent-VendingMachineClown = ХохохонкерсВенд .desc = Тут ты получишь порцию хонка! Удиви станцию с ХохохонкерсВенд — машиной, созданной для самых веселых розыгрышей. А если взломаешь её, тебя ждет нечто особенное! diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/consumable/drinks/drinks_cans.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/consumable/drinks/drinks_cans.ftl index e5e3aa840d..3b115c047f 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/consumable/drinks/drinks_cans.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/consumable/drinks/drinks_cans.ftl @@ -35,8 +35,8 @@ ent-DrinkDrGibbCan = банка доктора Гибба .desc = Восхитительная смесь из 42 различных вкусов. ent-DrinkNukieCan = банка нюка-робаст .desc = Бодрящий напиток... очень бодрящий. Заполнен зелёной жидкостью, после употребления рекомендуется обратиться к врачу. -ent-DrinkEnergyDrinkCan = банка энергетика Ред Булеан - .desc = Банка Ред Булеан, как известно, убивает лошадь. +ent-DrinkEnergyDrinkCan = банка Грей Булл + .desc = Грей Булл - и перчатки в придачу! Бодрит и защищает от ударов током. ent-DrinkCanPack = держатель для напитков .desc = Служит для удобного хранения сразу нескольких банок напитков. ent-DrinkShamblersJuiceCan = банка сока Shambler diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/chemistry.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/chemistry.ftl index 7c1effe749..afdd292fa7 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/chemistry.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/chemistry.ftl @@ -9,6 +9,24 @@ ent-GoldenBeaker = золотая мензурка ent-CryoxadoneBeakerSmall = мензурка криоксадона .desc = Наполнена реагентом, используемым в криогенных капсулах. .suffix = криоксадон +ent-BeakerSmallArith = мензурка аритразина + .desc = { ent-Beaker.desc } + .suffix = аритразин +ent-BeakerSmallSigy = мензурка сигината + .desc = { ent-Beaker.desc } + .suffix = сигинат +ent-BeakerSmallPhal = мензурка фалангимина + .desc = { ent-Beaker.desc } + .suffix = фалангимин +ent-BeakerSmallDiph = мензурка дифенгидрамина + .desc = { ent-Beaker.desc } + .suffix = дифенгидрамин +ent-BeakerSmallBruiz = мензурка бруизина + .desc = { ent-Beaker.desc } + .suffix = бруизин +ent-BeakerSmallLace = мензурка лацеринола + .desc = { ent-Beaker.desc } + .suffix = лацеринол ent-LargeBeaker = большая мензурка .desc = Используется для хранения большого количества химикатов и растворов. ent-CryostasisBeaker = криостазисная мензурка @@ -36,4 +54,4 @@ ent-Pill = таблетка ent-PillCanister = баночка для таблеток .desc = Вмещает до 10 таблеток. ent-BorgBeaker = встроенная колба - .desc = Внутренний отсек, установленный в киборга. Рассчитан на 50 единиц любой жидкости. \ No newline at end of file + .desc = Внутренний отсек, установленный в киборга. Рассчитан на 50 единиц любой жидкости. diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/vending_machines.ftl index d96eda2477..1cab9c3302 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/vending_machines.ftl @@ -38,11 +38,11 @@ ent-VendingMachineStarkist = торгомат Стар-кист .desc = Вкус жидкой звезды. ent-VendingMachineShamblersJuice = Сок Шамблер .desc = ~Встряхните мне немного этого сока Шамблера!~ -ent-VendingMachinePwrGame = Сила Гейм - .desc = Вы этого хотите, у нас это есть. В партнёрстве с компанией Влад'с Салад. +ent-VendingMachinePwrGame = торгомат Pwr Game + .desc = Вы этого хотите, у нас это есть. В партнёрстве с компанией Валид'с Салат. ent-VendingMachineDrGibb = Доктор Гибб - .desc = Консервированный взрыв всевозможных вкусов именно у этого производителя! -ent-VendingMachineSmite = НаказаМат + .desc = Взрыв разных вкусов в банке — прямо в этом автомате! +ent-VendingMachineSmite = БАНкомат .desc = Популярен у администрации. ent-VendingMachineDinnerware = ПосудоМат .desc = Поставщик оборудования для кухонь и ресторанов. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl index 82946cc5cf..d48fc42ab5 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl @@ -1,4 +1,18 @@ reagent-name-fourteenloko = фоуртин локо reagent-desc-fourteenloko = Сильно переработанная жидкая субстанция, едва ли соответствующая межгалактическим стандартам безопасности для безалкогольного напитка. reagent-name-fourteen-loko-plus = фоуртин локо плюс -reagent-desc-fourteen-loko-plus = Сильно переработанная жидкая субстанция с элиментами стимулирующих веществ, едва ли соответствующая межгалактическим стандартам безопасности для безалкогольного напитка. \ No newline at end of file +reagent-desc-fourteen-loko-plus = Сильно переработанная жидкая субстанция с элиментами стимулирующих веществ, едва ли соответствующая межгалактическим стандартам безопасности для безалкогольного напитка. + +reagent-name-cola-sunrise = Свежая космо кола +reagent-name-changeling-sting-sunrise = Свежее жало генокрада +reagent-name-dr-gibb-sunrise = Свежий доктор Гибб +reagent-name-energy-drink-sunrise = Грей бул +reagent-name-pwr-game-sunrise = Свежая PWR игра +reagent-name-root-beer-sunrise = Свежий рутбир +reagent-name-root-beer-float-sunrise = Свежий рутбир с мороженым +reagent-name-sol-dry-sunrise = Свежий Sol Dry +reagent-name-space-mountain-wind-sunrise = Свежий Космо ветер +reagent-name-space-up-sunrise = Свежий спейс-ап +reagent-name-starkist-sunrise = Свежий Стар-кист +reagent-name-fourteen-loko-sunrise = Свежий фоуртин локо +reagent-name-shamblers-juice-sunrise = Свежий сок Shambler diff --git a/Resources/Locale/ru-RU/_strings/reagents/drgibb.ftl b/Resources/Locale/ru-RU/_strings/reagents/drgibb.ftl new file mode 100644 index 0000000000..419c5a94a9 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/reagents/drgibb.ftl @@ -0,0 +1,3 @@ +### Сообщения, которые появляются при метаболизме Dr. Gibb. + +dr-gibbs-presence = Вы чувствуете, как дух Доктора Гибба течет сквозь вас. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index fe397ea8cf..56a82e3a3d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -7,6 +7,7 @@ DrinkEnergyDrinkCan: 4 FoodSnackPopcorn: 3 FoodSnackEnergy: 3 + FoodSnackMaysonEnergy: 2 # sunrise-add CigPackMixed: 2 DiscountDanLighter: 1 contrabandInventory: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index bb3eb76c29..23a5ff2ee9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -49,7 +49,7 @@ drink: maxVol: 30 reagents: - - ReagentId: Cola + - ReagentId: ColaSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Tag @@ -198,7 +198,7 @@ drink: maxVol: 30 reagents: - - ReagentId: RootBeer + - ReagentId: RootBeerSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -240,7 +240,7 @@ drink: maxVol: 30 reagents: - - ReagentId: SpaceMountainWind + - ReagentId: SpaceMountainWindSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -259,7 +259,7 @@ drink: maxVol: 30 reagents: - - ReagentId: SpaceUp + - ReagentId: SpaceUpSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -278,7 +278,7 @@ drink: maxVol: 30 reagents: - - ReagentId: SolDry + - ReagentId: SolDrySunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -297,7 +297,7 @@ drink: maxVol: 30 reagents: - - ReagentId: Starkist + - ReagentId: StarkistSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -335,7 +335,7 @@ drink: maxVol: 30 reagents: - - ReagentId: FourteenLoko + - ReagentId: FourteenLokoSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -354,7 +354,7 @@ drink: maxVol: 30 reagents: - - ReagentId: ChangelingSting + - ReagentId: ChangelingStingSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -373,7 +373,7 @@ drink: maxVol: 30 reagents: - - ReagentId: DrGibb + - ReagentId: DrGibbSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -415,7 +415,7 @@ drink: maxVol: 30 reagents: - - ReagentId: EnergyDrink + - ReagentId: EnergyDrinkSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -434,7 +434,7 @@ drink: maxVol: 30 reagents: - - ReagentId: ShamblersJuice + - ReagentId: ShamblersJuiceSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite @@ -453,7 +453,7 @@ drink: maxVol: 30 reagents: - - ReagentId: PwrGame + - ReagentId: PwrGameSunrise # Sunrise-edit Quantity: 30 grindable: *grindable - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 659ae0cbd1..3623921bfc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -792,6 +792,7 @@ radius: 1.5 energy: 3.0 color: "#00E645" + - type: PlayerCountDependentStock # Sunrise-vend - type: entity parent: VendingMachine diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 8d78818caf..a055ac1d38 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -154,6 +154,19 @@ flavor: pwrgamesoda color: "#9385bf" fizziness: 0.9 # gamers crave the fizz + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove - type: reagent id: RootBeer diff --git a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml index 8e930149f3..5f282702bb 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml @@ -1,6 +1 @@ -- type: vendingMachineInventory - id: MaysonYanInventory - startingInventory: - FoodSnackMaysonEnergy: 5 - DrinkLukin: 5 - DrinkFourteenLokoPlusCan: 5 + \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/randomization-race.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/randomization-race.yml index 58d94d41f6..38ca9e5a8e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/randomization-race.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/randomization-race.yml @@ -47,6 +47,22 @@ - type: RandomHumanoidAppearance randomizeName: false +- type: entity + parent: MobResomi + id: MobResomiRandomization + categories: [ HideSpawnMenu ] + components: + - type: RandomHumanoidAppearance + randomizeName: false + +- type: entity + parent: MobHumanoidXeno + id: MobHumanoidXenoRandomization + categories: [ HideSpawnMenu ] + components: + - type: RandomHumanoidAppearance + randomizeName: false + - type: entity parent: MobVox id: MobVoxRandomization @@ -70,4 +86,13 @@ components: - type: RandomHumanoidAppearance randomizeName: false - skinColor: "#E5BDA0FF" \ No newline at end of file + skinColor: "#E5BDA0FF" + +- type: entity + parent: MobHuman + id: MobHumanRandomizationRenamed + categories: [ HideSpawnMenu ] + components: + - type: RandomHumanoidAppearance + randomizeName: true + skinColor: "#E5BDA0FF" diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 836439eeab..e69de29bb2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -1,37 +0,0 @@ -- type: entity - parent: DrinkCanBaseFull - id: DrinkFourteenLokoPlusCan - name: Fourteen Loko Plus can - description: A remake of the popular drink Fourteen Loko. But just like the original, drink responsibly. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: FourteenLokoPlus - Quantity: 30 - - type: Sprite - sprite: _Sunrise/Objects/Consumable/Drinks/fourteen_loko_plus.rsi - - type: Item - sprite: _Sunrise/Objects/Consumable/Drinks/fourteen_loko_plus.rsi - -- type: entity - parent: DrinkCanBaseFull - id: DrinkLukin - name: Lukin's drink - description: Brother Lukin's not very famous alcoholic drink. It has medicinal properties to heal bodily harm, but don't drink too much. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Aloe - Quantity: 16 - - ReagentId: Bicaridine - Quantity: 14 - - type: Sprite - sprite: _Sunrise/Objects/Consumable/Drinks/lukins_drink.rsi - - type: Item - sprite: _Sunrise/Objects/Consumable/Drinks/lukins_drink.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/StatusEffects/speech.yml b/Resources/Prototypes/_Sunrise/Entities/StatusEffects/speech.yml new file mode 100644 index 0000000000..dff3283e06 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/StatusEffects/speech.yml @@ -0,0 +1,7 @@ +- type: entity + parent: SpeechStatusEffectBase + id: StatusEffectZombieAccent + name: zombieaccent + components: + - type: ReplacementAccent + accent: zombie diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml index 9387175702..3fa020b030 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml @@ -28,42 +28,6 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] -- type: entity - parent: VendingMachine - id: VendingMachineMayson - name: MaysonMil & YanLu corp - description: A vending machine containing products of the company "MaysonMil & YanLu". - components: - - type: VendingMachine - pack: MaysonYanInventory - dispenseOnHitChance: 0.25 - dispenseOnHitThreshold: 2 - offState: off - brokenState: broken - normalState: normal-unshaded - initialStockQuality: 0.33 - - type: Vocalizer - - type: DatasetVocalizer - dataset: DiscountDansAds - - type: SpeakOnUIClosed - pack: DiscountDansGoodbyes - - type: Speech - - type: Sprite - sprite: _Sunrise/Structures/Machines/VendingMachines/mayson.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Structures/Machines/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#6148c7" - - type: PlayerCountDependentStock # Sunrise-vend - - type: entity parent: VendingMachine id: VendingMachineClown diff --git a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml index 121bcce02d..03799cd1d4 100644 --- a/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_Sunrise/Polymorphs/polymorph.yml @@ -89,7 +89,7 @@ configuration: entity: MobVulpkaninRandomization forced: true - transferName: true + transferName: true inventory: Transfer revertOnCrit: false revertOnDeath: false @@ -108,3 +108,159 @@ # inventory: Drop # allowRepeatedMorphs: true # delay: 1 + +- type: polymorph + id: ChangelingStingHuman + configuration: + entity: MobHumanRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingReptilian + configuration: + entity: MobReptilianRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingTajaran + configuration: + entity: MobTajaranRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingSlime + configuration: + entity: MobSlimePersonRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingMoth + configuration: + entity: MobMothRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingSwine + configuration: + entity: MobSwineRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingResomi + configuration: + entity: MobResomiRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingVox + configuration: + entity: MobVoxRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingVulpkanin + configuration: + entity: MobVulpkaninRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingFelinid + configuration: + entity: MobFelinidRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingHumanoidXeno + configuration: + entity: MobHumanoidXenoRandomization + forced: true + transferDamage: true + transferName: true + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true + +- type: polymorph + id: ChangelingStingHumanRename + configuration: + entity: MobHumanRandomizationRenamed + forced: true + transferDamage: true + transferName: false + inventory: Transfer + revertOnDeath: true + revertOnCrit: true + revertOnDelete: true + allowRepeatedMorphs: true diff --git a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml index 0955c1b6e1..52efe25f8b 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml @@ -1,11 +1,18 @@ - type: reagent - id: FourteenLokoPlus - name: reagent-name-fourteen-loko-plus + id: ColaSunrise + name: reagent-name-cola-sunrise parent: BaseSoda - desc: reagent-desc-fourteen-loko-plus + desc: reagent-desc-cola physicalDesc: reagent-physical-desc-fizzy - flavor: fourteen_loko_soda_plus - color: "#fcf6de" + flavor: soda + color: "#6c2828" + recognizable: true + metamorphicSprite: + sprite: Objects/Consumable/Drinks/colaglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -15,14 +22,719 @@ - !type:MetabolizerTypeCondition type: [ Dwarf ] inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 + +- type: reagent + id: ChangelingStingSunrise + name: reagent-name-changeling-sting-sunrise + parent: BaseSoda + desc: reagent-desc-changeling-sting + physicalDesc: reagent-physical-desc-fizzy + flavor: soda + color: "#2E6671" + metabolisms: + Drink: + effects: + - !type:Polymorph + prototype: ChangelingStingHuman + probability: 0.083 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.083 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingReptilian + probability: 0.167 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.167 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingTajaran + probability: 0.25 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.25 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingSlime + probability: 0.333 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.333 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingMoth + probability: 0.417 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.417 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingSwine + probability: 0.5 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.5 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingResomi + probability: 0.583 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.583 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingVox + probability: 0.667 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.667 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingVulpkanin + probability: 0.75 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.75 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingFelinid + probability: 0.833 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.833 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingHumanoidXeno + probability: 0.917 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 0.917 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:Polymorph + prototype: ChangelingStingHumanRename + probability: 1 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + - !type:AdjustReagent + reagent: ChangelingStingSunrise + amount: -1000 + probability: 1 + conditions: + - !type:ReagentCondition + reagent: ChangelingStingSunrise + min: 5 + +- type: reagent + id: DrGibbSunrise + name: reagent-name-dr-gibb-sunrise + parent: BaseSoda + desc: reagent-desc-dr-gibb + physicalDesc: reagent-physical-desc-fizzy + flavor: drgibb + color: "#102000" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Poison: + effects: + - !type:PopupMessage + conditions: + - !type:ReagentCondition + reagent: DrGibbSunrise + min: 2 + type: Local + visualType: LargeCaution + messages: ["dr-gibbs-presence"] + probability: 0.2 + - !type:HealthChange + conditions: + - !type:ReagentCondition + reagent: DrGibbSunrise + min: 2 + probability: 0.0001 + damage: + types: + Blunt: 2000 + - !type:AdjustTemperature + amount: -1500 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 + +- type: reagent + id: EnergyDrinkSunrise + name: reagent-name-energy-drink-sunrise + parent: BaseSoda + desc: reagent-desc-energy-drink + physicalDesc: reagent-physical-desc-fizzy + flavor: energydrink + color: "#ffffbf" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 2 + type: Remove + - !type:GenericStatusEffect + key: ShockProtection + component: Insulated + time: 1.25 + type: Add + conditions: + - !type:ReagentCondition + reagent: EnergyDrinkSunrise + min: 5 + - !type:Jitter + conditions: + - !type:ReagentCondition + reagent: EnergyDrinkSunrise + min: 10 + - !type:AdjustTemperature + amount: -1500 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.1 + fizziness: 0.4 + +- type: reagent + id: PwrGameSunrise + name: reagent-name-pwr-game-sunrise + parent: BaseSoda + desc: reagent-desc-pwr-game + physicalDesc: reagent-physical-desc-fizzy + flavor: pwrgamesoda + color: "#9385bf" + fizziness: 0.9 # gamers crave the fizz + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 Narcotic: effects: - - !type:MovementSpeedModifier - walkSpeedModifier: 1.16 - sprintSpeedModifier: 1.16 + - !type:ModifyStatusEffect + effectProto: StatusEffectStimulantsStamina + time: 2 + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned + time: 2 + type: Remove + - !type:ModifyKnockdown + time: 2 + type: Remove + - !type:ModifyStatusEffect + effectProto: StatusEffectForcedSleeping + time: 2 + type: Remove + - !type:GenericStatusEffect + key: Adrenaline + component: IgnoreSlowOnDamage + time: 2 + +- type: reagent + id: RootBeerSunrise + name: reagent-name-root-beer-sunrise + parent: BaseSoda + desc: reagent-desc-root-beer + physicalDesc: reagent-physical-desc-fizzy + flavor: rootbeersoda + color: "#381c07" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/rootbeerglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 Poison: effects: - !type:HealthChange damage: types: - Poison: 1.4 + Poison: -1 + Blunt: -2 + Slash: -2 + Piercing: -2 + Bloodloss: -1 + conditions: + - !type:MetabolizerTypeCondition + type: [Plant] + - !type:HealthChange + conditions: + - !type:MetabolizerTypeCondition + type: [Plant] + - !type:ReagentCondition + reagent: RootBeerSunrise + min: 50 + damage: + types: + Asphyxiation: 1 + Poison: 1 + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.05 + - !type:PlantAdjustWeeds + probability: 0.025 + amount: 1 + - !type:PlantAdjustPests + probability: 0.025 + amount: 1 + - !type:RobustHarvest {} + +- type: reagent + id: RootBeerFloatSunrise + name: reagent-name-root-beer-float-sunrise + parent: BaseSoda + desc: reagent-desc-root-beer-float + physicalDesc: reagent-physical-desc-fizzy-and-creamy + flavor: rootbeerfloat + color: "#4f361f" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 7 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + fizziness: 0.4 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + Blunt: -2 + Slash: -2 + Piercing: -2 + Bloodloss: -1 + conditions: + - !type:MetabolizerTypeCondition + type: [Plant] + - !type:HealthChange + conditions: + - !type:MetabolizerTypeCondition + type: [Plant] + - !type:ReagentCondition + reagent: RootBeerFloatSunrise + min: 50 + damage: + types: + Asphyxiation: 1 + Poison: 1 + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.05 + - !type:PlantAdjustWeeds + probability: 0.025 + amount: 1 + - !type:PlantAdjustPests + probability: 0.025 + amount: 1 + - !type:RobustHarvest {} + +- type: reagent + id: SolDrySunrise + name: reagent-name-sol-dry-sunrise + parent: BaseSoda + desc: reagent-desc-sol-dry + physicalDesc: reagent-physical-desc-fizzy + flavor: gingersoda + color: "#ccb87e" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + - !type:CleanBloodstream + excluded: Charcoal + cleanseRate: 2 + +- type: reagent + id: SpaceMountainWindSunrise + name: reagent-name-space-mountain-wind-sunrise + parent: BaseSoda + desc: reagent-desc-space-mountain-wind + physicalDesc: reagent-physical-desc-fizzy + flavor: sodacitrus + color: "#a6fa5a" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 + - !type:HealthChange + conditions: + - !type:MobStateCondition + mobstate: Critical + damage: + types: + Asphyxiation: -2 + +- type: reagent + id: SpaceUpSunrise + name: reagent-name-space-up-sunrise + parent: BaseSoda + desc: reagent-desc-space-up + physicalDesc: reagent-physical-desc-fizzy + flavor: spaceup + color: "#e3e3e37d" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/space-up_glass.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:GenericStatusEffect + key: PressureImmunity + component: PressureImmunity + time: 1 + type: Add + probability: 0.5 + conditions: + - !type:ReagentCondition + reagent: SpaceUpSunrise + min: 10 + - !type:GenericStatusEffect + key: Stutter + component: StutteringAccent + - !type:Jitter + - !type:Emote + emote: Scream + probability: 0.05 + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "barozine-effect-muscle-contract" ] + probability: 0.1 + - !type:HealthChange + damage: + types: + Blunt: -1 + +- type: reagent + id: StarkistSunrise + name: reagent-name-starkist-sunrise + parent: BaseSoda + desc: reagent-desc-starkist + physicalDesc: reagent-physical-desc-fizzy + flavor: starkistsoda + color: "#9F3400" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:ModifyStatusEffect + effectProto: StatusEffectDrowsiness + time: 1 + type: Remove + - !type:HealthChange + damage: + types: + Cold: -1 + - !type:AdjustTemperature + amount: 2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + max: 310 + amount: 6000 + +- type: reagent + id: FourteenLokoSunrise + name: reagent-name-fourteen-loko-sunrise + parent: BaseSoda + desc: reagent-desc-fourteen-loko + physicalDesc: reagent-physical-desc-fizzy + flavor: fourteenlokosoda + color: "#deb928" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + conditions: + - !type:MetabolizerTypeCondition + type: [ Dwarf ] + inverted: true + - !type:AdjustReagent + reagent: Theobromine + amount: 0.1 + Poison: + effects: + - !type:HealthChange + conditions: + - !type:MetabolizerTypeCondition + type: [Slime] + inverted: true + damage: + types: + Poison: 1 + Narcotic: + effects: + - !type:MovementSpeedModifier + walkSpeedModifier: 1.16 + sprintSpeedModifier: 1.16 + +- type: reagent + id: ShamblersJuiceSunrise + name: reagent-name-shamblers-juice-sunrise + parent: BaseSoda + desc: reagent-desc-shamblers-juice + physicalDesc: reagent-physical-desc-fizzy + flavor: metallic + color: "#66538F" + metabolisms: + Drink: + effects: + - !type:ModifyStatusEffect + effectProto: StatusEffectZombieAccent + time: 2 + type: Add + conditions: + - !type:ReagentCondition + reagent: ShamblersJuiceSunrise + min: 15 + - !type:CureZombieInfection + probability: 0.35 + conditions: + - !type:ReagentCondition + reagent: ShamblersJuiceSunrise + min: 15 + - !type:AdjustTemperature + amount: -2000 + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 310 + amount: -6000 diff --git a/Resources/Prototypes/_Sunrise/status_effects.yml b/Resources/Prototypes/_Sunrise/status_effects.yml index 2d845329ff..eb4c9adde2 100644 --- a/Resources/Prototypes/_Sunrise/status_effects.yml +++ b/Resources/Prototypes/_Sunrise/status_effects.yml @@ -4,6 +4,10 @@ - type: statusEffect id: Flip +- type: statusEffect + id: ShockProtection # Used in Red Bool drink + alwaysAllowed: true + - type: entity parent: MobStatusEffectBase id: StatusEffectFall diff --git a/Resources/migration.yml b/Resources/migration.yml index 0fdc5de03f..b16693cf93 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -916,6 +916,9 @@ RandomHumanoidSpawnerERTMedicalAmberVeteran: RandomHumanoidSpawnerERTMedicalAmbe RandomHumanoidSpawnerERTSecurityAmberVeteran: RandomHumanoidSpawnerERTSecurityAmber RandomHumanoidSpawnerCBURNVeteran: RandomHumanoidSpawnerCBURNUnitEVA RandomHumanoidSpawnerERTLeaderGammaVeteran: RandomHumanoidSpawnerERTLeaderGamma +VendingMachineMayson: null +DrinkLukin: null +DrinkFourteenLokoPlusCan: null # SL HITSCAN START BoxMagazineRifle: BoxMagazineRifleSP MagazineBoxLightRifle: MagazineBoxLightRifleSP