forked from AdventureTimeSS14/space_station_ADT
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into investigator
- Loading branch information
Showing
59 changed files
with
839 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
using Content.Shared.ADT.Atmos.Miasma; | ||
using Content.Shared.Examine; | ||
using Content.Shared.Mobs.Systems; | ||
|
||
namespace Content.Server.ADT.Atmos.Rotting; | ||
|
||
public sealed partial class EmbalmedSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly MobStateSystem _mobState = default!; | ||
public override void Initialize() | ||
{ | ||
SubscribeLocalEvent<EmbalmedComponent, ExaminedEvent>(OnExamine); | ||
base.Initialize(); | ||
} | ||
|
||
private void OnExamine(EntityUid uid, EmbalmedComponent component, ExaminedEvent args) | ||
{ | ||
if (!_mobState.IsDead(uid)) | ||
return; | ||
args.PushMarkup(Loc.GetString("adt-rotting-embalmed")); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
using Content.Shared.EntityEffects; | ||
using Robust.Shared.Prototypes; | ||
using Content.Shared.ADT.Atmos.Miasma; | ||
|
||
|
||
namespace Content.Server.ADT.EntityEffects.Effects; | ||
|
||
public sealed partial class Embalm : EntityEffect | ||
{ | ||
protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) | ||
=> Loc.GetString("reagent-effect-guidebook-embalm", ("chance", Probability)); | ||
|
||
// Gives the entity a component that prevents rotting and also execution by defibrillator | ||
public override void Effect(EntityEffectBaseArgs args) | ||
{ | ||
var entityManager = args.EntityManager; | ||
entityManager.EnsureComponent<EmbalmedComponent>(args.TargetEntity); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
namespace Content.Shared.ADT.Atmos.Miasma; | ||
|
||
/// <summary> | ||
/// Entities wouldn't rot at all with this component. | ||
/// </summary> | ||
[RegisterComponent] | ||
public sealed partial class EmbalmedComponent : Component | ||
{ | ||
|
||
} |
12 changes: 12 additions & 0 deletions
12
Content.Shared/ADT/Damage/Components/IgnoreSlowOnDamageComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
using Robust.Shared.GameStates; | ||
using Content.Shared.Damage; | ||
|
||
namespace Content.Shared.ADT.Damage.Components; | ||
|
||
/// <summary> | ||
/// This is used for an effect that nullifies <see cref="SlowOnDamageComponent"/> and adds an alert. | ||
/// Thanks EmoGarbage404 for contributing this mechanic. | ||
/// https://github.com/space-wizards/space-station-14/pull/31322 | ||
/// </summary> | ||
[RegisterComponent, NetworkedComponent, Access(typeof(SlowOnDamageSystem))] | ||
public sealed partial class IgnoreSlowOnDamageComponent : Component; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
alerts-crawling-name = Ползание | ||
alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать. | ||
alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать. | ||
alerts-adrenaline-name = [color=red]Адреналин[/color] | ||
alerts-adrenaline-desc = Вы полны адреналина: боль вас не замедлит. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
adt-rotting-embalmed = [color=#edad45]Похоже, тело забальзамировано.[/color] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
reagent-effect-guidebook-embalm = | ||
{ $chance -> | ||
[1] Предотвращает | ||
*[other] предотвращают | ||
} гниение трупов |
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/ADT/guidebook/chemistry/statuseffects.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
reagent-effect-status-effect-Adrenaline = адреналин |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
defibrillator-embalmed = Обнаружено бальзамирование тела: реанимация невозможна. |
8 changes: 7 additions & 1 deletion
8
Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/walls.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,10 @@ | ||
ent-ADTSpaceSecWall = укреплённая стена | ||
.desc = Удерживает воздух внутри, а дронов снаружи. | ||
ent-ADTSpaceSecWallDiagonal = диагональная укреплённая стена | ||
.desc = Удерживает воздух внутри, а дронов снаружи. | ||
.desc = Удерживает воздух внутри, а дронов снаружи. | ||
ent-ADTCardboardWall = картонная стена | ||
.desc = Стена из бумаги и тонких досок. Пользуется определенной популярностью в [восточном месте]. | ||
ent-ADTStonebrickWall = каменная стена | ||
.desc = Классическая каменная стена. | ||
ent-ADTYellowbrickWall = кирпичная жёлтая стена | ||
.desc = Желтые кирпичи, уложенные по древним обычаям. |
20 changes: 20 additions & 0 deletions
20
Resources/Locale/ru-RU/ADT/reagents/effects/medicine_effects.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
medicine-effect-usual = Вы чувствуете, как ваша боль постепенно уходит. | ||
medicine-effect-asphyxia = Ваше дыхание восстанавливается и понемногу приходит в норму. | ||
medicine-effect-hungover = Ваши мысли становятся более собранными, а движения менее неряшливыми. | ||
medicine-effect-eyedamage = Ваше зрение стало чуть лучше. | ||
medicine-effect-mind = Похоже, ваш разум расширяется. | ||
medicine-effect-stress = Ваше тело напрягается. | ||
medicine-effect-headache = Вы чувствуете, как ваша головная боль постепенно уменьшается. | ||
medicine-effect-slash = Вы чувствуете, как боль от ваших ран уменьшается. | ||
medicine-effect-piercing = Вы чувствуете, как боль от ваших колотых мест уменьшается. | ||
medicine-effect-heat = Похоже, ваша температура совсем немного понизилась. | ||
medicine-effect-shock = Вы чувствуете, как боль от электрического ожога по всему вашему телу уменьшается. | ||
medicine-effect-major-stress = Ваше тело сильно напрягается. | ||
medicine-effect-emotions = Ваши эмоции и чувства становятся менее выразительными. | ||
medicine-effect-antipsychotic = Ваше зрение и мысли становятся менее расплывчатыми. | ||
medicine-effect-pain = Вы чувствуете, как ваша боль притупляется. | ||
medicine-effect-visible-emotions-m = { CAPITALIZE($entity) } выглядит менее эмоциональным. | ||
medicine-effect-visible-emotions-f = { CAPITALIZE($entity) } выглядит менее эмоциональной. | ||
medicine-effect-visible-polymorph = { CAPITALIZE($entity) } притерпевает изменения в теле! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
flavor-complex-somesalty = солёненькое | ||
reagent-name-ultra-chloral-hydrate = Ультрахлоральгидрат | ||
reagent-desc-ultra-chloral-hydrate = Модифицированный хлоральгидрат. В малых дозах вызывает сонливость. В больших дозах усыпляет. Передозировки нет | ||
reagent-name-nitrofurfoll = нитрофурфол | ||
reagent-desc-nitrofurfoll = Антимикробный препарат, который зачастую используют для исцеления небольших ран. Становится более эффективным вместе с бикаридином. | ||
reagent-name-perohydrogen = пероводород | ||
reagent-desc-perohydrogen = Часто используемый препарат для обработки болезненных уколов. Становится более эффективным вместе с бикаридином. | ||
reagent-name-anelgesin = анельгезин | ||
reagent-desc-anelgesin = Популярное жаропонижающее. Имеет исцелительные свойства в паре с дермалином. | ||
reagent-name-minoxide = миноксид | ||
reagent-desc-minoxide = Препарат, который смягчает эффект и боль от электрического шока. Становится более эффективным вместе с дермалином. | ||
reagent-name-biomicine = биомицин | ||
reagent-desc-biomicine = Сам по себе не влияет на организм, но становится крайне не стабильным при совмещении с диловеном. Зачастую используется в предсмертных случаях отравления. Оказывает значительное напряжение тела. | ||
reagent-name-nikematide = никематид | ||
reagent-desc-nikematide = Используется для лечения лёгкого кислородного голодания, но менее эффективно, чем дексалин. Однако, это отличное дополнение к дексалину плюс. | ||
reagent-name-diethamilate = диэтамилат | ||
reagent-desc-diethamilate = Гемостатическое средство для остановки небольшого кровотечения. Восполняет кровопотерю в паре с дексалином плюс. | ||
reagent-name-sodiumizole = натримизол | ||
reagent-desc-sodiumizole = Достаточно дешёвый и слабый анальгетик. Становится более эффективным в паре с бикаридином. | ||
reagent-name-agolatine = аголатин | ||
reagent-desc-agolatine = Атипичный антидепрессант, зачастую используемый для лечения эпизодов большой депрессии и генерализованного тревожного расстройства. | ||
reagent-name-morphine = морфин | ||
reagent-desc-morphine = Сильный опиат, добываемый из снотворного мака. В основном используется как анальгетик. | ||
reagent-name-formalin = формалин | ||
reagent-desc-formalin = Препарат, свёртывающий белки и предотвращающий их разложение. Используется для бальзамирования трупов. | ||
reagent-name-styptic-powder = Кровоостанавливающая пудра | ||
reagent-desc-styptic-powder = При нанесении на кожу заживляет травмы. | ||
reagent-name-silver-sulfadiazine = Сульфадиазин серебра | ||
reagent-desc-silver-sulfadiazine = При нанесении на кожу заживляет ожоги. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
reagent-physical-desc-skunky = вонючее |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.