diff --git a/Content.Server/ADT/Atmos/Rotting/EmbalmedSystem.cs b/Content.Server/ADT/Atmos/Rotting/EmbalmedSystem.cs new file mode 100644 index 00000000000..d2276874389 --- /dev/null +++ b/Content.Server/ADT/Atmos/Rotting/EmbalmedSystem.cs @@ -0,0 +1,22 @@ +using Content.Shared.ADT.Atmos.Miasma; +using Content.Shared.Examine; +using Content.Shared.Mobs.Systems; + +namespace Content.Server.ADT.Atmos.Rotting; + +public sealed partial class EmbalmedSystem : EntitySystem +{ + [Dependency] private readonly MobStateSystem _mobState = default!; + public override void Initialize() + { + SubscribeLocalEvent(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/ADT/EntityEffects/Effects/Embalm.cs b/Content.Server/ADT/EntityEffects/Effects/Embalm.cs new file mode 100644 index 00000000000..8bd761c7cdb --- /dev/null +++ b/Content.Server/ADT/EntityEffects/Effects/Embalm.cs @@ -0,0 +1,19 @@ +using Content.Shared.EntityEffects; +using Robust.Shared.Prototypes; +using Content.Shared.ADT.Atmos.Miasma; + + +namespace Content.Server.ADT.EntityEffects.Effects; + +public sealed partial class Embalm : EntityEffect +{ + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) + => Loc.GetString("reagent-effect-guidebook-embalm", ("chance", Probability)); + + // Gives the entity a component that prevents rotting and also execution by defibrillator + public override void Effect(EntityEffectBaseArgs args) + { + var entityManager = args.EntityManager; + entityManager.EnsureComponent(args.TargetEntity); + } +} \ No newline at end of file diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs index c9cb6cc58dc..da7a251c06a 100644 --- a/Content.Server/Medical/DefibrillatorSystem.cs +++ b/Content.Server/Medical/DefibrillatorSystem.cs @@ -24,6 +24,7 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Player; using Robust.Shared.Timing; +using Content.Shared.ADT.Atmos.Miasma; //ADT-Medicine namespace Content.Server.Medical; @@ -152,6 +153,11 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"), InGameICChatType.Speak, true); } + if (HasComp(target)) //ADT-Medicine + { + _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-embalmed"), + InGameICChatType.Speak, true); + } else if (HasComp(target)) { _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-unrevivable"), diff --git a/Content.Shared/ADT/Atmos/Rotting/EmbalmedComponent.cs b/Content.Shared/ADT/Atmos/Rotting/EmbalmedComponent.cs new file mode 100644 index 00000000000..f9b0bfb4670 --- /dev/null +++ b/Content.Shared/ADT/Atmos/Rotting/EmbalmedComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared.ADT.Atmos.Miasma; + +/// +/// Entities wouldn't rot at all with this component. +/// +[RegisterComponent] +public sealed partial class EmbalmedComponent : Component +{ + +} \ No newline at end of file diff --git a/Content.Shared/ADT/Damage/Components/IgnoreSlowOnDamageComponent.cs b/Content.Shared/ADT/Damage/Components/IgnoreSlowOnDamageComponent.cs new file mode 100644 index 00000000000..721c82a1bf8 --- /dev/null +++ b/Content.Shared/ADT/Damage/Components/IgnoreSlowOnDamageComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; +using Content.Shared.Damage; + +namespace Content.Shared.ADT.Damage.Components; + +/// +/// This is used for an effect that nullifies and adds an alert. +/// Thanks EmoGarbage404 for contributing this mechanic. +/// https://github.com/space-wizards/space-station-14/pull/31322 +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SlowOnDamageSystem))] +public sealed partial class IgnoreSlowOnDamageComponent : Component; \ No newline at end of file diff --git a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs index 833883c144c..99f25b82bee 100644 --- a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs +++ b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs @@ -1,6 +1,8 @@ using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; +using Content.Shared.Inventory; using Content.Shared.Movement.Systems; +using Content.Shared.ADT.Damage.Components; namespace Content.Shared.Damage { @@ -14,6 +16,9 @@ public override void Initialize() SubscribeLocalEvent(OnDamageChanged); SubscribeLocalEvent(OnRefreshMovespeed); + SubscribeLocalEvent(OnIgnoreStartup); //ADT-Medicine start + SubscribeLocalEvent(OnIgnoreShutdown); + SubscribeLocalEvent(OnIgnoreModifySpeed); //ADT-Medicine end } private void OnRefreshMovespeed(EntityUid uid, SlowOnDamageComponent component, RefreshMovementSpeedModifiersEvent args) @@ -36,10 +41,12 @@ private void OnRefreshMovespeed(EntityUid uid, SlowOnDamageComponent component, if (closest != FixedPoint2.Zero) { var speed = component.SpeedModifierThresholds[closest]; - args.ModifySpeed(speed, speed); + + var ev = new ModifySlowOnDamageSpeedEvent(speed); //ADT-Medicine start + RaiseLocalEvent(uid, ref ev); + args.ModifySpeed(ev.Speed, ev.Speed); //ADT-Medicine end } } - private void OnDamageChanged(EntityUid uid, SlowOnDamageComponent component, DamageChangedEvent args) { // We -could- only refresh if it crossed a threshold but that would kind of be a lot of duplicated @@ -47,5 +54,25 @@ private void OnDamageChanged(EntityUid uid, SlowOnDamageComponent component, Dam _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(uid); } + private void OnIgnoreStartup(Entity ent, ref ComponentStartup args) //ADT-Medicine start + { + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(ent); + } + + private void OnIgnoreShutdown(Entity ent, ref ComponentShutdown args) + { + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(ent); + } + + private void OnIgnoreModifySpeed(Entity ent, ref ModifySlowOnDamageSpeedEvent args) + { + args.Speed = 1f; + } } -} + + [ByRefEvent] + public record struct ModifySlowOnDamageSpeedEvent(float Speed) : IInventoryRelayEvent + { + public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET; + } //ADT-Medicine end +} \ No newline at end of file diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml index 5715b2f20b3..0b882650d51 100644 --- a/Resources/Changelog/1ChangelogADT.yml +++ b/Resources/Changelog/1ChangelogADT.yml @@ -2673,3 +2673,9 @@ Entries: будет гореть красным, как при обновлении от Визардов.', type: Tweak} time: '2024-09-02T13:17:49Z' id: 307 + - author: Шрёдька + changes: + - {message: Технический ассистент переименован в -> Инженер-стажёр., type: Tweak} + - {message: Научный ассистент переименован в -> Лаборант., type: Tweak} + time: '2024-09-02T14:12:31Z' + id: 308 diff --git a/Resources/Locale/en-US/disease/miasma.ftl b/Resources/Locale/en-US/disease/miasma.ftl index 46e8db33d4c..bcfbebc7b65 100644 --- a/Resources/Locale/en-US/disease/miasma.ftl +++ b/Resources/Locale/en-US/disease/miasma.ftl @@ -18,4 +18,4 @@ 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] +rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } is extremely bloated![/color] \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl b/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl index de6b88eb5b8..0de1798aa1f 100644 --- a/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl +++ b/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl @@ -1,2 +1,4 @@ alerts-crawling-name = Ползание -alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать. \ No newline at end of file +alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать. +alerts-adrenaline-name = [color=red]Адреналин[/color] +alerts-adrenaline-desc = Вы полны адреналина: боль вас не замедлит. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/disease/miasma.ftl b/Resources/Locale/ru-RU/ADT/disease/miasma.ftl new file mode 100644 index 00000000000..b57efd08c8e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/disease/miasma.ftl @@ -0,0 +1 @@ +adt-rotting-embalmed = [color=#edad45]Похоже, тело забальзамировано.[/color] \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/guidebook/chemistry/effects.ftl b/Resources/Locale/ru-RU/ADT/guidebook/chemistry/effects.ftl new file mode 100644 index 00000000000..42e90ccdeff --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/guidebook/chemistry/effects.ftl @@ -0,0 +1,5 @@ +reagent-effect-guidebook-embalm = + { $chance -> + [1] Предотвращает + *[other] предотвращают + } гниение трупов \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/ru-RU/ADT/guidebook/chemistry/statuseffects.ftl new file mode 100644 index 00000000000..b6fcd6e7800 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/guidebook/chemistry/statuseffects.ftl @@ -0,0 +1 @@ +reagent-effect-status-effect-Adrenaline = адреналин \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/medical/defibrillator.ftl b/Resources/Locale/ru-RU/ADT/medical/defibrillator.ftl new file mode 100644 index 00000000000..8499f3b0d60 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/medical/defibrillator.ftl @@ -0,0 +1 @@ +defibrillator-embalmed = Обнаружено бальзамирование тела: реанимация невозможна. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/walls.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/walls.ftl index 3fa0eb83d8f..5b1792c7656 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/walls.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/walls.ftl @@ -1,4 +1,10 @@ ent-ADTSpaceSecWall = укреплённая стена .desc = Удерживает воздух внутри, а дронов снаружи. ent-ADTSpaceSecWallDiagonal = диагональная укреплённая стена - .desc = Удерживает воздух внутри, а дронов снаружи. \ No newline at end of file + .desc = Удерживает воздух внутри, а дронов снаружи. +ent-ADTCardboardWall = картонная стена + .desc = Стена из бумаги и тонких досок. Пользуется определенной популярностью в [восточном месте]. +ent-ADTStonebrickWall = каменная стена + .desc = Классическая каменная стена. +ent-ADTYellowbrickWall = кирпичная жёлтая стена + .desc = Желтые кирпичи, уложенные по древним обычаям. 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..f29b9699159 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/effects/medicine_effects.ftl @@ -0,0 +1,20 @@ +medicine-effect-usual = Вы чувствуете, как ваша боль постепенно уходит. +medicine-effect-asphyxia = Ваше дыхание восстанавливается и понемногу приходит в норму. +medicine-effect-hungover = Ваши мысли становятся более собранными, а движения менее неряшливыми. +medicine-effect-eyedamage = Ваше зрение стало чуть лучше. +medicine-effect-mind = Похоже, ваш разум расширяется. +medicine-effect-stress = Ваше тело напрягается. + +medicine-effect-headache = Вы чувствуете, как ваша головная боль постепенно уменьшается. +medicine-effect-slash = Вы чувствуете, как боль от ваших ран уменьшается. +medicine-effect-piercing = Вы чувствуете, как боль от ваших колотых мест уменьшается. +medicine-effect-heat = Похоже, ваша температура совсем немного понизилась. +medicine-effect-shock = Вы чувствуете, как боль от электрического ожога по всему вашему телу уменьшается. +medicine-effect-major-stress = Ваше тело сильно напрягается. +medicine-effect-emotions = Ваши эмоции и чувства становятся менее выразительными. +medicine-effect-antipsychotic = Ваше зрение и мысли становятся менее расплывчатыми. +medicine-effect-pain = Вы чувствуете, как ваша боль притупляется. + +medicine-effect-visible-emotions-m = { CAPITALIZE($entity) } выглядит менее эмоциональным. +medicine-effect-visible-emotions-f = { CAPITALIZE($entity) } выглядит менее эмоциональной. +medicine-effect-visible-polymorph = { CAPITALIZE($entity) } притерпевает изменения в теле! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/medicine.ftl new file mode 100644 index 00000000000..53187abef48 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/meta/medicine.ftl @@ -0,0 +1,42 @@ +flavor-complex-somesalty = солёненькое +reagent-name-ultra-chloral-hydrate = Ультрахлоральгидрат +reagent-desc-ultra-chloral-hydrate = Модифицированный хлоральгидрат. В малых дозах вызывает сонливость. В больших дозах усыпляет. Передозировки нет + +reagent-name-nitrofurfoll = нитрофурфол +reagent-desc-nitrofurfoll = Антимикробный препарат, который зачастую используют для исцеления небольших ран. Становится более эффективным вместе с бикаридином. + +reagent-name-perohydrogen = пероводород +reagent-desc-perohydrogen = Часто используемый препарат для обработки болезненных уколов. Становится более эффективным вместе с бикаридином. + +reagent-name-anelgesin = анельгезин +reagent-desc-anelgesin = Популярное жаропонижающее. Имеет исцелительные свойства в паре с дермалином. + +reagent-name-minoxide = миноксид +reagent-desc-minoxide = Препарат, который смягчает эффект и боль от электрического шока. Становится более эффективным вместе с дермалином. + +reagent-name-biomicine = биомицин +reagent-desc-biomicine = Сам по себе не влияет на организм, но становится крайне не стабильным при совмещении с диловеном. Зачастую используется в предсмертных случаях отравления. Оказывает значительное напряжение тела. + +reagent-name-nikematide = никематид +reagent-desc-nikematide = Используется для лечения лёгкого кислородного голодания, но менее эффективно, чем дексалин. Однако, это отличное дополнение к дексалину плюс. + +reagent-name-diethamilate = диэтамилат +reagent-desc-diethamilate = Гемостатическое средство для остановки небольшого кровотечения. Восполняет кровопотерю в паре с дексалином плюс. + +reagent-name-sodiumizole = натримизол +reagent-desc-sodiumizole = Достаточно дешёвый и слабый анальгетик. Становится более эффективным в паре с бикаридином. + +reagent-name-agolatine = аголатин +reagent-desc-agolatine = Атипичный антидепрессант, зачастую используемый для лечения эпизодов большой депрессии и генерализованного тревожного расстройства. + +reagent-name-morphine = морфин +reagent-desc-morphine = Сильный опиат, добываемый из снотворного мака. В основном используется как анальгетик. + +reagent-name-formalin = формалин +reagent-desc-formalin = Препарат, свёртывающий белки и предотвращающий их разложение. Используется для бальзамирования трупов. + +reagent-name-styptic-powder = Кровоостанавливающая пудра +reagent-desc-styptic-powder = При нанесении на кожу заживляет травмы. + +reagent-name-silver-sulfadiazine = Сульфадиазин серебра +reagent-desc-silver-sulfadiazine = При нанесении на кожу заживляет ожоги. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/physical-desc.ftl new file mode 100644 index 00000000000..7a0979f8b28 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/meta/physical-desc.ftl @@ -0,0 +1 @@ +reagent-physical-desc-skunky = вонючее \ No newline at end of file diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl index 3b52efd2691..379399acb08 100644 --- a/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl +++ b/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl @@ -12,4 +12,4 @@ reagent-effect-status-effect-Pacified = принудительный пациф reagent-effect-status-effect-RatvarianLanguage = паттерны ратварского языка reagent-effect-status-effect-StaminaModifier = модифицированная выносливость reagent-effect-status-effect-RadiationProtection = защита от радиации -reagent-effect-status-effect-Drowsiness = сонливость +reagent-effect-status-effect-Drowsiness = сонливость \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Alerts/alerts.yml b/Resources/Prototypes/ADT/Alerts/alerts.yml index 4a004bc7393..df8bda0da9f 100644 --- a/Resources/Prototypes/ADT/Alerts/alerts.yml +++ b/Resources/Prototypes/ADT/Alerts/alerts.yml @@ -126,3 +126,11 @@ state: icon name: alerts-crawling-name description: alerts-crawling-desc + +- type: alert + id: Adrenaline + icons: + - sprite: Mobs/Species/Human/organs.rsi + state: heart-on + name: alerts-adrenaline-name + description: alerts-adrenaline-desc \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/ADT/Entities/Structures/Walls/walls.yml index 436c4a84e7a..733b2f44002 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Walls/walls.yml @@ -56,4 +56,52 @@ damage: 550 behaviors: - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file + acts: [ "Destruction" ] + +- type: entity + parent: BaseWall + id: ADTCardboardWall + name: cardboard Wall + description: A wall of paper and thin boards. Enjoys a certain popularity in [eastern place]. + components: + - type: Sprite + sprite: ADT/Structures/Walls/cardboard_walls.rsi + - type: Icon + sprite: ADT/Structures/Walls/cardboard_walls.rsi + - type: IconSmooth + base: cardboard + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + + +- type: entity + parent: BaseWall + id: ADTStonebrickWall + name: stone brick Wall + description: Stone brick wall. Classic + components: + - type: Sprite + sprite: ADT/Structures/Walls/stone_bricks_wall.rsi + - type: Icon + sprite: ADT/Structures/Walls/stone_bricks_wall.rsi + - type: IconSmooth + base: stonebricks + +- type: entity + parent: BaseWall + id: ADTYellowbrickWall + name: yellow brick Wall + description: Yellow bricks laid according to ancient customs + components: + - type: Sprite + sprite: ADT/Structures/Walls/yellow_bricks_wall.rsi + - type: Icon + sprite: ADT/Structures/Walls/yellow_bricks_wall.rsi + - type: IconSmooth + base: yellowbricks diff --git a/Resources/Prototypes/ADT/Reagents/medicine.yml b/Resources/Prototypes/ADT/Reagents/medicine.yml new file mode 100644 index 00000000000..f81f008c51b --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/medicine.yml @@ -0,0 +1,436 @@ +# Новые доп. препараты + +# 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: Adrenaline + component: IgnoreSlowOnDamage + 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" + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + damage: + types: + Piercing: -0.75 + 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" + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ModifyBleedAmount + amount: -1.5 #буквально как транексамовая, но надо плескать её. + 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: 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: + Cellular: 1 + +- 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: Adrenaline + component: IgnoreSlowOnDamage + 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:GenericStatusEffect + key: Stun + time: 1.5 + type: Remove + - !type:GenericStatusEffect + key: KnockedDown + time: 1.5 + type: Remove + - !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: [ "goodfeeling-artifact-drastic-3" ] + # - narcotic-effect-rainbows + probability: 0.05 +# - !type:PopupMessage +# type: Pvs +# visualType: Small +# messages: [ "narcotic-effect-visible-miosis" ] +# probability: 0.05 + +#Кровоостанавливающая пудра +- type: reagent + id: ADTStypticPowder + name: reagent-name-styptic-powder + group: Medicine + desc: reagent-desc-styptic-powder + flavor: medicine + color: "#c8a2c8" + physicalDesc: reagent-physical-desc-powdery + metabolisms: + Medicine: + metabolismRate : 0.75 + effects: + - !type:HealthChange + damage: + groups: + Brute: -2.25 + - !type:ModifyBleedAmount + amount: -1 #почему кровоостанавливающая пудра не останавливала кровотечение? + - !type:PopupMessage + conditions: + - !type:TotalDamage + min: 0.5 + type: Local + visualType: Small + messages: [ "medicine-effect-usual" ] + probability: 0.05 +#Сульфадиазин серебра +- type: reagent + id: ADTSilverSulfadiazine + name: reagent-name-silver-sulfadiazine + group: Medicine + desc: reagent-desc-silver-sulfadiazine + flavor: medicine + color: "#c8a2c8" + physicalDesc: reagent-physical-desc-powdery + metabolisms: + Medicine: + metabolismRate : 0.75 + effects: + - !type:HealthChange + damage: + groups: + Burn: -3 + - !type:PopupMessage + conditions: + - !type:TotalDamage + min: 0.5 + type: Local + visualType: Small + messages: [ "medicine-effect-usual" ] + probability: 0.05 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/USSP/fill.txt b/Resources/Prototypes/ADT/Roles/Jobs/USSP/fill.txt index b4954caf47d..d52be0ebabd 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/USSP/fill.txt +++ b/Resources/Prototypes/ADT/Roles/Jobs/USSP/fill.txt @@ -1 +1,2 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file +# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить +Тут уже не было Хурмика diff --git a/Resources/Prototypes/ADT/StatusEffects/hallucinations.yml b/Resources/Prototypes/ADT/StatusEffects/hallucinations.yml deleted file mode 100644 index 7e5d48c0f75..00000000000 --- a/Resources/Prototypes/ADT/StatusEffects/hallucinations.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: statusEffect - id: ADTHallucinations diff --git a/Resources/Prototypes/ADT/StatusEffects/seeingstatic.yml b/Resources/Prototypes/ADT/StatusEffects/seeingstatic.yml deleted file mode 100644 index 5fb3e737493..00000000000 --- a/Resources/Prototypes/ADT/StatusEffects/seeingstatic.yml +++ /dev/null @@ -1,4 +0,0 @@ -# Simple Station - -- type: statusEffect - id: SeeingStatic diff --git a/Resources/Prototypes/ADT/StatusEffects/starvation.yml b/Resources/Prototypes/ADT/StatusEffects/starvation.yml deleted file mode 100644 index 41ad270d8ad..00000000000 --- a/Resources/Prototypes/ADT/StatusEffects/starvation.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: statusEffect - id: ADTStarvation diff --git a/Resources/Prototypes/ADT/StatusEffects/status_effects.yml b/Resources/Prototypes/ADT/StatusEffects/status_effects.yml new file mode 100644 index 00000000000..86ee20a3c9a --- /dev/null +++ b/Resources/Prototypes/ADT/StatusEffects/status_effects.yml @@ -0,0 +1,14 @@ +- type: statusEffect + id: ADTHallucinations + +- type: statusEffect + id: ADTStarvation + +- type: statusEffect + id: Adrenaline + alert: Adrenaline + +# Simple Station + +- type: statusEffect + id: SeeingStatic diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index 41545aef894..48e6e98ca76 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -28,6 +28,7 @@ - Flashed - RadiationProtection - Drowsiness + - Adrenaline #ADT-Medicine - type: Buckle - type: StandingState - type: Tag @@ -105,6 +106,7 @@ - Flashed - RadiationProtection - Drowsiness + - Adrenaline #ADT-Medicine - type: Bloodstream bloodMaxVolume: 150 - type: MobPrice diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index ff6b66323f0..9e16ccf8881 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -106,6 +106,7 @@ - Pacified - RadiationProtection - Drowsiness + - Adrenaline #ADT-Medicine - type: Temperature heatDamageThreshold: 800 - type: Metabolizer diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index ce80579a988..5a19df851f2 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -134,6 +134,7 @@ - Flashed - RadiationProtection - Drowsiness + - Adrenaline # ADT-Medicine - ADTHallucinations # ADT-Tweak - ADTStarvation # ADT-Tweak - type: Body diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard0.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard0.png new file mode 100644 index 00000000000..b6e194ef5c7 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard0.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard1.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard1.png new file mode 100644 index 00000000000..7e0df330640 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard1.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard2.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard2.png new file mode 100644 index 00000000000..b6e194ef5c7 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard2.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard3.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard3.png new file mode 100644 index 00000000000..7e0df330640 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard3.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard4.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard4.png new file mode 100644 index 00000000000..ee433212561 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard4.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard5.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard5.png new file mode 100644 index 00000000000..a06bc640323 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard5.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard6.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard6.png new file mode 100644 index 00000000000..ee433212561 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard6.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard7.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard7.png new file mode 100644 index 00000000000..e8c651e4e6c Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard7.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/full.png b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/full.png new file mode 100644 index 00000000000..5b10d0a739b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/full.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/meta.json b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/meta.json new file mode 100644 index 00000000000..c4871c3fdcf --- /dev/null +++ b/Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "cardboard0", + "directions": 4 + }, + { + "name": "cardboard1", + "directions": 4 + }, + { + "name": "cardboard2", + "directions": 4 + }, + { + "name": "cardboard3", + "directions": 4 + }, + { + "name": "cardboard4", + "directions": 4 + }, + { + "name": "cardboard5", + "directions": 4 + }, + { + "name": "cardboard6", + "directions": 4 + }, + { + "name": "cardboard7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/full.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/full.png new file mode 100644 index 00000000000..498b24df556 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/full.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/meta.json b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/meta.json new file mode 100644 index 00000000000..ae47862a0de --- /dev/null +++ b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "stonebricks0", + "directions": 4 + }, + { + "name": "stonebricks1", + "directions": 4 + }, + { + "name": "stonebricks2", + "directions": 4 + }, + { + "name": "stonebricks3", + "directions": 4 + }, + { + "name": "stonebricks4", + "directions": 4 + }, + { + "name": "stonebricks5", + "directions": 4 + }, + { + "name": "stonebricks6", + "directions": 4 + }, + { + "name": "stonebricks7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png new file mode 100644 index 00000000000..32dfb47bb07 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png new file mode 100644 index 00000000000..a511b4be532 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png new file mode 100644 index 00000000000..55a025c6d45 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png new file mode 100644 index 00000000000..85b63e9f65a Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png new file mode 100644 index 00000000000..d4bb23b1963 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png new file mode 100644 index 00000000000..298262146be Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png new file mode 100644 index 00000000000..b7990c54e9e Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png new file mode 100644 index 00000000000..0589ee38c28 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/full.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/full.png new file mode 100644 index 00000000000..0202bdac3b3 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/full.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/meta.json b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/meta.json new file mode 100644 index 00000000000..9854781b6de --- /dev/null +++ b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "yellowbricks0", + "directions": 4 + }, + { + "name": "yellowbricks1", + "directions": 4 + }, + { + "name": "yellowbricks2", + "directions": 4 + }, + { + "name": "yellowbricks3", + "directions": 4 + }, + { + "name": "yellowbricks4", + "directions": 4 + }, + { + "name": "yellowbricks5", + "directions": 4 + }, + { + "name": "yellowbricks6", + "directions": 4 + }, + { + "name": "yellowbricks7", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png new file mode 100644 index 00000000000..23e270935ef Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png new file mode 100644 index 00000000000..74c3bf51ca4 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png new file mode 100644 index 00000000000..e39e87fb3a0 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png new file mode 100644 index 00000000000..77788c56d9f Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png new file mode 100644 index 00000000000..1fb7066b53a Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png new file mode 100644 index 00000000000..833d72bbf0c Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png new file mode 100644 index 00000000000..7f91a3a2ede Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png differ diff --git a/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png new file mode 100644 index 00000000000..38e02c33a7c Binary files /dev/null and b/Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png differ