diff --git a/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerBoundUserInterface.cs b/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerBoundUserInterface.cs
new file mode 100644
index 00000000000..5e5658f5411
--- /dev/null
+++ b/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerBoundUserInterface.cs
@@ -0,0 +1,71 @@
+using Content.Shared.Chemistry;
+using Content.Shared.Containers.ItemSlots;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Content.Shared.ADT.Chemistry;
+
+namespace Content.Client.ADT.Chemistry.UI
+{
+ ///
+ /// Initializes a and updates it when new server messages are received.
+ ///
+ [UsedImplicitly]
+ public sealed class ReagentAnalyzerBoundUserInterface : BoundUserInterface
+ {
+ [ViewVariables]
+ private ReagentAnalyzerWindow? _window;
+
+
+ public ReagentAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ {
+ }
+
+ ///
+ /// Called each time an analyzer UI instance is opened. Generates the dispenser window and fills it with
+ /// relevant info. Sets the actions for static buttons.
+ ///
+ protected override void Open()
+ {
+ base.Open();
+
+ // Setup window layout/elements
+ _window = new()
+ {
+ Title = EntMan.GetComponent(Owner).EntityName,
+ };
+
+ _window.OpenCentered();
+ _window.OnClose += Close;
+
+ // Setup static button actions.
+ _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentAnalyzer.OutputSlotName));
+ _window.ClearButton.OnPressed += _ => SendMessage(new ReagentAnalyzerClearContainerSolutionMessage());
+ }
+
+ ///
+ /// Update the UI each time new state data is sent from the server.
+ ///
+ ///
+ /// Data of the that this UI represents.
+ /// Sent from the server.
+ ///
+ protected override void UpdateState(BoundUserInterfaceState state)
+ {
+ base.UpdateState(state);
+
+ var castState = (ReagentAnalyzerBoundUserInterfaceState) state;
+
+ _window?.UpdateState(castState); //Update window state
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ base.Dispose(disposing);
+
+ if (disposing)
+ {
+ _window?.Dispose();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerWindow.xaml b/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerWindow.xaml
new file mode 100644
index 00000000000..895329b587f
--- /dev/null
+++ b/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerWindow.xaml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerWindow.xaml.cs b/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerWindow.xaml.cs
new file mode 100644
index 00000000000..0e1dd325d35
--- /dev/null
+++ b/Content.Client/ADT/Chemistry/UI/ReagentAnalyzerWindow.xaml.cs
@@ -0,0 +1,112 @@
+using System.Linq;
+using Content.Client.Stylesheets;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Shared.ADT.Chemistry;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
+
+namespace Content.Client.ADT.Chemistry.UI
+{
+ ///
+ /// Client-side UI used to control a .
+ ///
+ [GenerateTypedNameReferences]
+ public sealed partial class ReagentAnalyzerWindow : DefaultWindow
+ {
+ [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+ ///
+ /// Create and initialize the dispenser UI client-side. Creates the basic layout,
+ /// actual data isn't filled in until the server sends data about the dispenser.
+ ///
+ public ReagentAnalyzerWindow()
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+ }
+
+
+ ///
+ /// Update the UI state when new state data is received from the server.
+ ///
+ /// State data sent by the server.
+ public void UpdateState(BoundUserInterfaceState state)
+ {
+ var castState = (ReagentAnalyzerBoundUserInterfaceState) state;
+ UpdateContainerInfo(castState);
+
+ // Disable the Clear & Eject button if no beaker
+ ClearButton.Disabled = castState.OutputContainer is null;
+ EjectButton.Disabled = castState.OutputContainer is null;
+ }
+
+ ///
+ /// Update the fill state and list of reagents held by the current reagent container, if applicable.
+ /// Also highlights a reagent if it's dispense button is being mouse hovered.
+ ///
+ /// State data for the analyzer.
+ /// Prototype ID of the reagent whose dispense button is currently being mouse hovered,
+ /// or null if no button is being hovered.
+ public void UpdateContainerInfo(ReagentAnalyzerBoundUserInterfaceState state, ReagentId? highlightedReagentId = null)
+ {
+ ContainerInfo.Children.Clear();
+
+ if (state.OutputContainer is null)
+ {
+ ContainerInfo.Children.Add(new Label {Text = Loc.GetString("reagent-dispenser-window-no-container-loaded-text") });
+ return;
+ }
+
+ ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ Children =
+ {
+ new Label {Text = $"{state.OutputContainer.DisplayName}: "},
+ new Label
+ {
+ Text = $"{state.OutputContainer.CurrentVolume}/{state.OutputContainer.MaxVolume}",
+ StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
+ }
+ }
+ });
+
+ foreach (var (reagent, quantity) in state.OutputContainer.Reagents!)
+ {
+ // Try get to the prototype for the given reagent. This gives us its name.
+ var localizedName = _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? p)
+ ? p.LocalizedName
+ : Loc.GetString("reagent-dispenser-window-reagent-name-not-found-text");
+
+ var nameLabel = new Label {Text = $"{localizedName}: "};
+ var quantityLabel = new Label
+ {
+ Text = Loc.GetString("reagent-dispenser-window-quantity-label-text", ("quantity", quantity)),
+ StyleClasses = {StyleNano.StyleClassLabelSecondaryColor},
+ };
+
+ // Check if the reagent is being moused over. If so, color it green.
+ if (reagent == highlightedReagentId) {
+ nameLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
+ quantityLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
+ }
+
+ ContainerInfo.Children.Add(new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ Children =
+ {
+ nameLabel,
+ quantityLabel,
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
index ddfe7b3481e..e8cfa673cd9 100644
--- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
@@ -81,7 +81,7 @@ await server.WaitAssertion(() =>
.ToDictionary(x => x, _ => false);
foreach (var (reagent, quantity) in solution.Contents)
{
- Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.Prototype && x.Key.Value == quantity, out var foundProduct));
+ Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.Prototype && x.Key.Value == quantity, out var foundProduct), Is.True);
foundProductsMap[foundProduct.Value.Key] = true;
}
diff --git a/Content.Server/ADT/Chemistry/Components/ReagentAnalyzerComponent.cs b/Content.Server/ADT/Chemistry/Components/ReagentAnalyzerComponent.cs
new file mode 100644
index 00000000000..7fb7af83077
--- /dev/null
+++ b/Content.Server/ADT/Chemistry/Components/ReagentAnalyzerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Server.ADT.Chemistry.EntitySystems;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.ADT.Chemistry.Components
+{
+ ///
+ /// A thing that shows reagents in it.
+ ///
+ [RegisterComponent]
+ [Access(typeof(ReagentAnalyzerSystem))]
+ public sealed partial class ReagentAnalyzerComponent : Component
+ {
+ [DataField("clickSound"), ViewVariables(VVAccess.ReadWrite)]
+ public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
+ }
+}
\ No newline at end of file
diff --git a/Content.Server/ADT/Chemistry/ReagentAnalyzerSystem.cs b/Content.Server/ADT/Chemistry/ReagentAnalyzerSystem.cs
new file mode 100644
index 00000000000..6d9c8f9ce30
--- /dev/null
+++ b/Content.Server/ADT/Chemistry/ReagentAnalyzerSystem.cs
@@ -0,0 +1,94 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Database;
+using JetBrains.Annotations;
+using Robust.Server.Audio;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using System.Linq;
+using Content.Shared.ADT.Chemistry;
+using Content.Server.ADT.Chemistry.Components;
+
+namespace Content.Server.ADT.Chemistry.EntitySystems
+{
+ ///
+ /// Contains all the server-side logic for reagent analyzer.
+ ///
+ ///
+ [UsedImplicitly]
+ public sealed class ReagentAnalyzerSystem : EntitySystem
+ {
+ [Dependency] private readonly AudioSystem _audioSystem = default!;
+ [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+ [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
+ [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+ [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+ [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(SubscribeUpdateUiState);
+ SubscribeLocalEvent(SubscribeUpdateUiState);
+ SubscribeLocalEvent(SubscribeUpdateUiState);
+ SubscribeLocalEvent(SubscribeUpdateUiState);
+ SubscribeLocalEvent(SubscribeUpdateUiState);
+
+ SubscribeLocalEvent(OnClearContainerSolutionMessage);
+ }
+
+ private void SubscribeUpdateUiState(Entity ent, ref T ev)
+ {
+ UpdateUiState(ent);
+ }
+
+ private void UpdateUiState(Entity reagentAnalyzer)
+ {
+ var outputContainer = _itemSlotsSystem.GetItemOrNull(reagentAnalyzer, SharedReagentAnalyzer.OutputSlotName);
+ var outputContainerInfo = BuildOutputContainerInfo(outputContainer);
+
+ var state = new ReagentAnalyzerBoundUserInterfaceState(outputContainerInfo);
+ _userInterfaceSystem.TrySetUiState(reagentAnalyzer, ReagentAnalyzerUiKey.Key, state);
+ }
+
+ private ContainerInfo? BuildOutputContainerInfo(EntityUid? container)
+ {
+ if (container is not { Valid: true })
+ return null;
+
+ if (_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out _, out var solution))
+ {
+ return new ContainerInfo(Name(container.Value), solution.Volume, solution.MaxVolume)
+ {
+ Reagents = solution.Contents
+ };
+ }
+
+ return null;
+ }
+
+
+ private void OnClearContainerSolutionMessage(Entity reagentAnalyzer, ref ReagentAnalyzerClearContainerSolutionMessage message)
+ {
+ var outputContainer = _itemSlotsSystem.GetItemOrNull(reagentAnalyzer, SharedReagentAnalyzer.OutputSlotName);
+ if (outputContainer is not { Valid: true } || !_solutionContainerSystem.TryGetFitsInDispenser(outputContainer.Value, out var solution, out _))
+ return;
+
+ _solutionContainerSystem.RemoveAllSolution(solution.Value);
+ UpdateUiState(reagentAnalyzer);
+ ClickSound(reagentAnalyzer);
+ }
+
+ private void ClickSound(Entity reagentAnalyzer)
+ {
+ _audioSystem.PlayPvs(reagentAnalyzer.Comp.ClickSound, reagentAnalyzer, AudioParams.Default.WithVolume(-2f));
+ }
+ }
+}
\ No newline at end of file
diff --git a/Content.Server/Atmos/Rotting/EmbalmedSystem.cs b/Content.Server/Atmos/Rotting/EmbalmedSystem.cs
new file mode 100644
index 00000000000..424e9250e33
--- /dev/null
+++ b/Content.Server/Atmos/Rotting/EmbalmedSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Atmos.Miasma;
+using Content.Shared.Damage;
+using Content.Shared.Examine;
+using Content.Shared.Mobs.Systems;
+
+namespace Content.Server.Atmos.Rotting;
+
+public sealed partial class EmbalmedSystem : EntitySystem
+{
+ [Dependency] private readonly MobStateSystem _mobState = default!;
+ public override void Initialize()
+ {
+ SubscribeLocalEvent(OnExamine);
+ base.Initialize();
+ }
+
+ private void OnExamine(EntityUid uid, EmbalmedComponent component, ExaminedEvent args)
+ {
+ if (!_mobState.IsDead(uid))
+ return;
+ args.PushMarkup(Loc.GetString("adt-rotting-embalmed"));
+ }
+}
\ No newline at end of file
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index e3389def662..5491f9cae77 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -13,6 +13,7 @@
using Robust.Server.Containers;
using Robust.Shared.Physics.Components;
using Robust.Shared.Timing;
+using Content.Shared.Atmos.Miasma;
namespace Content.Server.Atmos.Rotting;
@@ -94,6 +95,9 @@ public bool IsRotProgressing(EntityUid uid, PerishableComponent? perishable)
if (TryComp(uid, out var mobState) && !_mobState.IsDead(uid, mobState))
return false;
+ if (HasComp(uid))
+ return false;
+
if (_container.TryGetOuterContainer(uid, Transform(uid), out var container) &&
HasComp(container.Owner))
{
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index e5f604f70df..7ccb88615ce 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -166,7 +166,7 @@ private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganCompon
float scale = (float) mostToRemove / (float) rate;
- // if it's possible for them to be dead, and they are,
+ // if it's possible for them to be dead, and they are (unless stated otherwise by the reagent), [Thanks to Gotimanga]
// then we shouldn't process any effects, but should probably
// still remove reagents
if (EntityManager.TryGetComponent(solutionEntityUid.Value, out var state))
diff --git a/Content.Server/Chemistry/ReagentEffects/Embalm.cs b/Content.Server/Chemistry/ReagentEffects/Embalm.cs
new file mode 100644
index 00000000000..327e3bab104
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/Embalm.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+using Content.Shared.Atmos.Miasma;
+
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed partial class Embalm : ReagentEffect
+{
+ 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(ReagentEffectArgs args)
+ {
+ var entityManager = args.EntityManager;
+ entityManager.EnsureComponent(args.SolutionEntity);
+ }
+}
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index e6ef8bf96a9..b4b96f33167 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -23,6 +23,7 @@
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
using Robust.Shared.Timing;
+using Content.Shared.Atmos.Miasma;
namespace Content.Server.Medical;
@@ -217,6 +218,13 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
ICommonSession? session = null;
var dead = true;
+
+ if (HasComp(target))
+ {
+ _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-embalmed"),
+ InGameICChatType.Speak, true);
+ }
+ else
if (_rotting.IsRotten(target))
{
_chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
diff --git a/Content.Shared/ADT/Chemistry/SharedReagentAnalyzer.cs b/Content.Shared/ADT/Chemistry/SharedReagentAnalyzer.cs
new file mode 100644
index 00000000000..b40cac5dc9f
--- /dev/null
+++ b/Content.Shared/ADT/Chemistry/SharedReagentAnalyzer.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Serialization;
+using Content.Shared.Chemistry;
+
+namespace Content.Shared.ADT.Chemistry
+{
+ ///
+ /// This class holds constants that are shared between client and server.
+ ///
+ public sealed class SharedReagentAnalyzer
+ {
+ public const string OutputSlotName = "beakerSlot";
+ }
+
+
+ [Serializable, NetSerializable]
+ public sealed class ReagentAnalyzerReagentMessage : BoundUserInterfaceMessage
+ {
+ public readonly ReagentId ReagentId;
+
+ public ReagentAnalyzerReagentMessage(ReagentId reagentId)
+ {
+ ReagentId = reagentId;
+ }
+ }
+
+ [Serializable, NetSerializable]
+ public sealed class ReagentAnalyzerClearContainerSolutionMessage : BoundUserInterfaceMessage
+ {
+
+ }
+
+ [Serializable, NetSerializable]
+ public sealed class ReagentAnalyzerBoundUserInterfaceState : BoundUserInterfaceState
+ {
+ public readonly ContainerInfo? OutputContainer;
+ public ReagentAnalyzerBoundUserInterfaceState(ContainerInfo? outputContainer)
+ {
+ OutputContainer = outputContainer;
+ }
+ }
+
+ [Serializable, NetSerializable]
+ public enum ReagentAnalyzerUiKey
+ {
+ Key
+ }
+}
\ No newline at end of file
diff --git a/Content.Shared/Atmos/Rotting/EmbalmedComponent.cs b/Content.Shared/Atmos/Rotting/EmbalmedComponent.cs
new file mode 100644
index 00000000000..d72925fb4df
--- /dev/null
+++ b/Content.Shared/Atmos/Rotting/EmbalmedComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Atmos.Miasma;
+
+///
+/// Entities wouldn't rot at all with this component.
+///
+[RegisterComponent]
+public sealed partial class EmbalmedComponent : Component
+{
+
+}
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index afd1e0cc969..9a1386aae38 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -48,7 +48,7 @@ public sealed partial class DefibrillatorComponent : Component
/// How long the victim will be electrocuted after getting zapped.
///
[DataField("writheDuration"), ViewVariables(VVAccess.ReadWrite)]
- public TimeSpan WritheDuration = TimeSpan.FromSeconds(3);
+ public TimeSpan WritheDuration = TimeSpan.FromSeconds(5);
///
/// How long the doafter for zapping someone takes
@@ -57,7 +57,7 @@ public sealed partial class DefibrillatorComponent : Component
/// This is synced with the audio; do not change one but not the other.
///
[DataField("doAfterDuration"), ViewVariables(VVAccess.ReadWrite)]
- public TimeSpan DoAfterDuration = TimeSpan.FromSeconds(3);
+ public TimeSpan DoAfterDuration = TimeSpan.FromSeconds(5);
///
/// The sound when someone is zapped.
diff --git a/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_charge.ogg b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_charge.ogg
new file mode 100644
index 00000000000..a950b55541d
Binary files /dev/null and b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_charge.ogg differ
diff --git a/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_off.ogg b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_off.ogg
new file mode 100644
index 00000000000..0fa862d7fd0
Binary files /dev/null and b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_off.ogg differ
diff --git a/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_on.ogg b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_on.ogg
new file mode 100644
index 00000000000..d2f20c1bcbb
Binary files /dev/null and b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_on.ogg differ
diff --git a/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_zap.ogg b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_zap.ogg
new file mode 100644
index 00000000000..ca80f859f06
Binary files /dev/null and b/Resources/Audio/ADT/Items/Medical/Defibs/highvolt-defib_zap.ogg differ
diff --git a/Resources/Audio/ADT/Items/Medical/Defibs/mob-defib_charge.ogg b/Resources/Audio/ADT/Items/Medical/Defibs/mob-defib_charge.ogg
new file mode 100644
index 00000000000..529d0ac9b35
Binary files /dev/null and b/Resources/Audio/ADT/Items/Medical/Defibs/mob-defib_charge.ogg differ
diff --git a/Resources/Audio/Items/Defib/defib_charge.ogg b/Resources/Audio/Items/Defib/defib_charge.ogg
index b94279675dd..7b74fb3eb28 100644
Binary files a/Resources/Audio/Items/Defib/defib_charge.ogg and b/Resources/Audio/Items/Defib/defib_charge.ogg differ
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
index cd560b1a0a4..9d6f1d25de3 100644
--- a/Resources/Changelog/ChangelogADT.yml
+++ b/Resources/Changelog/ChangelogADT.yml
@@ -1304,4 +1304,34 @@ Entries:
- {message: "Фикс недоделок в знаниях языков у мобов.", type: Fix}
- {message: "Скелет получил 50% сопротивление к электрическому урону.", type: Tweak}
id: 55692 #костыль отображения в Обновлениях
- time: '2024-02-26T20:20:00.0000000+00:00'
\ No newline at end of file
+ time: '2024-02-26T20:20:00.0000000+00:00'
+
+- author: JustKekc
+ changes:
+ - {message: Представляем Обновление медицинского отдела!, type: Add}
+ - {message: Добавлено в общей сложности 17 различных реагентов., type: Add}
+ - {message: Добавлены всплывающие надписи многим препаратам., type: Add}
+ - {message: Некоторые медицинские препараты изменили свои свойства в худшую или лучшую сторону., type: Tweak}
+ - {message: Медибот впрыскивает радость доктора вместо трикордазина., type: Tweak}
+ - {message: Добавлена новая цель станции., type: Add}
+ - {message: Добавлен мак снотворный. Семена можно найти в ящике лекарственных семян., type: Add}
+ - {message: Добавлена антибиотическая мазь и кровоостанавливающий жгут-турникет. Автор спрайтов жгута - @prazat911 (discord)., type: Add}
+ - {message: Увеличено время подготовки к удару у дефибриллятора., type: Tweak}
+ - {message: Переработан поддельный дефибриллятор у агентов синдиката. Вместо 35 повреждений ожогами он наносит 100., type: Tweak}
+ - {message: Добавлен высоковольтный дефибриллятор и личный дефибриллятор главного врача., type: Add}
+ - {message: Добавлена новая цель кражи для агентов синдиката., type: Add}
+ - {message: Добавлены новые бутылочки с таблетницами и упаковками таблеток., type: Add}
+ - {message: НТ наконец договорились с поставками фармацевтики на свои станции. Встречайте ТаблеткоМаты!, type: Add}
+ - {message: Добавлен небольшой шприц. Вмещает меньше; работает быстрее и помещается в раздатчики., type: Add}
+ - {message: Добавлен анализатор реагентов. Можно создать в медфабе; найти в шкафчиках главного врача; химика; патологоанатома, type: Add}
+ - {message: Добавлена новая роль - Патологоанатом., type: Add}
+ - {message: Добавлена бирка для ног., type: Add}
+ - {message: Добавлена возможность поместить листок на ячейку морга., type: Tweak}
+ - {message: Добавлена возможность приклеить этикетку ручным экитеровщиком на ячейки морга., type: Tweak}
+ - {message: Добавлен новый костюм главного врача., type: Add}
+ - {message: Добавлены одеждоматы и шкафчики биозащиты парамедика и патологоанатома., type: Add}
+ - {message: Добавлены РЕспрайты и новая одежда парамедика. Автор спрайтов - @prazat911 (discord), type: Add}
+ - {message: Переводы руководств. Добавлены руководства для новых реагентов и патологоанатома., type: Tweak}
+ - {message: Переводы реагентов., type: Tweak}
+ id: 55693 #костыль отображения в Обновлениях
+ time: '2024-02-26T22:20:00.0000000+00:00'
diff --git a/Resources/Locale/en-US/ADT/Reagents/Meta/chemicals.ftl b/Resources/Locale/en-US/ADT/Reagents/Meta/chemicals.ftl
new file mode 100644
index 00000000000..ef12c546e5c
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/Meta/chemicals.ftl
@@ -0,0 +1,2 @@
+reagent-name-copper-nitride = copper nitride(III)
+reagent-desc-copper-nitride = Dark-green crystals, that are used in various medications and has reaction with water.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ADT/Reagents/Meta/fun.ftl b/Resources/Locale/en-US/ADT/Reagents/Meta/fun.ftl
new file mode 100644
index 00000000000..1af0e37b683
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/Meta/fun.ftl
@@ -0,0 +1,4 @@
+reagent-name-polymorphine = polymorphine
+reagent-desc-polymorphine = Still not studied chemical that has strange and unique effect on bodies of sentient creatures.
+reagent-name-chaotic-polymorphine = chaotic polymorphine
+reagent-desc-chaotic-polymorphine = Extremely unstable chemical that has strange and unique effect on bodies of creatures.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ADT/Reagents/Meta/medicine.ftl b/Resources/Locale/en-US/ADT/Reagents/Meta/medicine.ftl
new file mode 100644
index 00000000000..bfdafa614ba
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/Meta/medicine.ftl
@@ -0,0 +1,35 @@
+reagent-name-sodiumizole = sodiumizole
+reagent-desc-sodiumizole = A pretty cheap and weak analgetic. Becomes efficent in healing blunt damage when it's paired with bicaridine.
+
+reagent-name-nitrofurfoll = nitrofurfoll
+reagent-desc-nitrofurfoll = An antimicrobal chemical that is often used to treat small wounds. Good addition for healing slash damage in pair with bicaridin.
+
+reagent-name-perohydrogen = perohydrogen
+reagent-desc-perohydrogen = A frequently used chemical to treat small piercing wounds. Becomes more efficent with bicaridine.
+
+reagent-name-anelgesin = anelgesin
+reagent-desc-anelgesin = A popular antipyretic. Has healing effect when paired with dermaline.
+
+reagent-name-minoxide = minoxide
+reagent-desc-minoxide = A chemical that softens the effect and pain of electic shock. Becomes more efficent with dermaline.
+
+reagent-name-biomicine = biomicine
+reagent-desc-biomicine = On it's own doesn't have any effect on organism, but it becomes extremely unstable when paired with dylovene. Often used in near-death cases of poisoning. Exerts major stress on body.
+
+reagent-name-nikematide = nikematide
+reagent-desc-nikematide = Used for treating minor oxygen deprivation, but still less efficent than dexalin. However, it's a good addition to dexalin plus.
+
+reagent-name-diethamilate = diethamilate
+reagent-desc-diethamilate = Hemostatic chemical to prevent small bleeding. Heals bloodloss when paired with dexalin plus.
+
+reagent-name-agolatine = agolatine
+reagent-desc-agolatine = An atypical antidepressant most commonly used to treat major depressive disorder and generalized anxiety disorder.
+
+reagent-name-haloperidol = haloperidol
+reagent-desc-haloperidol = A typical antipsychotic medication. Used in the treatment of schizophrenia, tics in Tourette syndrome, mania in bipolar disorder, delirium, agitation, acute psychosis, and hallucinations from alcohol withdrawal.
+
+reagent-name-morphine = morphine
+reagent-desc-morphine = A strong opiate that is found naturally in opium, by drying the latex of opium poppies. Mainly used as an analgesic.
+
+reagent-name-formalin = formalin
+reagent-desc-formalin = A chemical that coagulates proteine and prevents its decomposition. Used in embalming corpses.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ADT/Reagents/Meta/narcotics.ftl b/Resources/Locale/en-US/ADT/Reagents/Meta/narcotics.ftl
new file mode 100644
index 00000000000..43faee5a5c6
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/Meta/narcotics.ftl
@@ -0,0 +1,2 @@
+reagent-name-opium = opium
+reagent-desc-opium = Drastic narcotic produced by papaver somniferum. Used to be a pain killer, however, due to the consequences of drug addiction in patients, it has been used only in production of medical chemicals.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ADT/Reagents/effects/fun_effects.ftl b/Resources/Locale/en-US/ADT/Reagents/effects/fun_effects.ftl
new file mode 100644
index 00000000000..cf5c4bfb9d8
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/effects/fun_effects.ftl
@@ -0,0 +1 @@
+polymorph-effect-feelings = You feel strange changes in your body...
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ADT/Reagents/effects/medicine_effects.ftl b/Resources/Locale/en-US/ADT/Reagents/effects/medicine_effects.ftl
new file mode 100644
index 00000000000..df9481ee81b
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/effects/medicine_effects.ftl
@@ -0,0 +1,16 @@
+medicine-effect-usual = You feel how your pain is slowly going away.
+medicine-effect-asphyxia = Your breath is recovering and gradually comes back to normal rate.
+medicine-effect-hungover = Your thoughts become more assembled and the movement less sloppy.
+medicine-effect-eyedamage = Your vision has got a bit better.
+medicine-effect-mind = Looks like your mind is expanding.
+medicine-effect-stress = Your body is getting tense.
+
+medicine-effect-headache = You feel how your headache decreases.
+medicine-effect-slash = You feel how your pain from wounds decreases.
+medicine-effect-piercing = You feel how your pain from piercing wounds decreases.
+medicine-effect-heat = Looks like your temperature lowered a bit.
+medicine-effect-shock = You feel how your pain from electric shock decreases.
+medicine-effect-major-stress = Your body is getting very tense.
+medicine-effect-emotions = Your emotions and feelings become less bright.
+medicine-effect-antipsychotic = Your vision and thoughts are becoming less indistinct.
+medicine-effect-pain = You feel how your pain is dulled.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ADT/Reagents/effects/narcotic_effects.ftl b/Resources/Locale/en-US/ADT/Reagents/effects/narcotic_effects.ftl
new file mode 100644
index 00000000000..8b1a20c436a
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/Reagents/effects/narcotic_effects.ftl
@@ -0,0 +1,3 @@
+narcotic-effect-sleepy = You feel sleepy.
+narcotic-effect-rainbows = A picture before your eyes becomes more and more indistinct...
+narcotic-effect-visible-miosis = The pupils of { CAPITALIZE($entity) } are narrowed in a strange way.
diff --git a/Resources/Locale/en-US/disease/miasma.ftl b/Resources/Locale/en-US/disease/miasma.ftl
index 46e8db33d4c..f159d018f80 100644
--- a/Resources/Locale/en-US/disease/miasma.ftl
+++ b/Resources/Locale/en-US/disease/miasma.ftl
@@ -19,3 +19,5 @@ rotting-extremely-bloated = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } corpse
rotting-rotting-nonmob = [color=orange]{ CAPITALIZE(SUBJECT($target)) } is rotting![/color]
rotting-bloated-nonmob = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } is bloated![/color]
rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } is extremely bloated![/color]
+
+adt-rotting-embalmed = Looks like { CAPITALIZE(SUBJECT($target)) } {CONJUGATE-BE($target)} [color=#edad45]embalmed[/color].
\ No newline at end of file
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index b6f45d23862..869c99d769e 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -344,3 +344,9 @@ reagent-effect-guidebook-missing =
[1] Causes
*[other] cause
} an unknown effect as nobody has written this effect yet
+
+reagent-effect-guidebook-embalm =
+ { $chance ->
+ [1] Prevents
+ *[other] prevent
+ } the rotting of the corpses
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index d9fc0ab6953..5f143e49037 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -50,3 +50,4 @@ job-description-senior-researcher = Teach new scientists the basics of item prin
job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead.
job-description-senior-officer = Teach new officers the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
job-description-ADTInvestigator = Conduct interrogations, interview victims and witnesses, help the detective and the warden, solve a spesificly complex criminal cases.
+job-description-ADTPathologist = Examine the bodies of the dead crew, determine the causes of death and don't forget to clone them.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index ce0a894a742..367a0d9affd 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -52,6 +52,7 @@ job-name-senior-researcher = Senior Researcher
job-name-senior-physician = Senior Physician
job-name-senior-officer = Senior Officer
job-name-ADTInvestigator = Security Investigator
+job-name-ADTPathologist = Pathologist
job-name-visitor = Visitor
# Role timers - Make these alphabetical or I cut you
@@ -86,6 +87,7 @@ JobMedicalIntern = Medical intern
JobMime = Mime
JobMusician = Musician
JobParamedic = Paramedic
+JobADTPathologist = Pathologist
JobPassenger = Passenger
JobPsychologist = Psychologist
JobQuartermaster = Quartermaster
diff --git a/Resources/Locale/en-US/medical/components/defibrillator.ftl b/Resources/Locale/en-US/medical/components/defibrillator.ftl
index dc4a03aa3b1..3ac95e42ce5 100644
--- a/Resources/Locale/en-US/medical/components/defibrillator.ftl
+++ b/Resources/Locale/en-US/medical/components/defibrillator.ftl
@@ -1,4 +1,5 @@
defibrillator-not-on = The defibrillator isn't turned on.
defibrillator-no-mind = No intelligence pattern can be detected in patient's brain. Further attempts futile.
defibrillator-rotten = Body decomposition detected: resuscitation failed.
+defibrillator-embalmed = Body embalmment detected: resuscitation failed.
defibrillator-unrevivable = This patient is unable to be revived due to a unique body composition.
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index e208b9a8e40..06ae301bf9a 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -89,7 +89,7 @@ reagent-name-oculine = oculine
reagent-desc-oculine = A simple saline compound used to treat the eyes via ingestion.
reagent-name-ethylredoxrazine = ethylredoxrazine
-reagent-desc-ethylredoxrazine = Neutralises the effects of alcohol in the blood stream. Though it is commonly needed, it is rarely requested.
+reagent-desc-ethylredoxrazine = Neutralises the effects of alcohol in the blood stream. Good addition for healing poison to dylovene. Though it is commonly needed, it is rarely requested.
reagent-name-cognizine = cognizine
reagent-desc-cognizine = A mysterious chemical which is able to make any non-sentient creature sentient.
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/fills/items/pyotr_briefcase.ftl b/Resources/Locale/ru-RU/ADT/Catalog/fills/items/briefcases.ftl
similarity index 77%
rename from Resources/Locale/ru-RU/ADT/Catalog/fills/items/pyotr_briefcase.ftl
rename to Resources/Locale/ru-RU/ADT/Catalog/fills/items/briefcases.ftl
index a832183b90f..2fbb5d51d86 100644
--- a/Resources/Locale/ru-RU/ADT/Catalog/fills/items/pyotr_briefcase.ftl
+++ b/Resources/Locale/ru-RU/ADT/Catalog/fills/items/briefcases.ftl
@@ -2,6 +2,10 @@ ent-ADTBriefcaseBrownPyotr = чемодан Петра Шахина
.suffix = Заполненный
.desc = Коричневый чемодан, заполненный вещами Петра. На одной из сторон можно увидеть слегка потертые наклейки с миров, где побывал этот чемодан и его владелец.
+ent-ADTBriefcaseBrownHikingCmo = походный чемодан главного врача
+ .suffix = Заполненный
+ .desc = Коричневый чемодан, заполненный всем нужным для рабочих вылазок главного врача.
+
ent-ADTBriefcaseCentcomm = чемодан ЦентКома
.desc = Роскошный и сверхпрочный чемодан с символикой NanoTrasen. Предназначен для очень важных людей с очень важными бумагами.
.suffix = { "ЦК, CombatBibis" }
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ADT/Catalog/fills/lockers/biohazard.ftl
new file mode 100644
index 00000000000..eb9b1e6980d
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Catalog/fills/lockers/biohazard.ftl
@@ -0,0 +1,7 @@
+ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3Pathologist }
+ .suffix = Заполненный, Патологоанатом
+ .desc = { ent-ADTClosetL3Pathologist.desc }
+
+ent-ADTClosetL3ParamedicFilled = { ent-ADTClosetL3Paramedic }
+ .suffix = Заполненный, Парамедик
+ .desc = { ent-ADTClosetL3Paramedic.desc }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/fills/lockers/medical.ftl b/Resources/Locale/ru-RU/ADT/Catalog/fills/lockers/medical.ftl
new file mode 100644
index 00000000000..b88a30c0bdc
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Catalog/fills/lockers/medical.ftl
@@ -0,0 +1,3 @@
+ent-ADTLockerPathologistFilled = шкаф патологоанатома
+ .suffix = Заполненный
+ .desc = Всё нужное для работы с трупами.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl b/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl
index ca0f2f6434e..0eac26d6eed 100644
--- a/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl
+++ b/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl
@@ -47,8 +47,8 @@ uplink-mute-toxin-desc = Вещество, способное лишить ко
uplink-bar-toxins-name = набор барных токсинов
uplink-bar-toxins-desc = Небольшой набор, содержащий множество эффективных токсинов для незаметного подмешивания в коктейли.
-uplink-fake-defib-name = поддельный дефибриллятор
-uplink-fake-defib-desc = Дефибриллятор, лишь наносящий увеличенные электрические ожоги. Идеален для активной имитации бурной деятельности.
+uplink-fake-defib-name = поддельный высоковольтный дефибриллятор
+uplink-fake-defib-desc = Дефибриллятор, наносящий увеличенные электрические ожоги. Идеален для активной имитации бурной деятельности.
uplink-chemistry-kit-name = набор химика
uplink-chemistry-kit-desc = Стартовый набор для начинающего химика, включающий токсин и вестин для всех ваших нехороших дел!
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl
index 3b68880b98f..e2c2e418708 100644
--- a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl
+++ b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl
@@ -36,3 +36,33 @@ ent-ADTClothingBackpackSatchelLapkee = тёмная сумка
ent-ADTClothingBackpackDuffelDurathead = дюротканевый вещмешок
.desc = Вещмешок выполненый из более прочной и эластичной дюраткани.
+
+
+ent-ADTClothingBackpackMedical = медицинский рюкзак
+ .desc = Рюкзак для хранения медицинского оборудования.
+
+ent-ADTClothingBackpackDuffelMedical = медицинский вещмешок
+ .desc = Вместительный вещмешок для хранения медицинского оборудования.
+
+ent-ADTClothingBackpackSatchelMedical = медицинская сумка
+ .desc = Сумка для хранения медицинского оборудования.
+
+
+ent-ADTClothingBackpackPathologist = рюкзак патологоанатома
+ .desc = Рюкзак для хранения инструментов и бумаг.
+
+ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоанатома
+ .desc = Большой вещмешок для хранения инструментов и бумаг.
+
+ent-ADTClothingBackpackSatchelPathologist = сумка патологоанатома
+ .desc = Сумка для хранения инструментов и бумаг.
+
+
+ent-ADTClothingBackpackParamedic = рюкзак парамедика
+ .desc = Рюкзак, изготовленный для экстренных вызовов медицинской помощи.
+
+ent-ADTClothingBackpackDuffelParamedic = вещмешок парамедика
+ .desc = Вместительный вещмешок для оборудования экстренной помощи.
+
+ent-ADTClothingSatchelParamedic = сумка парамедика
+ .desc = Стерильная сумка для экстренных вызовов медицинской помощи.
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Belt/belt.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Belt/belt.ftl
index 268be2f3776..d5184a839fa 100644
--- a/Resources/Locale/ru-RU/ADT/Clothing/Belt/belt.ftl
+++ b/Resources/Locale/ru-RU/ADT/Clothing/Belt/belt.ftl
@@ -29,3 +29,11 @@ ent-ClothingBeltMedicalEMT = пояс парамедика
ent-ClothingBeltMedicalEMTFilled = пояс парамедика
.desc = Пояс для быстрого доступа к медикаментам в экстренных случаях.
.suffix = { "Заполненный" }
+
+ent-ADTClothingBeltMedicalBag = медицинская поясная сумка
+ .desc = Небольшая, но вместительная сумка для хранения медикаментов. Тут даже поместится планшет для бумаги!
+ .suffix = { "" }
+
+ent-ADTClothingBeltMedicalBagFilled = медицинская поясная сумка
+ .desc = Небольшая, но вместительная сумка для хранения медикаментов. Тут даже поместится планшет для бумаги!
+ .suffix = { "Заполнено" }
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Ears/headsets.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Ears/headsets.ftl
new file mode 100644
index 00000000000..c4e25b8372e
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Clothing/Ears/headsets.ftl
@@ -0,0 +1,2 @@
+ent-ADTClothingHeadsetParamedic = гарнитура парамедика
+ .desc = Гарнитура, используемая парамедиками.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
index 9d293813906..2c78f4030d7 100644
--- a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
+++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
@@ -58,12 +58,15 @@ ent-ADTClothingHeadHatsBavarianHatRed = красная егерская шляп
ent-ADTClothingHeadHairPin = золотая заколка
.desc = Золотая заколка для волос с красными перьями. Производства "Modeling Agency Dar-Vaxed".
+ .suffix = { "" }
ent-ADTClothingHeadPovar = Поварской колпак-берет шеф-повара
.desc = Обязательный головной убор уважающего себя шеф-повара, а так-же чтобы на еду не попали волосы.
+ .suffix = { "" }
ent-ADTClothingHeadHelmetHungerGamesCapitols = Шлем Капитолия
.desc = Шлем компании "Космических Голодных Игр".
+ .suffix = { "" }
ent-ADTClothingHeadHatsNTCap = колпак NT
.desc = Сегодня официальный день, раз колпак теперь в твоих руках.
@@ -164,3 +167,12 @@ ent-ADTClothingHeadSportHatStep = cпортивная шапка-пипо "STEP"
ent-ADTClothingHeadUrsHat = шапка урса
.desc = Тёплая шапка ушанка.
+
+ent-ADTClothingHeadHatsParamedicBeret = берет парамедика
+ .desc = Берет, связанный с постоянной медицинской работой.
+
+ent-ADTClothingHeadHatHoodBioPathologist = { ent-ClothingHeadHatHoodBioGeneral }
+ .desc = Капюшон для патологоанатома, защищающий голову и лицо от биологического заражения.
+
+ent-ADTClothingHeadHatHoodBioParamedic = { ent-ClothingHeadHatHoodBioGeneral }
+ .desc = Капюшон для парамедика, защищающий голову и лицо от биологического заражения.
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
index b7853409991..ada8a44a9b9 100644
--- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
+++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
@@ -45,6 +45,7 @@ ent-ADTClothingUniformRitaBlackDress = черное платье Риты
.desc = Черное платье, принадлежащее Рите Энглер. С рискованно большим вырезом
.suffix = { "" }
+
ent-ADTClothingUniformRabbitDress = кроличий купальник
.desc = А куда здесь крепить КПК?
.suffix = { "" }
@@ -345,3 +346,23 @@ ent-ADTClothingUniformWhiteSweaterHeart = белый свитер с серде
ent-ADTClothingUniformVizhivalovo = одежда Выживалово
.desc = Лучшие штаны и футболка для дегустации дешевых консерв.
.suffix = { "Выживалово" }
+
+
+ent-ADTClothingUniformPathologistSuit = костюм патологоанатома
+ .desc = Лёгкий комбинезон для работника морга.
+ .suffix = { "" }
+ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома
+ .desc = Лёгкая юбка-комбинезон для работницы морга.
+ .suffix = { "" }
+ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома
+ .desc = Лёгкий комбинезон для работника морга. Более угрюмая версия.
+ .suffix = { "" }
+ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома
+ .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия.
+ .suffix = { "" }
+ent-ADTClothingUniformHikeformCmo = походный костюм главного врача
+ .desc = Рубашка и мешковитые штаны, отлично подходящие для активной работы как вне, так и внутри своего отдела.
+ .suffix = { "" }
+ent-ADTClothingUniformHikeJumpskirtCmo = походная юбка-костюм главного врача
+ .desc = Рубашка и мешковитая юбка, отлично подходящие для активной работы как вне, так и внутри своего отдела.
+ .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl b/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl
index 9db06137c29..786be05ed63 100644
--- a/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl
+++ b/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl
@@ -93,3 +93,6 @@ ent-ADTClothingFootSportStepSneakers = кроссовки STEP "Ultra"
.desc = Кроссовки серии STEP "Ultra" ставят легкость и сцепление превыше всего. Благодаря подошвам для бега с цепкой поверхностью и особой легкой метаморф-ткани, любые представители иных рас могут с полным комфортом на идти пробежку.
ent-ADTClothingFootSportZetaCrocs = кроссы STEP "Zeta"
.desc = Кроссы STEP "Zeta" имеют удобную подошву и ярко-зелёную переднюю часть, чтобы вас точно заметили среди травы.
+
+ent-ADTClothingHighboots = сапоги главного врача
+ .desc = Пара высоких сапог, чтобы не заморать ноги во время ходьбы по лужам крови.
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl
index e87f6569df0..be7e00e87d0 100644
--- a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl
+++ b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl
@@ -29,6 +29,9 @@ ent-ADTClothingOuterCoatXCoat = икс-ключительное облачени
.desc = Кажется тот, кто его носит отличается иксключительным эгоизмом.
.suffix = { "" }
+ent-ADTClothingOuterWinterRussianCoat = Русский пуховик
+ .desc = Используется на экстремально холодных фронтах, сделан из натуральный шерсти. Производство компании "Modeling Agency Dar-Vaxed" и Текстильный комбинат СССП, улица Сталинавская.
+
ent-ADTClothingOuterCoatSecAuditor = шинель аудитора СБ
.desc = Стандартная шинель проверяющих работу Службы Безопасности станции со стороны комитета надзора NanoTrasen.
.suffix = { "ЦК, CombatBibis" }
@@ -51,3 +54,21 @@ ent-ADTClothingOuterCoatSportStepHoodie = ветровка STEP "Ultra"
.desc = Эта ветровка похожа на защитный кокон, помещающий тело владельца в карманную вселенную, где ветер, вода, грязь и огонь не могут причинить ему вреда. На этикетке гордо красуется огромная надпись "100% синтетика". Она абсолютно не пропускает воздух. (Внимание: Ветровка на самом деле не огнестойкий.)
ent-ADTClothingOuterCoatSportZetaBlouse = блузка STEP "Zeta"
.desc = Яркая зелёная блузка серии STEP "Zeta".
+
+ent-ADTClothingOuterBioPathologist = защитный костюм патологоанатома
+ .desc = Костюм, защищающий от биологического заражения во время работы с трупами.
+
+ent-ADTClothingOuterApronPathologist = фартук патологоанатома
+ .desc = Фартук для работы с трупами.
+
+ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома
+ .desc = { ent-ClothingOuterCoatLab.desc }
+
+ent-ADTClothingOuterCoatHikeLabcoatCmo = походный халат главного врача
+ .desc = Частично открытый халат. Не сковывает движения.
+
+ent-ADTClothingOuterBioParamedic = защитный костюм парамедика
+ .desc = Костюм для парамедиков, защищающий от биологического заражения.
+
+ent-ADTClothingOuterCoatLabParamedic = халат парамедика
+ .desc = { ent-ClothingOuterCoatLab.desc }
diff --git a/Resources/Locale/ru-RU/ADT/Hydroponics/papaver_somniferum.ftl b/Resources/Locale/ru-RU/ADT/Hydroponics/papaver_somniferum.ftl
new file mode 100644
index 00000000000..b832d05a970
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Hydroponics/papaver_somniferum.ftl
@@ -0,0 +1,8 @@
+seeds-papaver-somniferum-name = мак снотворный
+seeds-papaver-somniferum-display-name = мака снотворного
+
+ent-ADTFoodPapaverSomniferum = мак снотворный
+ .desc = Бутон, экстракт которого используется в создании медицинских препаратов. И наркотиков.
+
+ent-ADTPapaverSomniferumSeeds = пакет семян мака снотворного
+ .desc = { ent-SeedBase.desc }
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/medical_books.ftl b/Resources/Locale/ru-RU/ADT/Objects/Misc/medical_books.ftl
new file mode 100644
index 00000000000..43f2a3e076c
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Objects/Misc/medical_books.ftl
@@ -0,0 +1,2 @@
+ent-ADTBookNewChemicals = журнал о новых препаратах
+ .desc = Журнал, содержащий информацию о химикатах.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl b/Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl
index 3661fe150f5..473c0a60fb5 100644
--- a/Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl
+++ b/Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl
@@ -6,10 +6,20 @@ ent-ADTCombatHypo = боевой гипоспрей
.desc = Модель гипоспрея, разработанная NT для использования в боевых ситуациях - с повышенным объемом в ущерб скорости применения.
.suffix = { "" }
-ent-ADTHandDefibrillator = боевой переносной Дефибрилятор
- .desc = Облегченная версия дефибрилятора, возращает в жизни лучше и быстрее, хоть разряд опаснее. Можно надеть на шею
+ent-ADTHandDefibrillator = боевой переносной Дефибриллятор
+ .desc = Облегченная версия дефибриллятора, возращает к жизни лучше и быстрее, хоть разряд опаснее. Можно надеть на шею
.suffix = { "" }
+ent-ADTMedicalTourniquet = кровоостанавливающий жгут-турникет
+ .desc = Компактное средство от кровотечения.
+
+ent-ADTAntibioticOintment = антибиотическая мазь
+ .desc = Используется для лечения как ушибов, порезов, уколов, так и ожогов.
+ent-ADTAntibioticOintment1 = { ent-ADTAntibioticOintment }
+ .desc = { ent-ADTAntibioticOintment.desc }
+ .suffix = Один
+
+
ent-ADTPatchPack = коробка пластырей
.desc = Коробка для хранения медицинских пластырей.
.suffix = { "" }
@@ -38,15 +48,19 @@ ent-ADTPatchHonk = хонк пластырь
.desc = Чудо клоунской медицины, повышает уровень веселья в крови.
.suffix = { "" }
-ent-ADTCratePatchPack = набор пластырей
+ent-ADTCratePatchPackFilled = набор пластырей
.desc = Набор содержащий 4 коробки с пластырями
.suffix = { "" }
-ent-ADTBaseFakeDefibrillator = дефибриллятор
- .desc = ЧИСТО! РАЗРЯД!
- .suffix = { "Поддельный" }
-ent-Defibrillator = дефибриллятор
- .desc = ЧИСТО! РАЗРЯД!
+ent-ADTHighVoltageDefibrillator = высоковольтный дефибриллятор
+ .desc = Дефибриллятор, которому нужно гораздо меньше времени на подготовку, однако повреждений от тока больше.
+
+ent-ADTHighVoltageDefibrillatorEmpty = { ent-ADTHighVoltageDefibrillator }
+ .desc = { ent-ADTHighVoltageDefibrillator.desc }
+ .suffix = { "Пустой" }
+
+ent-ADTHighVoltageDefibrillatorFake = { ent-ADTHighVoltageDefibrillator }
+ .desc = { ent-ADTHighVoltageDefibrillator.desc } Но что-то не так...
.suffix = { "Поддельный" }
ent-BaseChemistryEmptyVial = пробирка
@@ -59,3 +73,127 @@ ent-VestineChemistryVial = пробирка с вестином
ent-BoxVial = коробка пробирок
.desc = Содержит шесть пробирок.
+
+ent-ADTCratePatchPack = набор пластырей
+ .desc = { ent-ADTCratePatchPackFilled.desc }
+ .suffix = { "" }
+
+ent-ADTMobileDefibrillator = мобильный дефибриллятор
+ .desc = Облегченная версия дефибрилятора, которую можно закрепить на ваш пояс, так же как и на медицинский. Это чудо даже в карман поместится!
+ .suffix = { "" }
+
+ent-ADTSmallSyringe = небольшой шприц
+ .desc = Маленький шприц для.. вы угадали, взятия небольшого количества вещества. Так же помещается в раздатчики и анализатор вещества.
+ent-ADTSmallSyringeBox = коробка небольших шприцов
+ .desc = Небольшая коробка небольших шприцов для небольшого количества препаратов.
+
+
+ent-ADTPillCanister = баночка для таблеток
+ .desc = Вмещает до 9 таблеток.
+ .suffix = { "" }
+ent-ADTMVitaminCanister = баночка витаминов
+ .desc = Содержит полезные витаминки.
+ .suffix = { "" }
+ent-ADTMAgolatineCanister = баночка аголатина
+ .desc = Содержит относительно полезные антидепрессанты.
+ .suffix = { "" }
+ent-ADTPlasticBottle = пластиковая бутылочка
+ .desc = Небольшая пластиковая бутылочка.
+ .suffix = { "" }
+ent-ADTMMorphineBottle = бутылочка морфина
+ .desc = небольшая бутылочка с морфином.
+ .suffix = { "" }
+ent-ADTMOpiumBottle = бутылочка опиума
+ .desc = небольшая бутылочка с опиумом.
+ .suffix = { "" }
+ent-ADTMPeroHydrogenBottle = бутылочка пероводорода
+ .desc = Пластиковая бутылочка. Буквы на этикетке настолько малы, что издали сливаются в забавную рожицу.
+ .suffix = { "" }
+ent-ADTMNikematideBottle = бутылочка никематида
+ .desc = { ent-ADTMPeroHydrogenBottle.desc }
+ .suffix = { "" }
+ent-ADTObjectsSpecificFormalinChemistryBottle = бутылочка формалина
+ .desc = Основа работы патологоанатома.
+ent-BasePack = упаковка таблеток
+ .desc = Содержит 10 таблеток с распространённым лекарством.
+ .suffix = { "" }
+ent-ADTMSodiumizolePack = упаковка натримизола
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTPillPack = упаковка таблеток
+ .desc = Вмещает до 10-и таблеток.
+ .suffix = { "" }
+ent-ADTMNitrofurfollPack = упаковка нитрофурфолла
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTMAnelgesinPack = упаковка анельгезина
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTMMinoxidePack = упаковка миноксида
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTMDiethamilatePack = упаковка диэтамилата
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTMHaloperidolPack = упаковка галоперидола
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTMCharcoalPack = упаковка угля
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+ent-ADTMEthylredoxrazinePack = упаковка этилредоксразина
+ .desc = { ent-BasePack.desc }
+ .suffix = { "" }
+
+ent-ADTMSodiumizolePill = таблетка натримизола
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMNitrofurfollPill = таблетка нитрофурфолла
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMAnelgesinPill = таблетка анельгезина
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMMinoxidePill = таблетка миноксида
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMDiethamilatePill = таблетка диэтамилата
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMHaloperidolPill = таблетка галоперидола
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMEthylredoxrazinePill = таблетка этилредоксразина
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMAgolatinePill = таблетка аголатина
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-ADTMVitaminPill = таблетка витаминов
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+ent-PillCharcoal = таблетка угля (10)
+ .desc = { ent-Pill.desc }
+ .suffix = { "" }
+
+ent-ADTCrateVendingMachineRestockPill = набор пополнения ТаблеткоМата
+ .desc = Ящик с набором пополнения ТаблеткоМата.
+ .suffix = { "" }
+
+ent-ADTCrateVendingMachineRestockPillFilled = набор пополнения ТаблеткоМата
+ .desc = Ящик с набором пополнения ТаблеткоМата.
+ .suffix = { "" }
+
+ent-ADTVendingMachineRestockPill = набор пополнения ТаблеткоМата
+ .desc = Поместите в ТаблеткоМат вашего отдела.
+ .suffix = { "" }
+
+ent-ADTFootTag = бирка для ног
+ .desc = Бумажка для пометки усопших.
+ .suffix = { "" }
+ent-ADTFootTagBox = коробка бирок для ног
+ .desc = Пластиковая коробка, содержащие бирки для ног.
+ .suffix = { "" }
+
+ent-ADTReagentAnalyzer = анализатор реагентов
+ .desc = Карманный помощник для определения странных химикатов. Может вместить себя больше, чем на первый взгляд.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl
index 6bf1f71369c..00708afde64 100644
--- a/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl
+++ b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl
@@ -1,4 +1,15 @@
ent-ADTVendingMachinePrazatClothing = СтильноМат
.desc = Особый вид автомата с одеждой, выдающий нестандартную одежду. Одобрен бюро по контролю за стилем NanoTrasen.
+
ent-ADTVendingMachineMasterSportDrobe = СпортМастерШкаф
- .desc = Торговый автомат, созданный совместно с компанией "Dar-Vaxed". В торговом автомате вы сможете приобрести спортивную одежду, а также новую серию спортивной одежды "STEP" от "VD-sport"!
\ No newline at end of file
+ .desc = Торговый автомат, созданный совместно с компанией "Dar-Vaxed". В торговом автомате вы сможете приобрести спортивную одежду, а также новую серию спортивной одежды "STEP" от "VD-sport"!
+
+
+ent-ADTVendingMachinePill = ТаблеткоМат
+ .desc = (Почти) практическое решение всех ваших болячек.
+
+ent-ADTVendingMachinePatholoDrobe = ПатологоШкаф
+ .desc = Самая стильная одежда в самом отдалёном месте медицинского отдела.
+
+ent-ADTVendingMachineParaDrobe = ПараШкаф
+ .desc = Стильная одежда для экстренных медицинских вызовов.
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/adt_medicine.ftl b/Resources/Locale/ru-RU/ADT/Reagents/adt_medicine.ftl
deleted file mode 100644
index 8289340dc2f..00000000000
--- a/Resources/Locale/ru-RU/ADT/Reagents/adt_medicine.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-reagent-name-zessul-blood = Кровь Зессул
-reagent-desc-zessul-blood = Компонент крови представителей расы Унати
-reagent-physical-desc-bloody = кровавое
-reagent-name-adtsalineglucosesolution = физраствор
-reagent-desc-adtsalineglucosesolution = Прозрачное.
-reagent-physical-desc-adtsalineglucosesolution = прозрачное
-flavor-complex-somesalty = солёненькое
-reagent-name-ultra-chloral-hydrate = Ультрахлоральгидрат
-reagent-desc-ultra-chloral-hydrate = Модифицированный хлоральгидрат. В малых дозах вызывает сонливость. В больших дозах усыпляет. Передозировки нет
-
-reagent-name-fleurdemai = духи с ароматом сирени
-reagent-desc-fleurdemai = Пахнет как цветущая сирень и погода в мае.
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/effects/fun_effects.ftl b/Resources/Locale/ru-RU/ADT/Reagents/effects/fun_effects.ftl
new file mode 100644
index 00000000000..4c6a387cbd7
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/effects/fun_effects.ftl
@@ -0,0 +1 @@
+polymorph-effect-feelings = Вы чувствуете странные изменения в вашем теле...
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/effects/medicine_effects.ftl b/Resources/Locale/ru-RU/ADT/Reagents/effects/medicine_effects.ftl
new file mode 100644
index 00000000000..970f435596d
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/effects/medicine_effects.ftl
@@ -0,0 +1,19 @@
+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) } выглядит менее эмоциональной.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/effects/narcotic_effects.ftl b/Resources/Locale/ru-RU/ADT/Reagents/effects/narcotic_effects.ftl
new file mode 100644
index 00000000000..a10d10e946a
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/effects/narcotic_effects.ftl
@@ -0,0 +1,4 @@
+narcotic-effect-sleepy = Вы чувствуете себя сонно.
+narcotic-effect-rainbows = Картина перед вашими глазами всё более и более расплывчатая...
+
+narcotic-effect-visible-miosis = Зрачки { CAPITALIZE($entity) } странным образом сузились.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/meta/adt_medicine.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/adt_medicine.ftl
new file mode 100644
index 00000000000..0858bd330db
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/meta/adt_medicine.ftl
@@ -0,0 +1,48 @@
+reagent-name-zessul-blood = Кровь Зессул
+reagent-desc-zessul-blood = Компонент крови представителей расы Унати
+reagent-physical-desc-bloody = кровавое
+reagent-name-adtsalineglucosesolution = физраствор
+reagent-desc-adtsalineglucosesolution = Прозрачное.
+reagent-physical-desc-adtsalineglucosesolution = прозрачное
+flavor-complex-somesalty = солёненькое
+reagent-name-ultra-chloral-hydrate = Ультрахлоральгидрат
+reagent-desc-ultra-chloral-hydrate = Модифицированный хлоральгидрат. В малых дозах вызывает сонливость. В больших дозах усыпляет. Передозировки нет
+
+reagent-name-fleurdemai = духи с ароматом сирени
+reagent-desc-fleurdemai = Пахнет как цветущая сирень и погода в мае.
+
+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-haloperidol = галоперидол
+reagent-desc-haloperidol = Популярный антипсихотический препарат. Применяют при шизофрении, тиках при синдроме Туррета, мании в биполярном расстройстве, в бреду, ажитации, остром психозе и алкогольном абстинентном синдроме.
+
+reagent-name-morphine = морфин
+reagent-desc-morphine = Сильный опиат, добываемый из снотворного мака. В основном используется как анальгетик.
+
+reagent-name-formalin = формалин
+reagent-desc-formalin = Препарат, свёртывающий белки и предотвращающий их разложение. Используется для бальзамирования трупов.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/meta/chemicals.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/chemicals.ftl
new file mode 100644
index 00000000000..fef284313cf
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/meta/chemicals.ftl
@@ -0,0 +1,2 @@
+reagent-name-copper-nitride = нитрид меди(III)
+reagent-desc-copper-nitride = Тёмно-зелёные кристаллы, которые используется в различных лекарствах и реагируют с водой.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/cherry_exquisite_wine.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/cherry_exquisite_wine.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/cherry_exquisite_wine.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/cherry_exquisite_wine.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/cocoa_solid.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/cocoa_solid.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/cocoa_solid.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/cocoa_solid.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/just_kekc_cocktails.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/just_kekc_cocktails.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/just_kekc_cocktails.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/just_kekc_cocktails.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/liquid_chocolate.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/liquid_chocolate.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/liquid_chocolate.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/liquid_chocolate.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/liquid_cocoa.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/liquid_cocoa.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/liquid_cocoa.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/liquid_cocoa.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/oktoberfest_beer.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/oktoberfest_beer.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/oktoberfest_beer.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/oktoberfest_beer.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/vodka_antivirus.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/vodka_antivirus.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/vodka_antivirus.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/drinks/vodka_antivirus.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/meta/fun.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/fun.ftl
new file mode 100644
index 00000000000..6ab3e2670f8
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/meta/fun.ftl
@@ -0,0 +1,4 @@
+reagent-name-polymorphine = полиморфин
+reagent-desc-polymorphine = До сих пор неизученный препарат, вызывающий необычный эффект на тело существа.
+reagent-name-chaotic-polymorphine = нестабильный полиморфин
+reagent-desc-chaotic-polymorphine = Крайне нестабильный препарат, вызывающий необычный эффект на тело существа.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/meta/narcotics.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/narcotics.ftl
new file mode 100644
index 00000000000..76542e3b5b1
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/meta/narcotics.ftl
@@ -0,0 +1,2 @@
+reagent-name-opium = опиум
+reagent-desc-opium = Сильнодействующий наркотик, получаемый из снотворного мака. Во время его отрытия использовался как болеутоляющее средство, однако из-за последствий в виде наркотической зависимости у пациентов начал применяться только как сырьё для медицинских препаратов.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/patch_medicine.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/patch_medicine.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Reagents/patch_medicine.ftl
rename to Resources/Locale/ru-RU/ADT/Reagents/meta/patch_medicine.ftl
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/meta/toxins.ftl b/Resources/Locale/ru-RU/ADT/Reagents/meta/toxins.ftl
new file mode 100644
index 00000000000..b222175d9c5
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Reagents/meta/toxins.ftl
@@ -0,0 +1,2 @@
+reagent-name-phronidolepaxorine = фронидолепаксорин
+reagent-desc-phronidolepaxorine = Крайне опасный препарат, который имеет особые свойства на новакидов.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/advertisements/patholog.ftl b/Resources/Locale/ru-RU/ADT/advertisements/patholog.ftl
new file mode 100644
index 00000000000..575fc0a5cc1
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/advertisements/patholog.ftl
@@ -0,0 +1,2 @@
+advertisement-patholog-1 = Только не запачкайтесь.
+advertisement-patholog-2 = Самая красивая одежда среди обитателей морга!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/advertisements/pill.ftl b/Resources/Locale/ru-RU/ADT/advertisements/pill.ftl
new file mode 100644
index 00000000000..ad9b3127bbe
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/advertisements/pill.ftl
@@ -0,0 +1,4 @@
+advertisement-pill-1 = Утопите боль в таблетках!
+advertisement-pill-2 = Хочешь витаминку?
+advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола!
+advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/bad.ftl b/Resources/Locale/ru-RU/ADT/bad.ftl
index f7470040af6..fe5ff3f6b2a 100644
--- a/Resources/Locale/ru-RU/ADT/bad.ftl
+++ b/Resources/Locale/ru-RU/ADT/bad.ftl
@@ -1,4 +1,4 @@
-reagent-physical-desc-silver = "Что то там серебрянное"
-reagent-name-salineglucosesolution = "Что такое"
-reagent-desc-salineglucosesolution = "Что то описание"
-reagent-physical-desc-salineglucosesolution = "Что то описание"
+reagent-physical-desc-silver = серебристое
+#reagent-name-salineglucosesolution = "Что такое"
+#reagent-desc-salineglucosesolution = "Что то описание"
+#reagent-physical-desc-salineglucosesolution = "Что то описание"
diff --git a/Resources/Locale/ru-RU/ADT/guidebook/guides.ftl b/Resources/Locale/ru-RU/ADT/guidebook/guides.ftl
index 76ac8e4e6d1..27d1fda9148 100644
--- a/Resources/Locale/ru-RU/ADT/guidebook/guides.ftl
+++ b/Resources/Locale/ru-RU/ADT/guidebook/guides.ftl
@@ -1,6 +1,9 @@
guide-new-recipes-ADT = Новые блюда
guide-new-cocktails-ADT = Авторские коктейли, рецепты
+guide-pathologist-ADT = Морг и патологоанатом
+guide-chemicals-ADT = Новые реагенты
+
guide-entry-all-korporate-zakon = Корпоративный Закон
guide-entry-all-korporate-zakon-oprs = ОПРС
guide-entry-all-korporate-zakon-minor = Легкие нарушения
diff --git a/Resources/Locale/ru-RU/ADT/morphine.ftl b/Resources/Locale/ru-RU/ADT/morphine.ftl
deleted file mode 100644
index 8a890ae68b5..00000000000
--- a/Resources/Locale/ru-RU/ADT/morphine.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-reagent-name-morphine = морфин
-reagent-desc-morphine = Сильный опиат, добываемый из снотворного мака. В основном используется как анальгетик.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/entities/spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/entities/spawners/jobs.ftl
new file mode 100644
index 00000000000..6a602f07f8c
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/entities/spawners/jobs.ftl
@@ -0,0 +1,3 @@
+ent-SpawnPointADTPathologist = патологоанатом
+ .desc = { ent-MarkerBase.desc }
+
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/entities/structures/storage/closets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/entities/structures/storage/closets.ftl
new file mode 100644
index 00000000000..089b1e00068
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/entities/structures/storage/closets.ftl
@@ -0,0 +1,8 @@
+ent-ADTClosetL3 = шкаф снаряжения 3-го уровня биологической опасности
+ .desc = Это хранилище для снаряжения 3-го уровня биологической опасности.
+
+ent-ADTClosetL3Pathologist = { ent-ADTClosetL3 }
+ .desc = { ent-ADTClosetL3.desc }
+
+ent-ADTClosetL3Paramedic = { ent-ADTClosetL3 }
+ .desc = { ent-ADTClosetL3.desc }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/research.ftl b/Resources/Locale/ru-RU/ADT/research.ftl
index 04948cc2006..9566f1eca0e 100644
--- a/Resources/Locale/ru-RU/ADT/research.ftl
+++ b/Resources/Locale/ru-RU/ADT/research.ftl
@@ -1,4 +1,4 @@
technologies-hud = Технология визоров
research-technology-light-tech = Технология Вечеринки
research-avanted-energy = Продвинутая энергетика
-
+research-technology-highvolt-defib = Высоковольтный дефибриллятор
diff --git a/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl b/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
index 37bf582a0ff..0bfd246f335 100644
--- a/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
+++ b/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
@@ -389,6 +389,41 @@ station-goal-smes =
Копии данного документа следует выслать и/или передать вручную руководителям Инженерного и Научного отделов, а так же отдела Снабжения. В случае отсутствия руководителей - копии документов передаются нижестоящим сотрудникам отдела.
+
+station-goal-polymorphine =
+ ███╗░░██╗████████╗
+ ████╗░██║╚══██╔══╝ NT-STATION-CC-CMD-DCR
+ ██╔██╗██║░░░██║░░░ Цель ЦК
+ ██║╚████║░░░██║░░░ для Станции на текущую смену
+ ██║░╚███║░░░██║░░░
+ ╚═╝░░╚══╝░░░╚═╝░░░
+ ═════════════════════════════════════════
+ Внимание, Командование Станции, цель вашей текущей смены - изготовление и тестирование новейшего препарата. Дальнейшая информация не подлежит разглашению перед экипажем, если они не участвуют в выполнении цели. Наши учёные разработали так называемый "полиморфин", способный обращать живые сущности в других существ или объекты. Вам разрешено тестировать его на обезьянах, добровольцах из числа экипажа станции, а так же гуманоидах, на которых не распространяется ОПРС, например враги корпорации. Вы должны провести и задокументировать 5 экспериментов с применением полиморфина и его нестабильной версии.
+
+ Далее перечислены требования к цели:
+ - Местоположение экспериментальной зоны должно охраняться двумя и более сотрудниками службы безопасности.
+ - Эксперименты должны проводиться на 5 сущностях различной формы жизни.
+ - Все эксперименты с использованием нестабильного полиморфа должны проводиться под присмотром квалифицированного сотрудника СБ.
+ - Все превращения должны быть задокументированы.
+ - Все экспериментальные образцы должны быть обеззаражены после проведения экспериментов.
+ - В случае полиморфирования в агрессивную фауну - следует утилизировать объект, вплоть до полного сжигания при необходимости.
+ - По окончанию смены, на ЦК должна быть доставлена партия полиморфа и нестабильного полиморфа в количестве 300u каждого препарата.
+
+ С момента начала экспериментов экспериментальная зона считается стратегической точкой, а его подопытные - особо ценным имуществом. Проникновение неавторизованного персонала в экспериментальную зону или кража образцов из неё должна расцениваться с точки зрения Корпоротивного Закна, в соответствии с этими примечаниями.
+
+ На момент выполнения цели заказы, заверенные печатью Главного врача, а так же напрямую относящиеся к её развитию, должны носить приоритетный характер и выполняться в кратчайшие сроки.
+
+ В отчете для Центрального Командования необходимо указать все этапы нестабильной полиморфизации образцов и выслать отдельными документами. В документе должны обязательно присутствовать:
+ - Пункт с описанием объекта/существа до полиморфа.
+ - Доза введённого нестабильного полиморфа.
+ - Реакция организма на нестабильный полиморф.
+ - Доза введённого полиморфа.
+ - Реакция организма на полиморф.
+ - Комментарии подопечного о своих ощущениях во время принятия реагента, если возможно.
+ - Итог полиморфизации.
+
+ Копии данного документа следует выслать или передать вручную руководителю медицинского отдела. В случае отсутствия руководителя - копия документа передаётся сотруднику указанного отдела, вставшему на пост ВрИО главы.
+
station-goal-shuttlecrew =
███╗░░██╗████████╗
████╗░██║╚══██╔══╝ NT-STATION-CC-CMD-DCR
diff --git a/Resources/Locale/ru-RU/disease/miasma.ftl b/Resources/Locale/ru-RU/disease/miasma.ftl
index 20c7abc5fb3..e3b591e9e83 100644
--- a/Resources/Locale/ru-RU/disease/miasma.ftl
+++ b/Resources/Locale/ru-RU/disease/miasma.ftl
@@ -26,3 +26,4 @@ rotting-extremely-bloated = [color=red]{ CAPITALIZE(SUBJECT($target)) } силь
rotting-rotting-nonmob = [color=orange]{ CAPITALIZE(SUBJECT($target)) } гниёт![/color]
rotting-bloated-nonmob = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } вздулось![/color]
rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } сильно вздулось![/color]
+adt-rotting-embalmed = Похоже, тело [color=#edad45]забальзамировано[/color].
diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
index 25a8ad89897..f1ec54d569c 100644
--- a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
@@ -11,6 +11,7 @@ guidebook-reagent-recipes-header = Рецепт
guidebook-reagent-recipes-reagent-display = [bold]{ $reagent }[/bold] \[{ $ratio }\]
guidebook-reagent-recipes-mix = Смешайте
guidebook-reagent-effects-header = Эффекты
+guidebook-reagent-recipes-mix-and-heat = Смешивайте при {$temperature}K
guidebook-reagent-effects-metabolism-group-rate = [bold]{ $group }[/bold] [color=gray]({ $rate } единиц в секунду)[/color]
guidebook-reagent-physical-description = На вид вещество { $description }.
guidebook-reagent-recipes-mix-info = {$minTemp ->
diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
index a34efd9c3d8..09f373b1717 100644
--- a/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
@@ -316,3 +316,9 @@ reagent-effect-guidebook-missing =
[1] Вызывает
*[other] вызывают
} неизвестный эффект, так как никто еще не написал об этом эффекте
+
+reagent-effect-guidebook-embalm =
+ { $chance ->
+ [1] Предотвращает
+ *[other] предотвращают
+ } гниение трупов
diff --git a/Resources/Locale/ru-RU/guidebook/guides.ftl b/Resources/Locale/ru-RU/guidebook/guides.ftl
index ba932e8d791..c43087a2feb 100644
--- a/Resources/Locale/ru-RU/guidebook/guides.ftl
+++ b/Resources/Locale/ru-RU/guidebook/guides.ftl
@@ -33,6 +33,7 @@ guide-entry-medicine = Медицина
guide-entry-botanicals = Ботаника
guide-entry-cloning = Клонирование
guide-entry-cryogenics = Криогеника
+guide-entry-brute = Углублённое лечение механических травм
guide-entry-survival = Выживание
guide-entry-anomalous-research = Исследование аномалий
guide-entry-scanners-and-vessels = Сканеры и сосуды
diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl
index 92b0b4e5092..399810e32e3 100644
--- a/Resources/Locale/ru-RU/job/job-description.ftl
+++ b/Resources/Locale/ru-RU/job/job-description.ftl
@@ -53,5 +53,6 @@ job-description-iaa = Наблюдайте за соблюдением СРП э
job-description-ADTBlueShieldOfficer = Защищайте капитана и глав отделов от покушений, других опасностей и, прежде всего, от них самих.
job-description-ADTInvestigator = Проводите допросы, опрашивайте потерпевших и свидетелей, помогайте детективу и смотрителю, ведите особо сложные уголовные дела.
job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками.
+job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
job-description-ussp-army-private = Несите службу во благо социализма и поедайте тушенку.
job-description-ussp-army-officer = Командуйте своими подопечными и следите, чтобы с рядовым Табуреткой не случилось ничего плохого.
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
index ef97911be65..676502a3ace 100644
--- a/Resources/Locale/ru-RU/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -12,6 +12,7 @@ job-name-psychologist = Психолог
job-name-intern = Интерн
job-name-doctor = Врач
job-name-paramedic = Парамедик
+job-name-ADTPathologist = Патологоанатом
job-name-cmo = Главный врач
job-name-chemist = Химик
job-name-technical-assistant = Инженер-стажер
@@ -86,6 +87,7 @@ JobMime = Мим
JobMusician = Музыкант
JobPassenger = Пассажир
JobParamedic = Парамедик
+JobADTPathologist = Патологоанатом
JobPsychologist = Психолог
JobQuartermaster = Квартирмейстер
JobReporter = Репортёр
diff --git a/Resources/Locale/ru-RU/medical/components/defibrillator.ftl b/Resources/Locale/ru-RU/medical/components/defibrillator.ftl
index 3eb469f830e..99af7fae3de 100644
--- a/Resources/Locale/ru-RU/medical/components/defibrillator.ftl
+++ b/Resources/Locale/ru-RU/medical/components/defibrillator.ftl
@@ -2,3 +2,4 @@ defibrillator-not-on = Дефибриллятор не включён.
defibrillator-no-mind = Не удалось обнаружить паттерны мозговой активности пациента. Дальнейшие попытки бесполезны...
defibrillator-ghosted = Реанимация не удалась - Ошибка ментального интерфейса. Дальнейшие попытки могут увенчаться успехом.
defibrillator-rotten = Обнаружено разложение тела: реанимация невозможна.
+defibrillator-embalmed = Обнаружено бальзамирование тела: реанимация невозможна.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/reagents/meta/biological.ftl
index 7e408dfbd80..ec59f5fd93d 100644
--- a/Resources/Locale/ru-RU/reagents/meta/biological.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/biological.ftl
@@ -1,9 +1,11 @@
reagent-name-blood = кровь
reagent-desc-blood = Я надеюсь, что это кетчуп.
+reagent-name-insect-blood = кровь насекомых
+reagent-desc-insect-blood = Ладно, это отвратительно. Выглядит даже... живым?
reagent-name-slime = слизь
reagent-desc-slime = Сначала вам показалось, что это градиент крови, но вы ошиблись.
-reagent-name-spider-blood = синяя кровь
-reagent-desc-spider-blood = На вкус совсем не как черничный сок.
+reagent-name-hemocyanin-blood = синяя кровь
+reagent-desc-hemocyanin-blood = На вкус совсем не как черничный сок.
reagent-name-zombie-blood = кровь зомби
reagent-desc-zombie-blood = Не рекомендуется употреблять в пищу. Может быть использована для создания прививки от инфекции.
reagent-name-ichor = ихор
diff --git a/Resources/Locale/ru-RU/reagents/meta/chemicals.ftl b/Resources/Locale/ru-RU/reagents/meta/chemicals.ftl
index 8f843e69840..c144b169175 100644
--- a/Resources/Locale/ru-RU/reagents/meta/chemicals.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/chemicals.ftl
@@ -6,3 +6,17 @@ reagent-name-sodium-carbonate = карбонат натрия
reagent-desc-sodium-carbonate = Белая, не имеющая запаха соль, хорошо растворимая в воде и образующая при этом щелочной раствор. Также известна как сода кальцинированная.
reagent-name-artifexium = артифексиум
reagent-desc-artifexium = Лавандовая смесь микроскопических фрагментов артефактов и сильной кислоты. Обладает способностью активировать артефакты.
+reagent-name-benzene = бензол
+reagent-desc-benzene = Ароматическое, слегка карцерогенное кольцо углерода, состоящее в основе многих органических соединений.
+reagent-name-hydroxide = гидроксид
+reagent-desc-hydroxide = Сильный щёлочной химикат, состоящий в основе многих органических соединений.
+reagent-name-sodium-hydroxide = гидроксид натрия
+reagent-desc-sodium-hydroxide = Белая растворимая в воде соль без запаха, из которой получается сильный щёлочной раствор в воде. Вызывает ожоги и рвоту при проглатывании.
+reagent-name-fersilicite = ферсилицит
+reagent-desc-fersilicite = Интерметаллид с необычными магнитными свойствами при низких температурах.
+reagent-name-sodium-polyacrylate = полиакрилат натрия
+reagent-desc-sodium-polyacrylate = Суперабсорбирующий полимер с различными видами промышленного применения.
+reagent-name-cellulose = целлюлозное волокно
+reagent-desc-cellulose = Кристаллический полимер полидекстрозы. Растения полны этой штукой.
+
+
diff --git a/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl b/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl
index 840f2c7e761..ca29d6873b8 100644
--- a/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl
@@ -2,6 +2,10 @@ reagent-name-bleach = отбеливатель
reagent-desc-bleach = В просторечии хлорка. Сверхмощное чистящее средство, которое может очищать полы так же, как и космический очиститель, а также обеззараживать одежду. Крайне токсичен при попадании в организм.
reagent-name-space-cleaner = космический очиститель
reagent-desc-space-cleaner = Способен очистить почти любую поверхность от всего, что может ее запачкать. Уборщик наверняка будет благодарен добавке.
+reagent-name-soap = мыло
+reagent-desc-soap = Может быть использовано для мыльной воды.
+reagent-name-soapy-water = мыльная вода
+reagent-desc-soapy-water = Мыло с водой. Полезна для уборки всякой дряни с поверхностей, однако поскользнуться на ней проще, чем на обычной воде.
reagent-name-space-lube = космическая смазка
reagent-desc-space-lube = Космическая смазка - высокоэффективный лубрикант, предназначенный для обслуживания исключительно сложного механического оборудования (и уж точно не используемый для подскальзывания людей).
reagent-name-space-glue = космический клей
diff --git a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl
index db192fcefa4..62193b88e15 100644
--- a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl
@@ -1,80 +1,131 @@
reagent-name-cryptobiolin = криптобиолин
reagent-desc-cryptobiolin = Вызывает растерянность и головокружение. Необходим для изготовления Космоциллина.
+
reagent-name-dylovene = диловен
reagent-desc-dylovene = Антитоксин широкого спектра действия, который лечит поражение кровеносной системы токсинами. Передозировка вызывает рвоту, головокружение и боль.
+
reagent-name-diphenhydramine = дифенгидрамин
reagent-desc-diphenhydramine = Он же димедрол. Быстро очищает организм от гистамина, и снижает нервозность и дрожь.
+
reagent-name-arithrazine = аритразин
reagent-desc-arithrazine = Слегка нестабильный препарат, применяемый в самых крайних случаях радиационного отравления. Оказывает незначительное напряжение организма.
+
reagent-name-bicaridine = бикаридин
reagent-desc-bicaridine = Анальгетик, который очень эффективен при лечении механических повреждений. Он полезен для стабилизации состояния людей, которых сильно избили, а также для лечения менее опасных для жизни травм.
+
reagent-name-cryoxadone = криоксадон
reagent-desc-cryoxadone = Необходим для нормального функционирования криогеники. Быстро исцеляет все стандартные типы повреждений, но работает только при температуре ниже 150 Кельвинов.
+
reagent-name-doxarubixadone = доксарубиксадон
reagent-desc-doxarubixadone = Химикат криогенного действия. Лечит некоторые виды клеточных повреждений, нанесенных слаймами и неправильным использованием других химикатов.
+
reagent-name-dermaline = дермалин
reagent-desc-dermaline = Передовой препарат, более эффективный при лечении ожогов, чем Келотан.
+
reagent-name-dexalin = дексалин
reagent-desc-dexalin = Используется для лечения лёгкого кислородного голодания. Необходимый реагент для создания Дексалина плюс.
+
reagent-name-dexalin-plus = дексалин плюс
reagent-desc-dexalin-plus = Используется для лечения кислородного голодания и потери крови. Выводит Лексорин из кровеносной системы.
+
reagent-name-epinephrine = эпинефрин
reagent-desc-epinephrine = Эффективный стабилизирующий препарат, используемый для предотвращения смерти от асфиксии, а также для устранения незначительных повреждений пациентов, находящихся в критическом состоянии. Выводит Лексорин из кровеносной системы за счёт большего количества Эпинефрина, но может повышать уровень Гистамина. Помогает уменьшить время оглушения. Часто встречается в экстренных медипенах.
+
reagent-name-hyronalin = хироналин
reagent-desc-hyronalin = Слабый препарат для лечения радиационного поражения. Предшественник Аритразина и Фалангимина. Может вызывать рвоту.
+
reagent-name-ipecac = ипекак
reagent-desc-ipecac = Быстродействующий рвотный препарат. Применяется для остановки неметаболизированных ядов или сеансов массовой рвоты.
+
reagent-name-inaprovaline = инапровалин
reagent-desc-inaprovaline = Инапровалин это синаптический и кардио- стимулятор, широко используемый для купирования удушья при критических состояниях и уменьшения кровотечения. Используется во многих современных лекарственных препаратах.
+
reagent-name-kelotane = келотан
reagent-desc-kelotane = Лечит ожоги. Передозировка значительно снижает способность организма сохранять воду.
+
reagent-name-leporazine = лепоразин
reagent-desc-leporazine = Химический препарат, используемый для стабилизации температуры тела и быстрого лечения повреждений от холода. Отлично подходит для путешествий по космосу без скафандра, но не позволяет использовать криогенные капсулы.
+
reagent-name-barozine = барозин
reagent-desc-barozine = Сильнодействующий химикат, предотвращающий повреждения от давления. Оказывает сильное напряжение на организм. Обычно встречается в виде космических медипенов.
+
reagent-name-phalanximine = фалангимин
reagent-desc-phalanximine = Современный препарат, используемый при лечении рака. Вызывает умеренное лучевое поражение.
+
reagent-name-ambuzol = амбузол
reagent-desc-ambuzol = Высокотехнологичный препарат, способный остановить развитие зомби-вируса.
+
reagent-name-ambuzol-plus = амбузол плюс
reagent-desc-ambuzol-plus = Разработка будущего с использованием крови зараженного, прививает живых против инфекции.
+
reagent-name-pulped-banana-peel = толчёная банановая кожура
reagent-desc-pulped-banana-peel = Толченая банановая кожура обладает определенной эффективностью против кровотечений.
+
reagent-name-siderlac = сидерлак
reagent-desc-siderlac = Мощное противокоррозийное средство, получаемое из растений.
+
reagent-name-stellibinin = стеллибинин
reagent-desc-stellibinin = Антитоксин природного происхождения, обладающий особенной эффективностью против аматоксина.
+
reagent-name-synaptizine = синаптизин
reagent-desc-synaptizine = Токсичный препарат, сокращающий продолжительность оглушения и нокдауна вдвое.
+
reagent-name-tranexamic-acid = транексамовая кислота
reagent-desc-tranexamic-acid = Препарат, способствующий свертыванию крови, применяемый для остановки обильного кровотечения. При передозировке вызывает ещё более сильное кровотечение. Часто встречается в экстренных медипенах.
+
reagent-name-tricordrazine = трикордразин
reagent-desc-tricordrazine = Стимулятор широкого спектра действия, изначально созданный на основе кордразина. Лечит лёгкие повреждения всех основных типов, если пользователь не сильно ранен в целом. Лучше всего использовать в качестве добавки к другим лекарственным средствам.
+
reagent-name-lipozine = липозин
reagent-desc-lipozine = Химическое вещество, ускоряющее метаболизм, в результате чего пользователь быстрее испытывает чувство голода.
+
reagent-name-omnizine = омнизин
reagent-desc-omnizine = Смягчающая молочноватая жидкость с радужным оттенком. Известная теория заговора гласит, что его происхождение остается тайной, потому что раскрытие секрета его производства сделало бы большинство коммерческих фармацевтических препаратов ненужными.
+
reagent-name-ultravasculine = ультраваскулин
reagent-desc-ultravasculine = Сложный антитоксин, который быстро выводит токсины, вызывая при этом незначительное напряжение организма. Реагирует с гистамином, дублируя себя и одновременно вымывая его. Передозировка вызывает сильную боль.
+
reagent-name-oculine = окулин
reagent-desc-oculine = Простой солевой раствор, используемый для лечения повреждений глаз при приеме внутрь.
+
reagent-name-ethylredoxrazine = этилредоксразин
-reagent-desc-ethylredoxrazine = Нейтрализует действие алкоголя в кровеносной системе. Несмотря на то, что он часто нужен, заказывают его редко.
+reagent-desc-ethylredoxrazine = Нейтрализует действие алкоголя в кровеносной системе. Хорошее дополнение для лечения отравления к диловену. Несмотря на то, что он часто нужен, заказывают его редко.
+
reagent-name-cognizine = когнизин
reagent-desc-cognizine = Таинственное химическое вещество, способное сделать любое неразумное существо разумным.
+
reagent-name-ethyloxyephedrine = этилоксиэфедрин
reagent-desc-ethyloxyephedrine = Слегка нестабильный препарат, производное дезоксиэфедрина, применяемый в основном для профилактики нарколепсии.
+
reagent-name-diphenylmethylamine = дифенилметиламин
reagent-desc-diphenylmethylamine = Более стабильное лекарственное средство, чем этилоксиэфедрин. Полезен для поддержания бодрости.
+
reagent-name-sigynate = сигинат
reagent-desc-sigynate = Густой розовый сироп, полезный для нейтрализации кислот и смягчения повреждений, вызванных кислотами. Сладкий на вкус!
+
reagent-name-saline = физраствор
reagent-desc-saline = Смесь воды с солью. Обычно используется для лечения обезвоживания или низкого содержания жидкости в крови.
+
reagent-name-lacerinol = ласеринол
reagent-desc-lacerinol = Довольно нереактивный химикат, ускоряющий синтез коллагена до небывалых высот, исцеляя резанные раны.
+
reagent-name-puncturase = панктурас
reagent-desc-puncturase = Шипучий химикат, который помогает восстановить повреждения от уколов, оставляя после себя немного повреждений ткани.
+
reagent-name-bruizine = бруизин
reagent-desc-bruizine = Изначально было лекарством от кашля. Как оказалось, этот химикат эффективен в лечении синяков.
+
reagent-name-holywater = святая вода
-reagent-desc-holywater = Самые чистые воды прямиком из рук Бога, известные магическим исцелением ран.
\ No newline at end of file
+reagent-desc-holywater = Самые чистые воды прямиком из рук Бога, известные магическим исцелением ран.
+
+reagent-name-pyrazine = пиразин
+reagent-desc-pyrazine = Эффективно лечит ожоги из самых очагов пожаров. Вызывает сильное внутреннее кровотечение при передозе.
+
+reagent-name-insuzine = инсузин
+reagent-desc-insuzine = В скором темпе восстанавливает мёртвую ткань от электрических повреждений, слегка вас охлаждая. При передозе пациент может замёрзнуть насмерть.
+
+reagent-name-necrosol = некросол
+reagent-desc-necrosol = Некротическая субстанция, которая, похоже, может исцелять замороженные тела. В малых дозах может обрабатывать и омолаживать растения.
+
+reagent-name-aloxadone = алоксадон
+reagent-desc-aloxadone = Криогенный препарат. Используется для лечения ожогов третьей степени, регенерируя клетки ткани. Работает независимо от состояния пациента.
diff --git a/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl b/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl
index ed374dab91b..010ff71cdd2 100644
--- a/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl
@@ -1,24 +1,41 @@
reagent-name-desoxyephedrine = дезоксиэфедрин
reagent-desc-desoxyephedrine = Более эффективный Эфедрин, имеющий более выраженные побочные эффекты. Требует меньшей дозы для профилактики нарколепсии.
+
reagent-name-ephedrine = эфедрин
reagent-desc-ephedrine = Кофеиновый адреналиновый стимулятор, который делает вас быстрее и устойчивее на ногах. Также помогает противостоять нарколепсии в дозах выше 30, но ценой сильного нервного стресса.
+
reagent-name-stimulants = стимулятор
reagent-desc-stimulants = Химический коктейль, разработанный компанией Donk Co., который позволяет агентам быстрее оправляться от оглушения, быстрее передвигаться, и легко излечивает в критическом состоянии. Из-за комплексной природы этого вещества организму гораздо труднее вывести его из организма естественным путем.
+
reagent-name-experimental-stimulants = экспериментальный стимулятор
reagent-desc-experimental-stimulants = Опытная, усиленная версия стимулятора. Её использование даёт практически полную невосприимчивость к оглушающему оружию, ускоренную регенерацию ран, огромную скорость передвижения за счёт понижения выработки молочной кислоты и общее чувство эйфории. Среди побочных эффектов можно выделить низкую свёртываемость крови, тоннельное зрение, сильное скопление токсинов в кровеносной системе и быстрое отмирание печени. Беречь от животных.
+
reagent-name-thc = ТГК
reagent-desc-thc = Он же тетрагидроканнабинол. Основное психоактивное вещество в конопле.
+
reagent-name-thc-oil = масло ТГК
reagent-desc-thc-oil = Чистое масло ТГК, полученное из листьев конопли. Оно намного сильнее, чем в натуральной форме, и может использоваться для снятия хронической боли у пациентов.
+
+reagent-name-bananadine = бананадин
+reagent-desc-bananadine = Мягкий психоделический реагент, найденный в небольших следах кожурок банана.
+
reagent-name-nicotine = никотин
reagent-desc-nicotine = Опасен и вызывает сильное привыкание, но так утверждает пропаганда.
+
reagent-name-impedrezene = импедризин
reagent-desc-impedrezene = Наркотик, который лишает человека дееспособности, замедляя высшие функции клеток мозга.
+
reagent-name-space-drugs = космические наркотики
reagent-desc-space-drugs = Запрещенное вещество, вызывающее ряд таких эффектов, как потеря равновесия и нарушения зрения.
+
reagent-name-nocturine = ноктюрин
reagent-desc-nocturine = Высокоэффективное снотворное и гипнотическое средство, разработанное Синдикатом для тайных операций. Билет в один конец в хонкоград.
+
reagent-name-mute-toxin = токсин немоты
reagent-desc-mute-toxin = Густой препарат, воздействующий на голосовые связки и лишающий пользователя возможности говорить пока усваивается организмом.
+
reagent-name-norepinephric-acid = норэпинефриновая кислота
reagent-desc-norepinephric-acid = Мягкое химическое вещество, которое блокирует оптические рецепторы, делая употребившего слепым пока усваивается организмом.
+
+reagent-name-tear-gas = слезоточивый газ
+reagent-desc-tear-gas = Химикат, который вызывает сильное раздражение и плач, зачастую используется в борьбе с беспорядками.
diff --git a/Resources/Locale/ru-RU/reagents/meta/toxins.ftl b/Resources/Locale/ru-RU/reagents/meta/toxins.ftl
index 828c5c084b3..e5c61a1d593 100644
--- a/Resources/Locale/ru-RU/reagents/meta/toxins.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/toxins.ftl
@@ -1,46 +1,74 @@
reagent-name-toxin = токсин
reagent-desc-toxin = Как ни странно, токсичный химикат. Доступен в емагнутом химическом раздатчике.
+
reagent-name-carpotoxin = карпотоксин
reagent-desc-carpotoxin = Высокотоксичный химикат, содержащийся в космических карпах. Вызывает болезненное чувство жжения.
+
reagent-name-mold = плесень
reagent-desc-mold = Грибковое образование, часто встречающееся в темных, влажных местах или на просроченном хлебе. При попадании в организм вызывает заболевания.
+
reagent-name-polytrinic-acid = политриновая кислота
reagent-desc-polytrinic-acid = Чрезвычайно едкое химическое вещество. Сильно обжигает всех, кто вступит с ней в непосредственный контакт.
+
reagent-name-chloral-hydrate = хлоральгидрат
reagent-desc-chloral-hydrate = Успокаивающее и гипнотическое химическое вещество. Обычно используется для усыпления других людей, независимо от того, хотят они этого или нет.
+
reagent-name-ferrochromic-acid = феррохромовая кислота
reagent-desc-ferrochromic-acid = Слабый едкий раствор, не способный причинить серьёзный вред здоровью, только если не вдыхать его.
+
reagent-name-fluorosulfuric-acid = фторсерная кислота
reagent-desc-fluorosulfuric-acid = Очень едкое химическое вещество, способное оставить заметный след на коже.
+
reagent-name-sulfuric-acid = серная кислота
reagent-desc-sulfuric-acid = Едкий химикат. Держать подальше от лица.
+
reagent-name-unstable-mutagen = нестабильный мутаген
reagent-desc-unstable-mutagen = Вызывает мутации при введении в живых людей или растения. Высокие дозы могут быть смертельными, особенно для людей.
+
reagent-name-heartbreaker-toxin = токсин хартбрейкер
reagent-desc-heartbreaker-toxin = Галлюциногенное соединение, получаемое из токсина майндбрейкер. Блокирует нейронные сигналы в дыхательной системе, вызывая удушье.
+
reagent-name-lexorin = лексорин
reagent-desc-lexorin = Быстродействующее химическое вещество, используемое для быстрого удушения людей. Однако Дексалин, Дексалин плюс и Эпинефрин способны вывести его из организма.
+
reagent-name-mindbreaker-toxin = токсин майндбрейкер
reagent-desc-mindbreaker-toxin = Сильнодействующее галлюциногенное соединение, ранее известное как ЛСД.
+
reagent-name-histamine = гистамин
reagent-desc-histamine = Химическое вещество, образующееся в результате реакции аллергенов с антителами. Смертельно опасен в больших количествах.
+
reagent-name-theobromine = теобромин
reagent-desc-theobromine = Теобромин - это горький алкалоид, выделяемый из семян какао, который можно встретить в шоколаде и некоторых других продуктах. Не давать животным.
+
reagent-name-amatoxin = аматоксин
reagent-desc-amatoxin = Смертельно опасный токсин, содержащийся в некоторых грибах, прежде всего в мухоморах. Смертелен в малых дозах.
+
reagent-name-vent-crud = вентиляционная грязь
reagent-desc-vent-crud = Черное вещество, которое можно встретить в плохо обслуживаемых вентиляционных системах. Может вызывать вентиляционный кашель.
+
reagent-name-romerol = ромерол
reagent-desc-romerol = Потустороннее средство, способное оживить мертвецов. Если его не лечить, эффект будет необратимым и приведет к гибели станции. Обращайтесь с осторожностью.
+
reagent-name-uncooked-animal-proteins = непрожаренные животные протеины
reagent-desc-uncooked-animal-proteins = Крайне опасны для желудков более слабых форм жизни.
+
reagent-name-allicin = аллицин
reagent-desc-allicin = Сероорганическое соединение, содержащееся в растениях-аллиумах, таких, как чеснок, лук и других.
+
reagent-name-pax = пакс
reagent-desc-pax = Психиатрический препарат, который не позволяет употребившему причинять вред кому-либо напрямую.
+
reagent-name-honk = хонк
reagent-desc-honk = Токсин, содержащийся в бананиуме. Вызывает обильное хонканье и внутреннее кровотечение, также может вызвать мутацию употребившего.
+
reagent-name-lead = свинец
reagent-desc-lead = Медленно действующий, но невероятно смертоносный токсин, содержащийся в стали, хотя и в незначительных количествах. Не имеет вкуса.
+
reagent-name-bungotoxin = бунготоксин
reagent-desc-bungotoxin = Яд умеренно медленного действия, содержащийся в косточках плода бунго.
+
+reagent-name-vestine = вестин
+reagent-desc-vestine = Имеет побочную реакцию с дрожью всего тела. Сам по себе не имеет применений, однако используется в создании небольшого количества химикатов.
+
+reagent-name-tazinide = тазинид
+reagent-desc-tazinide = Опасная металлическая смесь, которая может помешать любому движению посредством электрического тока.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/backpack.ftl
index c9f46b12cb1..5814287b888 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/backpack.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/backpack.ftl
@@ -4,5 +4,7 @@ ent-ADTClothingBackpackERTSecurityFilledL = { ent-ClothingBackpackERTSecurity }
.desc = { ent-ClothingBackpackERTSecurity.desc }
ent-ADTClothingBackpackERTLeaderFilledL = { ent-ClothingBackpackERTLeader }
.desc = { ent-ClothingBackpackERTLeader.desc }
-ent-ADTClothingBackpackParamedicalMedicalFilled = { ent-ClothingBackpackMedical }
- .desc = { ent-ClothingBackpackMedical.desc }
+ent-ADTClothingBackpackParamedicalMedicalFilled = { ent-ADTClothingBackpackParamedic }
+ .desc = { ent-ADTClothingBackpackParamedic.desc }
+ent-ADTClothingBackpackPathologistFilled = { ent-ADTClothingBackpackPathologist }
+ .desc = { ent-ADTClothingBackpackPathologist.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/duffelbag.ftl
index 5e5ec3c22e8..699d761d87a 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/duffelbag.ftl
@@ -1,4 +1,6 @@
-ent-ADTClothingBackpackDuffelParamedicalFilled = { ent-ClothingBackpackDuffelMedical }
- .desc = { ent-ClothingBackpackDuffelMedical.desc }
+ent-ADTClothingBackpackDuffelParamedicalFilled = { ent-ADTClothingBackpackDuffelParamedic }
+ .desc = { ent-ADTClothingBackpackDuffelParamedic.desc }
ent-ADTClothingBackpackDuffelSyndicateFilledAKMS = набор АКМС
.desc = Музейный раритет - автомат пятивековой давности и четыре магазина к нему
+ent-ADTClothingBackpackDuffelPathologistFilled = { ent-ADTClothingBackpackDuffelPathologist }
+ .desc = { ent-ADTClothingBackpackDuffelPathologist.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/satchel.ftl
index 8d4a955ff24..3448ae477a2 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/satchel.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startergear/satchel.ftl
@@ -1,2 +1,4 @@
-ent-ADTClothingBackpackSatchelParamedicalFilled = { ent-ClothingBackpackSatchelMedical }
- .desc = { ent-ClothingBackpackSatchelMedical.desc }
+ent-ADTClothingBackpackSatchelParamedicalFilled = { ent-ADTClothingSatchelParamedic }
+ .desc = { ent-ADTClothingSatchelParamedic.desc }
+ent-ADTClothingBackpackSatchelPathologistFilled = { ent-ADTClothingBackpackSatchelPathologist }
+ .desc = { ent-ADTClothingBackpackSatchelPathologist.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl
index d9e19dccc90..eec5ad83c3b 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl
@@ -15,7 +15,7 @@ ent-ClothingHeadHatBeretHoS = берет главы службы безопас
ent-ClothingHeadHatBeretWarden = берет смотрителя
.desc = Фирменный голубой берет с эмблемой смотрителя. Для офицеров, которые предпочитают стиль безопасности.
ent-ClothingHeadHatBeretBrigmedic = берет медика
- .desc = Белый берет, похож на кремовый пирог на голове.
+ .desc = Белый берет для стильных врачей.
ent-ClothingHeadHatBeretMerc = берет наёмника
.desc = Оливковый берет, на значке изображен шакал на скале.
ent-ClothingHeadHatBowlerHat = шляпа котелок
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl
index 4dec2b75276..5e365e96adc 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl
@@ -108,3 +108,6 @@ ent-SeniorOfficerPDA = КПК офицера-инструктора
ent-ADTInvestigatorPDA = КПК следователя СБ
.desc = Пахнет как чернила и дело, закрытое предварительно из-за смерти подозреваемого от несчастного случая на рабочем месте.
+
+ent-ADTPathologistPDA = КПК патологоанатома
+ .desc = От него веет прохладой.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
index 95d0f440dd6..f47cc60ece7 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
@@ -111,3 +111,6 @@ ent-SeniorOfficerIDCard = ID карта офицера-инструктора
ent-ADTInvestigatorIDCard = ID карта следователя СБ
.desc = { ent-IDCardStandard.desc }
+
+ent-ADTPathologistIDCard = ID карта патологоанатома
+ .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml
new file mode 100644
index 00000000000..a0ebfe782a7
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml
@@ -0,0 +1,40 @@
+#medicine
+- type: cargoProduct
+ id: ADTCratePatchPack
+ icon:
+ sprite: ADT/Objects/Specific/Medical/patch.rsi
+ state: patchpack
+ product: ADTCratePatchPackFilled
+ cost: 1600
+ category: Medical
+ group: market
+
+#service
+- type: cargoProduct
+ id: ADTCrateVendingMachineRestockPill
+ icon:
+ sprite: ADT/Objects/Specific/Service/vending_machine_restock.rsi
+ state: base
+ product: ADTCrateVendingMachineRestockPillFilled
+ cost: 1200
+ category: Medical
+ group: market
+
+#crates
+- type: entity
+ id: ADTCrateVendingMachineRestockPillFilled
+ name: Pill-O-Mat restock crate
+ parent: CrateMedical
+ components:
+ - type: StorageFill
+ contents:
+ - id: ADTVendingMachineRestockPill
+
+- type: entity
+ id: ADTCratePatchPackFilled
+ parent: CrateMedical
+ components:
+ - type: StorageFill
+ contents:
+ - id: ADTPatchPackFilled
+ amount: 4
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 97e3cfbe87f..713e73fabf1 100644
--- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -45,7 +45,7 @@
- type: entity
noSpawn: true
- parent: ClothingBackpackMedical
+ parent: ADTClothingBackpackParamedic
id: ADTClothingBackpackParamedicalMedicalFilled
components:
- type: StorageFill
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 120d4f242e4..a8f0042b26a 100644
--- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -1,6 +1,6 @@
- type: entity
noSpawn: true
- parent: ClothingBackpackDuffelMedical
+ parent: ADTClothingBackpackDuffelParamedic
id: ADTClothingBackpackDuffelParamedicalFilled
components:
- type: StorageFill
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index aca3a63b4be..13055c62a5e 100644
--- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -1,6 +1,6 @@
- type: entity
noSpawn: true
- parent: ClothingBackpackSatchelMedical
+ parent: ADTClothingSatchelParamedic
id: ADTClothingBackpackSatchelParamedicalFilled
components:
- type: StorageFill
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml
new file mode 100644
index 00000000000..b34f4921068
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml
@@ -0,0 +1,15 @@
+- type: entity
+ id: ADTClothingBeltMedicalBagFilled
+ parent: ADTClothingBeltMedicalBag
+ suffix: Filled
+ components:
+ - type: StorageFill
+ contents:
+ - id: Brutepack
+ amount: 2
+ - id: Ointment
+ amount: 1
+ - id: Bloodpack
+ amount: 1
+ - id: Gauze
+ - id: EmergencyMedipen
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/pyotr_briefcase.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml
similarity index 66%
rename from Resources/Prototypes/ADT/Catalog/Fills/Items/pyotr_briefcase.yml
rename to Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml
index d6f3be5c1d7..306c474555e 100644
--- a/Resources/Prototypes/ADT/Catalog/Fills/Items/pyotr_briefcase.yml
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml
@@ -16,6 +16,20 @@
- id: ADTClothingOuterCoatPyotrCoat
- id: ADTClothingUniformPyotrOfficialSuit
+- type: entity
+ id: ADTBriefcaseBrownHikingCmo
+ name: Chief medical officer's hiking briefcase
+ parent: BriefcaseBrown
+ suffix: Filled
+ components:
+ - type: StorageFill
+ contents:
+ - id: ADTClothingOuterCoatHikeLabcoatCmo
+ - id: ADTClothingUniformHikeJumpskirtCmo
+ - id: ADTClothingUniformHikeformCmo
+ - id: ADTClothingHighboots
+
+
- type: entity
id: ADTBriefcaseCentcomm
name: Centcomm briefcase
@@ -33,3 +47,4 @@
Blunt: 12
soundHit:
path: "/Audio/Weapons/smash.ogg"
+#у меня почему-то не хочет добавляться чемодан ЦК.
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml
new file mode 100644
index 00000000000..9471225efc0
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml
@@ -0,0 +1,19 @@
+ - type: entity
+ id: ADTClosetL3PathologistFilled
+ suffix: Filled, Pathologist
+ parent: ADTClosetL3Pathologist
+ components:
+ - type: StorageFill
+ contents:
+ - id: ADTClothingOuterBioPathologist
+ - id: ADTClothingHeadHatHoodBioPathologist
+
+ - type: entity
+ id: ADTClosetL3ParamedicFilled
+ suffix: Filled, Paramedic
+ parent: ADTClosetL3Paramedic
+ components:
+ - type: StorageFill
+ contents:
+ - id: ADTClothingOuterBioParamedic
+ - id: ADTClothingHeadHatHoodBioParamedic
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/medical.yml
new file mode 100644
index 00000000000..f57c3d82689
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/medical.yml
@@ -0,0 +1,22 @@
+- type: entity
+ id: ADTLockerPathologistFilled
+ name: pathologist's locker
+ description: All the needed for work on dead ones.
+ suffix: Filled
+ parent: LockerMedicine
+ components:
+ - type: StorageFill
+ contents:
+ - id: Brutepack
+ amount: 2
+ - id: Ointment
+ amount: 2
+ - id: ADTAntibioticOintment
+ amount: 2
+ - id: ADTFootTagBox
+ - id: ADTSmallSyringeBox
+ - id: BoxBodyBag
+ - id: BoxSyringe
+ - id: BoxFolderGreen
+ - id: ADTObjectsSpecificFormalinChemistryBottle
+ - id: ADTReagentAnalyzer
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml
new file mode 100644
index 00000000000..8bc74a39f83
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml
@@ -0,0 +1,5 @@
+- type: advertisementsPack
+ id: PatholodrobeAds
+ advertisements:
+ - advertisement-patholog-1
+ - advertisement-patholog-2
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml
new file mode 100644
index 00000000000..c67cdffb08c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml
@@ -0,0 +1,7 @@
+- type: advertisementsPack
+ id: PillAds
+ advertisements:
+ - advertisement-pill-1
+ - advertisement-pill-2
+ - advertisement-pill-3
+ - advertisement-pill-4
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/paradrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/paradrobe.yml
new file mode 100644
index 00000000000..f43af7c9ff7
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/paradrobe.yml
@@ -0,0 +1,15 @@
+- type: vendingMachineInventory
+ id: ParadrobeInventory
+ startingInventory:
+ ADTClothingBackpackParamedic: 2
+ ADTClothingBackpackDuffelParamedic: 2
+ ADTClothingSatchelParamedic: 2
+ ClothingUniformJumpsuitParamedic: 2
+ ClothingUniformJumpskirtParamedic: 2
+ ClothingShoesColorWhite: 2
+ ClothingOuterWinterPara: 2
+ ClothingOuterCoatParamedicWB: 2
+ ADTClothingOuterCoatLabParamedic: 2
+ ClothingHeadHatParamedicsoft: 2
+ ADTClothingHeadHatsParamedicBeret: 2
+ ADTClothingHeadsetParamedic: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml
new file mode 100644
index 00000000000..d702327837f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml
@@ -0,0 +1,15 @@
+- type: vendingMachineInventory
+ id: PatholodrobeInventory
+ startingInventory:
+ ADTClothingUniformPathologistSuit: 2
+ ADTClothingUniformPathologistSkirt: 2
+ ADTClothingUniformPathologistSuitAlt: 2
+ ADTClothingUniformPathologistSkirtAlt: 2
+ ADTClothingOuterApronPathologist: 2
+ ADTClothingOuterCoatLabPathologist: 2
+ ClothingShoesColorWhite: 2
+ ADTClothingBackpackPathologist: 2
+ ADTClothingBackpackDuffelPathologist: 2
+ ADTClothingBackpackSatchelPathologist: 2
+ ClothingHandsGlovesLatex: 2
+ ClothingMaskSterile: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/pill.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/pill.yml
new file mode 100644
index 00000000000..945cf19aa29
--- /dev/null
+++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/pill.yml
@@ -0,0 +1,18 @@
+- type: vendingMachineInventory
+ id: PillInventory
+ startingInventory:
+ ADTMSodiumizolePack: 5
+ ADTMNitrofurfollPack: 5
+ ADTMPeroHydrogenBottle: 5
+ ADTMAnelgesinPack: 5
+ ADTMMinoxidePack: 5
+ ADTMNikematideBottle: 5
+ ADTMDiethamilatePack: 5
+ ADTMAgolatineCanister: 5
+ ADTMHaloperidolPack: 5
+ ADTMVitaminCanister: 5
+ ADTMCharcoalPack: 5
+ ADTMEthylredoxrazinePack: 5
+ emaggedInventory:
+ ADTMMorphineBottle: 5
+ ADTMOpiumBottle: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/uplink.yml b/Resources/Prototypes/ADT/Catalog/uplink.yml
index 8ab6fa337f8..f8362bcadb6 100644
--- a/Resources/Prototypes/ADT/Catalog/uplink.yml
+++ b/Resources/Prototypes/ADT/Catalog/uplink.yml
@@ -325,10 +325,10 @@
- Bartender
- type: listing
- id: ADTuplinkADTFakeDefibrillator
+ id: ADTHighVoltageDefibrillatorFake
name: uplink-fake-defib-name
description: uplink-fake-defib-desc
- productEntity: ADTFakeDefibrillator
+ productEntity: ADTHighVoltageDefibrillatorFake
cost:
Telecrystal: 10
categories:
diff --git a/Resources/Prototypes/ADT/Demon/Body/Organs/demon.yml b/Resources/Prototypes/ADT/Demon/Body/Organs/demon.yml
index 6f3d958becd..1d21ba17654 100644
--- a/Resources/Prototypes/ADT/Demon/Body/Organs/demon.yml
+++ b/Resources/Prototypes/ADT/Demon/Body/Organs/demon.yml
@@ -5,3 +5,15 @@
components:
- type: Stomach
maxVol: 50
+
+- type: entity
+ id: OrganDemonHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Demon ]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Demon/Body/Prototypes/demon.yml b/Resources/Prototypes/ADT/Demon/Body/Prototypes/demon.yml
index dace2aa667c..ab2d8e2bdb1 100644
--- a/Resources/Prototypes/ADT/Demon/Body/Prototypes/demon.yml
+++ b/Resources/Prototypes/ADT/Demon/Body/Prototypes/demon.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoDemon
organs:
- heart: OrganAnimalHeart
+ heart: OrganDemonHeart
lungs: OrganHumanLungs
stomach: OrganDemonStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/ADT/Drask/Body/Organs/Drask.yml b/Resources/Prototypes/ADT/Drask/Body/Organs/Drask.yml
index 0347ee5d370..53a6c3b0966 100644
--- a/Resources/Prototypes/ADT/Drask/Body/Organs/Drask.yml
+++ b/Resources/Prototypes/ADT/Drask/Body/Organs/Drask.yml
@@ -24,7 +24,7 @@
removeEmpty: true
solutionOnBody: false
solution: "Lung"
- metabolizerTypes: [ Human ]
+ metabolizerTypes: [ Drask ]
groups:
- id: Gas
rateModifier: 100.0
@@ -55,7 +55,7 @@
state: heart_on
- type: Metabolizer
maxReagents: 2
- metabolizerTypes: [Human]
+ metabolizerTypes: [ Drask ]
groups:
- id: Medicine
- id: Poison
@@ -83,7 +83,7 @@
- type: Stomach
- type: Metabolizer
maxReagents: 3
- metabolizerTypes: [Human]
+ metabolizerTypes: [ Drask ]
groups:
- id: Food
- id: Drink
@@ -99,5 +99,5 @@
state: kidneys
- type: Metabolizer
maxReagents: 5
- metabolizerTypes: [Human]
+ metabolizerTypes: [ Drask ]
removeEmpty: true
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml
index 8c9451166eb..2de22fcb96e 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml
@@ -166,6 +166,79 @@
- id: ADTRubberStampinvestigator
- id: SpaceCash500
+# Приколы Патологоанатома
+- type: entity
+ parent: ClothingBackpackMedical
+ id: ADTClothingBackpackPathologist
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Back/pathologist_backpack.rsi
+
+- type: entity
+ parent: ClothingBackpackSatchelMedical
+ id: ADTClothingBackpackSatchelPathologist
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Back/pathologist_satchel.rsi
+
+- type: entity
+ parent: ClothingBackpackDuffelMedical
+ id: ADTClothingBackpackDuffelPathologist
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Back/pathologist_duffel.rsi
+
+- type: entity
+ noSpawn: true
+ parent: ADTClothingBackpackPathologist
+ id: ADTClothingBackpackPathologistFilled
+ components:
+ - type: StorageFill
+ contents:
+ - id: BoxSurvivalMedical
+ - id: BodyBag_Folded
+ - id: ADTFootTag
+
+- type: entity
+ noSpawn: true
+ parent: ADTClothingBackpackSatchelPathologist
+ id: ADTClothingBackpackSatchelPathologistFilled
+ components:
+ - type: StorageFill
+ contents:
+ - id: BoxSurvivalMedical
+ - id: BodyBag_Folded
+ - id: ADTFootTag
+
+- type: entity
+ noSpawn: true
+ parent: ADTClothingBackpackDuffelPathologist
+ id: ADTClothingBackpackDuffelPathologistFilled
+ components:
+ - type: StorageFill
+ contents:
+ - id: BoxSurvivalMedical
+ - id: BodyBag_Folded
+ - id: ADTFootTag
+
+# медицинские штучки-брючки
+- type: entity
+ parent: ClothingBackpack
+ id: ADTClothingBackpackMedical
+ name: medical backpack
+ description: Backpack to store some medical equipment.
+ components:
+ - type: Sprite
+ sprite: Clothing/Back/Backpacks/genetics.rsi
+
+- type: entity
+ parent: ClothingBackpack
+ id: ADTClothingBackpackParamedic
+ name: paramedical backpack
+ description: Backpack to store some paramedical equipment.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Back/paramedic_backpack.rsi
#дамские сумочки
- type: entity
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/Duffel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml
similarity index 61%
rename from Resources/Prototypes/ADT/Entities/Clothing/Back/Duffel.yml
rename to Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml
index b3ce59f0698..3daa9cd834e 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Back/Duffel.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml
@@ -33,4 +33,25 @@
- id: ForensicScanner
- id: ADTSpaceLaw
- id: Flash
+
+#медики
+- type: entity
+ parent: ClothingBackpackDuffel
+ id: ADTClothingBackpackDuffelMedical
+ name: medical duffel bag
+ description: A large duffel bag to hold medical equipment
+ components:
+ - type: Sprite
+ sprite: Clothing/Back/Duffels/genetics.rsi
+
+- type: entity
+ parent: ClothingBackpackDuffel
+ id: ADTClothingBackpackDuffelParamedic
+ name: parsmedical duffel bag
+ description: A large duffel bag to hold paramedical equipment
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Back/paramedic_duffel.rsi
+ - type: StorageFill
+ contents:
- id: SpaceCash500
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml
index fd279ab005a..2ded72975c3 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml
@@ -22,3 +22,21 @@
- id: Wirecutter
- id: Welder
- id: Multitool
+
+- type: entity
+ parent: ClothingBackpack
+ id: ADTClothingBackpackSatchelMedical
+ name: medical satchel
+ description: A satchel to hold medical equipment
+ components:
+ - type: Sprite
+ sprite: Clothing/Back/Satchels/genetics.rsi
+
+- type: entity
+ parent: ClothingBackpack
+ id: ADTClothingSatchelParamedic
+ name: paramedical satchel
+ description: A satchel to store some paramedical equipment.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Back/paramedic_satchel.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml
index 65b5f25afec..5dbe2c081b7 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml
@@ -182,6 +182,36 @@
- id: WeaponPistolMk58Nonlethal
- id: MagazinePistol
+- type: entity
+ parent: ClothingBeltStorageBase
+ id: ADTClothingBeltMedicalBag
+ name: medical bag
+ description: Small but capacious bag to hold various medical equipment. It even has some place for a tablet for paper!
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Belt/medical_bag.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Belt/medical_bag.rsi
+ - type: Storage
+ whitelist:
+ tags:
+ - Wrench
+ - Bottle
+ - Spray
+ - Brutepack
+ - Bloodpack
+ - Gauze
+ - Ointment
+ - CigPack
+ - PillCanister
+ - Radio
+ - DiscreteHealthAnalyzer
+ - Folder
+ components:
+ - Hypospray
+ - Injector
+ - Pill
+ - type: Appearance
#РПС Киллы
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml
new file mode 100644
index 00000000000..d32730d7403
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml
@@ -0,0 +1,10 @@
+- type: entity
+ parent: ClothingHeadsetMedical
+ id: ADTClothingHeadsetParamedic
+ name: paramedic's headset
+ description: A headset for the paramedic.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Ears/Headsets/headset_paramedic.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Ears/Headsets/headset_paramedic.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml
index 58e92c19fdf..2bc7cf8d910 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml
@@ -340,6 +340,9 @@
sprite: ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
- type: entity
parent: ClothingHeadBase
@@ -351,6 +354,9 @@
sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
- type: entity
parent: ClothingHeadBase
@@ -362,6 +368,9 @@
sprite: ADT/Clothing/Head/Hats/beret_SOO.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_SOO.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
- type: entity
parent: ClothingHeadBase
@@ -373,6 +382,9 @@
sprite: ADT/Clothing/Head/Hats/beret_cargo.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_cargo.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
- type: entity
parent: ClothingHeadBase
@@ -384,6 +396,9 @@
sprite: ADT/Clothing/Head/Hats/beret_CE.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_CE.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
- type: entity
parent: ClothingHeadBase
@@ -395,6 +410,9 @@
sprite: ADT/Clothing/Head/Hats/beret_CentCom.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_CentCom.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
- type: entity
parent: ClothingHeadBase
@@ -592,3 +610,54 @@
- type: Tag
tags:
- WhitelistChameleon
+
+# medical update
+- type: entity
+ parent: ClothingHeadBase
+ id: ADTClothingHeadHatsMedicalBeret
+ name: medical beret
+ description: A white beret with carefully sewn cross. Smells like familliar ethanol.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Head/Hats/medical_beret.rsi #спрайты от prazat911
+ - type: Clothing
+ sprite: ADT/Clothing/Head/Hats/medical_beret.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ADTClothingHeadHatsParamedicBeret
+ name: paramedic's beret
+ description: A blue beret of a constantly busy job.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Head/Hats/beret_paramedic.rsi #спрайты от prazat911
+ - type: Clothing
+ sprite: ADT/Clothing/Head/Hats/beret_paramedic.rsi
+ - type: Tag
+ tags:
+ - HamsterWearable
+
+#Шлемы для биокостюмов.
+- type: entity
+ parent: ClothingHeadHatHoodBioGeneral
+ id: ADTClothingHeadHatHoodBioPathologist
+ name: bio hood
+ suffix: pathologist
+ description: An hood for pathologists that protects the head and face from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Head/Hats/hood_pathologist.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Head/Hats/hood_pathologist.rsi
+
+- type: entity
+ parent: ClothingHeadHatHoodBioGeneral
+ id: ADTClothingHeadHatHoodBioParamedic
+ name: bio hood
+ suffix: paramedic
+ description: An hood for paramedics that protects the head and face from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Head/Hats/hood_paramedic.rsi #спрайты от prazat911
+ - type: Clothing
+ sprite: ADT/Clothing/Head/Hats/hood_paramedic.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml
new file mode 100644
index 00000000000..5d838224de6
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml
@@ -0,0 +1,21 @@
+- type: entity
+ parent: ClothingOuterStorageBase
+ id: ADTClothingOuterApronBar
+ name: bartender apron
+ description: An apron-jacket used by a bartender.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi
+
+- type: entity
+ parent: ClothingOuterStorageBase
+ id: ADTClothingOuterApronPathologist
+ name: pathologist's apron
+ description: An apron used by pathologists.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barapron.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barapron.yml
deleted file mode 100644
index 355fa39414b..00000000000
--- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barapron.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
- parent: ClothingOuterStorageBase
- id: ADTClothingOuterApronBar
- name: bartender apron
- description: An apron-jacket used by a bartender.
- components:
- - type: Sprite
- sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi
- - type: Clothing
- sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml
new file mode 100644
index 00000000000..ef865742bcd
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml
@@ -0,0 +1,21 @@
+- type: entity
+ parent: ClothingOuterBioGeneral
+ id: ADTClothingOuterBioPathologist
+ name: pathologist's bio suit
+ description: A suit that protects against biological contamination while working with dead bodies.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi
+
+- type: entity
+ parent: ClothingOuterBioGeneral
+ id: ADTClothingOuterBioParamedic
+ name: paramedic's bio suit
+ description: A suit for paramedics that protects against biological contamination.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoat_sec.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoat_sec.yml
deleted file mode 100644
index 35d3c39dfc1..00000000000
--- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoat_sec.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
- parent: ClothingOuterStorageBase
- id: ADTClothingOuterCoatLabSec
- name: lab coat (sec)
- description: A suit that protects against minor chemical spills. Has an red stripe on the shoulder.
- components:
- - type: Sprite
- sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi
- - type: Clothing
- sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml
new file mode 100644
index 00000000000..8c4758f43ee
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml
@@ -0,0 +1,44 @@
+- type: entity
+ parent: ClothingOuterStorageBase
+ id: ADTClothingOuterCoatLabSec
+ name: lab coat (sec)
+ description: A suit that protects against minor chemical spills. Has an red stripe on the shoulder.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi
+
+- type: entity
+ parent: ClothingOuterCoatLab
+ id: ADTClothingOuterCoatLabParamedic
+ name: paramedic's lab coat
+ description: A suit that protects against minor chemical spills.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi
+
+- type: entity
+ parent: ClothingOuterCoatLab
+ id: ADTClothingOuterCoatHikeLabcoatCmo
+ name: chief medical officer's hiking lab coat
+ description: Partially open labcoat. Does not hinder movement.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi
+
+- type: entity
+ parent: ClothingOuterCoatLab
+ id: ADTClothingOuterCoatLabPathologist
+ name: pathologist's lab coat
+ description: A suit that protects against minor chemical spills. But still a bit too white for blood stains.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi
+
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
index 9a57f26463e..20970973e91 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
@@ -434,3 +434,15 @@
containers:
item:
- ADTUSSPCombatKnifeBarzai
+
+#Med
+- type: entity
+ parent: ClothingShoesBaseButcherable
+ id: ADTClothingHighboots
+ name: Highboots
+ description: a pair of highboot to walk on blood puddles
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Shoes/Boots/highboots.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Shoes/Boots/highboots.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml
index b560ad6cebc..33adef64516 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml
@@ -344,6 +344,7 @@
sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlgreen.rsi #спрайты от SHIONE
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlgreen.rsi #спрайты от SHIONE
+
#костюмы от Празата
- type: entity
@@ -735,3 +736,37 @@
sprite: ADT/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi #Спрайты от prazat911
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi
+
+#Medical
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ADTClothingUniformHikeJumpskirtCmo
+ name: chief medical officer's hiking jumpskirt
+ description: Shirt and baggy skirt. Perfect for working in and out of medical departament.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ADTClothingUniformPathologistSkirt
+ name: pathologist jumpskirt
+ description: A lightweight jumpskirt for a morgue worker
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ADTClothingUniformPathologistSkirtAlt
+ name: pathologist jumpskirt
+ description: A lightweight jumpskirt for a morgue worker. A darker version.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
index 94c0f790591..e9119197cfd 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
@@ -1241,3 +1241,37 @@
sprite: ADT/Clothing/Uniforms/Jumpsuit/vishivalovo_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/vishivalovo_suit.rsi
+
+#Medical
+- type: entity
+ parent: ClothingUniformBase
+ id: ADTClothingUniformHikeformCmo
+ name: chief medical officer's hiking uniform
+ description: Shirt and baggy pants. Perfect for working in and out of medical departament.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ADTClothingUniformPathologistSuit
+ name: pathologist jumpsuit
+ description: A lightweight jumpsuit for a morgue worker
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ADTClothingUniformPathologistSuitAlt
+ name: pathologist jumpsuit
+ description: A lightweight jumpsuit for a morgue worker. A darker version.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi
+ - type: Clothing
+ sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
index 8698f5f771b..c67b1340287 100644
--- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
+++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
@@ -130,4 +130,16 @@
- sprite: Mobs/Silicon/chassis.rsi
state: miner
- sprite: Mobs/Silicon/chassis.rsi
- state: miner_e
\ No newline at end of file
+ state: miner_e
+
+- type: entity
+ id: SpawnPointADTPathologist
+ parent: ADTSpawnPointJobBase
+ name: pathologist
+ components:
+ - type: SpawnPoint
+ job_id: ADTPathologist
+ - type: Sprite
+ layers:
+ - state: green
+ - state: pathologist
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml
new file mode 100644
index 00000000000..d4cbaeebc44
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml
@@ -0,0 +1,29 @@
+- type: entity
+ name: Papaver somniferum
+ parent: FoodProduceBase
+ id: ADTFoodPapaverSomniferum
+ description: A flower which extracts used in making medicine. And narcotics.
+ components:
+ - type: FlavorProfile
+ flavors:
+ - Bitter
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ maxVol: 16
+ reagents:
+ - ReagentId: Nutriment
+ Quantity: 2
+ - ReagentId: Toxin
+ Quantity: 4
+ - ReagentId: ADTMOpium
+ Quantity: 10
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi
+ - type: Produce
+ seedId: ADTPapaverSomniferum
+ - type: Extractable
+ grindableSolutionName: food
+ - type: Tag
+ tags:
+ - Flower
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/medical_books.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/medical_books.yml
new file mode 100644
index 00000000000..30b1c02ffd1
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/medical_books.yml
@@ -0,0 +1,19 @@
+- type: entity
+ id: ADTBookNewChemicals
+ parent: BaseItem
+ name: magazine about new medication
+ description: A magazine, which consists information about chemicals.
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Misc/chem_book.rsi
+ layers:
+ - state: icon
+ - type: Tag
+ tags:
+ - Book
+ - type: Item
+ size: Small
+ - type: GuideHelp
+ openOnActivation: true
+ guides:
+ - ADTChemicals
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml
index 0d2d2b2e71a..97ca416e11d 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml
@@ -7,3 +7,13 @@
seedId: adt_pumpkin
- type: Sprite
sprite: ADT/Objects/Specific/Hydroponics/pumpkin.rsi
+
+- type: entity
+ parent: SeedBase
+ name: packet of papaver somniferum seeds
+ id: ADTPapaverSomniferumSeeds
+ components:
+ - type: Seed
+ seedId: ADTPapaverSomniferum
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/ADTchemistrybottles.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/ADTchemistrybottles.yml
similarity index 84%
rename from Resources/Prototypes/ADT/Entities/Objects/Specific/ADTchemistrybottles.yml
rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/ADTchemistrybottles.yml
index 65880e90761..a5a9e560759 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/ADTchemistrybottles.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/ADTchemistrybottles.yml
@@ -93,3 +93,20 @@
- type: Tag
tags:
- Bottle
+
+- type: entity
+ id: ADTObjectsSpecificFormalinChemistryBottle
+ name: Formalin bottle
+ parent: BaseChemistryEmptyBottle
+ description: A basis of pathologist's work.
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ drink:
+ maxVol: 15
+ reagents:
+ - ReagentId: ADTMFormalin
+ Quantity: 15
+ - type: Tag
+ tags:
+ - Bottle
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry.yml
new file mode 100644
index 00000000000..4fba7f8463c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry.yml
@@ -0,0 +1,662 @@
+# баночка
+- type: entity
+ name: pill canister
+ id: ADTPillCanister
+ parent: PillCanister
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/pills.rsi
+ state: pill-canister
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/pills.rsi
+
+- type: entity
+ name: vitamin canister
+ id: ADTMVitaminCanister
+ parent: ADTPillCanister
+ description: Contains healthy vitamins for you.
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/pills.rsi
+ state: vitamin-canister
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/pills.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMVitaminPill
+ amount: 10
+ - type: GuideHelp
+ guides:
+ - Medical Doctor
+
+- type: entity
+ name: agolatine canister
+ id: ADTMAgolatineCanister
+ parent: ADTPillCanister
+ description: Contains (almost) healthy antidepressants for you.
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/pills.rsi
+ state: agolatine-canister
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/pills.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMAgolatinePill
+ amount: 10
+ - type: GuideHelp
+ guides:
+ - Medical Doctor
+
+# бутылочка (не разбивающаяся)
+- type: entity
+ name: bottle
+ parent: BaseItem
+ id: BaseChemistryEmptyPlasticBottle
+ abstract: true
+ description: A small plastic bottle.
+ components:
+ - type: Tag
+ tags:
+ - Bottle
+ - Trash
+ - type: PhysicalComposition
+ materialComposition:
+ Plastic: 25
+ - type: SpaceGarbage
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/plastic-bottle.rsi
+ layers:
+ - state: icon
+ map: [ "enum.SolutionContainerLayers.Base" ]
+ - state: fill1
+ map: [ "enum.SolutionContainerLayers.Fill" ]
+ visible: false
+ - state: icon-front
+ map: [ "enum.SolutionContainerLayers.Overlay" ]
+ - type: Appearance
+ - type: SolutionContainerVisuals
+ maxFillLevels: 7
+ fillBaseName: fill
+ - type: Drink
+ - type: SolutionContainerManager
+ solutions:
+ drink:
+ maxVol: 30
+ canMix: true
+ - type: RefillableSolution
+ solution: drink
+ - type: DrainableSolution
+ solution: drink
+ - type: ExaminableSolution
+ solution: drink
+ - type: DrawableSolution
+ solution: drink
+ - type: SolutionTransfer
+ maxTransferAmount: 30
+ canChangeTransferAmount: true
+ - type: UserInterface
+ interfaces:
+ - key: enum.TransferAmountUiKey.Key
+ type: TransferAmountBoundUserInterface
+ - type: Item
+ size: Small
+ sprite: ADT/Objects/Specific/Medical/plastic-bottle.rsi
+ - type: Spillable
+ solution: drink
+ - type: MeleeWeapon
+ soundNoDamage:
+ path: "/Audio/Effects/Fluids/splat.ogg"
+ damage:
+ types:
+ Blunt: 0
+ - type: Openable
+ sound:
+ path: /Audio/Items/pop.ogg
+ - type: StaticPrice
+ price: 0
+ - type: GuideHelp
+ guides:
+ - Medical Doctor
+
+- type: entity
+ id: ADTPlasticBottle
+ name: plastic bottle
+ parent: BaseChemistryEmptyPlasticBottle
+
+- type: entity
+ id: ADTMMorphineBottle
+ name: morphine bottle
+ parent: BaseChemistryEmptyBottle
+ description: A small bottle with morphine.
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ drink:
+ reagents:
+ - ReagentId: ADTMMorphine
+ Quantity: 30
+
+- type: entity
+ id: ADTMOpiumBottle
+ name: opium bottle
+ parent: BaseChemistryEmptyBottle
+ description: A small bottle with opium.
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ drink:
+ reagents:
+ - ReagentId: ADTMOpium
+ Quantity: 30
+
+- type: entity
+ id: ADTMPeroHydrogenBottle
+ name: perohydrogen bottle
+ parent: BaseChemistryEmptyPlasticBottle
+ description: A small plastic bottle. The letters on the label so small that they form a funny face.
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/plastic-bottle.rsi
+ layers:
+ - state: icon
+ map: [ "enum.SolutionContainerLayers.Base" ]
+ - state: fill1
+ map: [ "enum.SolutionContainerLayers.Fill" ]
+ visible: false
+ - state: icon-front-perohydrogen
+ map: [ "enum.SolutionContainerLayers.Overlay" ]
+ - type: SolutionContainerManager
+ solutions:
+ drink:
+ reagents:
+ - ReagentId: ADTMPeroHydrogen
+ Quantity: 30
+
+- type: entity
+ id: ADTMNikematideBottle
+ name: nikematide bottle
+ description: A small plastic bottle. The letters on the label so small that they form a funny face.
+ parent: BaseChemistryEmptyPlasticBottle
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/plastic-bottle.rsi
+ layers:
+ - state: icon
+ map: [ "enum.SolutionContainerLayers.Base" ]
+ - state: fill1
+ map: [ "enum.SolutionContainerLayers.Fill" ]
+ visible: false
+ - state: icon-front-nikematide
+ map: [ "enum.SolutionContainerLayers.Overlay" ]
+ - type: SolutionContainerManager
+ solutions:
+ drink:
+ reagents:
+ - ReagentId: ADTMNikematide
+ Quantity: 30
+
+# Упаковки
+- type: entity
+ id: ADTBasePack
+ parent: BaseStorageItem
+ description: Holds up to 10 pills.
+ abstract: true
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: pack
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ size: Small
+ - type: Tag
+ tags:
+ - PillCanister
+ - type: Storage
+ grid:
+ - 0,0,4,1
+ whitelist:
+ components:
+ - Pill
+ - type: GuideHelp
+ guides:
+ - Medical Doctor # заменить на гайд врачей
+
+- type: entity
+ id: ADTPillPack
+ name: pill pack
+ parent: ADTBasePack
+
+- type: entity
+ name: sodiumizole pack
+ id: ADTMSodiumizolePack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: sodiumizole
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMSodiumizolePill
+ amount: 10
+
+- type: entity
+ name: nitrofurfoll pack
+ id: ADTMNitrofurfollPack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: nitrofurfoll
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMNitrofurfollPill
+ amount: 10
+
+- type: entity
+ name: anelgesin pack
+ id: ADTMAnelgesinPack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: anelgesin
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMAnelgesinPill
+ amount: 10
+
+- type: entity
+ name: minoxide pack
+ id: ADTMMinoxidePack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: minoxide
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMMinoxidePill
+ amount: 10
+
+- type: entity
+ name: diethamilate pack
+ id: ADTMDiethamilatePack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: diethamilate
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMDiethamilatePill
+ amount: 10
+
+- type: entity
+ name: haloperidol pack
+ id: ADTMHaloperidolPack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: haloperidol
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMHaloperidolPill
+ amount: 10
+
+- type: entity
+ name: charcoal pack
+ id: ADTMCharcoalPack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: charcoal
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: PillCharcoal
+ amount: 10
+
+- type: entity
+ name: ethylredoxrazine pack
+ id: ADTMEthylredoxrazinePack
+ parent: ADTPillPack
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ state: ethylredoxrazine
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/packs.rsi
+ - type: StorageFill
+ contents:
+ - id: ADTMEthylredoxrazinePill
+ amount: 10
+
+
+# пиллюли.
+- type: entity
+ name: pill
+ parent: Pill
+ id: ADTMPillBase
+ abstract: true
+ description: It's not a suppository.
+ components:
+ - type: GuideHelp
+ guides:
+ - Medical Doctor
+
+- type: entity
+ name: sodiumizole pill
+ parent: ADTMPillBase
+ id: ADTMSodiumizolePill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMSodiumizole
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill7
+
+- type: entity
+ name: nitrofurfoll pill
+ parent: ADTMPillBase
+ id: ADTMNitrofurfollPill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMNitrofurfoll
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill7
+
+- type: entity
+ name: anelgesin pill
+ parent: ADTMPillBase
+ id: ADTMAnelgesinPill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMAnelgesin
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill8
+
+- type: entity
+ name: minoxide pill
+ parent: ADTMPillBase
+ id: ADTMMinoxidePill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMMinoxide
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill20
+
+- type: entity
+ name: diethamilate pill
+ parent: ADTMPillBase
+ id: ADTMDiethamilatePill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMDiethamilate
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill9
+
+- type: entity
+ name: haloperidol pill
+ parent: ADTMPillBase
+ id: ADTMHaloperidolPill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMHaloperidol
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill9
+
+- type: entity
+ name: ethylredoxrazine pill
+ parent: ADTMPillBase
+ id: ADTMEthylredoxrazinePill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: Ethylredoxrazine
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill17
+
+- type: entity
+ name: agolatine pill
+ parent: ADTMPillBase
+ id: ADTMAgolatinePill
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: ADTMAgolatine
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill7
+
+- type: entity
+ name: vitamin pill
+ parent: ADTMPillBase
+ id: ADTMVitaminPill
+ description: Found in healthy, complete meals.
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ reagents:
+ - ReagentId: Vitamin
+ Quantity: 10
+ - type: Sprite
+ sprite: Objects/Specific/Chemistry/pills.rsi
+ state: pill16
+
+# Патологоанатомические приколы
+- type: entity
+ name: box of foot tags
+ parent: BoxCardboard
+ id: ADTFootTagBox
+ description: It's plastic a box with foot tags inside.
+ components:
+ - type: Storage
+ maxItemSize: Small
+ grid:
+ - 0,0,2,1
+ - type: StorageFill
+ contents:
+ - id: ADTFootTag
+ amount: 6
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi
+ state: icon
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi
+ size: Normal
+ - type: PhysicalComposition
+ materialComposition:
+ Cardboard: 50
+ - type: GuideHelp
+ guides:
+ - ADTPathologist
+
+- type: entity
+ name: small syringe
+ description: A small syringe to take.. you guessed it, small samples of liquid.
+ parent: BaseItem
+ id: ADTSmallSyringe
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/syringe.rsi
+ layers:
+ - state: fill1
+ map: ["enum.SolutionContainerLayers.Fill"]
+ visible: false
+ - state: syringe_base
+ map: ["enum.SolutionContainerLayers.Base"]
+ - type: Icon
+ sprite: ADT/Objects/Specific/Medical/syringe.rsi
+ state: "syringe_base"
+ - type: Item
+ size: Tiny
+ sprite: ADT/Objects/Specific/Medical/syringe.rsi
+ heldPrefix: 0
+ - type: SolutionContainerManager
+ solutions:
+ injector:
+ maxVol: 5
+ - type: FitsInDispenser
+ solution: injector
+ - type: Injector
+ minTransferAmount: 1
+ maxTransferAmount: 5
+ delay: 3
+ transferAmount: 1
+ toggleState: Draw
+ - type: SolutionContainerVisuals
+ maxFillLevels: 5
+ fillBaseName: fill
+ - type: Tag
+ tags:
+ - Syringe
+ - Trash
+ - type: UserInterface
+ interfaces:
+ - key: enum.TransferAmountUiKey.Key
+ type: TransferAmountBoundUserInterface
+
+- type: entity
+ name: box of small syringes
+ parent: BoxCardboard
+ id: ADTSmallSyringeBox
+ description: It's plastic a box with small syringes inside.
+ components:
+ - type: Storage
+ maxItemSize: Small
+ grid:
+ - 0,0,2,1
+ - type: StorageFill
+ contents:
+ - id: ADTSmallSyringe
+ amount: 6
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/syringe.rsi
+ state: icon
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/syringe.rsi
+ size: Normal
+ - type: PhysicalComposition
+ materialComposition:
+ Cardboard: 50
+
+- type: entity
+ name: Hypospray
+ suffix: "TESTPURPOSES"
+ parent: BaseItem
+ description: A hypospray model designed by NT for use in a combat situation - with increased capacity at the expense of speed.
+ id: ADMINHYPO
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/adt_combathypo.rsi
+ state: icon
+ - type: Item
+ sprite: ADT/Objects/Specific/Medical/adt_combathypo.rsi
+ size: Normal
+ - type: SolutionContainerManager
+ solutions:
+ hypospray:
+ maxVol: 5000
+ - type: RefillableSolution
+ solution: hypospray
+ - type: ExaminableSolution
+ solution: hypospray
+ - type: Hypospray
+ transferAmount: 30
+
+- type: entity
+ name: reagent analyzer
+ description: Your pocket helper of destinguishing strange chemicals.
+ parent: BaseItem
+ id: ADTReagentAnalyzer
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/reagent_analyzer.rsi
+ layers:
+ - state: icon
+ - state: screen
+ shader: unshaded
+ - state: content
+ shader: unshaded
+ visible: false
+ - type: Item
+ size: Tiny
+ sprite: ADT/Objects/Specific/Medical/reagent_analyzer.rsi
+ - type: ActivatableUI
+ key: enum.ReagentAnalyzerUiKey.Key
+ - type: UserInterface
+ interfaces:
+ - key: enum.ReagentAnalyzerUiKey.Key
+ type: ReagentAnalyzerBoundUserInterface
+ - type: ReagentAnalyzer
+ - type: ItemSlots
+ slots:
+ beakerSlot:
+ whitelistFailPopup: reagent-dispenser-component-cannot-put-entity-message
+ whitelist:
+ components:
+ - FitsInDispenser
+ - type: ContainerContainer
+ containers:
+ beakerSlot: !type:ContainerSlot
+ - type: ItemMapper
+ mapLayers:
+ content:
+ whitelist:
+ components:
+ - FitsInDispenser
+ sprite: ADT/Objects/Specific/Medical/reagent_analyzer.rsi
+ - type: Appearance
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Syndicate.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Syndicate.yml
index f6aa21fa535..c01ac328e43 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Syndicate.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Syndicate.yml
@@ -1,12 +1,11 @@
- type: entity
- id: ADTFakeDefibrillator
- parent: Defibrillator
+ id: ADTHighVoltageDefibrillatorFake
+ parent: ADTHighVoltageDefibrillator
+ description: A defibrillator that takes less time to zap but deals more electric damage. But something's off..
components:
- type: Defibrillator
zapHeal:
types:
Asphyxiation: -1
- writheDuration: 5
- zapDamage: 35
- zapDelay: 2
- doAfterDuration: 1
+ zapDamage: 100
+
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/defib.yml
index 6c9c31d2c88..72897de3870 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/defib.yml
@@ -23,3 +23,86 @@
- type: MultiHandedItem
- type: PowerCellDraw
useRate: 200
+
+- type: entity
+ id: ADTMobileDefibrillator
+ name: mobile defibrillator
+ description: Mobile version of defibrillator. Can be fixed on your belt, a medical one and even fits in pockets! #somehow
+ parent: [ BaseDefibrillator, PowerCellSlotSmallItem ]
+ components:
+ - type: Item
+ size: Small
+ - type: Clothing
+ quickEquip: false
+ slots:
+ - belt
+ - type: Tag
+ tags:
+ - Defibrillator
+ - MobileDefibrillator
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/mobile_defib.rsi
+ - type: Defibrillator
+ zapHeal:
+ types:
+ Asphyxiation: -20
+ doAfterDuration: 1.5
+ chargeSound:
+ path: /Audio/ADT/Items/Medical/Defibs/mob-defib_charge.ogg
+ - type: MultiHandedItem
+ - type: PowerCellDraw
+ useRate: 333 #~1 использование на маленькой
+ - type: StealTarget
+ stealGroup: MobileDefibrillator
+
+- type: entity
+ id: ADTHighVoltageDefibrillator
+ name: high voltage defibrillator
+ description: A defibrillator that takes less time to zap but deals more electric damage.
+ parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+ components:
+ - type: MultiHandedItem #новую текстурку.
+ - type: PowerCellDraw
+ useRate: 222 #~3 использования
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/high-volt_defib.rsi
+ layers:
+ - state: icon
+ - state: screen
+ map: [ "enum.ToggleVisuals.Layer" ]
+ visible: false
+ shader: unshaded
+ - state: ready
+ map: ["enum.PowerDeviceVisualLayers.Powered"]
+ shader: unshaded
+ - type: Appearance
+ - type: Tag
+ tags:
+ - Defibrillator
+ - HighVoltageDefibrillator
+ - type: Defibrillator
+ zapHeal:
+ types:
+ Asphyxiation: -25
+ doAfterDuration: 2
+ zapDelay: 3
+ powerOnSound:
+ path: /Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_on.ogg
+ powerOffSound:
+ path: /Audio/ADT/Items/Medical/Defibs/highvolt-defib_safety_off.ogg
+ chargeSound:
+ path: /Audio/ADT/Items/Medical/Defibs/highvolt-defib_charge.ogg
+ zapSound:
+ path: /Audio/ADT/Items/Medical/Defibs/highvolt-defib_zap.ogg
+ zapDamage: 30
+ writheDuration: 10
+
+- type: entity
+ id: ADTHighVoltageDefibrillatorEmpty
+ parent: ADTHighVoltageDefibrillator
+ suffix: Empty
+ components:
+ - type: ItemSlots
+ slots:
+ cell_slot:
+ name: power-cell-slot-component-slot-name-default
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml
new file mode 100644
index 00000000000..5a5591badf2
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml
@@ -0,0 +1,93 @@
+- type: entity
+ parent: BaseItem
+ id: ADTBaseHealingItem
+ abstract: true
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/Medical/medical.rsi
+ - type: Item
+ size: Small
+ sprite: ADT/Objects/Specific/Medical/medical.rsi
+ heldPrefix: med_tourniqet
+ - type: StaticPrice
+ price: 0
+
+- type: entity
+ name: medical tourniquet
+ description: A compact hemostatic agent.
+ parent: ADTBaseHealingItem
+ id: ADTMedicalTourniquet
+ components:
+ - type: Clothing
+ slots:
+ - neck
+ quickEquip: false
+ - type: Tag
+ tags:
+ - Gauze
+ - type: Sprite
+ state: med_tourniqet
+ - type: Item
+ heldPrefix: med_tourniqet
+ - type: Healing
+ damageContainers:
+ - Biological
+ damage:
+ groups:
+ Brute: 0 #заглушка для того, чтобы эта хрень просто работала.
+ bloodlossModifier: -15
+ delay: 1
+ selfHealPenaltyMultiplier: 1.5
+ healingBeginSound:
+ path: "/Audio/Items/Medical/brutepack_begin.ogg"
+ healingEndSound:
+ path: "/Audio/Items/Medical/brutepack_end.ogg"
+
+- type: entity
+ name: antibiotic ointment
+ description: Used to treat blunt and burn traumas.
+ parent: ADTBaseHealingItem
+ id: ADTAntibioticOintment
+ suffix: Full
+ components:
+ - type: Tag
+ tags:
+ - Ointment
+ - type: Sprite
+ state: antib_ointment
+ - type: Item
+ heldPrefix: antib_ointment
+ - type: Healing #по факту, эта штука может вылечить аж 210 урона за 10 штук, но учитывая то, что кислотные раны очень редки, то где-то 190, что тоже достаточно.
+ damageContainers:
+ - Biological
+ damage:
+ groups:
+ Brute: -9 #по 3 в каждом уроне.
+ Burn: -12 #по 3 в каждом уроне. даже кислотных.
+ healingBeginSound:
+ path: "/Audio/Items/Medical/ointment_begin.ogg"
+ healingEndSound:
+ path: "/Audio/Items/Medical/ointment_end.ogg"
+ - type: Stack
+ stackType: ADTAntibioticOintment
+ count: 10
+ - type: StackPrice
+ price: 10
+
+- type: entity
+ id: ADTAntibioticOintment1
+ parent: ADTAntibioticOintment
+ suffix: Single
+ components:
+ - type: Stack
+ stackType: ADTAntibioticOintment
+ count: 1
+
+#стаки
+- type: stack
+ id: ADTAntibioticOintment
+ name: antibiotic ointment
+ icon: { sprite: "/Textures/ADT/Objects/Specific/Medical/medical.rsi", state: antib_ointment }
+ spawn: ADTAntibioticOintment
+ maxCount: 10
+ itemSize: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml
index 1710bd17147..fcc6069a697 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml
@@ -161,23 +161,4 @@
maxVol: 15
reagents:
- ReagentId: Honk
- Quantity: 6
-#patch crate
-- type: entity
- id: ADTCratePatchPack
- parent: CrateMedical
- components:
- - type: StorageFill
- contents:
- - id: ADTPatchPackFilled
- amount: 4
-#Cargo
-- type: cargoProduct
- id: ADTCratePatchPack
- icon:
- sprite: ADT/Objects/Specific/Medical/patch.rsi
- state: patchpack
- product: ADTCratePatchPack
- cost: 1600
- category: Medical
- group: market
+ Quantity: 6
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/vending_machine_restock.yml
index ed8055388d8..97a7d9d09c5 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -25,4 +25,20 @@
- state: base
- state: green_bit
shader: unshaded
- - state: refill_stylish
\ No newline at end of file
+ - state: refill_stylish
+
+- type: entity
+ parent: ADTBaseVendingMachineRestock
+ id: ADTVendingMachineRestockPill
+ name: Pill-O-Mat restock box
+ description: Slot into your department's Pill-O-Mat.
+ components:
+ - type: VendingMachineRestock
+ canRestock:
+ - PillInventory
+ - type: Sprite
+ layers:
+ - state: base
+ - state: green_bit
+ shader: unshaded
+ - state: pillomat
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/misc.yml
new file mode 100644
index 00000000000..c90c7d8a03e
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/misc.yml
@@ -0,0 +1,36 @@
+- type: entity
+ name: foot tag
+ parent: BaseItem
+ id: ADTFootTag
+ description: A piece of paper for dead.
+ components:
+ - type: Sprite
+ sprite: ADT/Clothing/Shoes/Boots/foot_tag
+ layers:
+ - state: paper
+ - state: paper_words
+ map: ["enum.PaperVisualLayers.Writing"]
+ visible: false
+ - type: Clothing
+ sprite: ADT/Clothing/Shoes/Boots/foot_tag
+ slots:
+ - FEET
+ - type: Paper
+ - type: ActivatableUI
+ key: enum.PaperUiKey.Key
+ closeOnHandDeselect: false
+ - type: UserInterface
+ interfaces:
+ - key: enum.PaperUiKey.Key
+ type: PaperBoundUserInterface
+ - type: Item
+ size: Tiny
+ - type: Tag
+ tags:
+ - Document
+ - Trash
+ - type: Appearance
+ - type: PaperVisuals
+ - type: GuideHelp
+ guides:
+ - ADTPathologist
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml
index a4eff117ed7..bb5ba7d4f80 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml
@@ -31,7 +31,6 @@
energy: 1.6
color: "#c2adff"
-
- type: entity
parent: VendingMachine
id: ADTVendingMachineHalloween
@@ -99,6 +98,43 @@
energy: 1.6
color: "#1ca9d4"
+- type: entity
+ parent: VendingMachine
+ id: ADTVendingMachinePill
+ name: Pill-O-Mat
+ description: (Almost) A practical solution to many of your sores.
+ components:
+ - type: VendingMachine
+ pack: PillInventory
+ offState: off
+ brokenState: broken
+ normalState: normal-unshaded
+ denyState: deny-unshaded
+ ejectState: eject-unshaded
+ ejectDelay: 0.6
+ - type: Advertise
+ pack: PillAds
+ - type: Speech
+ - type: Sprite
+ sprite: ADT/Structures/Machines/VendingMachines/pillomat.rsi
+ layers:
+ - state: "off"
+ map: ["enum.VendingMachineVisualLayers.Base"]
+ - state: "off"
+ map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+ shader: unshaded
+ - state: panel
+ map: ["enum.WiresVisualLayers.MaintenancePanel"]
+ - type: PointLight
+ radius: 1.8
+ energy: 1.6
+ color: "#a1e1f0"
+ - type: StaticPrice
+ price: 2600
+ - type: GuideHelp
+ guides:
+ - Medical Doctor
+
- type: entity
parent: VendingMachine
id: ADTVendingMachineMasterSportDrobe
@@ -126,4 +162,65 @@
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded
- state: panel
- map: ["enum.WiresVisualLayers.MaintenancePanel"]
\ No newline at end of file
+ map: ["enum.WiresVisualLayers.MaintenancePanel"]
+
+- type: entity
+ parent: VendingMachine
+ id: ADTVendingMachineParaDrobe
+ name: ParaDrobe
+ description: A vending machine that dispences new clothing for paramedics.
+ components:
+ - type: VendingMachine
+ pack: ParadrobeInventory
+ offState: off
+ brokenState: broken
+ normalState: normal-unshaded
+ - type: Advertise
+ pack: MediDrobeAds
+ - type: Sprite
+ sprite: ADT/Structures/Machines/VendingMachines/paradrobe.rsi
+ layers:
+ - state: "off"
+ map: ["enum.VendingMachineVisualLayers.Base"]
+ - state: "off"
+ map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+ shader: unshaded
+ - state: panel
+ map: ["enum.WiresVisualLayers.MaintenancePanel"]
+ - type: AccessReader
+ access: [["Medical"]]
+ - type: PointLight
+ radius: 1.8
+ energy: 1.6
+ color: "#1ca9d4"
+
+
+- type: entity
+ parent: VendingMachine
+ id: ADTVendingMachinePatholoDrobe
+ name: PatholoDrobe
+ description: A vending machine that dispences new clothing for pathologists.
+ components:
+ - type: VendingMachine
+ pack: PatholodrobeInventory
+ offState: off
+ brokenState: broken
+ normalState: normal-unshaded
+ - type: Advertise
+ pack: PatholodrobeAds
+ - type: Sprite
+ sprite: ADT/Structures/Machines/VendingMachines/patholodrobe.rsi
+ layers:
+ - state: "off"
+ map: ["enum.VendingMachineVisualLayers.Base"]
+ - state: "off"
+ map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+ shader: unshaded
+ - state: panel
+ map: ["enum.WiresVisualLayers.MaintenancePanel"]
+ - type: AccessReader
+ access: [["Medical"]]
+ - type: PointLight
+ radius: 1.8
+ energy: 1.6
+ color: "#1ca9d4"
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/closets.yml
new file mode 100644
index 00000000000..b048b99bb5c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/closets.yml
@@ -0,0 +1,68 @@
+#База.
+#Это нужно для того, чтобы в будущем, если кто-то решит добавить ещё наших шкафов, то их текстурки хранились в отдельной папке.
+- type: entity
+ id: ADTClosetBase
+ parent: ClosetBase
+ name: closet
+ description: A standard-issue Nanotrasen storage unit.
+ abstract: true
+ components:
+ - type: Sprite
+ noRot: true
+ sprite: ADT/Structures/Storage/closet.rsi
+ layers:
+ - state: generic
+ map: ["enum.StorageVisualLayers.Base"]
+ - state: generic_door
+ map: ["enum.StorageVisualLayers.Door"]
+ - state: welded
+ visible: false
+ map: ["enum.WeldableLayers.BaseWelded"]
+ - type: EntityStorageVisuals
+ stateBaseClosed: generic
+ stateDoorOpen: generic_open
+ stateDoorClosed: generic_door
+
+# шкафы, которые можно разобрать и прочее.
+- type: entity
+ id: ADTClosetSteelBase
+ parent: ADTClosetBase
+ components:
+ - type: Construction
+ graph: ClosetSteel
+ node: done
+ containers:
+ - entity_storage
+ - type: StaticPrice
+ price: 20
+
+# Biohazard
+- type: entity
+ id: ADTClosetL3
+ parent: ADTClosetSteelBase
+ name: level 3 biohazard gear closet
+ description: It's a storage unit for level 3 biohazard gear.
+ components:
+ - type: Appearance
+
+# Патолог.
+- type: entity
+ id: ADTClosetL3Pathologist
+ parent: ADTClosetL3
+ components:
+ - type: Appearance
+ - type: EntityStorageVisuals
+ stateBaseClosed: bio_pathologist
+ stateDoorOpen: bio_pathologist_open
+ stateDoorClosed: bio_pathologist_door
+
+#парамед
+- type: entity
+ id: ADTClosetL3Paramedic
+ parent: ADTClosetL3
+ components:
+ - type: Appearance
+ - type: EntityStorageVisuals
+ stateBaseClosed: bio_paramedic
+ stateDoorOpen: bio_paramedic_open
+ stateDoorClosed: bio_paramedic_door
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Felinid/Body/Organs/felinid.yml b/Resources/Prototypes/ADT/Felinid/Body/Organs/felinid.yml
new file mode 100644
index 00000000000..fe5e87d1b7b
--- /dev/null
+++ b/Resources/Prototypes/ADT/Felinid/Body/Organs/felinid.yml
@@ -0,0 +1,13 @@
+- type: entity
+ id: ADTOrganFelinidHeart
+ parent: OrganHumanHeart
+ name: felinid heart
+ description: "I feel bad for the heartless bastard who lost this."
+ components:
+ - type: Metabolizer
+ maxReagents: 4
+ metabolizerTypes: [Felinid, Animal]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Felinid/Body/Prototypes/felinid.yml b/Resources/Prototypes/ADT/Felinid/Body/Prototypes/felinid.yml
index f0c98ff83ef..4b0aae57f4c 100644
--- a/Resources/Prototypes/ADT/Felinid/Body/Prototypes/felinid.yml
+++ b/Resources/Prototypes/ADT/Felinid/Body/Prototypes/felinid.yml
@@ -18,7 +18,7 @@
- left leg
- right leg
organs:
- heart: OrganAnimalHeart
+ heart: ADTOrganFelinidHeart
lungs: OrganHumanLungs
stomach: OrganReptilianStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/ADT/Guidebook/medical.yml b/Resources/Prototypes/ADT/Guidebook/medical.yml
new file mode 100644
index 00000000000..af3c4e3af2c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Guidebook/medical.yml
@@ -0,0 +1,9 @@
+- type: guideEntry
+ id: ADTPathologist
+ name: guide-pathologist-ADT
+ text: "/ServerInfo/ADT/Pathologist.xml"
+
+- type: guideEntry
+ id: ADTChemicals
+ name: guide-chemicals-ADT
+ text: "/ServerInfo/ADT/Chemicals.xml"
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Guidebook/srp.yml b/Resources/Prototypes/ADT/Guidebook/srp.yml
index 0b5733088e5..7526ca2ff57 100644
--- a/Resources/Prototypes/ADT/Guidebook/srp.yml
+++ b/Resources/Prototypes/ADT/Guidebook/srp.yml
@@ -352,6 +352,7 @@
- SrpMedicSenyor
- SrpMedicParamed
- SrpMedicMedic
+ - SrpMedicMedicPatologoanatom
- SrpMedicChimestry
- SrpMedicPhsiholog
- SrpMedicIntern
@@ -380,7 +381,6 @@
children:
- SrpMedicMedicVirusolog
- SrpMedicMedicHirurg
- - SrpMedicMedicPatologoanatom
- type: guideEntry
id: SrpMedicMedicVirusolog
diff --git a/Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml b/Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml
new file mode 100644
index 00000000000..2386bbd8678
--- /dev/null
+++ b/Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml
@@ -0,0 +1,29 @@
+- type: seed
+ id: ADTPapaverSomniferum
+ name: seeds-papaver-somniferum-name
+ noun: seeds-noun-seeds
+ displayName: seeds-papaver-somniferum-display-name
+ plantRsi: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi
+ packetPrototype: ADTPapaverSomniferumSeeds
+ productPrototypes:
+ - ADTFoodPapaverSomniferum
+ lifespan: 25
+ maturation: 10
+ production: 3
+ yield: 3
+ potency: 10
+ growthStages: 3
+ waterConsumption: 0.60
+ chemicals:
+ Nutriment:
+ Min: 1
+ Max: 2
+ Potencydivisor: 50
+ Toxin:
+ Min: 1
+ Max: 4
+ PotencyDivisor: 5
+ ADTMOpium:
+ Min: 1
+ Max: 10
+ PotencyDivisor: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml
index 8483fc90136..0cb98473362 100644
--- a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml
+++ b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml
@@ -67,6 +67,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1]
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml
index 8db69f94c80..f6342e47602 100644
--- a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml
@@ -4,3 +4,10 @@
sprite:
sprite: NES/GraviCore.rsi
state: GraviCore
+
+- type: stealTargetGroup
+ id: MobileDefibrillator
+ name: переносной дефибриллятор
+ sprite:
+ sprite: ADT/Objects/Specific/Medical/mobile_defib.rsi
+ state: icon
diff --git a/Resources/Prototypes/ADT/Objectives/traitor.yml b/Resources/Prototypes/ADT/Objectives/traitor.yml
index 65a8aef20fc..942e7d56b28 100644
--- a/Resources/Prototypes/ADT/Objectives/traitor.yml
+++ b/Resources/Prototypes/ADT/Objectives/traitor.yml
@@ -23,3 +23,15 @@
stealGroup: CaptainIDCard
prototype: HoPIDCard
owner: job-name-hop
+
+- type: entity
+ noSpawn: true
+ parent: BaseTraitorStealObjective
+ id: ADTCMODefibrillatorStealObjective
+ components:
+ - type: NotJobRequirement
+ job: ChiefMedicalOfficer
+ - type: StealCondition
+ stealGroup: MobileDefibrillator
+ prototype: ADTMobileDefibrillator
+ owner: job-name-cmo
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml
index 230dc5e0d37..f88700b8922 100644
--- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml
+++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml
@@ -56,6 +56,11 @@
damage:
groups:
Toxin: -1
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-hungover" ]
+ probability: 0.04
metamorphicSprite:
sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
state: adthungoverangel
diff --git a/Resources/Prototypes/ADT/Reagents/chemicals.yml b/Resources/Prototypes/ADT/Reagents/chemicals.yml
new file mode 100644
index 00000000000..1284110a04e
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/chemicals.yml
@@ -0,0 +1,8 @@
+- type: reagent
+ id: ADTCopperNitride
+ name: reagent-name-copper-nitride
+ desc: reagent-desc-copper-nitride
+ physicalDesc: reagent-physical-desc-crystalline
+ color: "#09590a"
+ boilingPoint: 300
+ meltingPoint: 300
diff --git a/Resources/Prototypes/ADT/Reagents/fun.yml b/Resources/Prototypes/ADT/Reagents/fun.yml
new file mode 100644
index 00000000000..a35f0452c3f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/fun.yml
@@ -0,0 +1,389 @@
+- type: reagent
+ id: ADTMPolymorphine
+ name: reagent-name-polymorphine
+ group: Medicine
+ desc: reagent-desc-polymorphine
+ physicalDesc: reagent-physical-desc-enigmatic
+ flavor: tingly
+ color: "#b26de3"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:Polymorph
+ prototype: ADTPMonkey
+ conditions:
+ - !type:OrganType
+ type: Human
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMonkey2
+ conditions:
+ - !type:OrganType
+ type: Human
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMonkey
+ conditions:
+ - !type:OrganType
+ type: Dwarf
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMonkey2
+ conditions:
+ - !type:OrganType
+ type: Dwarf
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPLizard
+ conditions:
+ - !type:OrganType
+ type: Reptilian
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPLizard2
+ conditions:
+ - !type:OrganType
+ type: Reptilian
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSpider
+ conditions:
+ - !type:OrganType
+ type: Arachnid
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSpider2
+ conditions:
+ - !type:OrganType
+ type: Arachnid
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPBush
+ conditions:
+ - !type:OrganType
+ type: Plant
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPBush2
+ conditions:
+ - !type:OrganType
+ type: Plant
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMothroach
+ conditions:
+ - !type:OrganType
+ type: Moth
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMothroach2
+ conditions:
+ - !type:OrganType
+ type: Moth
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSmile
+ conditions:
+ - !type:OrganType
+ type: Slime
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSmile2
+ conditions:
+ - !type:OrganType
+ type: Slime
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph #наши расы.
+ prototype: ADTPCat
+ conditions:
+ - !type:OrganType
+ type: Tajaran
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPCat2
+ conditions:
+ - !type:OrganType
+ type: Tajaran
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPCat
+ conditions:
+ - !type:OrganType
+ type: Felinid
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPCat2
+ conditions:
+ - !type:OrganType
+ type: Felinid
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPDog
+ conditions:
+ - !type:OrganType
+ type: Vulpkanin
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPDog2
+ conditions:
+ - !type:OrganType
+ type: Vulpkanin
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMonkey
+ conditions:
+ - !type:OrganType
+ type: Demon
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPMonkey2
+ conditions:
+ - !type:OrganType
+ type: Demon
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSpaceBear
+ conditions:
+ - !type:OrganType
+ type: Ursus
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSpaceBear2
+ conditions:
+ - !type:OrganType
+ type: Ursus
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSoap
+ conditions:
+ - !type:OrganType
+ type: Drask
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph
+ prototype: ADTPSoap2
+ conditions:
+ - !type:OrganType
+ type: Drask
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.5
+ - !type:Polymorph #животные, ради цели и разнообразия. Может быть сработает на некоторые расы, по типу Урсов или Унатхов.
+ prototype: ADTPMouse
+ conditions:
+ - !type:OrganType
+ type: Animal
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.25
+ - !type:Polymorph
+ prototype: ADTPSpider2
+ conditions:
+ - !type:OrganType
+ type: Animal
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.25
+ - !type:Polymorph
+ prototype: ADTPCarp
+ conditions:
+ - !type:OrganType
+ type: Animal
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.25
+ - !type:Polymorph
+ prototype: ADTPLizard2
+ conditions:
+ - !type:OrganType
+ type: Animal
+ - !type:ReagentThreshold
+ min: 20
+ max: 20
+ probability: 0.25
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 20
+ type: Local
+ visualType: Small
+ messages: [ "polymorph-effect-feelings" ]
+ probability: 0.05
+
+- type: reagent
+ id: ADTMChaoticPolymorphine
+ name: reagent-name-chaotic-polymorphine
+ group: Medicine
+ desc: reagent-desc-chaotic-polymorphine
+ physicalDesc: reagent-physical-desc-volatile
+ flavor: magical
+ color: "#62278c"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ damage:
+ types:
+ Cellular: 20
+ - !type:Polymorph
+ prototype: ADTPMonkey
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPBread
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPRodMetall2
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPFrog
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPCat
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPSkeleton
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPCow
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPPossum
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPCarp
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:Polymorph
+ prototype: ADTPSpaceBear
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ max: 15
+ probability: 0.1
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 15
+ type: Local
+ visualType: Small
+ messages: [ "polymorph-effect-feelings" ]
+ probability: 0.05
+
+#мне стыдно смотреть на этот код, но иначе как его сделать я не представляю.
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Reagents/medicine.yml b/Resources/Prototypes/ADT/Reagents/medicine.yml
index eb367bf44d2..5174b8b7b70 100644
--- a/Resources/Prototypes/ADT/Reagents/medicine.yml
+++ b/Resources/Prototypes/ADT/Reagents/medicine.yml
@@ -17,32 +17,33 @@
types:
Cold: -1
-- type: reagent
- id: SalineGlucoseSolution
- name: reagent-name-salineglucosesolution
- group: Medicine
- desc: reagent-desc-salineglucosesolution
- physicalDesc: reagent-physical-desc-salineglucosesolution
- flavor: somesalty
- color: "#75b1f0"
- metabolisms:
- Medicine:
- effects:
- - !type:HealthChange
- damage:
- groups:
- Burn: -0.5
- Brute: -0.5
- types:
- Bloodloss: -2
+# не знаю, кто и когда делал этот препарат, но он просто висит по-приколу с названием "Что такое".
+#- type: reagent
+# id: SalineGlucoseSolution
+# name: reagent-name-salineglucosesolution
+# group: Medicine
+# desc: reagent-desc-salineglucosesolution
+# physicalDesc: reagent-physical-desc-salineglucosesolution
+# flavor: somesalty
+# color: "#75b1f0"
+# metabolisms:
+# Medicine:
+# effects:
+# - !type:HealthChange
+# damage:
+# groups:
+# Burn: -0.5
+# Brute: -0.5
+# types:
+# Bloodloss: -2
-- type: flavor
- id: somesalty
- flavorType: Complex
- description: flavor-complex-somesalty
+#- type: flavor
+# id: somesalty
+# flavorType: Complex
+# description: flavor-complex-somesalty
#- type: reaction
-# id: SalineGlucoseSolution
+# id: SalineGlucoseSolution #зачем делать реагент и рецепт к нему, но не задействовать это? Причём рецепт конфликтный.
# reactants:
# Water:
# amount: 1
@@ -67,3 +68,444 @@
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
+
+
+# Новые доп. препараты
+
+# Bicaridine
+- type: reagent
+ id: ADTMSodiumizole # ADTM - medical. Сортировка реагентов. ## Натримизол, отсылающий к метамизолу натрия.
+ name: reagent-name-sodiumizole
+ group: Medicine
+ desc: reagent-desc-sodiumizole
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: medicine
+ color: "#ba4d16"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-headache" ]
+ probability: 0.05
+ - !type:GenericStatusEffect
+ key: PainKiller
+ component: PainKiller
+ type: Add
+ time: 20
+ refresh: true
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Bicaridine
+ min: 0.5
+ damage:
+ types:
+ Blunt: -1
+
+- type: reagent
+ id: ADTMNitrofurfoll #искаверканное название нитрофурала.
+ name: reagent-name-nitrofurfoll
+ group: Medicine
+ desc: reagent-desc-nitrofurfoll
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: medicine
+ color: "#fcf27c"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Slash: -0.25
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Bicaridine
+ min: 0.5
+ damage:
+ types:
+ Slash: -1
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-slash" ]
+ probability: 0.05
+
+- type: reagent
+ id: ADTMPeroHydrogen #литералли перекись водорода, но круче. Пероводород.
+ name: reagent-name-perohydrogen
+ group: Medicine
+ desc: reagent-desc-perohydrogen
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: medicine
+ color: "#d1d1d155"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Piercing: -0.25
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Bicaridine
+ min: 0.5
+ damage:
+ types:
+ Piercing: -1
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-piercing" ]
+ probability: 0.05
+
+# Dermaline.
+- type: reagent
+ id: ADTMAnelgesin #Налгезин ИРЛ.
+ name: reagent-name-anelgesin
+ group: Medicine
+ desc: reagent-desc-anelgesin
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: medicine
+ color: "#5b79ab"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:AdjustTemperature
+ conditions:
+ - !type:Temperature
+ min: 308.15
+ amount: -1500
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-heat" ]
+ probability: 0.05
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Dermaline
+ min: 0.5
+ damage:
+ types:
+ Heat: -1
+
+- type: reagent
+ id: ADTMMinoxide
+ name: reagent-name-minoxide #типо как ликоксид, но миноксид.
+ group: Medicine
+ desc: reagent-desc-minoxide
+ physicalDesc: reagent-physical-desc-soothing
+ flavor: medicine
+ color: "#e3fcff"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Shock: -0.25
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Dermaline
+ min: 0.5
+ damage:
+ types:
+ Shock: -1
+ - !type:GenericStatusEffect
+ key: KnockedDown #против ударов током.
+ time: 0.5
+ type: Remove
+ - !type:AdjustReagent
+ reagent: Licoxide
+ amount: -0.5
+ - !type:AdjustReagent
+ reagent: Tazinide
+ amount: -0.5
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-shock" ]
+ probability: 0.05
+
+#Dylovene
+# У этилредоксразина будет больше смысла в паре с диловеном, так что тут только один препарат.
+- type: reagent
+ id: ADTMBiomicine #Биомицин, отсылающий к неомицину.
+ name: reagent-name-biomicine
+ group: Medicine
+ desc: reagent-desc-biomicine
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: medicine
+ color: "#d1d1d155"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Dylovene
+ min: 0.5
+ damage:
+ types:
+ Poison: -2
+ Blunt: 1.5
+ - !type:Jitter
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Dylovene
+ min: 0.5
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Dylovene
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-major-stress" ]
+ probability: 0.1
+
+#DexalinPlus
+# Баффы очень маленькие, поскольку я хочу откреститься подальше от старого дексалина
+- type: reagent
+ id: ADTMNikematide #анаграмма никетамида.
+ name: reagent-name-nikematide
+ group: Medicine
+ desc: reagent-desc-nikematide
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: medicine
+ color: "#c98928"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Asphyxiation: -0.25
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-asphyxia" ]
+ probability: 0.05
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: DexalinPlus
+ min: 0.5
+ damage:
+ types:
+ Asphyxiation: -0.5
+
+- type: reagent
+ id: ADTMDiethamilate #Диэтамилат. Искаверканное и совмещённое название Дициона и Этамзилата.
+ name: reagent-name-diethamilate
+ group: Medicine
+ desc: reagent-desc-diethamilate
+ physicalDesc: reagent-physical-desc-powdery
+ flavor: medicine
+ color: "#f5c6dc"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:ModifyBleedAmount
+ amount: -0.5
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: DexalinPlus
+ min: 0.5
+ damage:
+ types:
+ Bloodloss: -0.5
+
+#а теперь маленькие, простенькие препаратики, которые предложили в дискорде.
+
+- type: reagent
+ id: ADTMAgolatine #Аголатин, изменённое название антидепрессанта Агомелатина.
+ name: reagent-name-agolatine
+ group: Medicine
+ desc: reagent-desc-agolatine
+ physicalDesc: reagent-physical-desc-opaque
+ flavor: medicine
+ color: "#f7ce5c"
+ metabolisms:
+ Medicine:
+ metabolismRate: 0.1
+ effects:
+ - !type:HealthChange #передоз антидепрессантов существует, и это плоха, дети.
+ conditions:
+ - !type:ReagentThreshold
+ min: 40
+ damage:
+ types:
+ Asphyxiation: 2
+ Blunt: 1
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-emotions" ]
+ probability: 0.05
+ - !type:PopupMessage
+ conditions:
+ - !type:SexCondition
+ sex: 0
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-visible-emotions-m" ]
+ probability: 0.05
+ - !type:PopupMessage
+ conditions:
+ - !type:SexCondition
+ sex: 1
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-visible-emotions-f" ]
+ probability: 0.05 #в общем, я не придумал способ обойти пол существ в всплывающем тексте, отчего у нас 2 надписи на 2 пола.
+ #Бесполезное внимание к деталям, но извините, я такой.
+
+- type: reagent
+ id: ADTMFormalin #Даже название коверкать не буду. Формалин существует.
+ name: reagent-name-formalin
+ group: Medicine
+ desc: reagent-desc-formalin
+ flavor: bitter
+ physicalDesc: reagent-physical-desc-skunky
+ color: "#ffd478"
+ worksOnTheDead: true
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:Embalm
+ conditions:
+ - !type:ReagentThreshold
+ min: 5
+ - !type:MobStateCondition
+ mobstate: dead
+ - !type:HealthChange
+ damage:
+ types:
+ Poison: 1
+
+
+- type: reagent
+ id: ADTMHaloperidol #Нейролептик, работает чисто как в Баратравме.
+ name: reagent-name-haloperidol
+ group: Medicine
+ desc: reagent-desc-haloperidol
+ flavor: bitter
+ physicalDesc: reagent-physical-desc-opaque
+ color: "#ad5113"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:GenericStatusEffect
+ key: SeeingRainbows
+ component: SeeingRainbows
+ type: Remove
+ time: 20
+ - !type:GenericStatusEffect
+ key: Drunk
+ time: 5.0 #Некоторые наркотические приколы включают в себя компонент опьянения. В любом случае он ниже, чем у этилредоксразина в 2 раза.
+ type: Remove
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages:
+ - medicine-effect-emotions
+ - narcotic-effect-sleepy
+ - medicine-effect-antipsychotic
+ probability: 0.05
+ #я пытался сперва сделать так, чтобы последняя надпись всплывала при условии что чел видит радуги, не получилось.
+ #затем попытался сделать список реагентов, при которых появлялась эта надпись. Тоже не получилось.
+
+- type: reagent
+ id: ADTMMorphine
+ name: reagent-name-morphine
+ group: Medicine
+ desc: reagent-desc-morphine
+ physicalDesc: reagent-physical-desc-viscous
+ flavor: bitter
+ color: "#c98928"
+ metabolisms:
+ Medicine:
+ metabolismRate: 1
+ effects:
+ - !type:GenericStatusEffect
+ key: PainKiller
+ component: PainKiller
+ type: Add
+ time: 60
+ refresh: true
+ - !type:HealthChange
+ damage:
+ groups:
+ Brute: -1
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-pain" ] #пусть помимо иконки будет ещё и надпись.
+ probability: 0.05
+ - !type:ChemVomit #а это уже передозы.
+ conditions:
+ - !type:ReagentThreshold
+ min: 30.05
+ probability: 0.3
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ min: 30.05
+ damage:
+ types:
+ Asphyxiation: 5
+ - !type:Jitter
+ conditions:
+ - !type:ReagentThreshold
+ min: 30.05
+ Narcotic:
+ metabolismRate: 0.1
+ effects:
+ - !type:GenericStatusEffect #не забываем, что морфин ещё и наркотик.
+ key: SeeingRainbows
+ component: SeeingRainbows
+ type: Add
+ time: 2.5
+ refresh: false
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages:
+ - narcotic-effect-rainbows
+ - goodfeeling-artifact-drastic-3
+ probability: 0.05
+ - !type:PopupMessage
+ type: Pvs
+ visualType: Small
+ messages: [ "narcotic-effect-visible-miosis" ]
+ probability: 0.05
diff --git a/Resources/Prototypes/ADT/Reagents/narcotics.yml b/Resources/Prototypes/ADT/Reagents/narcotics.yml
new file mode 100644
index 00000000000..bc8066bbf90
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/narcotics.yml
@@ -0,0 +1,53 @@
+- type: reagent
+ id: ADTMOpium
+ name: reagent-name-opium
+ group: Narcotics
+ desc: reagent-desc-opium
+ physicalDesc: reagent-physical-desc-cloudy
+ flavor: bitter
+ color: "#9c4008"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:GenericStatusEffect
+ key: PainKiller
+ component: PainKiller
+ type: Add
+ time: 10
+ refresh: false
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-pain" ]
+ probability: 0.05
+ Narcotic:
+ effects:
+ - !type:GenericStatusEffect
+ key: SeeingRainbows
+ component: SeeingRainbows
+ type: Add
+ time: 20 # THC масло по 16 добавляет.
+ refresh: false
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages:
+ - narcotic-effect-rainbows
+ - goodfeeling-artifact-drastic-3
+ - narcotic-effect-sleepy
+ probability: 0.05
+ - !type:PopupMessage
+ type: Pvs
+ visualType: Small
+ messages: [ "narcotic-effect-visible-miosis" ]
+ probability: 0.05
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ min: 10.05
+ damage:
+ types:
+ Asphyxiation: 2
diff --git a/Resources/Prototypes/ADT/Reagents/patch_medicine.yml b/Resources/Prototypes/ADT/Reagents/patch_medicine.yml
index 4fcade727d9..0b166e157f2 100644
--- a/Resources/Prototypes/ADT/Reagents/patch_medicine.yml
+++ b/Resources/Prototypes/ADT/Reagents/patch_medicine.yml
@@ -15,13 +15,15 @@
damage:
groups:
Brute: -2.25
+ - !type:ModifyBleedAmount
+ amount: -1 #почему кровоостанавливающая пудра не останавливала кровотечение?
- !type:PopupMessage
conditions:
- !type:TotalDamage
min: 0.5
type: Local
visualType: Small
- messages: [ "" ]
+ messages: [ "medicine-effect-usual" ]
probability: 0.05
#Сульфадиазин серебра
- type: reagent
@@ -46,5 +48,5 @@
min: 0.5
type: Local
visualType: Small
- messages: [ "" ]
+ messages: [ "medicine-effect-usual" ]
probability: 0.05
diff --git a/Resources/Prototypes/ADT/Reagents/toxins.yml b/Resources/Prototypes/ADT/Reagents/toxins.yml
index e824bea5f63..bbef2475dfe 100644
--- a/Resources/Prototypes/ADT/Reagents/toxins.yml
+++ b/Resources/Prototypes/ADT/Reagents/toxins.yml
@@ -21,3 +21,76 @@
component: ForcedSleeping
refresh: false
type: Add
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-sleepy" ]
+ probability: 0.06
+
+
+- type: reagent
+ id: ADTPhronidolepaxorine
+ name: reagent-name-phronidolepaxorine
+ group: Toxins
+ desc: reagent-desc-phronidolepaxorine
+ physicalDesc: reagent-physical-desc-translucent
+ flavor: bitter
+ color: "#c98928"
+ metabolisms:
+ Poison:
+ effects:
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Siderlac #если метаболизируется сидерлак, то он не наносит урон.
+ min: 0
+ max: 0.5
+ - !type:OrganType
+ type: Novakid
+ shouldHave: false #все, кроме новакидов будут получать по 10 урона кислотными.
+ damage:
+ types:
+ Caustic: 5
+ - !type:Drunk
+ conditions:
+ - !type:OrganType
+ type: Novakid
+ boozePower: 10 #у этанола 2.
+ - !type:GenericStatusEffect
+ conditions:
+ - !type:OrganType
+ type: Novakid
+ key: SeeingRainbows
+ component: SeeingRainbows
+ type: Add
+ time: 20 #у масла ТГК 16 стоит.
+ refresh: false
+ - !type:HealthChange
+ conditions:
+ - !type:OrganType
+ type: Novakid
+ - !type:ReagentThreshold
+ min: 10.05
+ damage:
+ types:
+ Bloodloss: 0.5
+ - !type:AdjustTemperature
+ conditions:
+ - !type:OrganType
+ type: Novakid
+ - !type:ReagentThreshold
+ min: 20.05
+ - !type:Temperature
+ min: 190
+ amount: -15000
+ - !type:PopupMessage
+ conditions:
+ - !type:OrganType
+ type: Novakid
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-rainbows" ]
+ probability: 0.05
+#ну и эффекты.
+#получилось небольшое спаггети, но я тупо не знаю, как нормально это всё сузить.
+
diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/ADT/Recipes/Lathes/chemistry.yml
new file mode 100644
index 00000000000..fb0a14fda9c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Lathes/chemistry.yml
@@ -0,0 +1,36 @@
+- type: latheRecipe
+ id: ADTPillCanister
+ result: ADTPillCanister
+ completetime: 2
+ materials:
+ Plastic: 100
+
+- type: latheRecipe
+ id: ADTPlasticBottle
+ result: ADTPlasticBottle
+ completetime: 2
+ materials:
+ Plastic: 50
+
+- type: latheRecipe
+ id: ADTPillPack
+ result: ADTPillPack
+ completetime: 2
+ materials:
+ Plastic: 100
+
+- type: latheRecipe
+ id: ADTFootTag
+ result: ADTFootTag
+ completetime: 2
+ materials:
+ Plastic: 25
+
+- type: latheRecipe
+ id: ADTReagentAnalyzer
+ result: ADTReagentAnalyzer
+ completetime: 2
+ materials:
+ Glass: 600
+ Steel: 500
+ Plastic: 700
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml b/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml
new file mode 100644
index 00000000000..f70568c2fa3
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml
@@ -0,0 +1,31 @@
+- type: latheRecipe
+ id: ADTMedicalTourniquet
+ result: ADTMedicalTourniquet
+ completetime: 5
+ materials:
+ Glass: 50
+ Plastic: 50
+
+- type: latheRecipe
+ id: ADTAntibioticOintment
+ result: ADTAntibioticOintment1
+ completetime: 2
+ materials:
+ Glass: 50
+ Plastic: 50
+
+- type: latheRecipe
+ id: ADTSmallSyringe
+ result: ADTSmallSyringe
+ completetime: 1
+ materials:
+ Plastic: 25
+ Steel: 25
+
+- type: latheRecipe
+ id: ADTHighVoltageDefibrillator
+ result: ADTHighVoltageDefibrillatorEmpty
+ completetime: 5
+ materials:
+ Plastic: 100
+ Steel: 350
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/ADT/Recipes/Reactions/chemicals.yml
index bf840d3e3ab..f3f3860257f 100644
--- a/Resources/Prototypes/ADT/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/chemicals.yml
@@ -9,3 +9,13 @@
amount: 1
products:
ADTUltraChloralHydrate: 1
+
+- type: reaction
+ id: ADTCopperNitride
+ reactants:
+ Copper:
+ amount: 3
+ Nitrogen:
+ amount: 1
+ products:
+ ADTCopperNitride: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/fun.yml b/Resources/Prototypes/ADT/Recipes/Reactions/fun.yml
new file mode 100644
index 00000000000..b12c6a4eee5
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/fun.yml
@@ -0,0 +1,27 @@
+- type: reaction
+ id: ADTMChaoticPolymorphine
+ reactants:
+ Uranium:
+ amount: 4
+ UnstableMutagen:
+ amount: 4
+ Phalanximine:
+ amount: 2
+ SulfuricAcid:
+ amount: 1
+ products:
+ ADTMChaoticPolymorphine: 3
+
+- type: reaction
+ id: ADTMPolymorphine
+ reactants:
+ ADTMChaoticPolymorphine:
+ amount: 1
+ DexalinPlus:
+ amount: 1
+ Phalanximine:
+ amount: 1
+ Plasma:
+ amount: 1
+ products:
+ ADTMPolymorphine: 4
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml b/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml
new file mode 100644
index 00000000000..613a8f72ede
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml
@@ -0,0 +1,165 @@
+# новые доп. препараты.
+
+
+
+#bicaridine
+- type: reaction
+ id: ADTMSodiumizole
+ reactants:
+ Bicaridine:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Sodium:
+ amount: 1
+ products:
+ ADTMSodiumizole: 2
+
+- type: reaction
+ id: ADTMNitrofurfoll
+ reactants:
+ Bicaridine:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Carbon:
+ amount: 1
+ products:
+ ADTMNitrofurfoll: 2
+
+- type: reaction
+ id: ADTMPeroHydrogen
+ reactants:
+ Bicaridine:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Hydrogen:
+ amount: 1
+ products:
+ ADTMPeroHydrogen: 2
+
+#Dermaline
+- type: reaction
+ id: ADTMAnelgesin
+ reactants:
+ Dermaline:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Carbon:
+ amount: 1
+ products:
+ ADTMAnelgesin: 2
+
+- type: reaction
+ id: ADTMMinoxide
+ reactants:
+ Dermaline:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Hydrogen:
+ amount: 1
+ products:
+ ADTMMinoxide: 2
+
+#Dylovene
+- type: reaction
+ id: ADTMBiomicine
+ reactants:
+ Dylovene:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Carbon:
+ amount: 1
+ products:
+ ADTMBiomicine: 2
+
+#DexalinPlus
+- type: reaction
+ id: ADTMNikematide
+ reactants:
+ DexalinPlus:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Hydrogen:
+ amount: 1
+ products:
+ ADTMNikematide: 2
+
+- type: reaction
+ id: ADTMDiethamilate
+ reactants:
+ DexalinPlus:
+ amount: 1
+ ADTCopperNitride:
+ amount: 1
+ Carbon:
+ amount: 1
+ products:
+ ADTMDiethamilate: 2
+
+# Дополнения
+- type: reaction
+ id: ADTMAgolatine
+ reactants:
+ Carbon:
+ amount: 1
+ Ammonia:
+ amount: 2
+ Oxygen:
+ amount: 1
+ products:
+ ADTMAgolatine: 4
+
+- type: reaction
+ id: ADTMHaloperidol
+ reactants:
+ ADTMAgolatine:
+ amount: 2
+ Chlorine:
+ amount: 1
+ products:
+ ADTMHaloperidol: 3
+
+- type: reaction
+ id: Vitamin
+ reactants:
+ Carbon:
+ amount: 1
+ Hydrogen:
+ amount: 1
+ Oxygen:
+ amount: 1
+ products:
+ Vitamin: 3
+
+- type: reaction
+ id: ADTMMorphine
+ minTemp: 370
+ reactants:
+ ADTMOpium:
+ amount: 1
+ Water:
+ amount: 1
+ Ethanol:
+ amount: 1
+ products:
+ ADTMMorphine: 3
+
+- type: reaction
+ id: ADTMFormalin
+ minTemp: 370
+ reactants:
+ Water:
+ amount: 2
+ Vinegar: #тут не совсем должен быть уксус, а формальдегит. Но в таком случае придётся делать ещё один препарат от гниения.
+ amount: 1
+ Iron:
+ amount: 1
+ catalyst: true
+ products:
+ ADTMFormalin: 3
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml b/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml
new file mode 100644
index 00000000000..47803ee3d5f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml
@@ -0,0 +1,11 @@
+- type: reaction
+ id: ADTPhronidolepaxorine
+ reactants:
+ Plasma:
+ amount: 2
+ Leporazine:
+ amount: 2
+ Lexorin:
+ amount: 1
+ products:
+ ADTPhronidolepaxorine: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Research/biochemical.yml b/Resources/Prototypes/ADT/Research/biochemical.yml
new file mode 100644
index 00000000000..bfb4228aa54
--- /dev/null
+++ b/Resources/Prototypes/ADT/Research/biochemical.yml
@@ -0,0 +1,12 @@
+# Tier 2.
+- type: technology
+ id: ADTHighVoltageDefibrillator
+ name: research-technology-highvolt-defib
+ icon:
+ sprite: ADT/Objects/Specific/Medical/high-volt_defib.rsi
+ state: icon
+ discipline: Biochemical
+ tier: 2
+ cost: 5000
+ recipeUnlocks:
+ - ADTHighVoltageDefibrillator
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist/pathologist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist/pathologist.yml
new file mode 100644
index 00000000000..098a62b2934
--- /dev/null
+++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist/pathologist.yml
@@ -0,0 +1,33 @@
+- type: job
+ id: ADTPathologist
+ name: job-name-ADTPathologist
+ description: job-description-ADTPathologist
+ playTimeTracker: JobADTPathologist
+ requirements:
+ - !type:DepartmentTimeRequirement
+ department: Medical
+ time: 21600 #6 hrs
+ startingGear: ADTPathologistGear
+ icon: "JobIconADTPathologist"
+ supervisors: job-supervisors-cmo
+ canBeAntag: true
+ access:
+ - Medical
+ - Maintenance
+
+- type: startingGear
+ id: ADTPathologistGear
+ equipment:
+ jumpsuit: ADTClothingUniformPathologistSuit
+ back: ADTClothingBackpackPathologistFilled
+ shoes: ClothingShoesColorWhite
+ id: ADTPathologistPDA
+ ears: ClothingHeadsetMedical
+ belt: BoxFolderClipboard
+ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
+ socks: ClothingUnderwearSocksNormal
+ underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear
+ underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
+ innerClothingSkirt: ADTClothingUniformPathologistSkirt
+ satchel: ADTClothingBackpackSatchelPathologistFilled
+ duffelbag: ADTClothingBackpackDuffelPathologistFilled
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist/pathologist_pda.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist/pathologist_pda.yml
new file mode 100644
index 00000000000..9ff53cb1bca
--- /dev/null
+++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist/pathologist_pda.yml
@@ -0,0 +1,25 @@
+- type: entity
+ parent: IDCardStandard
+ id: ADTPathologistIDCard
+ name: pathologist's ID card
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Misc/id_cards.rsi
+ layers:
+ - state: default
+ - state: id-pathologist
+ - type: PresetIdCard
+ job: ADTPathologist
+
+- type: entity
+ parent: MedicalPDA
+ id: ADTPathologistPDA
+ name: pathologist's PDA
+ description: It breezes chill.
+ components:
+ - type: Pda
+ id: ADTPathologistIDCard
+ state: pda-pathologist
+ - type: PdaBorderColor
+ borderColor: "#d7d7d0"
+ accentVColor: "#15616b"
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Shark/Body/Organs/Shark.yml b/Resources/Prototypes/ADT/Shark/Body/Organs/Shark.yml
index 38f64823741..8fa36b6732a 100644
--- a/Resources/Prototypes/ADT/Shark/Body/Organs/Shark.yml
+++ b/Resources/Prototypes/ADT/Shark/Body/Organs/Shark.yml
@@ -5,3 +5,15 @@
components:
- type: Stomach
maxVolume: 50
+
+- type: entity
+ id: OrganSharkHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Shark ]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
diff --git a/Resources/Prototypes/ADT/Shark/Body/Prototypes/Shark.yml b/Resources/Prototypes/ADT/Shark/Body/Prototypes/Shark.yml
index 389cab0bb1c..edcd6447f5e 100644
--- a/Resources/Prototypes/ADT/Shark/Body/Prototypes/Shark.yml
+++ b/Resources/Prototypes/ADT/Shark/Body/Prototypes/Shark.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoShark
organs:
- heart: OrganAnimalHeart
+ heart: OrganSharkHeart
lungs: OrganHumanLungs
stomach: OrganSharkStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/ADT/StatusEffects/job.yml b/Resources/Prototypes/ADT/StatusEffects/job.yml
index 6c3c4096bf9..ce14ae5adb4 100644
--- a/Resources/Prototypes/ADT/StatusEffects/job.yml
+++ b/Resources/Prototypes/ADT/StatusEffects/job.yml
@@ -18,3 +18,10 @@
icon:
sprite: Interface/Misc/job_icons.rsi
state: JobIconADTInvestigator
+
+- type: statusIcon
+ parent: JobIcon
+ id: JobIconADTPathologist
+ icon:
+ sprite: Interface/Misc/job_icons.rsi
+ state: JobIconADTPathologist
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Tajaran/Body/Organs/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Body/Organs/Tajaran.yml
index 2abbbfe436d..47817e1f0a8 100644
--- a/Resources/Prototypes/ADT/Tajaran/Body/Organs/Tajaran.yml
+++ b/Resources/Prototypes/ADT/Tajaran/Body/Organs/Tajaran.yml
@@ -5,3 +5,15 @@
components:
- type: Stomach
maxVolume: 50
+
+- type: entity
+ id: OrganTajaranHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Tajaran, Animal ]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
diff --git a/Resources/Prototypes/ADT/Tajaran/Body/Prototypes/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Body/Prototypes/Tajaran.yml
index 85a49333caa..39ac8388bc1 100644
--- a/Resources/Prototypes/ADT/Tajaran/Body/Prototypes/Tajaran.yml
+++ b/Resources/Prototypes/ADT/Tajaran/Body/Prototypes/Tajaran.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoTajaran
organs:
- heart: OrganAnimalHeart
+ heart: OrganTajaranHeart
lungs: OrganHumanLungs
stomach: OrganTajaranStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/ADT/Ursus/Body/Organs/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Body/Organs/Ursus.yml
new file mode 100644
index 00000000000..f622359c84f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Ursus/Body/Organs/Ursus.yml
@@ -0,0 +1,11 @@
+- type: entity
+ id: OrganUrsusHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Ursus, Animal ] #надо для того, чтобы и травил шоколад, и работал полиморфин.
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Ursus/Body/Prototypes/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Body/Prototypes/Ursus.yml
index f7c8e9c132e..e7ee324271e 100644
--- a/Resources/Prototypes/ADT/Ursus/Body/Prototypes/Ursus.yml
+++ b/Resources/Prototypes/ADT/Ursus/Body/Prototypes/Ursus.yml
@@ -18,7 +18,7 @@
- right_leg
- left_leg
organs:
- heart: OrganAnimalHeart
+ heart: OrganUrsusHeart
lungs: OrganHumanLungs
stomach: OrganAnimalStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml
index ff54ca42b00..d679a70b064 100644
--- a/Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml
+++ b/Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml
@@ -21,3 +21,15 @@
groups:
- id: Alcohol
rateModifier: 0.1
+
+- type: entity
+ id: OrganVulpkaninHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Vulpkanin, Animal ]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
diff --git a/Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml
index b23cf7784fa..2cb6043ae4b 100644
--- a/Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml
+++ b/Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoVulpkanin
organs:
- heart: OrganAnimalHeart
+ heart: OrganVulpkaninHeart
lungs: OrganHumanLungs
stomach: OrganVulpkaninStomach
liver: ADTOrganVulpkaninAnimalLiver #Печень вульпы
diff --git a/Resources/Prototypes/ADT/polymorphs.yml b/Resources/Prototypes/ADT/polymorphs.yml
new file mode 100644
index 00000000000..7927e5e4561
--- /dev/null
+++ b/Resources/Prototypes/ADT/polymorphs.yml
@@ -0,0 +1,361 @@
+#ADTP - Polymorph
+#человек и дворф
+- type: polymorph
+ id: ADTPMonkey
+ configuration:
+ entity: MobMonkey
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPMonkey2
+ configuration:
+ entity: MobMonkey
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#унатхи и кобольды
+- type: polymorph
+ id: ADTPLizard
+ configuration:
+ entity: MobLizard
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPLizard2
+ configuration:
+ entity: MobLizard
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#арахниды
+- type: polymorph
+ id: ADTPSpider
+ configuration:
+ entity: MobGiantSpider
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPSpider2
+ configuration:
+ entity: MobGiantSpider
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#дионы
+- type: polymorph
+ id: ADTPBush
+ configuration:
+ entity: FloraTree01
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPBush2
+ configuration:
+ entity: FloraTree01
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#моли (другого не придумал)
+- type: polymorph
+ id: ADTPMothroach
+ configuration:
+ entity: MobMothroach
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPMothroach2
+ configuration:
+ entity: MobMothroach
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#слаймолюды
+- type: polymorph
+ id: ADTPSmile
+ configuration:
+ entity: MobSlimesPet
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPSmile2
+ configuration:
+ entity: MobSlimesPet
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#наши расы
+#таяры и фелиниды, кто бы мог подумать.
+- type: polymorph
+ id: ADTPCat
+ configuration:
+ entity: MobCat
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPCat2
+ configuration:
+ entity: MobCat
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#вульпы (увы, других собак нету.)
+- type: polymorph
+ id: ADTPDog
+ configuration:
+ entity: MobWalter
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPDog2
+ configuration:
+ entity: MobWalter
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#новакиды. Не совсем понятно, стоит ли и им добавлять, поскольку полиморфин работает на органику, но полиморф оставлю.
+- type: polymorph
+ id: ADTPRodMetall
+ configuration:
+ entity: PartRodMetal1
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPRodMetall2
+ configuration:
+ entity: PartRodMetal1 #ну вы поняли, палка с огнём.
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#Урсы
+- type: polymorph
+ id: ADTPSpaceBear
+ configuration:
+ entity: MobBearSpace
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPSpaceBear2
+ configuration:
+ entity: MobBearSpace
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#Драски
+- type: polymorph
+ id: ADTPSoap
+ configuration:
+ entity: Soap
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPSoap2
+ configuration:
+ entity: Soap
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 120
+
+#самое весёлое: нестабильный полиморф. максимальный рандом, потому что нестабильность.
+- type: polymorph
+ id: ADTPBread
+ configuration:
+ entity: FoodBreadPlain
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPSkeleton
+ configuration:
+ entity: MobSkeletonPerson
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 15
+
+- type: polymorph
+ id: ADTPCow
+ configuration:
+ entity: MobCow
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 20
+
+- type: polymorph
+ id: ADTPFrog
+ configuration:
+ entity: MobFrog
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 35
+
+- type: polymorph
+ id: ADTPPossum
+ configuration:
+ entity: MobPossum
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 40
+
+- type: polymorph
+ id: ADTPCarp
+ configuration:
+ entity: MobCarp
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 50
+
+- type: polymorph
+ id: ADTPMouse
+ configuration:
+ entity: MobMouse
+ forced: true
+ transferName: true
+ allowRepeatedMorphs: False
+ inventory: Drop
+ revertOnCrit: true
+ revertOnDeath: true
+ duration: 30
diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml
index 1f4c86494eb..2b8186d66c6 100644
--- a/Resources/Prototypes/ADT/tags.yml
+++ b/Resources/Prototypes/ADT/tags.yml
@@ -31,6 +31,9 @@
- type: Tag
id: CatWearable
+- type: Tag
+ id: Defibrillator
+
- type: Tag
id: PowerCellMedium
@@ -38,7 +41,13 @@
id: Fish
- type: Tag
+ id: ChangelingBlacklist
+
+- type: Tag
id: BoomBoxTape
- type: Tag
- id: ChangelingBlacklist
\ No newline at end of file
+ id: MobileDefibrillator
+
+- type: Tag
+ id: HighVoltageDefibrillator
diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
index 1a07a0e50d3..6ab9bbbc649 100644
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -27,3 +27,15 @@
groups:
- id: Food
- id: Drink
+
+- type: entity
+ id: OrganMothHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Moth ]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
index 1015b09ad81..f50a2131217 100644
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -20,3 +20,15 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
+
+- type: entity
+ id: OrganReptilianHeart
+ parent: OrganAnimalHeart
+ components:
+ - type: Metabolizer
+ maxReagents: 2
+ metabolizerTypes: [ Reptilian, Animal ]
+ groups:
+ - id: Medicine
+ - id: Poison
+ - id: Narcotic
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/kobalt.yml b/Resources/Prototypes/Body/Prototypes/kobalt.yml
index 93ae8300c92..bd0403f713f 100644
--- a/Resources/Prototypes/Body/Prototypes/kobalt.yml
+++ b/Resources/Prototypes/Body/Prototypes/kobalt.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoKobolt
organs:
- heart: OrganAnimalHeart
+ heart: OrganReptilianHeart
lungs: OrganHumanLungs
stomach: OrganKoboltStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/Body/Prototypes/moth.yml b/Resources/Prototypes/Body/Prototypes/moth.yml
index 7ebeda7fefa..62654bfc3a1 100644
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ b/Resources/Prototypes/Body/Prototypes/moth.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoMoth
organs:
- heart: OrganAnimalHeart
+ heart: OrganMothHeart
lungs: OrganHumanLungs
stomach: OrganMothStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/Body/Prototypes/reptilian.yml b/Resources/Prototypes/Body/Prototypes/reptilian.yml
index 347af8aa7a2..632d2c2a485 100644
--- a/Resources/Prototypes/Body/Prototypes/reptilian.yml
+++ b/Resources/Prototypes/Body/Prototypes/reptilian.yml
@@ -13,7 +13,7 @@
torso:
part: TorsoReptilian
organs:
- heart: OrganAnimalHeart
+ heart: OrganReptilianHeart
lungs: OrganHumanLungs
stomach: OrganReptilianStomach
liver: OrganAnimalLiver
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index fc749f225e6..8f92db5ae15 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -14,7 +14,7 @@
sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
state: seed
product: CrateHydroponicsSeedsMedicinal
- cost: 700
+ cost: 800
category: Hydroponics
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 78931227650..83fad7f975d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -94,7 +94,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockMedicalFilled
- cost: 2400
+ cost: 2700
category: Medical
group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index f9a25dd0c51..5c003a33081 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -39,6 +39,8 @@
amount: 3
- id: PoppySeeds
amount: 3
+ - id: ADTPapaverSomniferumSeeds
+ amount: 3
- id: ADTcannabiswhiteSeeds
prob: 0.2
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index 309ef814236..25c6a5701e9 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -34,11 +34,11 @@
- type: StorageFill
contents:
- id: MedicatedSuture
- amount: 2
- id: BruteAutoInjector
amount: 2
- - id: EmergencyMedipen
+ - id: ADTMedicalTourniquet
- id: PillCanisterIron
+ amount: 2
- type: entity
id: MedkitToxinFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 0fa4750eb6e..8b991a1c592 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -277,6 +277,9 @@
- id: ClothingHeadHatBeretCmo
- id: ClothingOuterHardsuitMedical
- id: Hypospray
+ - id: ADTBookNewChemicals
+ - id: ADTReagentAnalyzer
+ - id: ADTMobileDefibrillator
- id: HandheldCrewMonitor
- id: DoorRemoteMedical
- id: RubberStampCMO
@@ -294,6 +297,8 @@
# Sirena-Underwear-Start
- id: ADTUnderwearBoxCMO
# Sirena-Underwear-End
+ - id: ADTBriefcaseBrownHikingCmo
+ - id: ADTClothingBeltMedicalBagFilled
- type: entity
@@ -313,6 +318,9 @@
- id: ClothingMaskSterile
- id: ClothingHeadHatBeretCmo
- id: Hypospray
+ - id: ADTBookNewChemicals
+ - id: ADTReagentAnalyzer
+ - id: ADTMobileDefibrillator
- id: HandheldCrewMonitor
- id: DoorRemoteMedical
- id: RubberStampCMO
@@ -331,6 +339,8 @@
# Sirena-Underwear-Start
- id: ADTUnderwearBoxCMO
# Sirena-Underwear-End
+ - id: ADTBriefcaseBrownHikingCmo
+ - id: ADTClothingBeltMedicalBagFilled
- type: entity
id: LockerResearchDirectorFilledHardsuit
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index f035c0f8f99..af657eac36e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -14,9 +14,13 @@
amount: 2
- id: Ointment
amount: 2
+ - id: ADTAntibioticOintment
+ amount: 2
- id: Bloodpack
amount: 2
- id: Gauze
+ - id: ADTMedicalTourniquet
+ amount: 3
- type: entity
id: LockerWallMedicalFilled
@@ -33,10 +37,13 @@
amount: 2
- id: Ointment
amount: 2
+ - id: ADTAntibioticOintment
+ amount: 2
- id: Bloodpack
amount: 2
- id: Gauze
-
+ - id: ADTMedicalTourniquet
+ amount: 3
- type: entity
id: LockerMedicalFilled
@@ -50,6 +57,7 @@
- id: ClothingHandsGlovesLatex
- id: ClothingHeadsetMedical
- id: ClothingEyesHudMedical #Removed until working properly
+ - id: ADTClothingBeltMedicalBag
- id: ClothingBeltMedical
- id: ClothingHeadHatSurgcapGreen
prob: 0.1
@@ -84,6 +92,7 @@
- id: ClothingHandsGlovesLatex
- id: ClothingHeadsetMedical
- id: ClothingEyesHudMedical #Removed until working properly
+ - id: ADTClothingBeltMedicalBag
- id: ClothingBeltMedical
- id: ClothingHeadHatSurgcapGreen
prob: 0.1
@@ -121,11 +130,14 @@
amount: 2
- id: BoxVial
- id: ChemBag
+ - id: ADTClothingBeltMedicalBag
- id: ClothingHandsGlovesLatex
- id: ClothingHeadsetMedical
- id: ClothingMaskSterile
- id: HandLabeler
prob: 0.5
+ - id: ADTReagentAnalyzer
+ - id: ADTSmallSyringeBox
- type: entity
id: LockerParamedicFilled
@@ -139,14 +151,20 @@
- id: ADTClothingOuterParamedicVoidHardsuit
- id: ClothingOuterCoatParamedicWB
- id: ClothingHeadHatParamedicsoft
+ - id: ADTClothingHeadHatsParamedicBeret
- id: ClothingOuterWinterPara
- id: ClothingUniformJumpsuitParamedic
- id: ClothingUniformJumpskirtParamedic
- id: ClothingEyesHudMedical
- id: Defibrillator
- id: ClothingHandsGlovesLatex
- - id: ClothingHeadsetMedical
+ - id: ADTClothingHeadsetParamedic
+ - id: ADTClothingOuterCoatLabParamedic
- id: ClothingMaskSterile
+ - id: ADTMedicalTourniquet
+ amount: 3
- id: HandheldGPSBasic
- id: MedkitFilled
prob: 0.3
+ - id: ADTClothingHeadHatHoodBioParamedic
+ - id: ADTClothingOuterBioParamedic
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
index d028c55cabc..10ff178fa2c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -9,6 +9,7 @@
ClothingBackpackSatchelChemistry: 2
ClothingBackpackDuffelChemistry: 2
ChemBag: 2
+ ADTClothingBeltMedicalBag: 2
ClothingBeltMedical: 2
ClothingHandsGlovesLatex: 2
ClothingHeadsetMedical: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
index b3535de2b82..d4a2a397ca7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -5,6 +5,8 @@
Brutepack: 5
Ointment: 5
Bloodpack: 5
+ ADTAntibioticOintment: 5
+ ADTMedicalTourniquet: 10
EpinephrineChemistryBottle: 3
Syringe: 5
ADTPatchHealing: 4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index 00339087498..25d01d555ed 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -4,21 +4,17 @@
ClothingBackpackDuffelMedical: 4
ClothingBackpackMedical: 4
ClothingBackpackSatchelMedical: 4
- ClothingUniformJumpsuitParamedic: 4
- ClothingUniformJumpskirtParamedic: 4
- ClothingUniformJumpsuitMedicalDoctor: 4
- ClothingUniformJumpskirtMedicalDoctor: 4
- ClothingEyesEyepatchHudMedical: 1
+ #ADTClothingBackpackDuffelMedical: 4
+ #ADTClothingBackpackMedical: 4
+ #ADTClothingBackpackSatchelMedical: 4
+ #ADTClothingBeltMedicalBag: 4
+ ADTClothingHeadHatsMedicalBeret: 4
ClothingHeadNurseHat: 4
ClothingOuterCoatLab: 4
ClothingShoesColorWhite: 4
ClothingHandsGlovesLatex: 4
ClothingHeadsetMedical: 4
ClothingOuterWinterMed: 2
- ClothingOuterWinterPara: 2
- ClothingOuterCoatParamedicWB: 2
- ClothingHeadHatParamedicsoft: 2
- ADTClothingOuterParamedicVoidHardsuit: 1
#ClothingHeadHelmetVoidParamed: 1
#ClothingOuterHardsuitVoidParamed: 1
ClothingOuterHospitalGown: 5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
index 405e2eff564..1fbdb198240 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
@@ -3,6 +3,8 @@
startingInventory:
Brutepack: 3
Ointment: 3
+ ADTAntibioticOintment: 3
Bloodpack: 3
+ ADTMedicalTourniquet: 5
EpinephrineChemistryBottle: 3
Syringe: 3
diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml
index 4d69f34a404..ba436c01761 100644
--- a/Resources/Prototypes/Chemistry/metabolizer_types.yml
+++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml
@@ -48,3 +48,35 @@
- type: metabolizerType
id: Novakid
name: novakid
+
+- type: metabolizerType
+ id: Demon
+ name: demon
+
+- type: metabolizerType
+ id: Shark
+ name: shark
+
+- type: metabolizerType
+ id: Vulpkanin
+ name: vulpkanin
+
+- type: metabolizerType
+ id: Tajaran
+ name: tajaran
+
+- type: metabolizerType
+ id: Reptilian
+ name: reptilian
+
+- type: metabolizerType
+ id: Ursus
+ name: ursus
+
+- type: metabolizerType
+ id: Drask
+ name: drask
+
+- type: metabolizerType
+ id: Felinid
+ name: felinid
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Objectives/goals.yml b/Resources/Prototypes/Corvax/Objectives/goals.yml
index f6e89648083..d8eb8b249af 100644
--- a/Resources/Prototypes/Corvax/Objectives/goals.yml
+++ b/Resources/Prototypes/Corvax/Objectives/goals.yml
@@ -66,6 +66,10 @@
id: stationgoalsmes
text: station-goal-smes
+- type: stationGoal
+ id: stationgoalpolymorphine
+ text: station-goal-polymorphine
+
- type: stationGoal
id: stationgoalshuttlecrew
text: station-goal-shuttlecrew
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index b5ad5bb0236..9012fef34ff 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -270,6 +270,7 @@
- PillCanister
- Radio
- DiscreteHealthAnalyzer
+ - Defibrillator
components:
- Hypospray
- Injector
@@ -302,6 +303,10 @@
# whitelist:
# tags:
# - WrenchMedical
+ defibrillator:
+ whitelist:
+ tags:
+ - Defibrillator
wrench:
whitelist:
tags:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 2c85b647968..683ddf21776 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -341,10 +341,9 @@
- type: Medibot
treatments:
Alive:
- reagent: Tricordrazine
- quantity: 30
- minDamage: 0
- maxDamage: 50
+ reagent: DoctorsDelight
+ quantity: 10
+ minDamage: 10
Critical:
reagent: Inaprovaline
quantity: 15
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 9d1398c6cae..c592307525a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -81,6 +81,9 @@
paper_label: !type:ContainerSlot
- type: StaticPrice
price: 50
+ - type: GuideHelp
+ guides:
+ - ADTPathologist
- type: entity
id: BodyBag_Folded
@@ -95,6 +98,9 @@
# - type: Placeable
# prototype: someId
# snap: Center
+ - type: GuideHelp
+ guides:
+ - ADTPathologist
- type: entity
parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index 027ff206f8d..783a4f7a3eb 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -17,7 +17,7 @@
map: [ "enum.SolutionContainerLayers.Fill" ]
visible: false
- type: Item
- size: Normal
+ size: Large
sprite: Objects/Specific/Chemistry/jug.rsi
- type: RefillableSolution
solution: beaker
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index acfb65aa54f..0cec23da420 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -41,6 +41,8 @@
- type: SolutionTransfer
maxTransferAmount: 30
canChangeTransferAmount: true
+ - type: FitsInDispenser
+ solution: drink
- type: UserInterface
interfaces:
- key: enum.TransferAmountUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 95b3241eb7c..127058dee41 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -453,7 +453,7 @@
- type: SolutionContainerManager
solutions:
food:
- maxVol: 20
+ maxVol: 30
- type: SolutionSpiker
sourceSolution: food
- type: Extractable
diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 1d9bb47e0e6..a4d25be930f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -23,5 +23,6 @@
whitelist:
components:
- Item
+ - EntityStorage
tags:
- Structure
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index d7df219663e..3f9ef6cacec 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -18,7 +18,7 @@
sprite: Structures/Machines/mixer.rsi
state: mixer_loaded
- type: ChemMaster
- pillDosageLimit: 20
+ pillDosageLimit: 30
- type: Physics
bodyType: Static
- type: Fixtures
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index ab105a45c2d..89e672f1b67 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -278,6 +278,7 @@
- HoloprojectorField
- Saw
- Hemostat
+ - ADTHighVoltageDefibrillator
- Syringecartridge
- CryostasisBeaker
- SyringeCryostasis
@@ -872,6 +873,9 @@
staticRecipes:
- Brutepack
- Ointment
+ - ADTReagentAnalyzer
+ - ADTAntibioticOintment
+ - ADTMedicalTourniquet
- Gauze
- HandLabeler
- Defibrillator
@@ -884,10 +888,15 @@
- LargeBeaker
- Dropper
- Syringe
+ - ADTSmallSyringe
- Implanter
- PillCanister
+ - ADTPillCanister
+ - ADTPillPack
- BodyBag
+ - ADTFootTag
- ChemistryEmptyBottle01
+ - ADTPlasticBottle
- RollerBedSpawnFolded
- CheapRollerBedSpawnFolded
- EmergencyRollerBedSpawnFolded
@@ -919,6 +928,7 @@
- SyringeBluespace
- Jug
- SyringeCryostasis
+ - ADTHighVoltageDefibrillator
- type: Machine
board: MedicalTechFabCircuitboard
- type: StealTarget
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index 725f4c9b0f2..937bad00407 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -44,9 +44,11 @@
path: /Audio/Items/deconstruct.ogg
- type: EntityStorageLayingDownOverride
- type: Morgue
+ - type: ItemSlots
- type: ContainerContainer
containers:
entity_storage: !type:Container
+ paper_label: !type:ContainerSlot
- type: Appearance
- type: GenericVisualizer
visuals:
@@ -71,6 +73,23 @@
- type: AntiRottingContainer
- type: StaticPrice
price: 200
+ - type: PaperLabel
+ labelSlot:
+ insertVerbText: Attach Label
+ ejectVerbText: Remove Label
+ whitelist:
+ components:
+ - Paper
+ - type: ItemMapper
+ mapLayers:
+ morgue_paper:
+ whitelist:
+ tags:
+ - Document
+ sprite: Structures/Storage/morgue.rsi
+ - type: GuideHelp
+ guides:
+ - ADTPathologist
- type: entity
id: Crematorium
diff --git a/Resources/Prototypes/GG/painkiller.yml b/Resources/Prototypes/GG/painkiller.yml
index 5b74cbc6015..9b280fd0f43 100644
--- a/Resources/Prototypes/GG/painkiller.yml
+++ b/Resources/Prototypes/GG/painkiller.yml
@@ -7,36 +7,4 @@
icons: [ /Textures/GG/Interface/Alerts/painkiller.png ]
name: На болеутоляющих
description: Вас ничего не сковывает.
-
-# мне было лень редачить имя и описание, это вы как нить сами
# иконку сделал LogDog из GG
-
-- type: reagent
- id: Morphine
- name: reagent-name-morphine
- group: Medicine
- desc: reagent-desc-morphine
- physicalDesc: reagent-physical-desc-viscous
- flavor: medicine
- color: "#ba7d7d"
- metabolisms:
- Narcotic:
- metabolismRate: 1
- effects:
- - !type:GenericStatusEffect
- key: PainKiller
- component: PainKiller
- type: Add
- time: 60
- refresh: true
- Medicine:
- effects:
- - !type:HealthChange
- conditions:
- - !type:ReagentThreshold
- min: 1
- damage:
- groups:
- Brute: -0.1
-
-
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 9ea2398a7ce..8c7f1dbf666 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -7,6 +7,7 @@
- Chemist
- Cloning
- Cryogenics
+ - ADTPathologist
- type: guideEntry
id: Medical Doctor
@@ -28,8 +29,10 @@
name: guide-entry-chemist
text: "/ServerInfo/Guidebook/Medical/Chemist.xml"
children:
+ - ADTChemicals
- Medicine
- Botanicals
+ - Chemicals
- AdvancedBrute
- type: guideEntry
diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml
index 9df1b260084..5bce30fb728 100644
--- a/Resources/Prototypes/Guidebook/shiftandcrew.yml
+++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml
@@ -35,6 +35,8 @@
name: guide-entry-bartender
text: "/ServerInfo/Guidebook/Service/Bartender.xml"
filterEnabled: True
+ children:
+ - ADTNewCocktails
- type: guideEntry
id: Chef
@@ -42,7 +44,7 @@
text: "/ServerInfo/Guidebook/Service/Chef.xml"
children:
- Food Recipes
-
+ - ADTNewRecipes
- type: guideEntry
id: Food Recipes
name: guide-entry-foodrecipes
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml
index dfe072b3e03..0d36db6861b 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/ss14.yml
@@ -6,7 +6,6 @@
- Controls
- Jobs
- Survival
- - Chemicals
- Antagonists
- Writing
- Glossary
diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
index 25581ca6d97..816fba0bac4 100644
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -69,6 +69,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml
index 20e1519b042..a6c422832cf 100644
--- a/Resources/Prototypes/Maps/cluster.yml
+++ b/Resources/Prototypes/Maps/cluster.yml
@@ -69,6 +69,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1]
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
index 46fe010b1e9..bafe382f972 100644
--- a/Resources/Prototypes/Maps/core.yml
+++ b/Resources/Prototypes/Maps/core.yml
@@ -72,7 +72,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
- ADTInvestigator: [ 1, 1 ] #ADT
+ ADTPathologist: [ 1 , 1] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
ADTJanitorBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
index 824723875f6..64f6348af09 100644
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -70,7 +70,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
- ADTInvestigator: [ 1, 1 ] #ADT
+ ADTPathologist: [ 1 , 1] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
ADTJanitorBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index f0c09804561..9a649e97123 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -66,6 +66,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index d02cfdb81bf..120c9160861 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -68,6 +68,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
index 26f9bab6d95..2678304b84b 100644
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -64,6 +64,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml
index 192203f64aa..e29ee5583f4 100644
--- a/Resources/Prototypes/Maps/origin.yml
+++ b/Resources/Prototypes/Maps/origin.yml
@@ -71,6 +71,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
index 9e8363a33d9..f394cb9ad5a 100644
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -67,6 +67,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index 0141fbe1f19..0036956ef73 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -67,6 +67,7 @@
Brigmedic: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]
Magistrat: [ 1, 1 ]
+ ADTPathologist: [ 1 , 1] #ADT
ADTInvestigator: [ 1, 1 ] #ADT
ADTSecurityCyborg: [ 1, 1 ] #ADT
ADTEngiBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 3c1b4661d4c..5259e52833f 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -672,37 +672,6 @@
sprite: Objects/Consumable/Drinks/devilskiss.rsi
state: icon
-- type: reagent
- id: DoctorsDelight
- name: reagent-name-doctors-delight
- parent: BaseDrink
- desc: reagent-desc-doctors-delight
- physicalDesc: reagent-physical-desc-strong-smelling
- flavor: medicine
- color: "#FF8CFF"
- metamorphicSprite:
- sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
- state: icon
- metabolisms:
- Drink:
- effects:
- - !type:SatiateThirst
- factor: 2
- - !type:SatiateHunger
- factor: -2
- - !type:AdjustReagent
- reagent: Ethanol
- amount: 0.05
- Medicine:
- effects:
- - !type:HealthChange
- damage:
- groups:
- Burn: -1
- Brute: -1
- Airloss: -1
- Toxin: -1
-
- type: reagent
id: DriestMartini
name: reagent-name-driest-martini
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 7a04018a594..35cd609c128 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -471,3 +471,30 @@
effects:
- !type:SatiateThirst
factor: 1
+
+
+- type: reagent
+ id: DoctorsDelight
+ name: reagent-name-doctors-delight
+ parent: BaseDrink
+ desc: reagent-desc-doctors-delight
+ physicalDesc: reagent-physical-desc-strong-smelling
+ flavor: medicine
+ color: "#FF8CFF"
+ metamorphicSprite:
+ sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
+ state: icon
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ groups:
+ Burn: -1
+ Brute: -1
+ Airloss: -1
+ Toxin: -1
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index eba3611b062..e6659827b1a 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -34,7 +34,7 @@
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 20
+ min: 20.05
damage:
groups:
Brute: 2
@@ -50,15 +50,21 @@
visualType: Medium
messages: [ "generic-reagent-effect-nauseous" ]
probability: 0.2
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- !type:ChemVomit
conditions:
- !type:ReagentThreshold
min: 20
probability: 0.02
- !type:Drunk
- conditions:
- - !type:ReagentThreshold
- min: 15
+ boozePower: 3 #у этанола 2
plantMetabolism:
- !type:PlantAdjustToxins
amount: -10
@@ -101,12 +107,21 @@
effects:
- !type:GenericStatusEffect
key: Drunk
- time: 6.0
+ time: 10.0
type: Remove
- !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ reagent: Dylovene
+ min: 0.5
damage:
types:
- Poison: -0.5
+ Poison: -0.75
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-hungover" ]
+ probability: 0.05
- type: reagent
id: Arithrazine
@@ -125,6 +140,11 @@
Radiation: -3
groups:
Brute: 0.5
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.05
- type: reagent
id: Bicaridine
@@ -135,16 +155,24 @@
flavor: medicine
color: "#ffaa00"
metabolisms:
- Medicine:
+ Medicine:
effects:
- !type:HealthChange
damage:
groups:
- Brute: -2
+ Brute: -2
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 15
+ min: 15.05
damage:
types:
Asphyxiation: 0.5
@@ -227,11 +255,19 @@
types:
Heat: -1.5
Shock: -1.5
- Cold: -1.5
+ Cold: -1.5 #получается, всего за единицу лечит 9 ожогов.
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 10
+ min: 10.05
damage:
types:
Asphyxiation: 1
@@ -241,7 +277,15 @@
- !type:Jitter
conditions:
- !type:ReagentThreshold
- min: 10
+ min: 10.05
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 10.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Dexalin
@@ -262,11 +306,27 @@
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 20
+ min: 20.05
damage:
types:
Asphyxiation: 3
Cold: 1
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 20.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-asphyxia" ]
+ probability: 0.05
- type: reagent
id: DexalinPlus
@@ -282,8 +342,8 @@
- !type:HealthChange
damage:
types:
- Asphyxiation: -3.5
- Bloodloss: -3
+ Asphyxiation: -2
+ Bloodloss: -1
- !type:AdjustReagent
conditions:
- !type:ReagentThreshold
@@ -294,11 +354,27 @@
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 25
+ min: 25.05
damage:
types:
Asphyxiation: 5
Cold: 3
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 25.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-asphyxia" ]
+ probability: 0.05
# this ones a doozy
- type: reagent
@@ -319,7 +395,7 @@
mobstate: Critical
- !type:ReagentThreshold
min: 0
- max: 20
+ max: 20.5
damage:
types:
Asphyxiation: -3
@@ -330,11 +406,19 @@
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 20
+ min: 20.05
damage:
types:
Asphyxiation: 1
Poison: 1
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 20.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- !type:AdjustReagent
reagent: HeartbreakerToxin
amount: -2
@@ -361,6 +445,17 @@
key: KnockedDown
time: 0.75
type: Remove
+ - !type:PopupMessage
+ conditions:
+ - !type:MobStateCondition
+ mobstate: Critical
+ type: Local
+ visualType: Small
+ messages:
+ - medicine-effect-usual
+ - medicine-effect-asphyxia
+ probability: 0.05
+
- type: reagent
id: Hyronalin
@@ -377,19 +472,35 @@
damage:
types:
Radiation: -1
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- !type:ChemVomit
probability: 0.02
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 30
+ min: 30.05
damage:
types:
Heat: 2
- !type:Jitter
conditions:
- !type:ReagentThreshold
- min: 30
+ min: 30.05
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 30.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Ipecac
@@ -429,6 +540,14 @@
Asphyxiation: -5
- !type:ModifyBleedAmount
amount: -0.25
+ - !type:PopupMessage
+ type: Local
+ conditions:
+ - !type:MobStateCondition
+ mobstate: Critical
+ visualType: Small
+ messages: [ "medicine-effect-asphyxia" ]
+ probability: 0.05
- type: reagent
id: Kelotane
@@ -451,7 +570,7 @@
factor: -10
conditions:
- !type:ReagentThreshold
- min: 30
+ min: 30.05
- !type:PopupMessage
type: Local
messages:
@@ -461,7 +580,15 @@
probability: 0.1
conditions:
- !type:ReagentThreshold
- min: 25
+ min: 25.05
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id: Leporazine
@@ -623,12 +750,16 @@
flavor: salty
color: "#0064C8"
metabolisms:
- Drink:
- effects:
- - !type:SatiateThirst
- factor: 6
- - !type:ModifyBloodLevel
- amount: 6
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Bloodloss: -2.5
+ - !type:SatiateThirst
+ factor: 6
+ - !type:ModifyBloodLevel
+ amount: 6
- type: reagent
id: Siderlac
@@ -645,6 +776,14 @@
damage:
types:
Caustic: -5
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id: Stellibinin
@@ -660,7 +799,7 @@
- !type:HealthChange
damage:
types:
- Poison: -4
+ Poison: -2.5
- !type:AdjustReagent
conditions:
- !type:ReagentThreshold
@@ -668,6 +807,14 @@
min: 1
reagent: Amatoxin
amount: -3
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id: Synaptizine
@@ -715,10 +862,18 @@
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 15
+ min: 15.05
damage:
types:
Bloodloss: 3
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 15.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Tricordrazine
@@ -743,6 +898,14 @@
Heat: -0.33
Shock: -0.33
Cold: -0.33
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id: Lipozine
@@ -757,7 +920,7 @@
effects:
# what the hell, this isn't satiating at all!!
- !type:SatiateHunger
- factor: -1
+ factor: -3
# Should heal quite literally everything, use in very small amounts
- type: reagent
@@ -778,6 +941,18 @@
Toxin: -2
Airloss: -2
Brute: -2
+ - !type:ModifyBleedAmount
+ amount: -1.5
+ - !type:ModifyBloodLevel
+ amount: 3
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id: Ultravasculine
@@ -821,6 +996,11 @@
min: 1
reagent: Ultravasculine
amount: 0.5
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Oculine
@@ -834,6 +1014,11 @@
Medicine:
effects:
- !type:ChemHealEyeDamage
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-eyedamage" ]
+ probability: 0.04
- type: reagent
id: Cognizine
@@ -850,6 +1035,11 @@
conditions:
- !type:ReagentThreshold
min: 5
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-mind" ]
+ probability: 0.05
- type: reagent
id: Ethyloxyephedrine
@@ -936,6 +1126,15 @@
- !type:ReagentThreshold
min: 30
probability: 0.02
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
+
- type: reagent
id: Lacerinol
@@ -952,13 +1151,29 @@
damage:
types:
Slash: -3
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-slash" ]
+ probability: 0.05
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 12
+ min: 12.05
damage:
types:
Cold: 3
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 12.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Puncturase
@@ -976,13 +1191,29 @@
types:
Piercing: -4
Blunt: 0.1
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-piercing" ]
+ probability: 0.05
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 11
+ min: 11.05
damage:
types:
Blunt: 5
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 11.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-major-stress" ]
+ probability: 0.06
- type: reagent
id: Bruizine
@@ -999,6 +1230,14 @@
damage:
types:
Blunt: -3.5
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- !type:HealthChange
conditions:
- !type:ReagentThreshold
@@ -1006,6 +1245,14 @@
damage:
types:
Poison: 4
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 10.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Holywater
@@ -1029,6 +1276,14 @@
Heat: -0.2
Shock: -0.2
Cold: -0.2
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id: Pyrazine
@@ -1046,11 +1301,19 @@
damage:
types:
Heat: -1
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-heat" ]
+ probability: 0.05
# od causes massive bleeding
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 20
+ min: 20.05
damage:
types:
Slash: 0.5
@@ -1063,9 +1326,17 @@
- !type:Emote
conditions:
- !type:ReagentThreshold
- min: 20
+ min: 20.05
emote: Scream
probability: 0.2
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 20.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-major-stress" ]
+ probability: 0.1
- type: reagent
id: Insuzine
@@ -1089,26 +1360,47 @@
- !type:AdjustReagent
reagent: Tazinide
amount: -4
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-shock" ]
+ probability: 0.05
# makes you a little chilly when not oding
- !type:AdjustTemperature
amount: -5000
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-heat" ]
+ probability: 0.05
# od makes you freeze to death
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 12
+ min: 12.05
damage:
types:
Cold: 2
- !type:AdjustTemperature
conditions:
- !type:ReagentThreshold
- min: 12
+ min: 12.05
amount: -30000
- !type:Jitter
conditions:
- !type:ReagentThreshold
- min: 12
+ min: 12.05
+ - !type:PopupMessage
+ conditions:
+ - !type:ReagentThreshold
+ min: 12.05
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-stress" ]
+ probability: 0.06
- type: reagent
id: Necrosol
@@ -1138,6 +1430,14 @@
Burn: -5
types:
Poison: -2
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
- type: reagent
id : Aloxadone
@@ -1160,3 +1460,11 @@
Heat: -3.0
Shock: -3.0
Caustic: -1.0
+ - !type:PopupMessage
+ conditions:
+ - !type:TotalDamage
+ min: 0.5
+ type: Local
+ visualType: Small
+ messages: [ "medicine-effect-usual" ]
+ probability: 0.05
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 168c6cf2032..3b8d5510fbf 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -170,6 +170,11 @@
type: Add
time: 16
refresh: false
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-rainbows" ]
+ probability: 0.07
- type: reagent
id: THCOil # deprecated in favor of THC, preserved here for forks
@@ -189,6 +194,11 @@
type: Add
time: 16
refresh: false
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-rainbows" ]
+ probability: 0.07
- type: reagent
id: Nicotine
@@ -231,6 +241,11 @@
probability: 0.05
- !type:Drunk # Headaches and slurring are major symptoms of brain damage, this is close enough
boozePower: 5
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-rainbows" ]
+ probability: 0.07
- type: reagent
id: SpaceDrugs
@@ -249,6 +264,11 @@
type: Add
time: 5
refresh: false
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-rainbows" ]
+ probability: 0.07
- type: reagent
id: Bananadine
@@ -290,6 +310,11 @@
component: ForcedSleeping
refresh: false
type: Add
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-sleepy" ]
+ probability: 0.05
- type: reagent
id: MuteToxin
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index ea0446523f1..15c42ec0827 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -76,6 +76,11 @@
damage:
types:
Poison: 1.5
+ - !type:PopupMessage
+ type: Local
+ visualType: Small
+ messages: [ "narcotic-effect-sleepy" ]
+ probability: 0.05
- type: reagent
id: Mold
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index 1c2d43c85e6..731f881fbeb 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -365,10 +365,11 @@
- type: reaction
id: Charcoal
+ minTemp: 370
reactants:
Carbon:
amount: 1
- Ash:
+ Nitrogen:
amount: 1
products:
Charcoal: 1
@@ -425,7 +426,7 @@
- type: reaction
id: Benzene
- minTemp: 310
+ minTemp: 370
reactants:
Hydrogen:
amount: 1
@@ -435,7 +436,7 @@
Benzene: 1
- type: reaction
- minTemp: 310
+ minTemp: 370
id: Hydroxide
priority: -1 #needs to be here due to how sulfuric acid reaction words
reactants:
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index d6aebbb1d63..0f17e6f46a7 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -26,6 +26,7 @@
ears: ClothingHeadsetMedical
belt: ChemBag
pocket1: HandLabeler
+ pocket2: ADTBookNewChemicals
# the purple glasses?
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
socks: ClothingUnderwearSocksNormal
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 6c4df96b072..504b1bd01c9 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -30,7 +30,7 @@
back: ADTClothingBackpackParamedicalMedicalFilled
shoes: ClothingShoesColorWhite
id: ParamedicPDA
- ears: ClothingHeadsetMedical
+ ears: ADTClothingHeadsetParamedic
belt: ClothingBeltMedicalEMTFilled
underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
socks: ClothingUnderwearSocksNormal
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 12afe686067..9026907d966 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -75,6 +75,7 @@
- ChiefMedicalOfficer
- MedicalDoctor
- MedicalIntern
+ - ADTPathologist
- Psychologist
- Paramedic
- SeniorPhysician
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index d7af9513cad..53830a75709 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -178,5 +178,8 @@
- type: playTimeTracker
id: JobADTInvestigator
+- type: playTimeTracker
+ id: JobADTPathologist
+
- type: playTimeTracker
id: JobSecurityCyborg
diff --git a/Resources/ServerInfo/ADT/Chemicals.xml b/Resources/ServerInfo/ADT/Chemicals.xml
new file mode 100644
index 00000000000..c0990d7e6e0
--- /dev/null
+++ b/Resources/ServerInfo/ADT/Chemicals.xml
@@ -0,0 +1,49 @@
+
+# Новые препараты в медицине.
+
+В этом журнале мы расскажем о новооткрытых реагентах, препаратах, которых рекомендуют использовать с "основными" лекарствами медицинского отдела, а так же некоторых полезных дополнениях.
+
+# Фармацевтика
+
+
+
+
+
+Большинство этих лекарств продаются во многих аптеках по вселенной и имеют большой спрос. Некоторые из них, в паре с определённым химикатом, становятся полноценными медицинскими препаратами.
+
+[head=2]Полезное[/head]
+
+
+
+
+
+
+
+
+
+[head=2]Бикаридин[/head]
+
+
+
+
+[head=2]Дермалин[/head]
+
+
+
+[head=2]Диловен[/head]
+
+
+
+[head=2]Дексалин плюс[/head]
+
+
+
+# Остальное
+Эти реагенты не являются медицинскими, и даже могут нанести некоторый вред.
+
+
+
+- Во время создания нитрида меди желательно добавлять с начала нужное количество меди, а затем азот, чтобы получились точные числа.
+
+
+
\ No newline at end of file
diff --git a/Resources/ServerInfo/ADT/Pathologist.xml b/Resources/ServerInfo/ADT/Pathologist.xml
new file mode 100644
index 00000000000..1d13873504e
--- /dev/null
+++ b/Resources/ServerInfo/ADT/Pathologist.xml
@@ -0,0 +1,81 @@
+
+# Морг и патологоанатом
+Последнее место, в котором хотел бы оказаться пациент - морг.
+
+Разберёмся в основах обслуживания трупов.
+
+## Морг
+
+[head=3]Ячейки морга[/head]
+
+
+
+В местных дормах трупы (в основном) лежат в специальных ячейках морга. Не пренебригайте ими, оставляя на полу умерших, поскольку морг не позволяет телам гнить.
+
+На нижней части ячейки находится сенсор, отображающий состояние души и, соответственно, возможность воскресить мертвеца.
+
+- [color=green]Зелёный[/color] цвет обозначает, что душа находится в теле и готова к клонированию или ударам дефибриллятора. Дабы привлечь к себе внимание и помочь поскорее возрадить пациента, морг начинает пищать как утренний будильник.
+- [color=red]Красный[/color] цвет означает, что в ячейке находится труп без души.
+- [color=yellow]Жёлтый[/color] цвет значит, что в морге находится посторонний предмет. Не советуется оставлять это без внимания. Зачем использовать морг как шкафчик?
+
+[head=3]Переработка[/head]
+
+
+
+
+
+Крайне не советуется перерабатывать тела умерших членов экипажа (если их не клонировали), однако, если оно пролежало в морге без души уже достаточно долго, или в случае недостатка биомассы в критической ситуации стоит прибегнуть к переработчику биомассы.
+
+Перенеся тело [color=red]без души[/color] (важная деталь, поскольку трупы с душой не даются переработке.) в переработчик биомассы (вашим курсором) оно будет раздроблено для повторного использования. Если это член экипажа, лучше всего раздеть тело и вернуть его вещи перед переработкой.
+- Держите в голове, что чем больше тело - тем дольше длится переработка, но и количество биомассы увеличится.
+- В среднем с одного человека получается 28 единиц биомассы.
+
+[head=3]Гниение[/head]
+
+Разложение - естественный процесс для всего живого. Или, в нашем случае, не совсем живого.
+
+Перед тем, как начать разлагаться, свежий труп пролежит 10 минут. Понять сколько времени осталось до этого можно осмотрев тело.
+- "[color=green]Тело всё ещё выглядит свежим.[/color]"
+- "[color=orangered]Тело выглядит отчасти свежим.[/color]"
+- "[color=red]Похоже, тело не свежее.[/color]"
+
+В самом гниении так же есть несколько стадий.
+- "[color=orange]Тело гниёт![/color]"
+- "[color=orangered]Тело вздулось![/color]"
+- "[color=red]Тело сильно вздулось![/color]"
+
+Учитывайте, что гниющие тела выделяют [color=purple]миазмы[/color]. Если оставить гнилое тело в морге слишком надолго, то, открыв ячейку, ваш ждёт вонючий сюрпиз.
+- Помимо этого, сильно вздувшиеся тела могут разорваться, выпустив ещё больше миазм!
+
+Если осмотрев тело вы понимаете, что оно [color=#edad45]забальзамировано[/color], то это значит, что дальнейшие степени гниения не произойдут.
+
+## Патологоанатом
+Поздравляю, отныне вы работаете в самом тихом участке медицинского отдела.
+
+Патологоанатом выявляет причины смерти, следит за сохранностью трупов и их предметов, ведёт документацию свидетельств о смерти, а так же клонирует тела. [italic](Смотрите пункт "Клонирование" в руководстве.)[/italic]
+
+[head=3]Экипировка[/head]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+- В ваш КПК встроен анализатор здоровья, так что вам не придётся бегать по зарядникам.
+- Мешок для трупов не даёт телам разлагаться, а так же ускоряет их перемещение, так что этот предмет незаменим в работе патологоанатома. Мало того, в случае, когда все ячейки морга забиты, вместо них можно использовать мешки.
+- Бирка для ног говорит сама за себя. Удобна для тех случаев, когда поток трупов большой, и их сортировка становится затруднительной.
+- Бумага - ваша кладесь информации и основа работы. В ней вы храните всё, что касается определённого мертвеца. Так же важно подметить, что вы можете прикрепить листок к ячейке морга или мешку.
+- Формалин - препарат, свёртывающий белки и предотвращающий их разложение. Используется для [color=#edad45]бальзамирования[/color] трупов. [color=#edad45]Бальзамирование[/color], как и было сказано выше, предотвращает гниение трупов. Достаточно всего 5 единиц, однако учитывайте, что вы не можете воскресить забальзамированный труп дефибриллятором, так что советуется применять формалин в случаях, когда тело вот-вот или уже начало разложение.
+- Небольшой шприц удобен своими размерами, а так же возможностью вставить его в раздатчики или анализатор вещества. Если вам привезли свежий труп, то советуется взять образец его крови. Не переваренные вещества в ней могут помочь расследовать смерть пациента. А так же вместимости шприца достаточно, чтобы бальзамировать тела.
+- Для случаев экстренной медицинской помощи или же для приведения внешнего вида мертвеца в какой-никакой порядок желательно носить с собой медикаменты. Так же стоит отметить, что трупы можно исцелять при помощи криогенных препаратов. [italic](Смотрите пункт "Криогеника" в руководстве.)[/italic]
+
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/Medical/AdvancedBrute.xml b/Resources/ServerInfo/Guidebook/Medical/AdvancedBrute.xml
index 186799b85eb..28962686d88 100644
--- a/Resources/ServerInfo/Guidebook/Medical/AdvancedBrute.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/AdvancedBrute.xml
@@ -1,28 +1,28 @@
- # Specialized Brute Chemicals
+ # Специализированные препараты от механических травм
- Nanotrasen's greatest scientists have synthesized three more specific brute chemicals! Each one heals a specific damage subtype.
+ Величайшие учёные Нанотрейзен смогли синтезировать 3 препарата, специализирующиеся на механических повреждениях! Каждый из них лечит определённый тип повреждений.
- # Razorium
+ # Разориум
- [color=red]USE CAUTION[/color] when using the aforementioned specialized brute chemicals. Should one mix together with a different type of brute chemical, the resulting mixture will create a dangerous chemical known as Razorium!
+ [color=red]БУДЬТЕ ОСТОРОЖНЫ[/color], используя вышесказанные препараты. Смешав вместе два специализирующихся препарата, вы получите опасный химикат, известный как Разориум!
- To avoid this, make sure the patient is done metabolizing one brute medication before giving them another. Keep an eye on the rate their health is changing.
+ Чтобы избежать этого, убедитесь, что ваш пациент переварил первый препарат, прежде чем давать второй. Следите за тем, как меняется их здоровье.
- [bold]Some examples of mixtures that create Razorium are as follows:[/bold]
+ [bold]Несколько примеров смесей, что создают Разориум:[/bold]
- Bicaridine and Puncturase
+ Бикаридин и Панктурас
- Puncturase and Lacerinol
+ Панктурас и Ласеринол
- Bruizine and Bicaridine
+ Бруизин и Бикаридин
- Lacerinol and Bruizine
+ Ласеринол и Бруизин
- Please note that [bold]any[/bold] combination of these 4 chemicals will likely mix and create Razorium! Be careful when creating these chemicals, as they contain Bicaridine. Any leftover Bicaridine will likely mix to create Razorium!
+ Учитывайте, что [bold]любая[/bold] смесь этих 4-х препаратов создаст Разориум! Будьте аккуратны, создавая эти реагенты, поскольку для них нужен Бикаридин. Любые остатки Бикаридина, скорее всего, смешаются и создадут Разориум!
diff --git a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml
index 60153e87e8c..f7e114a2b90 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml
@@ -1,7 +1,7 @@
-# Botanicals
+# Ботаника
-Botany and Chemistry can often work together to produce better medicine (or recreational cocktails). It may be worthwhile to give them the fertilizers they need, and request some medicinal plants in return.
+Гидропоника и Химия зачастую могут работать вместе для создания более продуктивных препаратов (или развлекательных коктейлей). Можно сделать выгодную сделку в виде нужных ботаникам удобрений в обмен на медицинские растения.
diff --git a/Resources/ServerInfo/Guidebook/Medical/Chemist.xml b/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
index 05b853d1880..d0c79b1ccdf 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
@@ -1,10 +1,10 @@
-# Chemist
-Now you've done it, you picked the one job where -math- is mandatory. Grab your beaker, pull up a chair, and get cracking, it's time to cook up some chems.
+# Химик
+Вы сделали это, вы выбрали работу на которой необходима -математика-. Хватайте мензурку, пододвигайте стул и разминайте спину, пришла пора варить химикаты.
-While chemists primarily make medications, there's a very wide variety of chemicals that can be made, all of which are showcased in the Chemicals section of the Guidebook.
+В основном химики производят лекарства, однако есть и широкое разнообразие в других химикатах, все из которых показаны на страницы "Химические вещества" в Руководстве.
-## Equipment:
+## Оборудование:
@@ -20,25 +20,25 @@ While chemists primarily make medications, there's a very wide variety of chemic
-## The Basics:
-Chemistry is fairly straightforward once you know what to expect. Here's a simple, step-by-step process on how to begin.
+## Основы:
+Химия достаточно прямолинейна, если вы знаете, чего от неё ожидать. Взгляните на простой, пошаговый процесс того, как начать вашу работу.
-- Grab a beaker, Pill Canister, and if desired, some Bottles.
-- Place the beaker in the Chemical Dispenser, and Pill Canister (or bottle) in the Chem Master.
-- Open the Chemical Dispenser UI, and make your mix. Recipies are in other sections of the guidebook.
-- Alt-click the dispenser to remove your beaker, and place it in the Chem Master.
-- Open the Chem Master UI. On the Input tab, move your mix into the buffer.
-- Move to the Output tab, customise your pill, and press the Create button.
-- Alt-click the Chem Master to get the pill bottle out. You may have to remove the beaker first.
-- Click on a table, crate, or another surface to empty the pill bottle if desired. Alternatively, store or empty it into another storage container.
+- Возьмите мензурку, баночку для таблеток и если желаете, несколько бутылочек.
+- Поместите мензурку в раздатчик химикатов и баночку для таблеток (или бутылочку) в ХимМастер 4000.
+- Откройте меню раздатчика, и совместите нужные реагенты. Рецепты прописаны в других разделах Руководства.
+- Нажмите Alt-лкм по раздатчику, чтобы достать вашу мензурку, и поместите её в ХимМастер.
+- Откройте меню ХимМастера. На странице "Вход", переместите вашу смесь в буффер.
+- Переключитесь на страницу "Выход", выберите вид таблетки, пропишите количество содержимого препарата, напишите название и нажмите кнопку "Создать".
+- Нажмите Alt-лкм по ХимМастеру, чтобы достать баночку или бутылочку. Возможно сперва возьмётся мензурка.
+- Если нужно, выкладывайте таблетки на поверхность. Или можете хранить в них.
-That's it, you've made your first set of pills! Consider checking with Medical Doctors and other crew to see what else may be requested, refilling the medical kits in medbay storage, or just experimenting!
+Вот и всё, вы сделали первую поставку таблеток! Не забывайте узнавать у врачей и экипажа что ещё может пригодиться, пополнять аптечки в хранилище медицинского отдела, или просто экспериментируйте!
-You can also use the hand labeler to organize individual bottles or bags without using the Chem Master labeling system.
+Вы так же можете использовать ручной этикетировщик, чтобы пометить бутылочки или сумки не прибегая к ХимМастеру.
-## Extra Content:
+## Дополнение:
-Speaking of experimentation, there are a few more toy you can use when it comes to chemistry. This job requires a lot of trial and error, but it was worth mentioning that these things exist! It's up to you to figure out what to make with them.
+Кстати о экспериментах, есть ещё несколько вещей, с которыми можно поиграться, говоря о химии. В этой работе много проб и ошибок, но так же не стоит забывать о том, что эти вещи существуют! Вы сами разберётесь, что делать с ними.
diff --git a/Resources/ServerInfo/Guidebook/Medical/Cloning.xml b/Resources/ServerInfo/Guidebook/Medical/Cloning.xml
index ee41dd49b27..ecb959c3ef8 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Cloning.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Cloning.xml
@@ -1,20 +1,18 @@
-# Cloning
-If all else fails, patients will need to be cloned. This should only be used as a last resort, if recovery is impossible. This is most often the case when the body has started to rot, or if they have excessive amounts of damage.
+# Клонирование
+Если вы потерпите неудачу, пациентов придётся клонировать. Это должно быть использовано только в последнюю очередь, если восстановление умершего невозможно. Самый частый случай такого - начало гниения тела, или слишком высокий показатель повреждений.
-Cloning itself is relatively simple. (Assuming the network is set.) Just drag a body into the scanner, check the cloning console, and clone! If they've taken cellular damage, or have rotted for too long, the results can be... less than pleasant.
+Само по себе клонирование достаточно простое. (Учитывая, что сеть установлена.) Просто перенесите тело в сканер, проверьте возможность клонирования и клонируйте! Если у тела есть клеточные повреждения, или гнило слишком долго, результаты могут быть... неприятные.
-As a note: Cloning isn't always available, and it would be best not to rely on it.
+Пометка: Клонирование не всегда доступно и лучше всего особо не надеяться на это.
-
+
-## Biomass
-Creating a clone requires biomass, which, gruesomely, involves recycling organic material. Be it crew members without a soul, station pets, or hostile creatures that have been 'taken care of', things can often be recycled.
-
-Dragging a body onto the biomass reclaimer (with your cursor) will mulch it for re-use. If it's a crew member, it's common practice to strip the body and return departmental gear before doing such.
+## Биомасса
+Создание клона требует биомассы, чтобы получить которую, что ужасно, надо переработать органический материал. Будь тому экипаж без души, питомцы станции, или враждебные существа, о которых 'уже позаботились'. [italic](Смотрите пункт "Морг и патологоанатом" в руководстве.)[/italic]
diff --git a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
index ad97f1b2d79..0c6662cc456 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
@@ -1,18 +1,18 @@
-# Cryogenics
-Cryogenics can be a bit daunting to understand, but hopefully, quick run through of this diagram, you'll learn how to work it! So, let's go over what each part does:
-
-- Air in: Air comes in here through the distro or an air tank, giving those inside something to breathe, and the freezer something to chill.
-- Gas pump: Limits the network pressure, so those in the tube aren't crushed.
-- Freezer: Chills the air, and by extension, patients in the tube, so Cryoxadone can activate.
-- Gas filters: Removes waste gas (Carbon Dioxide and Nitrous Oxide) from the loop.
-- Air out: Waste gasses go here, either into a storage tank, or into the waste network.
+# Криогеника
+Криогеника может быть сложна в понятии, но, к счастью, пройдясь по этой схеме, вы поймёте как с ней работать! Так что давайте пройдёмся по частям:
+
+- Вход воздуха: Воздух проходит через дистру или канистру с воздухом, позволяя тем, кто в капсуле дышать, а охладителю охлаждать.
+- Газовый насос: Ограничивает давление в капсуле, чтобы того, кто был в ней не раздавило.
+- Охладитель: Охлаждает воздух, и вдобавок пациента в капсуле, чтобы в теле мог заработать криоксадон.
+- Газовый фильтр: Убирает остаточный газ (Диоксид углерода и оксид азота) из труб.
+- Выход воздуха: Остаточные газы уходят туда, либо в канистру, либо в сеть сброса отходов.
-
+
@@ -24,27 +24,30 @@ Cryogenics can be a bit daunting to understand, but hopefully, quick run through
-
+
-
+
-Not every network will look like this, but hopefully, it's enough to give you the basic gist of how it's functioning.
+Однако не каждая схема будет выглядеть именно так, но, к счастью, этой информации достаточно чтобы донести до вас суть функционирования.
-An important thing to note, winter clothing (and hardsuits) will make cryogenic treatment less, or completely ineffective. Be sure to remove cold preventative clothing before placing people in the pod.
+Важная вещь, которую стоить отметить, так это то, что зимняя одежда (и скафандры) уменьшат исцеление криогеникой, либо сделают её полностью неэффективной. Не забудьте снять тёплые вещи с пациента, перед тем как засунуть его в капсулу.
-## Using the Pod
-Once things have been set up, you're going to require a specific medication, Cryoxadone. Cryoxadone heals all damage types when a patient is chilled, and can either be pre-adminsitered (with a pill), or loaded into the cell directly with a beaker. Do note, patients won't begin to heal until they've chilled to the appropriate temperature, it may be worthwhile to wait a bit before placing a beaker inside.
+## Использование капсулы
+Как только всё настроят, вам понадобятся особые препараты, такие как криоксадон и доксарубиксадон. Криоксадон исцеляет практически все повреждения и может быть либо принят до входа в капсулу (таблеткой), или загружено в капсулу сразу мензуркой. Однако помните, что препараты не будут действовать до тех пор, пока температура пациента не опустится до нужных значений, так что может быть целеобразнее поместить мензурку спустя некоторое время после начала охлаждения.
-## Additional Information:
+## Дополнительная информация:
-The standard pressure for a gas pump is 1.325 kpa. Cryoxadone works at under 170K, but it is standard practice to set the freezer to 100K for faster freezing.
+Стандартное давление для газового насоса - 1.325 кПа. Криоксадон начинает действовать при температуре ниже 170° по Кельвину, так что вполне стандартная практика установить значение охлаждения охладителя на 100°К.
-
+
+
+- Лепоразин поможет восстановить температуру пациента до прежних значений, так что лучше его использовать после исцеления в криокапсуле.
+
diff --git a/Resources/ServerInfo/Guidebook/Medical/Medical.xml b/Resources/ServerInfo/Guidebook/Medical/Medical.xml
index 22a4149833b..67955c95b1c 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Medical.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Medical.xml
@@ -1,10 +1,10 @@
-# Medical
-This is the department where people go to when they're hurt, it's up to the folks working here to fix them.
+# Медицинский отдел
+Это отдел, в который идут при различных ранениях. Задача работающих там - помочь клиентам.
-Right now, medbay is divided into two different sets of care:
+Сейчас медицинский отсек разделён на две разные отрасли работы:
-## Medical Treatment
+## Медицинское обслуживание
@@ -12,7 +12,7 @@ Right now, medbay is divided into two different sets of care:
-## Chemical Production
+## Производство химикатов
diff --git a/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml b/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
index 72bdfcad6b7..dcf981c3e66 100644
--- a/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
@@ -1,41 +1,41 @@
-# Medical Doctor
-It's time to heal. Or at least, try to heal, anyway. Medical Doctors are the primary caretakers of every boo boo and ouchie crewmembers get on the station, be it a small scratch, or boiled skin.
+# Врач
+Пришло время лечить. Или, хотя бы, попытаться. Врачи - первые, кто отзываются на все болячки, что получают сотрудники станции, будь то маленькая царапина, или сожжёное лицо.
-This guide will give you a basic outline of the treatment options you have available, triage, and other avenues of care.
+Это руководство даст вам основные знания в путях оказания медицинской помощи.
-## The Basics
-There are two ways to tell what's ailing someone: Taking a scan (with a health analyzer or a medical PDA), or examining them, with a shift-click, and clicking the heart symbol.
+## Основы
+Есть два способа узнать, что у кого болит: Сканирование (анализатором здоровья или КПК врача), или осмотр пациента, нажав shift-лкм, а затем на символ сердца.
-It's best to do both, if possible, as some things (such as poison, or radiation) don't show up on examination, while others (such as blood levels) don't show up on an analyzer.
+Лучше использовать оба, если есть такая возможность, поскольку некоторая информация (по типу отравления или радиационного поражения) не показывается при осмотре, в то время как другая (например уровень крови) не видна в анализаторе.
-
+
-
+
-## Medication and Treatment Options
-Before we go any further, it's probably a good idea to go over damage types, and what will heal them The wiki has more extensive info available, but these are commonly used.
+## Лекарства и лечение.
+Перед тем как начать, сперва стоит пройтись по типам повреждений и что их лечит. На Википедии больше полезной информации, но в основном используют эти.
-An important note: Most medication has an overdose level, which will cause harm to your patient. Chemicals also take time to metabolise in pill form, if you want things to act quickly, use a syringe.
+Важная пометка: У большинства лекарств есть передозы, которые начнут вредить вашему пациенту. Химикатам так же нужно время для переваривания, будучи в таблетках, так что если вам нужно действовать быстро, используйте шприц.
-- Brute Damage: Bicaridine or Bruise Packs
-- Burn Damage: Dermaline or Ointment
-- Toxin (Poison): Dylovene
-- Toxin (Radiation) Hyronalin or Arithrazine
-- Airloss: Dexaline or Inaprovaline
-- Bloodloss: Dexaline (Examine the patient, if pale, they still need blood or iron.)
-- Bleeding: Tranexamic acid and Gauze (Bleeding can also be cauterized with burn damage.)
+- Механические повреждения: Бикаридин, набор от ушибов или антибиотическая мазь.
+- Физические: Дермалин, мазь или антибиотическая мазь.
+- Токсины (Яды): Диловен, уголь.
+- Токчины (Радиация): Хироналин или аритразин.
+- Удушение: Дексалин или инапровалин. Так же помните, что дефибриллятор исцеляет 40 удушья.
+- Кровопотеря: Дексалин, пакеты с кровью, физраствор. (Осмотрите пациента. Если он выглядит бледно, то ему нужна кровь или железо)
+- Кровотечение: Транексамовая кислота, марлевый бинт и самое быстрое средство: кровоостанавливающий жгут-турникет. (Кровотечение так же может быть остановлено прижиганием.)
-Many stations are stocked with kits in storage, and all medics have some equipment in their starting belt.
+Многие станции наполнены аптечками в хранилище, и у всех врачей есть немного припасов в их ремнях.
-
-
-
-
+
+
+
+
@@ -46,29 +46,75 @@ Many stations are stocked with kits in storage, and all medics have some equipme
-## Basic Treatment and Triage
-Examine your patient, and note down the important details: Are they alive? Bleeding? What type of damage?
+
+
+
+
+
+
+
+## Дополнительные препараты.
+
+
+
+
+
+
+Некоторые препараты имеют особый медицинский эффект, когда их применяют с "основными" лекарствами. В основном они специализируются на лечении определённого типа урона, отчего Вам придётся выбирать, какой дополнительный реагент дать своему пациенту. (Если, конечно, хотите ускорить процесс исцеления.)
+
+Ниже приведён небольшой список препаратов с их основой (и типом урона в скобках), однако больше информации вы можете получить в подразделе "Новые препараты" руководства Химика.
+
+- Бикаридин: Натримизол(удары), Нитрофурфолл(порезы), Пероводород(уколы).
+- Дермалин: Анельгезин(термические ожоги), Миноксид(электрические ожоги).
+- Диловен: Этилредоксразин(яды), Биомицин(яды, однако в большем количестве); Биомицин советуется использовать с осторожностью, так как он нагружает организм и наносит повреждения ударами.
+- Дексалин плюс: Никематид(удушье), Диэтамилат(кровопотеря).
+
+[head=2]Полезное[/head]
-If alive, treat them as best as you can. Patients are in critical condition at 100 damage, and dead at 200. Keep this in mind when choosing how to treat them. Emergency Pens and Epinephrine are often used to keep patients stable.
+Так же существуют препараты, которые могут так или иначе пригодиться в медицинском отделе.
-If possible, buckle them to a medical bed, if you need time to treat them, strap them to a stasis bed instead. Just keep in mind that metabolism (and by extension, healing chemicals) are slowed to a crawl when on stasis, they'll need to be taken off of it for the medicine to be effective. (But Blood Packs, Ointment, and Brute packs all work as normal.)
+- Этилредоксразин.
+Поможет избавиться от опьянения.
+- Галоперидол.
+Является сильным нейролептиком.
+- Морфин.
+Сильный опиумный анальгетик.
+- Кровоостанавливающая пудра.
+Можно встретить в медицинских пластырях. Неплохое дополнение для лечения механических повреждений.
+- Сульфадиазин серебра.
+Можно встретить в медицинских пластырях. Неплохое дополнение для лечения физических повреждений.
+
+## Основы лечения и распределения
+Осмотрите вашего пациента и выделите важные моменты: Пациент жив? У него идёт кровь? Какие и сколько у него повреждений?
+
+Если он ещё жив, лечите его как можно скорее. Пациенты находятся в критическом состоянии при 100 повреждениях, и мертвы при 200. Держите это в голове, продумывая план лечения. Экстренный медипен и эпинефрин самые частые варианты для поддержания жизни пациента.
+
+Если есть такая возможность, уложите его в кровать, а если нужно длительное время, лучше в стазисный вариант. Просто не забывайте что метаболизм (и лечащие препараты в том числе) сильно замедленны при лежании на стазисной кровати, так что пациента требуется поднимать для действия лекарств. (Однако пакеты крови, мази, наборы для ушибов и марлевые бинты работают как обычно.)
-## Death and Revival
-You can't save them all, sometimes, death happens. Depending on the status of the body, if there's a soul present, and if the body has started rotting, there are a few things that can be done.
+## Смерть и Воскрешение
+Не важно, насколько вы профессиональный врач. Порой, не все жизни можно спасти. В зависимости от состояния тела, если в нём присутствует душа, и труп не начал гнить, есть несколько вариантов действий.
-1. Do they have a soul attached? You can tell if, when examining, the following phrase is displayed: "Their soul has departed." If this isn't displayed, consider storing the body in a morgue tray, or using them for biomass.
+1. Присутствует ли в теле душа? Вы можете понять это при осмотре тела, в случае если показана фраза: "Он мёртв." В противном случае, отдайте труп на попечение Патологоанатома, или сделайте из него биомассу. [italic](Смотрите пункт "Морг и патологоанатом" в руководстве.)[/italic]
-2. Is the body rotting? If it is, sadly, they'll have to be cloned. A rotting body can't be brought back with a defibrillator. (See Cloning)
+2. Тело гниёт? Если это так, к сожалению, пациента придётся клонировать. Сгнившие тела нельзя вернуть к жизни дефибриллятором. [italic](Смотрите пункт "Клонирование" в руководстве.)[/italic]
-3. If they have a soul, and aren't rotten, it's possible to revive them. Not counting airloss, Defibrillator's can be used to revive patients under 200 total damage. Chemicals don't metabolise in the dead, but brute packs and ointment can still patch them up. Use them to bring their numbers down enough for revival.
+3. Если у тела есть душа и оно не начало гнить, есть возможность вернуть пациента к жизни. Не считая удушья, дефибриллятор может возрадить пациента, если у него ниже 200 общих повреждений. Химикаты не метаболизируются в трупах, однако наборы для ушибов и мази всё ещё могут их подлатать. Используйте их, чтобы понизить показатели урона до приемлемых значений.
+
+3.1 Если осмотрев тело вы видите надпись "Похоже, тело [color=#edad45]забальзамировано[/color].", значит кто-то позаботился о состоянии трупа, отчего его НЕ получится возрадить дефибриллятором, работает только машина клонирования.
-
+
+
+
+
+
+
+
diff --git a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
index 7a09a1647d2..1c19356bdce 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
@@ -1,35 +1,71 @@
-# Core Medications
+- Ниже преведены новые препараты!
-These medications are almost always useful to medbay in one way or another.
+# Основные лекарства
+
+Эти лекарства, так или иначе, почти всегда полезны в медицинском отсеке.
+
-
+
+
+# Дополнительные лекарства
+
+Большинство этих лекарств продаются во многих аптеках по вселенной и имеют большой спрос. Некоторые из них, в паре с определённым химикатом, становятся полноценными медицинскими препаратами.
+
+- Нитрид меди НЕ является медицинским препаратом, а лишь одним из нужных реагентов в реакциях.
+- Желательно добавлять с начала нужное количество меди, а затем азот, чтобы получились точные числа.
+
+
+## Полезное
+
+
+
+
+
+
+
+
+## Бикаридин
+
+
+
+
+## Дермалин
+
+
-# Specialty Medications
+## Диловен
+
+
-These medications tend to have specific use cases.
+## Дексалин плюс
+
+
+
+# Особые лекарства
+
+Эти лекарства используют в особых случаях.
-
-# All Medications
+# Все лекарства
-This is a list of -all- medications available, including ones previously listed.
+Это список -всех- доступных лекарств, включая тех, что указаны выше.
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..e9e2d26ad1a
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/icon.png
new file mode 100644
index 00000000000..0a015b53c9a
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/inhand-left.png
new file mode 100644
index 00000000000..645451d1406
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/inhand-right.png
new file mode 100644
index 00000000000..67055a0152b
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/meta.json
new file mode 100644
index 00000000000..84bb9e9bde6
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..3e092c6b48a
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/icon.png
new file mode 100644
index 00000000000..7acffef0997
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/inhand-left.png
new file mode 100644
index 00000000000..74f5c50c872
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/inhand-right.png
new file mode 100644
index 00000000000..f4ca843c65c
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/meta.json
new file mode 100644
index 00000000000..84bb9e9bde6
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..77d2c2f1f24
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/icon.png
new file mode 100644
index 00000000000..aa1621d267c
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/inhand-left.png
new file mode 100644
index 00000000000..066a98fa349
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/inhand-right.png
new file mode 100644
index 00000000000..3fbcd99f4bd
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/meta.json
new file mode 100644
index 00000000000..84bb9e9bde6
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..0f4ccfb1040
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/icon.png
new file mode 100644
index 00000000000..7124dcfd120
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-left.png
new file mode 100644
index 00000000000..24697435236
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-right.png
new file mode 100644
index 00000000000..0fcdbe84a0f
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json
new file mode 100644
index 00000000000..880271d7b62
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..2e5790934ed
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/icon.png
new file mode 100644
index 00000000000..e6af1d9b3fd
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-left.png
new file mode 100644
index 00000000000..bea3102d2e8
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-right.png
new file mode 100644
index 00000000000..d6487b51d07
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json
new file mode 100644
index 00000000000..880271d7b62
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..994b3bed247
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/icon.png
new file mode 100644
index 00000000000..bf81ea59874
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-left.png
new file mode 100644
index 00000000000..bb089a8d440
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-right.png
new file mode 100644
index 00000000000..9b292a1d3dd
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/meta.json
new file mode 100644
index 00000000000..880271d7b62
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/equipped-BELT.png b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..46df54d9520
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/icon.png b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/icon.png
new file mode 100644
index 00000000000..d4c777f50c0
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/inhand-left.png
new file mode 100644
index 00000000000..2d9103b393e
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/inhand-right.png
new file mode 100644
index 00000000000..31347391f50
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/meta.json b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/meta.json
new file mode 100644
index 00000000000..9578ed8cfd4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BELT",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/equipped-EARS.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/equipped-EARS.png
new file mode 100644
index 00000000000..87da680017f
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/equipped-EARS.png differ
diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/icon.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/icon.png
new file mode 100644
index 00000000000..202fcd895e5
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/meta.json b/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/meta.json
new file mode 100644
index 00000000000..47344de7351
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/equipped-HELMET-hamster.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..f84ffbf4956
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..376c5646286
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/icon.png
new file mode 100644
index 00000000000..00fea8fe251
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/inhand-left.png
new file mode 100644
index 00000000000..9cd1e23b7af
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/inhand-right.png
new file mode 100644
index 00000000000..505255291b6
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/meta.json
new file mode 100644
index 00000000000..e43f00742ad
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET-hamster",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..a520db6d544
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/icon.png
new file mode 100644
index 00000000000..6e57a0e4825
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/inhand-left.png
new file mode 100644
index 00000000000..23f191e5e08
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/inhand-right.png
new file mode 100644
index 00000000000..5df32dced5a
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/meta.json
new file mode 100644
index 00000000000..e8723b2ec1d
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Head/Hats/hood_paramedic.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat911.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..b8689d254fb
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/icon.png
new file mode 100644
index 00000000000..576a000a6d8
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..ce338af8f3d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..b1f44f7cbf4
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json
new file mode 100644
index 00000000000..b3783801da7
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..b2425b6851e
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/icon.png
new file mode 100644
index 00000000000..b7f6cd25422
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-left.png
new file mode 100644
index 00000000000..f39980dc937
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-right.png
new file mode 100644
index 00000000000..26832a51f64
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/meta.json
new file mode 100644
index 00000000000..823470fed1d
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "JustKekc and prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..a5b670565b7
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/icon.png
new file mode 100644
index 00000000000..0bcbc00a338
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..11ac597b52b
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..efe0b04fec3
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/meta.json
new file mode 100644
index 00000000000..1b9ee617e6b
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..5360875eb7e
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/icon.png
new file mode 100644
index 00000000000..e07821d6f7d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/inhand-left.png
new file mode 100644
index 00000000000..41a6aedee29
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/inhand-right.png
new file mode 100644
index 00000000000..9bed60697a4
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/meta.json
new file mode 100644
index 00000000000..514cd682be8
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord: prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..bb74c740bd9
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon.png
new file mode 100644
index 00000000000..4800a822f28
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..ee9dc3c79e8
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..04a7594670b
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/meta.json
new file mode 100644
index 00000000000..1b9ee617e6b
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..035c7779872
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/icon.png
new file mode 100644
index 00000000000..62551c1cb60
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..5b73a5e4a36
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..cc9646a3436
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json
new file mode 100644
index 00000000000..1b9ee617e6b
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..204299f63c8
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/icon.png
new file mode 100644
index 00000000000..92729504f3f
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/inhand-left.png
new file mode 100644
index 00000000000..a7d17ae7cb0
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/inhand-right.png
new file mode 100644
index 00000000000..b23960767e4
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/meta.json
new file mode 100644
index 00000000000..f20a2af90ce
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_paramedic.rsi/meta.json
@@ -0,0 +1,24 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left"
+ },
+ {
+ "name": "inhand-right"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..01460d23296
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/icon.png
new file mode 100644
index 00000000000..7e3e7f9addc
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..f1d1deb712f
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..8f9daec6a0f
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/meta.json
new file mode 100644
index 00000000000..bf87ee2b1dc
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/equipped-FEET.png
new file mode 100644
index 00000000000..b02a593bb02
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/equipped-FEET.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/inhand-left.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/inhand-left.png
new file mode 100644
index 00000000000..f6d65cbcbf0
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/inhand-right.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/inhand-right.png
new file mode 100644
index 00000000000..276c0d6166b
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/meta.json
new file mode 100644
index 00000000000..b3eb0f00e84
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/meta.json
@@ -0,0 +1,29 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "paper"
+ },
+ {
+ "name": "paper_words"
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/paper.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/paper.png
new file mode 100644
index 00000000000..d4fb658e7a8
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/paper.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/paper_words.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/paper_words.png
new file mode 100644
index 00000000000..e61fd4ce2a6
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/foot_tag/paper_words.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/equipped-FEET.png
new file mode 100644
index 00000000000..c18b5fadda3
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/icon.png
new file mode 100644
index 00000000000..1675f913109
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/inhand-left.png
new file mode 100644
index 00000000000..7ec95ad9b57
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/inhand-right.png
new file mode 100644
index 00000000000..cfa8f10802d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/meta.json
new file mode 100644
index 00000000000..130aa6c099a
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a761ad18484
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/icon.png
new file mode 100644
index 00000000000..57322beb00d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..01b07847786
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..2afe2f3386d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/meta.json
new file mode 100644
index 00000000000..92e0986e8f4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c391e98c1b7
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/icon.png
new file mode 100644
index 00000000000..67d7e988e65
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..b34b9d66299
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..5ce111b9528
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/meta.json
new file mode 100644
index 00000000000..92e0986e8f4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..bc05fc1d271
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/icon.png
new file mode 100644
index 00000000000..cfa499c5762
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-left.png
new file mode 100644
index 00000000000..2c0cb120d3d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-right.png
new file mode 100644
index 00000000000..cf048071c4f
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/meta.json
new file mode 100644
index 00000000000..92e0986e8f4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..73d28687847
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/icon.png
new file mode 100644
index 00000000000..d0d71acb1c1
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..01b07847786
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..2afe2f3386d
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/meta.json
new file mode 100644
index 00000000000..92e0986e8f4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a961e51f887
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/icon.png
new file mode 100644
index 00000000000..35ff4730355
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..d319cd79ede
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..a2b4e3412b5
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/meta.json
new file mode 100644
index 00000000000..92e0986e8f4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..7ce107d10a8
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/icon.png
new file mode 100644
index 00000000000..3c088b5e8f3
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-left.png
new file mode 100644
index 00000000000..2e179b2bf02
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-right.png
new file mode 100644
index 00000000000..f16c595398a
Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json
new file mode 100644
index 00000000000..92e0986e8f4
--- /dev/null
+++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Markers/job.rsi/meta.json b/Resources/Textures/ADT/Markers/job.rsi/meta.json
index a2d1519dd83..40d0eda2dcf 100644
--- a/Resources/Textures/ADT/Markers/job.rsi/meta.json
+++ b/Resources/Textures/ADT/Markers/job.rsi/meta.json
@@ -21,6 +21,9 @@
},
{
"name": "urist"
+ },
+ {
+ "name": "pathologist"
}
]
}
diff --git a/Resources/Textures/ADT/Markers/job.rsi/pathologist.png b/Resources/Textures/ADT/Markers/job.rsi/pathologist.png
new file mode 100644
index 00000000000..1da905aca17
Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/pathologist.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/chem_book.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/chem_book.rsi/icon.png
new file mode 100644
index 00000000000..2cc371ff8ac
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/chem_book.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/chem_book.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/chem_book.rsi/meta.json
new file mode 100644
index 00000000000..93e74b1f951
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Misc/chem_book.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png
new file mode 100644
index 00000000000..f7848f63f6a
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png
new file mode 100644
index 00000000000..82b5598806d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png
new file mode 100644
index 00000000000..95b3d54c270
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/id-pathologist.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/id-pathologist.png
new file mode 100644
index 00000000000..a4793b60469
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/id-pathologist.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json
new file mode 100644
index 00000000000..f8b4aa32c54
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, pathologist made by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "default"
+ },
+ {
+ "name": "id-pathologist"
+ },
+ {
+ "name": "default-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "default-inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/dead.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/dead.png
new file mode 100644
index 00000000000..10a06b21ef4
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/dead.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/harvest.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/harvest.png
new file mode 100644
index 00000000000..f4333b1f29b
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/harvest.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/meta.json
new file mode 100644
index 00000000000..26a6f80394a
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+ "version": 1,
+ "license": "Custom",
+ "copyright": "Created by JustKekc. Approved for use ONLY on the Adventure Time project.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "dead"
+ },
+ {
+ "name": "harvest"
+ },
+ {
+ "name": "produce"
+ },
+ {
+ "name": "seed"
+ },
+ {
+ "name": "stage-1"
+ },
+ {
+ "name": "stage-2"
+ },
+ {
+ "name": "stage-3"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/produce.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/produce.png
new file mode 100644
index 00000000000..3bc346363ed
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/produce.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/seed.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/seed.png
new file mode 100644
index 00000000000..fd57eb53aa8
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/seed.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-1.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-1.png
new file mode 100644
index 00000000000..b8d41367e13
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-1.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-2.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-2.png
new file mode 100644
index 00000000000..c6c5f77e26d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-2.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-3.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-3.png
new file mode 100644
index 00000000000..9a36827e2b5
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi/stage-3.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/icon.png
new file mode 100644
index 00000000000..c8d4b506b49
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/inhand-left.png
new file mode 100644
index 00000000000..a45ce6c6938
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/inhand-right.png
new file mode 100644
index 00000000000..bc2f8c7cbf8
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/meta.json
new file mode 100644
index 00000000000..6ff35f18ba3
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/foot-tag-box.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-NC-SA-4.0",
+ "copyright": "Created by JustKekc.",
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/icon.png
new file mode 100644
index 00000000000..5d79e97aedb
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/inhand-left.png
new file mode 100644
index 00000000000..769a10ef99f
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/inhand-right.png
new file mode 100644
index 00000000000..769a10ef99f
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/meta.json
new file mode 100644
index 00000000000..5e36025ce64
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "Custom",
+ "copyright": "Created by JustKekc. Approved for use ONLY on the Adventure Time project.",
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "ready"
+ },
+ {
+ "name": "screen",
+ "delays": [ [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/ready.png b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/ready.png
new file mode 100644
index 00000000000..518826bfc04
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/ready.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/screen.png b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/screen.png
new file mode 100644
index 00000000000..249ce684155
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/high-volt_defib.rsi/screen.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment-inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment-inhand-left.png
new file mode 100644
index 00000000000..ae4e7bc7f02
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment-inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment-inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment-inhand-right.png
new file mode 100644
index 00000000000..bccb346c37b
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment-inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment.png
new file mode 100644
index 00000000000..18dbc8cea9a
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/antib_ointment.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-equipped-BELT.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-equipped-BELT.png
new file mode 100644
index 00000000000..099d2e4661d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-equipped-BELT.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-inhand-left.png
new file mode 100644
index 00000000000..b0edb057df3
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-inhand-right.png
new file mode 100644
index 00000000000..b412d2798c3
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet-inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet.png b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet.png
new file mode 100644
index 00000000000..2acd66da9e9
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/med_tourniqet.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/meta.json
new file mode 100644
index 00000000000..0640d49d926
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/medical.rsi/meta.json
@@ -0,0 +1,36 @@
+{
+ "version": 1,
+ "license": "Custom",
+ "copyright": "Created by JustKekc and @prazat911. Approved for use ONLY on the Adventure Time project.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "med_tourniqet"
+ },
+ {
+ "name": "med_tourniqet-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "med_tourniqet-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "med_tourniqet-equipped-BELT"
+ },
+ {
+ "name": "antib_ointment"
+ },
+ {
+ "name": "antib_ointment-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "antib_ointment-inhand-left",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..45a454d7dbe
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/icon.png
new file mode 100644
index 00000000000..0317e6f8e88
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/inhand-left.png
new file mode 100644
index 00000000000..242295e73d6
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/inhand-right.png
new file mode 100644
index 00000000000..242295e73d6
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/meta.json
new file mode 100644
index 00000000000..b882d994f18
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "Custom",
+ "copyright": "Created by JustKekc. Approved for use ONLY on the Adventure Time project.",
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "ready"
+ },
+ {
+ "name": "screen",
+ "delays": [ [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+ },
+ {
+ "name": "equipped-BELT",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/ready.png b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/ready.png
new file mode 100644
index 00000000000..997e431aa38
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/ready.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/screen.png b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/screen.png
new file mode 100644
index 00000000000..4eac45c0823
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/mobile_defib.rsi/screen.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/anelgesin.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/anelgesin.png
new file mode 100644
index 00000000000..f418bdb42d6
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/anelgesin.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/charcoal.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/charcoal.png
new file mode 100644
index 00000000000..cc985b33f41
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/charcoal.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/diethamilate.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/diethamilate.png
new file mode 100644
index 00000000000..07e10f8b55d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/diethamilate.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/ethylredoxrazine.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/ethylredoxrazine.png
new file mode 100644
index 00000000000..e544c92733a
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/ethylredoxrazine.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/haloperidol.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/haloperidol.png
new file mode 100644
index 00000000000..ba0c73adb7c
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/haloperidol.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/inhand-left.png
new file mode 100644
index 00000000000..f6d65cbcbf0
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/inhand-right.png
new file mode 100644
index 00000000000..276c0d6166b
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/meta.json
new file mode 100644
index 00000000000..3aa2afba911
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-NC-SA-4.0",
+ "copyright": "Created by JustKekc.",
+ "states": [
+ {
+ "name": "pack"
+ },
+ {
+ "name": "sodiumizole"
+ },
+ {
+ "name": "nitrofurfoll"
+ },
+ {
+ "name": "anelgesin"
+ },
+ {
+ "name": "minoxide"
+ },
+ {
+ "name": "diethamilate"
+ },
+ {
+ "name": "haloperidol"
+ },
+ {
+ "name": "charcoal"
+ },
+ {
+ "name": "ethylredoxrazine"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/minoxide.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/minoxide.png
new file mode 100644
index 00000000000..53774fa0740
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/minoxide.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/nitrofurfoll.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/nitrofurfoll.png
new file mode 100644
index 00000000000..1598c36e612
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/nitrofurfoll.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/pack.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/pack.png
new file mode 100644
index 00000000000..ef1b9a69c54
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/pack.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/sodiumizole.png b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/sodiumizole.png
new file mode 100644
index 00000000000..88bf34d2d9d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/packs.rsi/sodiumizole.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/agolatine-canister.png b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/agolatine-canister.png
new file mode 100644
index 00000000000..9fbb19fb6d6
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/agolatine-canister.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/inhand-left.png
new file mode 100644
index 00000000000..abc8210c3b5
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/inhand-right.png
new file mode 100644
index 00000000000..4b4e5619f6d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/meta.json
new file mode 100644
index 00000000000..96a1f4796ce
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-NC-SA-4.0",
+ "copyright": "Created by JustKekc.",
+ "states": [
+ {
+ "name": "pill-canister"
+ },
+ {
+ "name": "agolatine-canister"
+ },
+ {
+ "name": "vitamin-canister"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/pill-canister.png b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/pill-canister.png
new file mode 100644
index 00000000000..39e2a1aebc7
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/pill-canister.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/vitamin-canister.png b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/vitamin-canister.png
new file mode 100644
index 00000000000..b5028c98d26
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/pills.rsi/vitamin-canister.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill1.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill1.png
new file mode 100644
index 00000000000..f21d8446925
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill1.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill2.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill2.png
new file mode 100644
index 00000000000..bffbc8ed49a
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill2.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill3.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill3.png
new file mode 100644
index 00000000000..a63161b3194
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill3.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill4.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill4.png
new file mode 100644
index 00000000000..3445bf49de2
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill4.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill5.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill5.png
new file mode 100644
index 00000000000..785369617bf
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill5.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill6.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill6.png
new file mode 100644
index 00000000000..bb787c28ff5
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill6.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill7.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill7.png
new file mode 100644
index 00000000000..cfb82d68266
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/fill7.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front-nikematide.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front-nikematide.png
new file mode 100644
index 00000000000..2d1cd60853f
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front-nikematide.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front-perohydrogen.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front-perohydrogen.png
new file mode 100644
index 00000000000..9e1d466cdb3
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front-perohydrogen.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front.png
new file mode 100644
index 00000000000..be6d8afc8b0
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon-front.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon.png
new file mode 100644
index 00000000000..da77de1eb51
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/inhand-left.png
new file mode 100644
index 00000000000..89a690c937d
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/inhand-right.png
new file mode 100644
index 00000000000..853d38480a3
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/meta.json
new file mode 100644
index 00000000000..79fb6eeff4e
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/plastic-bottle.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-NC-SA-4.0",
+ "copyright": "Created by JustKekc.",
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon-front"
+ },
+ {
+ "name": "icon-front-nikematide"
+ },
+ {
+ "name": "icon-front-perohydrogen"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "fill1"
+ },
+ {
+ "name": "fill2"
+ },
+ {
+ "name": "fill3"
+ },
+ {
+ "name": "fill4"
+ },
+ {
+ "name": "fill5"
+ },
+ {
+ "name": "fill6"
+ },
+ {
+ "name": "fill7"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/content.png b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/content.png
new file mode 100644
index 00000000000..4d5466199d8
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/content.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/icon.png
new file mode 100644
index 00000000000..51693d01a73
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/inhand-left.png
new file mode 100644
index 00000000000..bda43ceb42c
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/inhand-right.png
new file mode 100644
index 00000000000..6e7afcafa40
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/meta.json
new file mode 100644
index 00000000000..89ce543a492
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by JustKekc. Approved for use ONLY on the Adventure Time project.",
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "content",
+ "delays": [ [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] ]
+ },
+ {
+ "name": "screen",
+ "delays": [ [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/screen.png b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/screen.png
new file mode 100644
index 00000000000..289f2579fa8
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/reagent_analyzer.rsi/screen.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill1.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill1.png
new file mode 100644
index 00000000000..1e33adaa7c7
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill1.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill2.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill2.png
new file mode 100644
index 00000000000..81405aecbcf
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill2.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill3.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill3.png
new file mode 100644
index 00000000000..2423b8a2e0c
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill3.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill4.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill4.png
new file mode 100644
index 00000000000..00f9fedd241
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill4.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill5.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill5.png
new file mode 100644
index 00000000000..b44edd823d0
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/fill5.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/icon.png
new file mode 100644
index 00000000000..46e0c75f9a3
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/inhand-left.png
new file mode 100644
index 00000000000..7ea530abbe9
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/inhand-right.png
new file mode 100644
index 00000000000..863a40a4932
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/meta.json
new file mode 100644
index 00000000000..78377d59300
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "syringe_base"
+ },
+ {
+ "name": "fill1"
+ },
+ {
+ "name": "fill2"
+ },
+ {
+ "name": "fill3"
+ },
+ {
+ "name": "fill4"
+ },
+ {
+ "name": "fill5"
+ },
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/syringe_base.png b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/syringe_base.png
new file mode 100644
index 00000000000..f5df4b0f8a8
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Medical/syringe.rsi/syringe_base.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
index 1ed55fa7188..304694e3416 100644
--- a/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
+++ b/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
@@ -21,6 +21,9 @@
{
"name": "green_bit"
},
+ {
+ "name": "pillomat"
+ },
{
"name": "refill_stylish"
}
diff --git a/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/pillomat.png b/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/pillomat.png
new file mode 100644
index 00000000000..8eb9c3e7c79
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/vending_machine_restock.rsi/pillomat.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/broken.png
new file mode 100644
index 00000000000..39ebd530484
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/broken.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/meta.json
new file mode 100644
index 00000000000..4eb75fdce1f
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by discord: prazat911",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "broken"
+ },
+ {
+ "name": "off"
+ },
+ {
+ "name": "panel"
+ },
+ {
+ "name": "normal-unshaded",
+ "delays": [
+ [
+ 1.0,
+ 0.1,
+ 1.0,
+ 0.1,
+ 1.0,
+ 0.1
+ ]
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..d8191578f19
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/off.png
new file mode 100644
index 00000000000..fdd611704c7
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/off.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/panel.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/panel.png
new file mode 100644
index 00000000000..0032751ff4f
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/paradrobe.rsi/panel.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/broken.png
new file mode 100644
index 00000000000..cb3f5e45c2a
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/broken.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json
new file mode 100644
index 00000000000..7a99d3e9b02
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "broken"
+ },
+ {
+ "name": "off"
+ },
+ {
+ "name": "panel"
+ },
+ {
+ "name": "normal-unshaded",
+ "delays": [
+ [
+ 1.0,
+ 0.1,
+ 1.0,
+ 0.1,
+ 1.0,
+ 0.1
+ ]
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..d8191578f19
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/off.png
new file mode 100644
index 00000000000..a249c5ea329
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/off.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/panel.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/panel.png
new file mode 100644
index 00000000000..0032751ff4f
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/panel.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/broken.png
new file mode 100644
index 00000000000..e495135dd41
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/broken.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/deny-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..30250aedb78
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/eject-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..68ff9b3c752
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/meta.json
new file mode 100644
index 00000000000..e65d518eb27
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/meta.json
@@ -0,0 +1,62 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "JustKekc",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "normal-unshaded",
+ "delays": [
+ [
+ 2,
+ 2,
+ 0.15,
+ 0.15,
+ 1.5,
+ 1.5,
+ 0.15,
+ 0.15,
+ 1.5,
+ 1.5,
+ 0.15,
+ 0.15,
+ 1.5,
+ 1.5,
+ 0.15,
+ 0.15
+ ]
+ ]
+ },
+ {
+ "name": "deny-unshaded",
+ "delays": [
+ [
+ 1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "eject-unshaded",
+ "delays": [
+ [
+ 0.1,
+ 0.4,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "off"
+ },
+ {
+ "name": "broken"
+ },
+ {
+ "name": "panel"
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..8921f29d323
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/off.png
new file mode 100644
index 00000000000..5095c64cda3
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/off.png differ
diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/panel.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/panel.png
new file mode 100644
index 00000000000..a797b42b18b
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/pillomat.rsi/panel.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png
new file mode 100644
index 00000000000..9fb79da87ef
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png
new file mode 100644
index 00000000000..dc7d1924fad
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png
new file mode 100644
index 00000000000..70bd872400d
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png
new file mode 100644
index 00000000000..9c30d08321a
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png
new file mode 100644
index 00000000000..7c70b7a6484
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png
new file mode 100644
index 00000000000..cacaa5ac991
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png
new file mode 100644
index 00000000000..cd0c0ff2ea1
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png
new file mode 100644
index 00000000000..26498527779
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png
new file mode 100644
index 00000000000..2487eae1fdd
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png
new file mode 100644
index 00000000000..01ed5bf73b6
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png differ
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json
new file mode 100644
index 00000000000..44474f86fdb
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "copyright": "Taken from tgstation. Bio Pathologist and Paramedic made by JustKekc.",
+ "license": "CC-BY-SA-3.0",
+ "states": [
+ {
+ "name": "generic"
+ },
+ {
+ "name": "generic_door"
+ },
+ {
+ "name": "generic_open"
+ },
+ {
+ "name": "generic_icon"
+ },
+ {
+ "name": "welded"
+ },
+ {
+ "name": "bio_pathologist"
+ },
+ {
+ "name": "bio_pathologist_door"
+ },
+ {
+ "name": "bio_pathologist_open"
+ },
+ {
+ "name": "bio_paramedic"
+ },
+ {
+ "name": "bio_paramedic_door"
+ },
+ {
+ "name": "bio_paramedic_open"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png
new file mode 100644
index 00000000000..5ba5dcc8962
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/defibrillator.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/defibrillator.png
new file mode 100644
index 00000000000..c7f31234bce
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/defibrillator.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
index 3f3418b36c1..609fd414683 100644
--- a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
@@ -16,6 +16,9 @@
{
"name": "bottle_spray"
},
+ {
+ "name": "defibrillator"
+ },
{
"name": "cleaver"
},
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png
index 2f7a32ae935..ab28f4d0303 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET.png
index 3073620445c..91d17311a81 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon.png
index e9316eb37db..125a60b7fd6 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-left.png
index f919e81c64d..736547b2b52 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-right.png
index a5b68442f3b..9aff526eaac 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
index b60639b2654..941cfd7d2d4 100644
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Made by MagnusCrowe (Github) for SS14",
+ "copyright": "Made by MagnusCrowe (Github) for SS14, modified for Adventure Time by prazat911 (Discord)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
index 9615f685657..c38aee7b094 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
index a13937f7643..c40e0d6c8f9 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
index 7f61c958c15..94b1b3c7fef 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-left.png
index cf742039657..601fa2b9683 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-right.png
index 9abbda4ccb5..d79c0c36b39 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
index bbcef071e2e..51df1712c77 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14. Modified for Adventure Time by prazat911 (Discord)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
index 81c2e530360..8196e9a6eb8 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
index ec9299f9f35..48ddd425d0d 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
index 7b21801944a..4fe93891db1 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png
index cf742039657..601fa2b9683 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png
index 9abbda4ccb5..d79c0c36b39 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
index 010cbd51718..affe594ac2c 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14. Modified for Adventure Time by prazat911 (Discord)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/JobIconADTPathologist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/JobIconADTPathologist.png
new file mode 100644
index 00000000000..3f637538f97
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/JobIconADTPathologist.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 250d66eeb23..daeadbaf373 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -198,6 +198,9 @@
},
{
"name": "JobIconVisitor"
+ },
+ {
+ "name": "JobIconADTPathologist"
}
]
}
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
index c9390b697e2..5c40582c934 100644
--- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -232,6 +232,9 @@
},
{
"name": "pda-syndi-agent"
+ },
+ {
+ "name": "pda-pathologist"
}
]
}
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-pathologist.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-pathologist.png
new file mode 100644
index 00000000000..14d8219888e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-pathologist.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 17a76974867..78c98c5e8da 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
- "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Central Command (cc) made by Tamioki.",
+ "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Central Command (cc) made by Tamioki. Paramedic ReSprite made by discord: prazat911 for Adventure Time",
"license": "CC-BY-SA-3.0",
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/paramed.png b/Resources/Textures/Structures/Storage/closet.rsi/paramed.png
index 245fa9cea17..22e6f0f9615 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/paramed.png and b/Resources/Textures/Structures/Storage/closet.rsi/paramed.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png
index 5588ffcd11f..2f99c4ed1f4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png b/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png
index d365ba2f837..ec0b835bd74 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png differ
diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/meta.json b/Resources/Textures/Structures/Storage/morgue.rsi/meta.json
index bdbd10ef961..2815164f234 100644
--- a/Resources/Textures/Structures/Storage/morgue.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/morgue.rsi/meta.json
@@ -50,6 +50,10 @@
{
"name": "morgue_tray",
"directions": 4
+ },
+ {
+ "name": "morgue_paper",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_paper.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_paper.png
new file mode 100644
index 00000000000..9bcb9110c8f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_paper.png differ