From e4e6fe5abf97b73c15c8cdf3ad164a6d66e0af81 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 00:29:39 +1000 Subject: [PATCH 1/3] Auto CL update (#393) No cl, no fun Co-authored-by: github-actions[bot] --- Resources/Changelog/1ChangelogADT.yml | 6 ++++++ 1 file changed, 6 insertions(+) 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 From 96979ae970995e7f90fc8c92a8303b06ce3a2773 Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Tue, 3 Sep 2024 03:42:22 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9C=D0=B5=D0=B4=20=D0=B0=D0=BF=D0=B4?= =?UTF-8?q?=D0=B5=D0=B9=D1=82=E2=84=A2=20-=20=D0=BC=D0=B5=D0=B4=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=BF=D0=B0=D1=80=D0=B0=D1=82=D1=8B.=20(#340)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Препараты с таблеткомата без рецептов. https://github.com/user-attachments/assets/b90322b8-b8dd-4c38-820f-17b7ab0a30bb --------- Co-authored-by: KashRas2 <140270505+KashRas2@users.noreply.github.com> --- .../ADT/Atmos/Rotting/EmbalmedSystem.cs | 22 + .../ADT/EntityEffects/Effects/Embalm.cs | 19 + Content.Server/Medical/DefibrillatorSystem.cs | 6 + .../ADT/Atmos/Rotting/EmbalmedComponent.cs | 10 + .../Components/IgnoreSlowOnDamageComponent.cs | 12 + .../Damage/Systems/SlowOnDamageSystem.cs | 33 +- Resources/Locale/en-US/disease/miasma.ftl | 2 +- Resources/Locale/ru-RU/ADT/alerts/alerts.ftl | 4 +- Resources/Locale/ru-RU/ADT/disease/miasma.ftl | 1 + .../ru-RU/ADT/guidebook/chemistry/effects.ftl | 5 + .../ADT/guidebook/chemistry/statuseffects.ftl | 1 + .../ru-RU/ADT/medical/defibrillator.ftl | 1 + .../ADT/reagents/effects/medicine_effects.ftl | 20 + .../ru-RU/ADT/reagents/meta/medicine.ftl | 42 ++ .../ru-RU/ADT/reagents/meta/physical-desc.ftl | 1 + .../guidebook/chemistry/statuseffects.ftl | 2 +- Resources/Prototypes/ADT/Alerts/alerts.yml | 8 + .../Prototypes/ADT/Reagents/medicine.yml | 436 ++++++++++++++++++ .../ADT/StatusEffects/hallucinations.yml | 2 - .../ADT/StatusEffects/seeingstatic.yml | 4 - .../ADT/StatusEffects/starvation.yml | 2 - .../ADT/StatusEffects/status_effects.yml | 14 + .../Entities/Mobs/NPCs/simplemob.yml | 2 + .../Entities/Mobs/Player/dragon.yml | 1 + .../Prototypes/Entities/Mobs/Species/base.yml | 1 + 25 files changed, 637 insertions(+), 14 deletions(-) create mode 100644 Content.Server/ADT/Atmos/Rotting/EmbalmedSystem.cs create mode 100644 Content.Server/ADT/EntityEffects/Effects/Embalm.cs create mode 100644 Content.Shared/ADT/Atmos/Rotting/EmbalmedComponent.cs create mode 100644 Content.Shared/ADT/Damage/Components/IgnoreSlowOnDamageComponent.cs create mode 100644 Resources/Locale/ru-RU/ADT/disease/miasma.ftl create mode 100644 Resources/Locale/ru-RU/ADT/guidebook/chemistry/effects.ftl create mode 100644 Resources/Locale/ru-RU/ADT/guidebook/chemistry/statuseffects.ftl create mode 100644 Resources/Locale/ru-RU/ADT/medical/defibrillator.ftl create mode 100644 Resources/Locale/ru-RU/ADT/reagents/effects/medicine_effects.ftl create mode 100644 Resources/Locale/ru-RU/ADT/reagents/meta/medicine.ftl create mode 100644 Resources/Locale/ru-RU/ADT/reagents/meta/physical-desc.ftl create mode 100644 Resources/Prototypes/ADT/Reagents/medicine.yml delete mode 100644 Resources/Prototypes/ADT/StatusEffects/hallucinations.yml delete mode 100644 Resources/Prototypes/ADT/StatusEffects/seeingstatic.yml delete mode 100644 Resources/Prototypes/ADT/StatusEffects/starvation.yml create mode 100644 Resources/Prototypes/ADT/StatusEffects/status_effects.yml 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/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/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/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/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 From ffdcdda035bc2599a3ee841aa6c721a3bbd7afbb Mon Sep 17 00:00:00 2001 From: Hyrmik <72623996+Hyrmik@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:09:02 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=BD=20(#395)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR Коммит взят отсюда: https://github.com/crystallpunk-14/crystall-punk-14/pull/108/commits/6307c1b1b5f81e06d0362934c588e922e0bda906 **Ссылка на публикацию в Discord** - [Заказы-разработка](https://discord.com/channels/901772674865455115/1232912408419504260) **Проверки** - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** :cl: Хурмик - add: Новые стены для мапперов и ивентеров: картонная, каменная и кирпичная жёлтая стена --- .../Entities/Structures/Walls/walls.ftl | 8 ++- .../ADT/Entities/Structures/Walls/walls.yml | 50 +++++++++++++++++- .../Prototypes/ADT/Roles/Jobs/USSP/fill.txt | 3 +- .../Walls/cardboard_walls.rsi/cardboard0.png | Bin 0 -> 758 bytes .../Walls/cardboard_walls.rsi/cardboard1.png | Bin 0 -> 623 bytes .../Walls/cardboard_walls.rsi/cardboard2.png | Bin 0 -> 758 bytes .../Walls/cardboard_walls.rsi/cardboard3.png | Bin 0 -> 623 bytes .../Walls/cardboard_walls.rsi/cardboard4.png | Bin 0 -> 628 bytes .../Walls/cardboard_walls.rsi/cardboard5.png | Bin 0 -> 421 bytes .../Walls/cardboard_walls.rsi/cardboard6.png | Bin 0 -> 628 bytes .../Walls/cardboard_walls.rsi/cardboard7.png | Bin 0 -> 259 bytes .../Walls/cardboard_walls.rsi/full.png | Bin 0 -> 487 bytes .../Walls/cardboard_walls.rsi/meta.json | 46 ++++++++++++++++ .../Walls/stone_bricks_wall.rsi/full.png | Bin 0 -> 814 bytes .../Walls/stone_bricks_wall.rsi/meta.json | 46 ++++++++++++++++ .../stone_bricks_wall.rsi/stonebricks0.png | Bin 0 -> 1219 bytes .../stone_bricks_wall.rsi/stonebricks1.png | Bin 0 -> 923 bytes .../stone_bricks_wall.rsi/stonebricks2.png | Bin 0 -> 1237 bytes .../stone_bricks_wall.rsi/stonebricks3.png | Bin 0 -> 921 bytes .../stone_bricks_wall.rsi/stonebricks4.png | Bin 0 -> 922 bytes .../stone_bricks_wall.rsi/stonebricks5.png | Bin 0 -> 671 bytes .../stone_bricks_wall.rsi/stonebricks6.png | Bin 0 -> 914 bytes .../stone_bricks_wall.rsi/stonebricks7.png | Bin 0 -> 257 bytes .../Walls/yellow_bricks_wall.rsi/full.png | Bin 0 -> 712 bytes .../Walls/yellow_bricks_wall.rsi/meta.json | 46 ++++++++++++++++ .../yellow_bricks_wall.rsi/yellowbricks0.png | Bin 0 -> 1105 bytes .../yellow_bricks_wall.rsi/yellowbricks1.png | Bin 0 -> 824 bytes .../yellow_bricks_wall.rsi/yellowbricks2.png | Bin 0 -> 1086 bytes .../yellow_bricks_wall.rsi/yellowbricks3.png | Bin 0 -> 825 bytes .../yellow_bricks_wall.rsi/yellowbricks4.png | Bin 0 -> 864 bytes .../yellow_bricks_wall.rsi/yellowbricks5.png | Bin 0 -> 567 bytes .../yellow_bricks_wall.rsi/yellowbricks6.png | Bin 0 -> 850 bytes .../yellow_bricks_wall.rsi/yellowbricks7.png | Bin 0 -> 258 bytes 33 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard0.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard1.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard2.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard3.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard4.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard5.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard6.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard7.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/full.png create mode 100644 Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/full.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png create mode 100644 Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/full.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png create mode 100644 Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png 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/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/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/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 0000000000000000000000000000000000000000..b6e194ef5c744ae7794ee485698f744c19b9f005 GIT binary patch literal 758 zcmVPx%ut`KgRCt{2S}||aP!Rr#+D=uKbhd*B&t-`i@((&AMz-u#e+gn|V?@j>9m-Nw z6%rB)i={rrZ(z!ctZYUKL+Ypr4!q~P`i?r^7@vLbzPxvLK7V^qfbnR!XnODa>#uth z-}{uCIWQg#7yaV{G5^oRJS&0t4yePRPukT%P)C3(O5B-wYyQ*`005Kuuhx8ZJ_mH3 z0CKi@8KvGe{B+R6!;VAAw-aSW-L z^LExo@52rv$M$#Kb-87$DYh6OKgbY~}DciwjQ;7QGM=k))5cUu7zI>@;Bpt-E{wAAIdBB${# zwJBl$JB2gn2-_L2 z|I~Kro-0L~Oi_F;)9x>MT~!dv-}m|V+g+^EHXqp4o%)j3pJhHZ^K66vT}Rdoa|M5) znrpHl4c}xoXl@i${HVM5ZbK=j!TZ0t$*UUr+Rw1dxOlG95^(WM^qX{qE#-dJJgpCU zysHFrLlruNTI%Mk=4z?qNmwuN(;?@;kMvXL*;s9C_!tu&yJ>uR>>8~W{a5co)|H@a z`wpRx-)l9O+6x-7ZD8GC2qzZSUw>74>++j>4|0W`z0?1@f58{y0}=bP0l+XkK=KdSa literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b6e194ef5c744ae7794ee485698f744c19b9f005 GIT binary patch literal 758 zcmVPx%ut`KgRCt{2S}||aP!Rr#+D=uKbhd*B&t-`i@((&AMz-u#e+gn|V?@j>9m-Nw z6%rB)i={rrZ(z!ctZYUKL+Ypr4!q~P`i?r^7@vLbzPxvLK7V^qfbnR!XnODa>#uth z-}{uCIWQg#7yaV{G5^oRJS&0t4yePRPukT%P)C3(O5B-wYyQ*`005Kuuhx8ZJ_mH3 z0CKi@8KvGe{B+R6!;VAAw-aSW-L z^LExo@52rv$M$#Kb-87$DYh6OKgbY~}DciwjQ;7QGM=k))5cUu7zI>@;Bpt-E{wAAIdBB${# zwJBl$JB2gn2-_L2 z|I~Kro-0L~Oi_F;)9x>MT~!dv-}m|V+g+^EHXqp4o%)j3pJhHZ^K66vT}Rdoa|M5) znrpHl4c}xoXl@i${HVM5ZbK=j!TZ0t$*UUr+Rw1dxOlG95^(WM^qX{qE#-dJJgpCU zysHFrLlruNTI%Mk=4z?qNmwuN(;?@;kMvXL*;s9C_!tu&yJ>uR>>8~W{a5co)|H@a z`wpRx-)l9O+6x-7ZD8GC2qzZSUw>74>++j>4|0W`z0?1@f58{y0}=bP0l+XkK=KdSa literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ee4332125610664109b802f1563595f5285a1571 GIT binary patch literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>VAAt+aSW-L z^LCcK_hAQ#WAaDyf^OMrN?KWWE|}cxZQrn1Z`brXp~COV9esLyyE-})cI*(bsWP`P zRW0cbU^iW2y0!EDLE+iIeb3&nes}#&HTy}f6Eg2}{APWP+9c~{IFEhto$K~9{&g++ z8+!8S=?38gdufMg4q zZZO`kV0^=nGl!v!!OV}rnn7B;WSDZzm3P~?#dCEB>yr4AKkjz~ zCfr+ab;-V)Lds$VzfHDGY;KDCIG?*aHe8zD!AX1QOUQLKU~x?rM0u*m+M(oXYLFapDXY z`2M8C$7eDexO(zs|L1ex`CWhpEP455R|dPC&H4Ga-dEc7Tzv6mSFq5fN&mR^vb}lx zPNjR{nsfD!E9)*jOxyeI^-k9X+&|vA+!I~+cB*o$!>oOm4BXP?jNR0?GBixBm)D5o z4e)Z->{Uq4(VnX7=CzWArP01TXZC~7oE4kzq^)Gp(Q0BS$lrN3=xT%O<6GBu_y=n- ze&$NJ_qcvx2vgS?rfnL&yc~-yuImW68P57D)pIed%_WnC;b&Uo^!0D|MF}w;%V-Jg zxmYkKTTFuYIK#Ec*-J05#@xSCTl(s=c|$Ar!ixntxrtvGUy3izZlABQ5}1q_JYD@< J);T3K0RVKi6Pf@3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a06bc640323f070f11968e6911ebec0c1cde621e GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z<2_v*Ln`LH zon_d4$U(r({i5HIFOyE)^3wTZ``vy0R>8Hbr5nwPVxG!A*>z`@)0L@}+;#jc!7V?( zWvY1_$u|FtIP)s$Mtu=tvlj{}YY#8+vmg!8YJG1=7&hQ*T zeXEeI)wMAPp1&$7mDyJx`}#4{9`QSBtK}R%d}Eq)`(2HV=c|~N-#>;-kTcMAKl}aZ zM2`>syBjhs51HE=uCrCxesuOqPA>+nh8w@PJF>3f7vHpJ=1ZXo44ey?FL*G>Hn=gp zU@#GKU|%qi!HS`mFq-TNX2F`SCcH7%; zZCBqr_FtaiJoA=|u|U<$<;qq280HIhrL)ROPN)(6p&G#R`>gu3hpc)EZ4)L;Wnco? tb~`DC!B)9}8{MW71}PNBVAAt+aSW-L z^LCcK_hAQ#WAaDyf^OMrN?KWWE|}cxZQrn1Z`brXp~COV9esLyyE-})cI*(bsWP`P zRW0cbU^iW2y0!EDLE+iIeb3&nes}#&HTy}f6Eg2}{APWP+9c~{IFEhto$K~9{&g++ z8+!8S=?38gdufMg4q zZZO`kV0^=nGl!v!!OV}rnn7B;WSDZzm3P~?#dCEB>yr4AKkjz~ zCfr+ab;-V)Lds$VzfHDGY;KDCIG?*aHe8zD!AX1QOUQLKU~x?rM0u*m+M(oXYLFapDXY z`2M8C$7eDexO(zs|L1ex`CWhpEP455R|dPC&H4Ga-dEc7Tzv6mSFq5fN&mR^vb}lx zPNjR{nsfD!E9)*jOxyeI^-k9X+&|vA+!I~+cB*o$!>oOm4BXP?jNR0?GBixBm)D5o z4e)Z->{Uq4(VnX7=CzWArP01TXZC~7oE4kzq^)Gp(Q0BS$lrN3=xT%O<6GBu_y=n- ze&$NJ_qcvx2vgS?rfnL&yc~-yuImW68P57D)pIed%_WnC;b&Uo^!0D|MF}w;%V-Jg zxmYkKTTFuYIK#Ec*-J05#@xSCTl(s=c|$Ar!ixntxrtvGUy3izZlABQ5}1q_JYD@< J);T3K0RVKi6Pf@3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e8c651e4e6cf96fdd087af4741674b9aef3d3284 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_IkQFhE&XX zdut=_p#UC+z;;UwW9Hx2&p4cvOW_drS1RAT^zz9`-T(U!?wR*I-}wK(y1ui2l8yiH zi#Tv+a4ldpVZFdK>niWukL5L|-Px$p-DtRR9J=Wma%SwFc5}+B9bXWp)*hqncF2(-hlVW9`Phq_q<1!4xOS7*}FuF z6?^CuBg96fbcmofm`0hX7`M?2y)pBu$1>0gCp+z%l%2Bsv*@pqtz6F#rP|83^6HcifS{Kuop$H%(Y^@aq z`!W;(K(`M5kTNaDtDIFIMkPRG1=3UAse{u~4q&Qe{uhS(vjDulZL2KmCJ&MHlq=7a dG9v~6d;_Ez3nY-~rR4ws002ovPDHLkV1mx#(82%! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..498b24df5564e5d9d2655f87e94bb5537c700c84 GIT binary patch literal 814 zcmV+}1JV46P)Px%=t)FDR9J<@RxxYaKotILv=|&|&`oi?xCNz4ONJVnLZK~zQfO%h51I43I(O(8 z2$>Dm;Kj5<{0>iy0#1Qfi@?{LuVf{&YU)H~EGTdr2dzdc8Bo(lkhl!fkyx-84eXvVcV zLciBT6op1E{rl!9X0gmw`ZCpLa?B}n)nggI3h@wz$kq|Lv(}y*%FZzQ->x=Z( z=IX2y+hc(4#r4&u<3ggakI!Sm)|(LVb_Z_rJEzG01^8l(Q$Xks61`on9dVgT9gokA zC#hjnflC8iC`h))=JM*=Fe%=6G<0)_M}}n^m2nK|xd5h6maCOvEH0B;u2wkccAXqo zoE}44%EDF~93kTE4jlCkQI?f@Hi_!mF4*t&^om?JCJwn@Syns3 zruz_DZ_mDLxLBl=5JKz-t!}P~Qx^{wHyMD$Sb{FrR0} zSW2~G*H+tH7qk&kkvd@kYTInyx+);=uWi?(f0vjEoiIkgi?|z*55C^F=DI4>F0KnP% zcV=e|;vtSptdt9=FRPOm&%ODxX{wCKcEUQB;~X+4S1!Hzd@f78HZQ`((Xb^O2Z2drLj2e&p$=Kufz07*qoM6N<$g6x}uuK)l5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..32dfb47bb0707b9f184188dda646c7c5e72732ad GIT binary patch literal 1219 zcmV;!1U&nRP)Px(eMv+?RCt`-S}{u;K@|QBX@v8(a4XMkPGL1gf<=TVq(}&aKmsW&toCEkn_ciX#%rfrxX1;mz-kXC3 z*xB71003iQ+UB~8U@U~|F6O?+ScsG3{W+DnpR2sA13SBWgEyP60RT}HqtR^P^QVuQ zF;NuDU-p5M<9((1jT1n)4eqc|sbqeS!*Xp&d0yiLFczj3cAP4J#Ns>|1nSob;{?di zXtqk5%L)Pjp`TwClvlt)rIPtD zuU3QORN**PL{U8Ay)D<4j2w4)P$uACr;|Q27J@Mb*L5@2rS^lvqmg#gP$nSnBPMC@ z-gKm6%7iij-J1^PtBdHzA?B-e>@n$BYVXJ9El<$m2Y9twrmY(UBW)tOK~SpCpNFYz zfp&ZR(zap$16l}3mbK{h(O>bX<3F6Xj7ey@4)c4SF@}B|LaqYY@iu6IG65uh^x=Fv z0CeN5#c6y$4&l{(TwPzP{tHS_Cg980o!mYWI+;)cz}fkQ>h#J`KL&#!w@=gq8=*ZU z#(!*98;WE6rZAObP}GAw$7m)zLH^_NR9zHG535@OITce3vf|jU})VaigWwuw+(j$WdhF5FA8sUHr)7%pd~0eDZIL$rp+i_W*ViY z$7N|V(#^~3n9AgCgF7tOmT+)*^q_5Zb$$7?>je2#LGbFnw6=i2uN>8w zqHzLbHA1{l!bhf}gs(l&kz_Sa01sXlc%i)S^)il?P7$@DNJ{2Ji74t*fi)|D>IN7K z0Y6)JKp#z!Cs`HgV_^jWe@_1b7}gO`Ar+6j+5=S>Cm=cU{E_yedxFk8gmD6ZVT}Pn z7Bx!4Y|tA@vx0!4^cq2|InWhVwt|47^cq2|InWhVHhv5y36tXe&RCeF+=X#Ewu12$ zFljA8(X$GS6X4Z-bZEM=CLS}W>*D2%TF@&rXu8z*w)7OTQ|L}+zoeZUJ}k-*973Z8sK2mn63 zf0y|^uDFWEOj3|J4#o+Xua4Fbke4^kLDF#?8W%y{!y_T&YmD-QP#27^0N`=n-pqJ{ hKyi%$fT`9Q{0E_u*&pDQM*aW*002ovPDHLkV1o6+JYxU= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a511b4be5320d1687bed24d3f4a2e7be83e519ad GIT binary patch literal 923 zcmV;M17!S(P)Px&RY^oaRCt{2TQO_fKotH`x&&<9U`>|2qy?oNTC!wtAkd*u3N7uBp>zL9=hEL2 zFc?FIK%p(9L$@S`B#WX>r$K7KqdS7;C`JZV$k$BLiTr6GLq- zF3(Iq!3f3#+{KZ}nln>J#uUZ`WF47iqp_4DLv6}zeciAsf;6+0uB$*8uYhKwkz3MT z&x2A9lyY)J6umepBpDNMI{N3xXdOXo4cB!S3Lw?zhA{zEgOD(|WnfG|a5ciF)5183 zu<1-^U28qJ%{Y-mjuk(k>v_4dAPi^9iU`6GzfO1$Lcof)!1?*&1CEp}Vu66^awpNF zfzh)lhS`DBmf?hz<8XG*YppR(BFs|(sxLtcj0qs|qk(730U${7Gfwp-3?8sRz}xo+ zmG4OC%7l{e+uVg4OI7gk~hi+ZrgG2(|jR21@vJ;?n1f`rbS)%S0 zAVLHBgCPL0xX2<1*x&1=2^2q0ej>Q4uW$A(aGT`lRe+rUZipZtn_RV)RsgV*`+paR z5J9p691uake^(f5Yz4BeFbCKP$f~|l&Uzk(IKfT;u$q5^Eem!6vRi;d3)l%Da7Bwm x_yO7DaNQ6=00m4tUVHtH!`u+D0ys~De*p|?tz+K(26F%a002ovPDHLkV1k|~qbL9X literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..55a025c6d4564aa7f75f834543769e149d8ab4d0 GIT binary patch literal 1237 zcmV;`1SPx(k4Z#9RCt`-S}|)BK@|QJo5V5)oihwgOssY-rnro?B1C-*_q^PZg*yuz5U+IH*em1 zm*4=FmS3F!fDm!s=KE6+B8Klzl|Cm#jLnUeOPqIK;XG^tOUtiL?$6x=03=C@t?eB= zee$?4CP`BL!y&M_vBG-4bpi-~qQ97IGz#~lFw>f5zt=heLd3a+J+BEMv$#wKf%;9t zIsrOtZSU0fE++`^ye5wNeE^yG?d{e_z~$QBR03J$OU3RCVVwZl`bf~^t*{QT_D}$r zy?*m#+_6DB#NxtyE@rE1>+F4;3$_N_otp=sw;WAxxo>NGCwFpO0GohYVF&>5<_1>P zIWk+@I|b|0SleI|KUQ&MAz}z2;QM~Ty41e9wm#Hu8*Bo~ zK4P5q-eFfercSU4=pA-3(VW6@8e^hK+n&&lrS{|0zU2u<{D7dYXsAs^FN$jQ z`O9!7OQ6#kJ+)m}|9}w!vT3b)ee|ntb@GSPlCcRR$6 z7Zd;Cv|tlJmX*WfKo37ZN?4q~1f(c1FtBctq@{gy@4^{@O~BrdpOvRN7fyUt zFcK6U7ePDB(`J+|vyEEQjcP7=99l)TDfC{N(l+_+^VV!_% z%L|9vtIi1~&k)uL00uP%1YOi953|8+D9s51s?uu&wdTN7RM`mvs?uu&wdTN7RN4AA zm?ccA*SipLmU36dnOF+eXTZ3%1Xb4@SSKK8hv*%4b8%CrwOVs<;YF|)Md)<8Ln${I zvLJqV|Bm%;CkT*5aGaWgPN!=u-ELh33A&V7S!%7S|9@e929PJHirOfVBe$3f>k*;Z z>o-qi;j0ojU0uPsj|c(4qlXU)_oIrdXv{bTnWJExfQjaC4FP$1qZ}j?+o5$4ls!BW zLb=AMObAWE`V0V0=j~k>PY|fCF#vF;bq4Px&Q%OWYRCt{2TQO_fKotH`x&<u%;+p(t^?qEm<-+5a>_{frNI*(7FGlbLnph z6iOjOpwJf5p_>yy;zd!W(;zkA(H+cFPO@Y>zVp2!?zhOC?l|3dci(&O?s)~wIDY?O z2mnH)rE=eILx>c<-)?LxM2fT1lNFWzpQ<$0fvqqE0C+nt0N~5lZ#X>IFV)GiyuNV= zoSmL1_0LYg-@CiwxgM+)Gk%lYPHnp$tSR@;PC(0Xir-n5qZ0(kvbO z|M8Qxe|7@me#F}U6V~1>z|s?-WJ3Yq`Lh>8mG)QH7s}tD0%Z-@-su7ucVqxebYiH@ z)%AtyCn!OgfO#Al*_^35GOAD}Kz3wWjx&=ZLv8A8y=iC_L7Le{*VRHOuYi{0l$LZS z2;g}xJkKo=QT5_%AxW8lUUcus2$4bv0pIth3Lw?zhB5(7gRo(6vp|`ExF2EFZDWw9 zSanCUE`*raW{}%MjutP3GPACbVKYdjF1SP1O!6a#XSJeX>q5Viq9&A|~CZF+hVIgL)st3~?BTi^DgFv&Y zSB3IXiQwjDSQ0qd!|QB>*nai0w%w!k1ceyQFhzt-B1!eQq4hw7$e`t2uMg>1Jx*xV zfa-7G_iI*&U4p2^6O3zSvZ>rQ7`+47w1r?NK!_Bc=N8El zrdNO!8bIby7D7|7f`GlllvV)Hllwmp ztPnxYpvVdW{=33hVk;oK!W>{HKvsRvbC)w1;siSZ0PhhwI|1?*;Lrkg0tj43_9zoYCMvD=DMFiQmGI00000NkvXXu0mjf6z-|L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d4bb23b19633f55480a5938d23e93e3a7b0594c3 GIT binary patch literal 922 zcmV;L17-Y)P)Px&R7pfZRCt{2TEA=CKp1@~T@124_@+2r+CtJXLk)Ex(4kNQE$z^MsB`JxQZN`p zXbT2==n~o`G9+CTWjYO#1s>DEoP1JFKim`dU820j@}10QJ$>K1cb~KaV!VFy;RXO0 z>w)tC0O0*yRQ~7F%B%@L+{a2c&F(szBlcgcWX_2-=eNGK^1^I?A8>p$Ov<2fEwQW*umRc`@Z{-!ax79?mEvM-%Gd7i?Drol zM6i|;I6fLC$KAn3oWh#&PO%ufLm`6XR{iNt&ZJl!AT<^!w;` zJE?B3_{`49!vqdoR?=!6n@@XGUf$2uSZ}&j&DUrNEW^#fopYox90DBM@Z!ah07~)i9#%OK~6wkowqv0kI-c;(18^qC@a6% w_Ld1@U9cbn^2M)62=AQ}^c3k_G*=h?0e)P*5xZV1bN~PV07*qoM6N<$f&#j#5dZ)H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..298262146be56811accf32abcd5e4d21dee3c389 GIT binary patch literal 671 zcmV;Q0$}}#P)Px%SxH1eRCt{2n!jtpKorNnEgjor&`Ism7Np&}I7ARS6r>>ZPb~-{bSMb6&<-6% zXkDyMmmxO09m2&kO{o%j--Gir88E!$n|JTm-2uql+}y3?$M~Af@im(RNW4H2x(A#b9|Hh<-$N8Fpj0So zpDw^)_`G(#&HCR3bOEGaI14=nuyJ01LOB!wF3vBP|NrZ6istd6P-4J!BLDy>72@M_ z#CU`haRIIy0j}!xwD@^?e2{*GHAG{8etBK|*noHtG|S#7T1cD!g{T0!%Bxi?X$8ne zJO*@o{j}bfE_?G37r^ZPq&vSnM3;d6@~qA;4{9Z7!xEqg5Jd|&J-|$Z&Ut{D25o_s z25tEI06~DxT^m3W1G3W~2KzK9Y0MV4Hxc&$8yX-Jng{s4XN5;l>j39s0FXp~T?g3U z0pe+JFno5q4%oNDfHm_#fS3hrNr%*VfRkB3uYWTgGTEm=Nn_K=7z0Uz8z7zr+2;YW zIKMsaya3d_d4PYufPO~k^sEjbsR`a+JO&3{sDff-Znk zA+;}{3t;vGzVC_m2Xp~6tn!#11eFRgP`oJ--2=+yQWE^CRdnv!ZY}}c8Z%Cd(*2KcUS8iYoygg?W(lyc!ULGy;18@a>W~MRZ0Z02002ovPDHLk FV1g>%CpZ8A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b7990c54e9ecf9019fc06a368bf95c60167e9fe8 GIT binary patch literal 914 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 Ef-Ga=ApigX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..77788c56d9f0e1912635ba60f009e0ad6e4e4929 GIT binary patch literal 825 zcmV-91IGM`P)Px%^GQTORCt{2n$J$uP!z^Lz|7Fmpp(vGOq_%uA#vpb*|}g#Vgm66cma0m#>6*p z$qTsBm62#9ab+T|fW<7C;8-${5YjS&$ow&&i^;96?R2I&cjg?@ew)ti+>_h;yX`sW zo^}Mxdi(UzABz3smmfwb_SY!JI#kT(&}d)y&Ka4pNSpurQ^XDc@K3nWzUVqZ)lVID zfM5r3>+WxVJF@p>jK2Me9l*!;4(s^r0KV*;u#P{I*f`=mI&wpAuy z14U#XusmNP*{^Mtsh2fbbFajPQ`(|HuWU|d_NG&00N#m(t#s7?5}=R) z+`i|{&MpK0`?EFunH*JQ0NzaQyd4Ap0J%&s+IH(ZY>@%PnRHZtE|CFzDj)gU=7bU1 z-#Kkihtw)9QDAAVh&zQFv26D3GrZe8)G<6sS^(6X)=+E)p~UY6wA=xf-E@DK%xq*| zwensYPHD>o`<;-Ki7ROV;G8yG?{C@7P*3lT4w51P8NkZIwEO$@*8@Cxu?PTo{_G8A zr}CjTlZA0ub`z6@acoqmS3naP!1wA8U%P(X$qUR010^#X8XouUGgx-Br@t7623ixm zdA&2i)%9KX+{(hVdtQPD3gF~d3$H%!`5uMU^<6B@6$d$NERg|xJO1fujpAtMUxMRJ zc1mW}ZL4G4>~Rnx*W(_}%tY1%XQ%SMXT9dMuwAXY?Tt$1YS#qS?Y&*C2fV&_qTTGS zd=yZtYuQG?t6O&X&QL`N2};Z2!yIgRzU00RH!@>5te>-&#aVWPlFH<4+hGY6VIZvs z@Bomq`Tzp}HF+t1fXxX?xeF5S16Y#~p!1!e_fxsf4zkv_JvEUMaR+cd4k7?3aX3a% z05~KD09RNP1At2@0PYI_^nUytS0VtUVUSTG0B~-ML;wKz9s@A|fHV_ikq7{36aZh5 zL<|5fi2$HhKXrl(5(Oa9J|NNc0M2&>A^>nI@c{k;-TnB+bNjp}00000NkvXXu0mjf DyK;Zd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1fb7066b53a8ca8e78c4b4f7ada934543ad5c4d5 GIT binary patch literal 864 zcmV-m1E2hfP)Px&8c9S!RCt{2TfcA9KotH;QG!bqh@2saT0#-3#KaIf!O*o55)~6n{RbHN50F@Z zt^WW!AR-Wzn2?%{cF35h4Myn@6{jK4=9g5;U_IyJI9Ad-{0_z6;@tUO-o5Yc{660$ zb7021r}xjY=>>H9rvQM~Ne{2T)F!qs?3CtY{9lkURs{;416mM3FcR~T`_zg64roIF z$LIqZ5x|9*0PYR|gXzza4Wx1?06e&J`)ty-8><$sTuuUTgRVE*c=+<8bRT38`3&HC z*o_0*65td+B3KB}X%<9I0FAsZB*aUA!>KO81B_W44=_Fi zXL<>US8l{Yh|94qB*Z!(YKOXvJRz3C+#TRXoCTtGsLRwR#A%Sru`V+q)&WsF)NMcD zqU;xJtXfmGuQ%HOfYynuXEl%}fDSrD_)mI*Mq8I32>F9 zs|dqYBSEctWGCRw+aFj+1ZU%R-wk%$eHCCQ0B{2pgQUQN%3Ytqe09aqiVkxsYmCb>3jQ3yb(!RAIpw{R`ViSa!e;3eV2G~y5`)rw`TWlg| zdxM z0N~ZL0v_MJ?%gX^DpLO039!s0Y^Mv$Oa`XH1LqjFW1x97&pzSYOHhQ@`v4EM*pfa%)J~SZ2~I)Ag`CxW9k& zTbY0MJ;8g+%if+~K9?TS0kuXCyVYi>eX&yczxM=b%7+CiE(>Z)bw#-(z)t{;xa|bL q1)3>iL>=1BXx(|iz67|p#s30@M-4=QCS1V)0000R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..833d72bbf0c72025f184f35d8b14c6c10e77ee41 GIT binary patch literal 567 zcmV-70?7S|P)Px$@kvBMRCt{2nz2d)K@f)js2EJZhb9g=wFrSAD-t$iN$iI8lNt})AXbE z`{ngZH9lPc?FBcX=Kwar3*c2l0pM@pe}%w z>@Uz-VG9)iAZ`IGE}$ks3&btJ2x`Ut0I3RCg0=;$xFGlwp;!g916r}Z5X&GduoWl7 zK0rI5SU=b;u-E%u7Kha*CQNe0{DlbsshMW_+qLV z^>@^B0DB&wN&GX!{s1=AyLo^=UqGJ`a%TnpGaz{^=vyF7I!Kcadfj$S3@zvaxG+SZ z3m|PVt2?9%AOt%rJjiy{KSYKL=mN-$K(G#AV@81BlOVv^2BrjHU_t=q36Ti_fLH}+ zm=Yk!M#v@TDiCxZz`QFoA%GBbK*%|Og$V&-CkS35`~emxk=hph-zxwB002ovPDHLk FV1kbo?tuUR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7f91a3a2ede9aa2f3b937f252eef1aca2cbf54a0 GIT binary patch literal 850 zcmV-Y1FigtP)Px&3`s;mRCt{2TEB18KotH;QG!bqh@2saT0#-3#KaIf!O*o55)~6n{RbHN50F@Z zt^YuGKtv!aF;!|d+96}2HW;NtRGgYX$uFstAv*VxT&<*c_&un<#kupnynCPT{kXHI zK#aFf?;mH=GidjYU?rwe_gh%osEsXO*eXrw=)a&N{6ByN0qx!qnQj&YP=W;kR$`h= zHwyv)Iuh6r0MNt&Rs>K$D~AHWgFCm6#~r(}=-|rbBme|C|KZCI+H=rB3ouy)aTbVLVVnh+AHR9bMg;Fm54*(Z+|6pa&nP`07Z|SNu z3T*{`aRS$*uEMnJuDkNv zWY8vHv)nW>4>H7s5cLG8LHceUnC$xk6?DH7G@b@0#iWJQFbZ2GEqQVRboEG1K);ggSA^kJqk!4!k(_|nZ@ytB zq0YvwUfviDRNo6YB^A6#97W{*gdf`j;yD|Ob1PF+2@#^|c(D!8Nrt-amNw6WH`Kyby zjjzb((m~(q`VN*CvVT=CIRSH-S)kk;C~O=%8MMW9zkG6k_u!{7{p4qY_vYt=Gr@c= zJx~YK8eMEx{ZRR0rSfl|35q2jW~l5IVyx&Z>Lmes0>l${J@qcoPFW+>q3ezIofYIR cKz%I!2P4M k>+kr>1~QNc^&sQ8J4Jcw7KWH?2Ks}+)78&qol`;+04CN}MgRZ+ literal 0 HcmV?d00001