From 52d66a5f7bebebfc40bc21e54b83dc93a9ca356a Mon Sep 17 00:00:00 2001 From: Eugeny Date: Sat, 7 Oct 2023 08:36:01 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=80=D0=BE=D0=BB=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 14 +++++++++ .../Objects/Consumable/Drinks/oktoberfest.ftl | 31 +++++++++++++++++++ .../Consumable/Drink/oktoberfest_beer.yml | 30 ++++++++++++------ .../Reagents/Consumable/Drink/alcohol.yml | 2 +- .../Jobs/Engineering/technical_assistant.yml | 10 +++--- .../Roles/Jobs/Medical/medical_intern.yml | 8 ++--- .../Roles/Jobs/Science/research_assistant.yml | 8 ++--- .../Roles/Jobs/Security/security_cadet.yml | 8 ++--- 8 files changed, 84 insertions(+), 27 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/oktoberfest.ftl diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index b0f5b3c76ae..01f68acc9af 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -262,3 +262,17 @@ Entries: - {message: Коронавирус на станции закончился - вкусы напитков и прочих вновь вернулись., type: fix} id: 55578 #костыль отображения в Обновлениях time: '2023-10-06T09:19:00.0000000+00:00' + +- author: Петр Игнатьевич + changes: + - {message: Изменены некоторые эффекты от пива для Октоберфеста., type: Tweak} + - {message: Боги услышали молитвы уборщиков. Для рвоты от алкогольного отравления надо теперь содержать в себе очень много этанола., type: Tweak} + - {message: Добавлен таймер для открытия роли инженера-стажера., type: Tweak} + id: 55578 #костыль отображения в Обновлениях + time: '2023-10-07T09:19:00.0000000+00:00' + +- author: JustKekc + changes: + - {message: Возвращена возможность играть за кадета. интерна. лаборанта и инженера-стажера даже при открытии более высоких ролей в отделе., type: fix} + id: 55580 #костыль отображения в Обновлениях + time: '2023-10-07T09:19:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/oktoberfest.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/oktoberfest.ftl new file mode 100644 index 00000000000..0d90293c80e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/oktoberfest.ftl @@ -0,0 +1,31 @@ +ent-ADTGoldenAleGlass = золотой эль + .desc = Прямиком из таверны "Розаверн". + .suffix = { "Октоберфест" } + +ent-ADTSausageBeerGlass = лучшее сосисочное пиво + .desc = Варево с ароматом сосисок. + .suffix = { "Октоберфест" } + +ent-ADTTechnoBeerGlass = пиво "Технарское" + .desc = Напиток, сваренный в глубинах инженерного отдела безумными атмосианами. + .suffix = { "Октоберфест" } + +ent-ADTClassicPaulanerBeerGlass = классический пауланер + .desc = Сорт пива, дающий радость уже больше 500 лет. + .suffix = { "Октоберфест" } + +ent-ADTLivseyBeerGlass = пиво "Доктор Ливси" + .desc = АХАХАХАХАХХА, то есть да. Напиток, сваренный криониками из медбэя. + .suffix = { "Октоберфест" } + +ent-ADTLuckyJonnyBeerGlass = пиво "Счастливчик Джонни" + .desc = Крайне странный сорт, о котором каждый расскажет свою историю. + .suffix = { "Октоберфест" } + +ent-ADTSecUnfilteredBeerGlass = охранное нефильтрованное пиво + .desc = Робаст, алкоголь и пена. Замешано на слезах клоуна. + .suffix = { "Октоберфест" } + +ent-ADTGlyphidStoutBeerGlass = глифидский стаут + .desc = Напиток, подаренный теми четыремя безумными дворфами. + .suffix = { "Октоберфест" } diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml index 578d80a48fb..81c617c74e0 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml @@ -14,7 +14,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.2 - !type:HealthChange damage: groups: @@ -45,7 +45,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.2 - !type:AdjustReagent reagent: Nutriment amount: 0.2 @@ -69,9 +69,14 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.35 + amount: 0.25 + Medicine: + effects: - !type:AdjustTemperature - amount: 100 + conditions: + - !type:Temperature + max: 350.15 + amount: 10000 # thermal energy, not temperature! metamorphicSprite: sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi state: technobeer @@ -92,7 +97,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.2 + amount: 0.15 - !type:AdjustReagent reagent: Nutriment amount: 0.1 @@ -116,9 +121,14 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.35 + amount: 0.25 + Medicine: + effects: - !type:AdjustTemperature - amount: -100 + conditions: + - !type:Temperature + min: 263.15 + amount: -10000 metamorphicSprite: sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi state: livseybeer @@ -139,7 +149,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.35 + amount: 0.25 - !type:MovespeedModifier walkSpeedModifier: 1.1 sprintSpeedModifier: 1.1 @@ -169,7 +179,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.35 + amount: 0.3 - !type:MovespeedModifier walkSpeedModifier: 0.85 sprintSpeedModifier: 0.85 @@ -193,7 +203,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.45 + amount: 0.35 - !type:HealthChange damage: types: diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 56c8036e794..f4708d6dd15 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -156,7 +156,7 @@ conditions: - !type:ReagentThreshold reagent: Ethanol - min: 12 + min: 30 # dwarves immune to vomiting from alcohol - !type:OrganType type: Dwarf diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 81f70b358a3..30bdfa8ecdc 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -4,10 +4,12 @@ description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at engineering! + - !type:OverallPlaytimeRequirement + time: 7200 #2 hrs + #- !type:DepartmentTimeRequirement + # department: Engineering + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index f1a5544db47..3faf77d6152 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -4,10 +4,10 @@ description: job-description-intern playTimeTracker: JobMedicalIntern requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 54000 # 15 hrs - inverted: true # stop playing intern if you're good at med! + #- !type:DepartmentTimeRequirement + # department: Medical + # time: 54000 # 15 hrs + # inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 64cf297fc8e..245418e1576 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -4,10 +4,10 @@ description: job-description-research-assistant playTimeTracker: JobResearchAssistant requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at science! + #- !type:DepartmentTimeRequirement + # department: Science + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 147704f49e8..66067890f0a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,10 +6,10 @@ requirements: - !type:OverallPlaytimeRequirement time: 36000 #10 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at security! + #- !type:DepartmentTimeRequirement + # department: Security + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security