From c42880e9ee753fee2be3e5202765ee44b48e3780 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:46:26 +0300 Subject: [PATCH 01/15] add: bz, no2 and pluoxium to cargo (#224) --- .../Catalog/Cargo/cargo_atmospherics.yml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml index 0aa4938399..4df6e9e761 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml @@ -111,3 +111,33 @@ # cost: 15500 # category: Atmospherics # group: market + +- type: cargoProduct + id: AtmosphericsNitrousOxide + icon: + sprite: Structures/Storage/canister.rsi + state: redws + product: NitrousOxideCanister + cost: 1300 + category: Atmospherics + group: market + +- type: cargoProduct + id: AtmosphericsBZ + icon: + sprite: Structures/Storage/canister.rsi + state: purple + product: BZCanister + cost: 3500 + category: Atmospherics + group: market + +- type: cargoProduct + id: AtmosphericsPluoxium + icon: + sprite: Structures/Storage/canister.rsi + state: darkblue + product: PluoxiumCanister + cost: 3500 + category: Atmospherics + group: market From 4442e2b625def0df05d19ecb3198f52359a5462a Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Wed, 20 Mar 2024 19:47:29 +0000 Subject: [PATCH 02/15] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 190083b214..c4b14bc9fc 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2411,3 +2411,13 @@ id: 202 time: '2024-03-17T22:20:34.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/217 +- author: ThereDrD + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u043A\u0441\ + \u0438\u0434 \u0430\u0437\u043E\u0442\u0430, \u0411\u0417 \u0438 \u043F\u043B\ + \u044E\u043E\u043A\u0441\u0438\u0443\u043C \u0432 \u043A\u0430\u0440\u0433\u043E\ + -\u043A\u043E\u043D\u0441\u043E\u043B\u044C." + type: Add + id: 203 + time: '2024-03-20T19:46:26.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/224 From 3a55a8afbed4492770084053c46a2cfcbb7b1b67 Mon Sep 17 00:00:00 2001 From: RinKeeper <161238702+RinKeeper@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:51:28 +0300 Subject: [PATCH 03/15] add: medical patches (#194) * add: medical patches * removing some comments * some fixes * oops --- .../EntitySystems/ChemistrySystem.Patch.cs | 175 ++++++++++++++++++ .../EntitySystems/ChemistrySystem.cs | 1 + .../Chemistry/Components/PatchComponent.cs | 42 +++++ .../chemistry/components/patch-component.ftl | 10 + .../chemistry/components/patch-component.ftl | 13 ++ .../ru-RU/locales-new/autotranslate-54.ftl | 6 + .../VendingMachines/Inventories/medical.yml | 3 + .../Objects/Specific/Medical/patch.yml | 68 +++++++ .../Specific/Medical/patch.rsi/meta.json | 26 +++ .../Specific/Medical/patch.rsi/patch.png | Bin 0 -> 298 bytes .../Specific/Medical/patch.rsi/patch1.png | Bin 0 -> 109 bytes .../Specific/Medical/patch.rsi/patch2.png | Bin 0 -> 125 bytes .../Specific/Medical/patch.rsi/patch3.png | Bin 0 -> 143 bytes .../Specific/Medical/patch.rsi/patch4.png | Bin 0 -> 150 bytes 14 files changed, 344 insertions(+) create mode 100644 Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs create mode 100644 Content.Shared/Chemistry/Components/PatchComponent.cs create mode 100644 Resources/Locale/en-US/chemistry/components/patch-component.ftl create mode 100644 Resources/Locale/ru-RU/chemistry/components/patch-component.ftl create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml create mode 100644 Resources/Textures/Objects/Specific/Medical/patch.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/patch.rsi/patch.png create mode 100644 Resources/Textures/Objects/Specific/Medical/patch.rsi/patch1.png create mode 100644 Resources/Textures/Objects/Specific/Medical/patch.rsi/patch2.png create mode 100644 Resources/Textures/Objects/Specific/Medical/patch.rsi/patch3.png create mode 100644 Resources/Textures/Objects/Specific/Medical/patch.rsi/patch4.png diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs new file mode 100644 index 0000000000..3ad6899e8f --- /dev/null +++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Patch.cs @@ -0,0 +1,175 @@ +using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Components.SolutionManager; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; +using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Interaction.Events; +using Content.Shared.Mobs.Components; +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Chemistry; +using Content.Shared.DoAfter; + +namespace Content.Server.Chemistry.EntitySystems +{ + public sealed partial class ChemistrySystem + { + [Dependency] private readonly ReactiveSystem _reactive = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + + public void InitializePatch() + { + SubscribeLocalEvent(OnPatchDoAfter); + SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnUseInHand); + SubscribeLocalEvent(OnSolutionChange); + } + + private void OnPatchDoAfter(Entity entity, ref PatchDoAfterEvent args) + { + if (args.Cancelled || args.Handled || args.Args.Target == null) + return; + + TryDoInject(entity, args.Args.Target.Value, args.Args.User); + args.Handled = true; + } + + private void PatchDoAfter(Entity patch, EntityUid target, EntityUid user) + { + var (uid, component) = patch; + + // Dont need to start DoAfter if patch is empty + if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var _, out var patchSolution) || patchSolution.Volume == 0) + { + _popup.PopupCursor(Loc.GetString("patch-component-empty-message"), user); + return; + } + + // Create a pop-up for the user + _popup.PopupEntity(Loc.GetString("patch-component-injecting-user"), target, user); + + var isTarget = user != target; + + if (isTarget) + { + // Create a pop-up for the target + var userName = Identity.Entity(user, EntityManager); + _popup.PopupEntity(Loc.GetString("injector-component-injecting-target", + ("user", userName)), user, target); + } + + var actualDelay = MathHelper.Max(patch.Comp.Delay, TimeSpan.FromSeconds(1)); + + // Injections take 0.5 seconds longer per additional 5u + actualDelay += TimeSpan.FromSeconds(patchSolution.Volume.Float() / component.Delay.TotalSeconds - 0.5f); + + _adminLogger.Add(LogType.ForceFeed, $"{_entMan.ToPrettyString(user):user} is attempting to put a patch on {_entMan.ToPrettyString(target):target}"); + + _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new PatchDoAfterEvent(), patch.Owner, target: target, used: patch.Owner) + { + BreakOnUserMove = true, + BreakOnDamage = true, + BreakOnTargetMove = true + }); + } + + /// + /// Actually difference between OnUseInHand and OnAfterInteract only in target + /// In OnUseInHand target is always = user. In OnAfterInteract target may be user or may not + /// + private void OnUseInHand(Entity entity, ref UseInHandEvent args) + { + if (args.Handled) + return; + + if (args.User is not { Valid: true } target) + return; + + PatchDoAfter(entity, target, args.User); + + args.Handled = true; + } + + private void OnAfterInteract(Entity entity, ref AfterInteractEvent args) + { + if (!args.CanReach || args.Handled) + return; + + var (_, component) = entity; + + if (!EligibleEntity(args.Target, _entMan, component)) + return; + + if (args.Target is not { Valid: true } target) + return; + + var user = args.User; + + PatchDoAfter(entity, target, user); + args.Handled = true; + } + + private void OnSolutionChange(Entity entity, ref SolutionContainerChangedEvent args) + { + Dirty(entity); + } + + private bool TryDoInject(Entity patch, EntityUid? target, EntityUid user) + { + var (uid, component) = patch; + + string? msgFormat = null; + if (!EligibleEntity(target, _entMan, component)) + return false; + + if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var patchSoln, out var patchSolution) || patchSolution.Volume == 0) + { + // TODO: Empty patch should stop the bleeding + + _popup.PopupCursor(Loc.GetString("patch-component-empty-message"), user); + return true; + } + + if (!_solutionContainers.TryGetInjectableSolution(target.Value, out var targetSoln, out var targetSolution)) + { + _popup.PopupCursor(Loc.GetString("patch-cant-inject", ("target", Identity.Entity(target.Value, _entMan))), user); + return false; + } + + if (patchSolution.Volume > targetSolution.AvailableVolume) + { + _popup.PopupCursor(Loc.GetString("patch-cant-inject-now"), user); + return false; + } + + var removedSolution = _solutionContainers.SplitSolution(patchSoln.Value, patchSolution.Volume); + + _popup.PopupCursor(Loc.GetString(msgFormat ?? "patch-component-inject-other-message", ("other", target)), user); + + if (!targetSolution.CanAddSolution(removedSolution)) + return true; + + _reactive.DoEntityReaction(target.Value, removedSolution, ReactionMethod.Touch); + // Transfering only half of the solution via Injection method + removedSolution.ScaleSolution(0.5f); + _reactive.DoEntityReaction(target.Value, removedSolution, ReactionMethod.Injection); + _solutionContainers.TryAddSolution(targetSoln.Value, removedSolution); + QueueDel(patch); + + _adminLogger.Add(LogType.ForceFeed, $"{_entMan.ToPrettyString(user):user} put a patch on {_entMan.ToPrettyString(target.Value):target} with a solution {SolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {_entMan.ToPrettyString(uid):using}"); + + return true; + } + + static bool EligibleEntity([NotNullWhen(true)] EntityUid? entity, IEntityManager entMan, PatchComponent component) + { + // Using patch only on mobs + return component.OnlyMobs + ? entMan.HasComponent(entity) && + entMan.HasComponent(entity) + : entMan.HasComponent(entity); + } + } +} diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs index c4f22dc63a..97d1c65757 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs @@ -22,5 +22,6 @@ public sealed partial class ChemistrySystem : EntitySystem // Why ChemMaster duplicates reagentdispenser nobody knows. InitializeHypospray(); InitializeMixing(); + InitializePatch(); } } diff --git a/Content.Shared/Chemistry/Components/PatchComponent.cs b/Content.Shared/Chemistry/Components/PatchComponent.cs new file mode 100644 index 0000000000..da014a4f53 --- /dev/null +++ b/Content.Shared/Chemistry/Components/PatchComponent.cs @@ -0,0 +1,42 @@ +using Content.Shared.DoAfter; +using Content.Shared.FixedPoint; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Chemistry.Components; + +[Serializable, NetSerializable] +public sealed partial class PatchDoAfterEvent : SimpleDoAfterEvent +{ +} + +/// +/// Implements draw/inject behavior for droppers and syringes. +/// +/// +/// Can optionally support both +/// injection and drawing or just injection. Can inject/draw reagents from solution +/// containers, and can directly inject into a mobs bloodstream. +/// + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class PatchComponent : Component +{ + + [ViewVariables, AutoNetworkedField] + public FixedPoint2 CurrentVolume; + + [ViewVariables, AutoNetworkedField] + public FixedPoint2 TotalVolume; + + [DataField("solutionName")] + public string SolutionName = "patch"; + + [DataField("onlyMobs")] + public bool OnlyMobs = true; + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("delay")] + public TimeSpan Delay = TimeSpan.FromSeconds(5); + +} diff --git a/Resources/Locale/en-US/chemistry/components/patch-component.ftl b/Resources/Locale/en-US/chemistry/components/patch-component.ftl new file mode 100644 index 0000000000..f62ab45a35 --- /dev/null +++ b/Resources/Locale/en-US/chemistry/components/patch-component.ftl @@ -0,0 +1,10 @@ +## Entity + +patch-component-target-getting-injected = Someone trying to put a patch on you +patch-component-injecting-user = You are trying to put a patch on {$target}. +patch-component-inject-other-message = You put a patch on {$other}. +patch-component-inject-self-message = You put a patch on yourself. +patch-component-empty-message = It's empty! +patch-component-feel-prick-message = You feel a little sting +patch-cant-inject = Can't put a patch on {$target}! +patch-cant-inject-now = Can't put a patch now diff --git a/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl b/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl new file mode 100644 index 0000000000..86c4a12e47 --- /dev/null +++ b/Resources/Locale/ru-RU/chemistry/components/patch-component.ftl @@ -0,0 +1,13 @@ +## Entity + +patch-component-injecting-user = Вы приклеиваете пластырь. +patch-component-inject-other-message = Вы приклеили пластырь к {$other}. +patch-component-inject-self-message = Вы наложили на себя пластырь. +patch-component-empty-message = Пластырь пуст! +patch-component-feel-prick-message = Вы чувствуете небольшое жжение. +patch-cant-inject = Вы не моежете прикрепить пластырь к {$target}! +patch-cant-inject-now = Вы не можете наложить пластырь сейчас + +## mob-inject doafter messages + +injector-component-injecting-target = {CAPITALIZE(THE($user))} пытается приклеить пластырь на вас! diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-54.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-54.ftl index b744a0df1c..eabd40d46d 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-54.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-54.ftl @@ -18,3 +18,9 @@ ent-BaseLightTube = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-HandheldHealthAnalyzerEmpty = { ent-HandheldHealthAnalyzer } .desc = { ent-HandheldHealthAnalyzer.desc } +ent-Patch = пластырь + .desc = Медицинский пластырь, доставляющий реагенты сквозь кожу прямо в кровь. +ent-BurnPatch = пластырь от ожогов + .desc = Инновационный пластырь для ускоренного лечения мелких ожогов. +ent-BrutePatch = пластырь от ушибов + .desc = Компоненты пластыря непрерывно поступают к источнику боли, заживляя мелкие порезы и царапины. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index df23526d30..bfcf9b970f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -12,5 +12,8 @@ SyringeBicaridine: 1 SyringeDermaline: 1 Eftpos: 2 + Patch: 20 + BrutePatch: 10 + BurnPatch: 10 emaggedInventory: SyringeEphedrine: 1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml new file mode 100644 index 0000000000..1f25e5c06e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml @@ -0,0 +1,68 @@ +- type: entity + parent: BaseItem + id: BasePatch + abstract: true + components: + - type: Sprite + sprite: Objects/Specific/Medical/patch.rsi + layers: + - state: patch + - state: patch1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - type: Item + sprite: Objects/Specific/Medical/patch.rsi + - type: SolutionContainerManager + solutions: + patch: + maxVol: 40 + - type: RefillableSolution + solution: patch + - type: ExaminableSolution + solution: patch + - type: Appearance + - type: SolutionContainerVisuals + - type: Patch + OnlyMobs: false + - type: StaticPrice + price: 30 + +- type: entity + name: patch + parent: BasePatch + description: a medicated patch that can deliver drugs directly into the bloodstream through the layers of the skin. + id: Patch + components: + - type: StaticPrice + price: 10 + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: patch + +- type: entity + name: brute patch + parent: Patch + description: This innovative medical patch utilizes advanced biomimetic technology to significantly accelerate the healing of minor cuts and scrapes. + id: BrutePatch + components: + - type: SolutionContainerManager + solutions: + patch: + maxVol: 40 + reagents: + - ReagentId: Bicaridine + Quantity: 10 + +- type: entity + name: burn patch + parent: Patch + description: This type of patch contains a drug reservoir made of a substance that heals burns. + id: BurnPatch + components: + - type: SolutionContainerManager + solutions: + patch: + maxVol: 40 + reagents: + - ReagentId: Dermaline + Quantity: 10 diff --git a/Resources/Textures/Objects/Specific/Medical/patch.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/patch.rsi/meta.json new file mode 100644 index 0000000000..d0f83381d3 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/patch.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Copyright (c) 2024 RinKeeper", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "patch" + }, + { + "name": "patch1" + }, + { + "name": "patch2" + }, + { + "name": "patch3" + }, + { + "name": "patch4" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/patch.rsi/patch.png b/Resources/Textures/Objects/Specific/Medical/patch.rsi/patch.png new file mode 100644 index 0000000000000000000000000000000000000000..ea0b5943740ee8eddd4ec6ac7459ea23c480808e GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Pdr^5Ln2y} z6C_v{Cy4YkP2`jCym~=C?XUd&nun_vtIRy*Kgdkch45iHX$PgO_m9|Jo$0wCF;MOtOqGANR~V{b!+2)-YKr0X5B9Y z9Jb5E+U%*cRW9-n;P&8RjF@w{hL8D#;=uzB77LY_CpkCVYFHw$W2eH~|3HHu+O__y zQJli>&3=1Ztm-YFNzMlxBBvy#<|?=eOrFhg@)WCqd&}aVb7UM!I7HT2o$8R;azadL p^Y+}`UO|}_4_rTLK>WnSaAR_uRUhlNyFmXkc)I$ztaD0e0svKcauomo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/patch.rsi/patch1.png b/Resources/Textures/Objects/Specific/Medical/patch.rsi/patch1.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd18e6b5b6d133b1ecc7c54109f643aace343f6 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_ z&l&PEFmN0&XsSQ|;Q@o(q_6{-1`OlzT4)# pIdMUUX3d{|qV4-0Mh1tatnR1mkKgZW76uy1;OXk;vd$@?2>?|4FZ=)i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/patch.rsi/patch4.png b/Resources/Textures/Objects/Specific/Medical/patch.rsi/patch4.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2f289160b0cd6ca885764c28f256ed05a7eb6a GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}0iG_7ArY-_ zuk7Xms&WW?`TzgUX>A;x0fI-Wmo2NA#=)>))6U9w5`ia|SZjYTIe3LpcR{(x{l@r4 w9qYhi_IF;&am|{XZ|BT&xnIw~Adt$qNyh!)`-wi5K(iS Date: Wed, 20 Mar 2024 22:52:47 +0300 Subject: [PATCH 04/15] Chem touch effect (#221) * radium, fluorine and chlorine have now touch damage on touch. Mercury now applies blurry vision effect * add: synthflesh, styptic powder, silver sulfadiazine * fix: typo --- .../Locale/en-US/reagents/meta/medicine.ftl | 10 +++ .../en-US/reagents/meta/physical-desc.ftl | 1 + .../Locale/ru-RU/reagents/meta/medicine.ftl | 9 +++ .../ru-RU/reagents/meta/physical-desc.ftl | 1 + Resources/Prototypes/Reagents/elements.yml | 31 ++++++++ Resources/Prototypes/Reagents/medicine.yml | 76 +++++++++++++++++++ .../Prototypes/Recipes/Reactions/medicine.yml | 42 ++++++++++ 7 files changed, 170 insertions(+) diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index e208b9a8e4..6aaa85ce1b 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -129,3 +129,13 @@ reagent-desc-necrosol = A necrotic substance that seems to be able to heal froze reagent-name-aloxadone = aloxadone reagent-desc-aloxadone = A cryogenics chemical. Used to treat severe third degree burns via regeneration of the burnt tissue. Works regardless of the patient being alive or dead. + +reagent-name-synthflesh = synthflesh +reagent-desc-synthflesh = A slightly toxic medicine capable of healing both bruises and burns. + +reagent-name-silversulfadiazine = silver sulfadiazine +reagent-desc-silversulfadiazine = This compound with antibacterial properties is administered for the treatment of individuals suffering from burns. + +reagent-name-stypticpowder = styptic powder +reagent-desc-stypticpowder = Aluminum sulfate styptic powder aids in managing bleeding and promoting the healing of bodily injuries. + diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 24340e63a6..c6547a884d 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -96,3 +96,4 @@ reagent-physical-desc-alkaline = alkaline reagent-physical-desc-reflective = reflective reagent-physical-desc-holy = holy reagent-physical-desc-slimy = slimy +reagent-physical-desc-gelatinous = gelatinous diff --git a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl index 2ecb19e25f..f8198140ab 100644 --- a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl @@ -129,3 +129,12 @@ reagent-desc-necrosol = Некротическое вещество, котор reagent-name-aloxadone = алоксадон reagent-desc-aloxadone = Криогенное химическое вещество. Используется для лечения тяжёлых ожогов третьей степени путём регенерации обожжённых тканей. Работает независимо от того, жив пациент или мертв. + +reagent-name-synthflesh = синтеплоть +reagent-desc-synthflesh = Токсичное вещество. Заживляет как ожоги, так и мелкие царапины. + +reagent-name-silversulfadiazine = сульфадиазин серебра +reagent-desc-silversulfadiazine = Это соединение, обладающее антибактериальными свойствами, применяется для лечения ожогов. + +reagent-name-stypticpowder = кровоостанавливающая пудра +reagent-desc-stypticpowder = Кровоостанавливающий порошок из сульфата алюминия помогает остановить кровотечение и способствует заживлению телесных повреждений. diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl index 93d0cd4399..fac737e543 100644 --- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl @@ -96,3 +96,4 @@ reagent-physical-desc-alkaline = щелочное reagent-physical-desc-reflective = отражающее reagent-physical-desc-holy = святое reagent-physical-desc-slimy = слизкое +reagent-physical-desc-gelatinous = желеобразное diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index 1e278ffa8a..2e6e81cae7 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -46,6 +46,14 @@ damage: types: Poison: 2 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + damage: + types: + Heat: 0.5 - type: reagent id: Copper @@ -105,6 +113,16 @@ types: Caustic: 0.5 Poison: 0.5 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + damage: + types: + Heat: 0.5 + - type: reagent id: Gold name: reagent-name-gold @@ -205,6 +223,9 @@ - !type:GenericStatusEffect key: Stutter component: ScrambledAccent + - !type:GenericStatusEffect + key: BlurryVision + component: BlurryVision - type: reagent id: Potassium @@ -246,6 +267,16 @@ color: "#00ff04" meltingPoint: 700.0 boilingPoint: 1737.0 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + damage: + types: + Heat: 0.5 + Cellular: 1 - type: reagent id: Silicon diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index dfc0886ebf..d993d3bab3 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1167,3 +1167,79 @@ Heat: -3.0 Shock: -3.0 Caustic: -1.0 + +- type: reagent + id: Synthflesh + name: reagent-name-synthflesh + desc: reagent-desc-synthflesh + flavor: metallic + physicalDesc: reagent-physical-desc-gelatinous + color: "#E0D4D3" + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + damage: + groups: + Brute: -2.5 + types: + Heat: -2.5 + Shock: -2.5 + Cold: -2.5 + Poison: 0.66 + slippery: true + +- type: reagent + id: SilverSulfadiazine + name: reagent-name-silversulfadiazine + desc: reagent-desc-silversulfadiazine + flavor: medicine + physicalDesc: reagent-physical-desc-creamy + color: "#c2c22b" + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + damage: + types: + Heat: -1 + metabolisms: + Medicine: + effects: + - !type:HealthChange + conditions: + damage: + types: + Heat: -1.0 + Poison: 0.5 + +- type: reagent + id: StypticPowder + name: reagent-name-stypticpowder + desc: reagent-desc-stypticpowder + flavor: medicine + physicalDesc: reagent-physical-desc-powdery + color: "#c2485e" + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + damage: + groups: + Brute: -1 + metabolisms: + Medicine: + effects: + - !type:HealthChange + conditions: + damage: + groups: + Brute: -1 + types: + Poison: 0.5 diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index a1ca3ea38e..eeabb24d62 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -574,3 +574,45 @@ amount: 2 products: Aloxadone: 4 + +- type: reaction + id: Synthflesh + reactants: + Blood: + amount: 1 + Carbon: + amount: 1 + Bicaridine: + amount: 1 + products: + Synthflesh: 2 + +- type: reaction + id: SilverSulfadiazine + reactants: + Ammonia: + amount: 1 + Iron: + amount: 1 + Sulfur: + amount: 1 + Oxygen: + amount: 1 + Chlorine: + amount: 1 + products: + SilverSulfadiazine: 5 + +- type: reaction + id: StypticPowder + reactants: + Aluminium: + amount: 1 + Carbon: + amount: 1 + SulfuricAcid: + amount: 1 + Oxygen: + amount: 1 + products: + StypticPowder: 4 From bd2768280aacc795053e1b8dd7bdf8cd4c98e8e6 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:53:45 +0900 Subject: [PATCH 05/15] - tweak: Nerf stims. (#196) --- Resources/Prototypes/Reagents/narcotics.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 11b5fb1376..ba86e86406 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -31,6 +31,9 @@ - !type:GenericStatusEffect key: Stutter component: StutteringAccent + - !type:GenericStatusEffect + key: BlurryVision + component: BlurryVision - !type:Jitter - !type:GenericStatusEffect key: Stun @@ -72,6 +75,9 @@ Poison: 2 # this is added to the base damage of the meth. Asphyxiation: 2 - !type:Jitter + - !type:GenericStatusEffect + key: BlurryVision + component: BlurryVision - !type:GenericStatusEffect key: Stun time: 1 From 735ff4a00b749dc7c828626f8bb2f82250104d64 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:54:07 +0900 Subject: [PATCH 06/15] =?UTF-8?q?=D0=92=D1=81=D1=8F=D0=BA=D0=BE=D0=B5=20(#?= =?UTF-8?q?213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * - tweak: Shotgun firerate standartization. * - tweak: Less storage clothing size. * - tweak: No spears for nukies. * - tweak: Slightly buff ling armor. * - tweak: Nerf tranquilizers. * Revert "Tranquilizer balance (#23979)" This reverts commit 9e1342f3e4340ca6e32533cff9765b968089f543. * - remove: Disable whisper aspect. * - fix: Borer fix on transform person. * - fix: Items no longer get dropped on transform. * - tweak: Reduce ling tentacle stun time. * - tweak: Update chitinous armor desc. * - fix: Transform sting range check. * - tweak: More explosion resistance. * - tweak: Fuel tanks can't create vacuum. * - fix: Fix transform while being carried. * - fix: Monkey form. * - fix: I have no brain but I must live. * - tweak: Update ling desc. * - tweak: Fleshmend heals airloss. * - fix: New wiki rules. * - fix: Fix missing polymorph. * - tweak: Structural damage now works better. * - tweak: Less reflect prob. * - fix: Popup fix. --- .../Changeling/ChangelingSystem.Abilities.cs | 26 ++++++++++++++ .../Inventory/ServerInventorySystem.cs | 12 +++++-- .../Construction/Completions/Surgery.cs | 4 ++- .../_White/Other/CritSystem/CritSystem.cs | 2 +- .../Changeling/SharedTentacleGun.cs | 2 +- .../_White/BetrayalDagger/BackstabSystem.cs | 2 +- Content.Shared/_White/WhiteCVars.cs | 2 +- .../ru-RU/White/changeling/changeling.ftl | 3 +- .../white/changeling/changeling-entities.ftl | 34 +++++++++---------- Resources/Prototypes/Damage/modifier_sets.yml | 28 ++++++--------- .../Entities/Clothing/OuterClothing/armor.yml | 10 +++--- .../OuterClothing/base_clothingouter.yml | 4 +-- .../Guns/Ammunition/Cartridges/shotgun.yml | 2 +- .../Weapons/Guns/Shotguns/shotguns.yml | 2 +- .../Structures/Storage/Tanks/tanks.yml | 2 ++ Resources/Prototypes/Polymorphs/polymorph.yml | 11 ++++++ Resources/Prototypes/Reagents/biological.yml | 1 + .../Prototypes/Recipes/Lathes/security.yml | 2 -- .../Prototypes/White/Aspects/Aspects.yml | 1 + Resources/Prototypes/White/Catalog/uplink.yml | 5 +++ .../Objects/Weapons/chaplain_weapons.yml | 2 +- 21 files changed, 103 insertions(+), 54 deletions(-) diff --git a/Content.Server/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/Changeling/ChangelingSystem.Abilities.cs index 61feff6656..2154870c19 100644 --- a/Content.Server/Changeling/ChangelingSystem.Abilities.cs +++ b/Content.Server/Changeling/ChangelingSystem.Abilities.cs @@ -4,6 +4,8 @@ using Content.Server.Administration.Systems; using Content.Server.Bible.Components; using Content.Server.Body.Components; using Content.Server.Body.Systems; +using Content.Server.Borer; +using Content.Server.Carrying; using Content.Server.Cuffs; using Content.Server.DoAfter; using Content.Server.Emp; @@ -23,6 +25,7 @@ using Content.Server.Temperature.Systems; using Content.Shared._White.Chaplain; using Content.Shared._White.Overlays; using Content.Shared.Actions; +using Content.Shared.Borer; using Content.Shared.Changeling; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Cuffs.Components; @@ -35,6 +38,7 @@ using Content.Shared.Hands.EntitySystems; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; using Content.Shared.Implants.Components; +using Content.Shared.Interaction; using Content.Shared.Inventory; using Content.Shared.Miracle.UI; using Content.Shared.Mobs; @@ -85,6 +89,8 @@ public sealed partial class ChangelingSystem [Dependency] private readonly EmpSystem _empSystem = default!; [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly ContainerSystem _container = default!; + [Dependency] private readonly ServerBorerSystem _borer = default!; + [Dependency] private readonly CarryingSystem _carrying = default!; private void InitializeAbilities() { @@ -377,6 +383,13 @@ public sealed partial class ChangelingSystem var target = GetEntity(args.Target); var user = GetEntity(args.Entity); + if (!Transform(user).Coordinates.InRange(EntityManager, _transform, Transform(target).Coordinates, + SharedInteractionSystem.InteractionRange)) + { + _popup.PopupEntity(Loc.GetString("changeling-popup-transform-too-far"), user, user); + return; + } + if (!TryComp(uid, out var actorComponent)) return; @@ -757,6 +770,8 @@ public sealed partial class ChangelingSystem if (!TakeChemicals(uid, component, 5)) return; + BeforeTransform(args.User); + var polymorphEntity = _polymorph.PolymorphEntity(args.User, "MonkeyChangeling"); if (polymorphEntity == null) @@ -883,6 +898,8 @@ public sealed partial class ChangelingSystem if (!HasComp(target) && !humanoidOverride) return null; + BeforeTransform(target); + var polymorphEntity = _polymorph.PolymorphEntity(target, transformData.EntityPrototype.ID); if (polymorphEntity == null) @@ -927,6 +944,15 @@ public sealed partial class ChangelingSystem return polymorphEntity; } + private void BeforeTransform(EntityUid target) + { + if (TryComp(target, out BorerHostComponent? host) && host.BorerContainer.Count > 0) + _borer.GetOut(host.BorerContainer.ContainedEntities[0]); + + if (TryComp(target, out BeingCarriedComponent? beingCarried)) + _carrying.DropCarried(beingCarried.Carrier, target); + } + private void TransferComponents(EntityUid from, EntityUid to) { if (HasComp(from)) diff --git a/Content.Server/Inventory/ServerInventorySystem.cs b/Content.Server/Inventory/ServerInventorySystem.cs index 29d39f3723..c980057266 100644 --- a/Content.Server/Inventory/ServerInventorySystem.cs +++ b/Content.Server/Inventory/ServerInventorySystem.cs @@ -46,11 +46,19 @@ namespace Content.Server.Inventory return; var enumerator = new InventorySlotEnumerator(source.Comp); + // WD EDIT START + List<(EntityUid, string)> items = new(); while (enumerator.NextItem(out var item, out var slot)) { - if (TryUnequip(source, slot.Name, true, true, inventory: source.Comp)) - TryEquip(target, item, slot.Name , true, true, inventory: target.Comp); + items.Add((item, slot.Name)); } + + foreach (var (item, name) in items) + { + TryUnequip(source, name, true, true, inventory: source.Comp); + TryEquip(target, item, name, true, true, inventory: target.Comp); + } + // WD EDIT END } } } diff --git a/Content.Server/_White/Construction/Completions/Surgery.cs b/Content.Server/_White/Construction/Completions/Surgery.cs index 53255fa9e9..0a5380f01e 100644 --- a/Content.Server/_White/Construction/Completions/Surgery.cs +++ b/Content.Server/_White/Construction/Completions/Surgery.cs @@ -2,6 +2,7 @@ using Content.Server.Body.Systems; using Content.Shared.Body.Organ; using Content.Shared.Construction; using Content.Shared._White.CheapSurgery; +using Content.Shared.Changeling; namespace Content.Server._White.Construction.Completions; @@ -20,7 +21,8 @@ public sealed partial class Surgery : IGraphAction return; } - if (entityManager.TryGetComponent(surgeryComponent.OrganUid, out var organComponent)) + if (entityManager.TryGetComponent(surgeryComponent.OrganUid, out var organComponent) && + !entityManager.HasComponent(uid)) bodySystem.RemoveOrgan(surgeryComponent.OrganUid, organComponent); entityManager.RemoveComponent(uid); diff --git a/Content.Server/_White/Other/CritSystem/CritSystem.cs b/Content.Server/_White/Other/CritSystem/CritSystem.cs index 37c074f743..5bfca01d6a 100644 --- a/Content.Server/_White/Other/CritSystem/CritSystem.cs +++ b/Content.Server/_White/Other/CritSystem/CritSystem.cs @@ -67,7 +67,7 @@ public sealed class CritSystem : EntitySystem args.BonusDamage = new DamageSpecifier(_prototypeManager.Index("Slash"), damage - args.BaseDamage.GetTotal()); - _popup.PopupEntity($@"Crit! {damage}", args.User, PopupType.MediumCaution); + _popup.PopupEntity($"Crit! {damage}", args.User, args.User, PopupType.MediumCaution); } } diff --git a/Content.Shared/Changeling/SharedTentacleGun.cs b/Content.Shared/Changeling/SharedTentacleGun.cs index e3baa2f2ee..358eed81b4 100644 --- a/Content.Shared/Changeling/SharedTentacleGun.cs +++ b/Content.Shared/Changeling/SharedTentacleGun.cs @@ -137,7 +137,7 @@ public abstract class SharedTentacleGun : EntitySystem private bool PullMob(ProjectileEmbedEvent args) { - var stunTime = _random.Next(TimeSpan.FromSeconds(2), TimeSpan.FromSeconds(5)); + var stunTime = _random.Next(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(3)); if (!_stunSystem.TryParalyze(args.Embedded, stunTime, true)) return false; diff --git a/Content.Shared/_White/BetrayalDagger/BackstabSystem.cs b/Content.Shared/_White/BetrayalDagger/BackstabSystem.cs index fa11986080..595f8a6c31 100644 --- a/Content.Shared/_White/BetrayalDagger/BackstabSystem.cs +++ b/Content.Shared/_White/BetrayalDagger/BackstabSystem.cs @@ -52,6 +52,6 @@ public sealed class BackstabSystem : EntitySystem return; var message = Loc.GetString("backstab-damage-betrayal-dagger", ("damage", damage)); - _popup.PopupClient(message, args.User, args.User, PopupType.MediumCaution); + _popup.PopupEntity(message, args.User, args.User, PopupType.MediumCaution); } } diff --git a/Content.Shared/_White/WhiteCVars.cs b/Content.Shared/_White/WhiteCVars.cs index 6d41fd267e..6575b93cf8 100644 --- a/Content.Shared/_White/WhiteCVars.cs +++ b/Content.Shared/_White/WhiteCVars.cs @@ -17,7 +17,7 @@ public sealed class WhiteCVars */ public static readonly CVarDef RulesWiki = - CVarDef.Create("white.wiki_rules", "https://wiki.ss14.su/%D0%9F%D1%80%D0%B0%D0%B2%D0%B8%D0%BB%D0%B0", + CVarDef.Create("white.wiki_rules", "https://js.ss14.su/rules", CVar.SERVER | CVar.REPLICATED); /* diff --git a/Resources/Locale/ru-RU/White/changeling/changeling.ftl b/Resources/Locale/ru-RU/White/changeling/changeling.ftl index bab073c4e3..afa6cec777 100644 --- a/Resources/Locale/ru-RU/White/changeling/changeling.ftl +++ b/Resources/Locale/ru-RU/White/changeling/changeling.ftl @@ -1,4 +1,4 @@ -chat-manager-changeling-channel-name = УЛЕЙ +chat-manager-changeling-channel-name = УЛЕЙ hud-chatbox-select-channel-Changeling = Улей chat-manager-send-changeling-chat-wrap-message = [bold]\[УЛЕЙ\][/bold] [font size=13][italic][bold]{ $player }[/bold] шипит, "{ $message }"[/italic][/font] @@ -21,6 +21,7 @@ changeling-popup-cant-sting = Мы не можем ужалить это! changeling-popup-transform-no-dna = У нас нет поглощенного ДНК! changeling-popup-cant-transform-someone = Мы не можем превратит это! changeling-popup-transform-not-effective = Вирус перевоплощения не сработал! +changeling-popup-transform-too-far = Цель слишком далеко! changeling-popup-already-lesser-form = Мы уже заняли примитивную форму жизни! diff --git a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl index 4d155a6359..7ea6754f48 100644 --- a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl +++ b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl @@ -1,53 +1,53 @@ changeling-ability-fleshmend = Восстановление тканей -changeling-ability-fleshmend-desc = Быстро вылечить большую часть повреждений +changeling-ability-fleshmend-desc = Быстро вылечить большую часть повреждений. Стоит 20 химикатов. changeling-ability-biodegrade = Биоразложение -changeling-ability-biodegrade-desc = Растворяет наручники и прочие сдерживающие элементы. +changeling-ability-biodegrade-desc = Растворяет наручники и прочие сдерживающие элементы. Стоит 30 химикатов. changeling-ability-eyesight = Аугментация зрения changeling-ability-eyesight-desc = Развивает переключаемое ночное зрение. Когда способность неактивна, защищает вас от флешек и яркого света, например от сварки. changeling-ability-dissonant-shriek = Диссонирующий вопль -changeling-ability-dissonant-shriek-desc = Испускает заряд ЭМИ, который нарушает работу всего оборудования вокруг. +changeling-ability-dissonant-shriek-desc = Испускает заряд ЭМИ, который нарушает работу всего оборудования вокруг. Стоит 20 химикатов. changeling-ability-void-adaptation = Пустотная адаптация changeling-ability-void-adaptation-desc = Наделяет пассивной способностью, позволяющей сопротивляться холоду, низкому давлению и потребности в кислороде. При использовании замедляет регенерацию химикатов на 25%. changeling-ability-adrenaline-sacks = Мешки с адреналином -changeling-ability-adrenaline-sacks-desc = Дает кратковременный прилив адреналина в крови. +changeling-ability-adrenaline-sacks-desc = Дает кратковременный прилив адреналина в крови. Стоит 30 химикатов. changeling-ability-cryo-sting = Жало заморозки -changeling-ability-cryo-sting-desc = Вводит в кровь цели химикаты, которые со временем превращают её кровь в лед. +changeling-ability-cryo-sting-desc = Вводит в кровь цели химикаты, которые со временем превращают её кровь в лед. Стоит 15 химикатов. changeling-ability-hallucination-sting = Жало галлюцинаций -changeling-ability-hallucination-sting-desc = Вводит в кровь цели химикаты, вызывающие сильные галлюцинации. +changeling-ability-hallucination-sting-desc = Вводит в кровь цели химикаты, вызывающие сильные галлюцинации. Стоит 5 химикатов. changeling-ability-mute-sting = Жало безмолвия -changeling-ability-mute-sting-desc = Вводит в кровь цели химикаты, заставляющие цель замолчать за короткий срок. +changeling-ability-mute-sting-desc = Вводит в кровь цели химикаты, заставляющие цель замолчать за короткий срок. Стоит 20 химикатов. changeling-ability-blind-sting = Жало слепоты -changeling-ability-blind-sting-desc = Вводит в кровь цели химикаты, заставляющие цель временно ослепнуть. +changeling-ability-blind-sting-desc = Вводит в кровь цели химикаты, заставляющие цель временно ослепнуть. Стоит 25 химикатов. changeling-ability-transform-sting = Жало трансформации -changeling-ability-transform-sting-desc = Вводит в кровь цели вирус, заставляющий её превратиться в другое существо. +changeling-ability-transform-sting-desc = Вводит в кровь цели вирус, заставляющий её превратиться в другое существо. Стоит 50 химикатов. changeling-ability-extraction-sting = Жало извлечения -changeling-ability-extraction-sting-desc = Безшумно и безопасно извлекает ДНК из цели. +changeling-ability-extraction-sting-desc = Безшумно и безопасно извлекает ДНК из цели. Стоит 25 химикатов. changeling-ability-tentacle-arm = Рука-щупальце -changeling-ability-tentacle-arm-desc = Превращает одну из рук в щупальце, способное притягивать людей или забирать вещи из их рук. +changeling-ability-tentacle-arm-desc = Превращает одну из рук в щупальце, способное притягивать людей или забирать вещи из их рук. Стоит 10 химикатов. changeling-ability-changeling-armor = Хитиновая броня -changeling-ability-changeling-armor-desc = Надувает тело, превращая его в крепкую хитиновую броню. +changeling-ability-changeling-armor-desc = Надувает тело, превращая его в крепкую хитиновую броню. При использовании замедляет регенерацию химикатов на 25%. Стоит 20 химикатов. changeling-ability-changeling-shield = Органический щит -changeling-ability-changeling-shield-desc = Превращает одну из рук в крепкий органический щит. +changeling-ability-changeling-shield-desc = Превращает одну из рук в крепкий органический щит. Стоит 20 химикатов. changeling-ability-changeling-armblade = Рука-клинок -changeling-ability-changeling-armblade-desc = Превращает одну из рук в клинок, созданный из костей и плоти. +changeling-ability-changeling-armblade-desc = Превращает одну из рук в клинок, созданный из костей и плоти. Стоит 20 химикатов. changeling-ability-changeling-lesser-form = Примитивная форма -changeling-ability-changeling-lesser-form-desc = Превращает в самую примитивную форму. Полезно для побега из наручников. +changeling-ability-changeling-lesser-form-desc = Превращает в самую примитивную форму. Полезно для побега из наручников. Стоит 5 химикатов. ent-ActionChangelingShop = Эволюции .desc = Эволюционируйте и развивайтесь. @@ -56,10 +56,10 @@ ent-ActionChangelingAbsorb = Поглотить .desc = Поглотить существо. ent-ActionChangelingTransform = Превращение - .desc = Превратиться в одну из поглощенных личностей. + .desc = Превратиться в одну из поглощенных личностей. Стоит 5 химикатов. ent-ActionChangelingRegenerate = Регенерация - .desc = Войти в регенерирующий стазис. + .desc = Войти в регенерирующий стазис. Стоит 15 химикатов. ent-OrganicShield = органический щит .desc = Большой щит из плоти. diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index a70270252d..94122476a1 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -16,26 +16,23 @@ Slash: 0.5 Piercing: 0.5 Shock: 1.2 - Structural: 0.25 - flatReductions: - Blunt: 10 - Slash: 10 - Piercing: 10 - Heat: 10 - Structural: 10 - -- type: damageModifierSet - id: StructuralMetallic - coefficients: - Shock: 1.2 - Heat: 1.2 Structural: 0.5 flatReductions: Blunt: 10 Slash: 10 Piercing: 10 Heat: 10 - Structural: 10 + +- type: damageModifierSet + id: StructuralMetallic + coefficients: + Shock: 1.2 + Heat: 1.2 + flatReductions: + Blunt: 10 + Slash: 10 + Piercing: 10 + Heat: 10 - type: damageModifierSet id: Rock @@ -113,7 +110,6 @@ Slash: 5 Piercing: 5 Heat: 5 - Structural: 5 - type: damageModifierSet id: RGlass @@ -123,13 +119,11 @@ Piercing: 0.6 Heat: 0.5 Shock: 0 - Structural: 0.5 flatReductions: Blunt: 5 Slash: 5 Piercing: 5 Heat: 5 - Structural: 10 - type: damageModifierSet id: Wood diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 5793210b3a..1bc4fb5e98 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -165,12 +165,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.6 - Heat: 0.5 + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.5 + Heat: 0.4 - type: ExplosionResistance - damageCoefficient: 0.9 + damageCoefficient: 0.5 - type: GroupExamine - type: Unremoveable deleteOnDrop: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 4d6a8a4aed..9d3e8d5ae9 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -17,7 +17,7 @@ id: ClothingOuterBaseLarge components: - type: Item - size: Huge + size: Large - type: Clothing slots: - outerClothing @@ -155,4 +155,4 @@ id: ClothingOuterBaseMedium components: - type: Item - size: Huge + size: Large diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 9048c0b77a..0ef6ff1fb2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -125,7 +125,7 @@ ammo: reagents: - ReagentId: ChloralHydrate - Quantity: 7 + Quantity: 5 - type: SolutionTransfer maxTransferAmount: 7 - type: SpentAmmoVisuals diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index f1e467c57a..25949f933a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -194,7 +194,7 @@ sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi heldPrefix: sawn - type: Gun - fireRate: 4 + fireRate: 2 - type: BallisticAmmoProvider capacity: 2 autoCycle: true diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index 0defeb83ae..80fac33636 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -34,6 +34,7 @@ - type: Explosive explosionType: Default totalIntensity: 120 # ~ 5 tile radius + canCreateVacuum: false - type: entity id: WeldingFuelTankFull @@ -76,6 +77,7 @@ - type: Explosive explosionType: Default totalIntensity: 140 + canCreateVacuum: false # Water diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml index 94ba593212..f32561c89d 100644 --- a/Resources/Prototypes/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/Polymorphs/polymorph.yml @@ -340,6 +340,17 @@ allowRepeatedMorphs: true inventory: Transfer +- type: polymorph + id: MobHumanGhost + configuration: + entity: MobHuman + forced: true + revertOnCrit: false + revertOnDeath: false + transferDamage: true + allowRepeatedMorphs: true + inventory: Transfer + - type: polymorph id: MobGingerbread configuration: diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 574a36fa0f..38a29877f3 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -145,6 +145,7 @@ groups: Burn: -5 Brute: -5 + Airloss: -5 # for lings Toxin: -2 types: Bloodloss: -5 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 644478f37c..56fb788940 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -248,8 +248,6 @@ Plastic: 15 Steel: 10 Glass: 5 - Plasma: 10 - Silver: 5 - type: latheRecipe id: TargetHuman diff --git a/Resources/Prototypes/White/Aspects/Aspects.yml b/Resources/Prototypes/White/Aspects/Aspects.yml index 7173056f29..3c8a784b6b 100644 --- a/Resources/Prototypes/White/Aspects/Aspects.yml +++ b/Resources/Prototypes/White/Aspects/Aspects.yml @@ -258,6 +258,7 @@ weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg + forbidden: true - type: WhisperAspect - type: entity diff --git a/Resources/Prototypes/White/Catalog/uplink.yml b/Resources/Prototypes/White/Catalog/uplink.yml index 56b9b07841..08c2a52f6a 100644 --- a/Resources/Prototypes/White/Catalog/uplink.yml +++ b/Resources/Prototypes/White/Catalog/uplink.yml @@ -87,6 +87,11 @@ Telecrystal: 12 categories: - UplinkImplants + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink # Night Vision - type: listing diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml index 5eed41f0ea..08227d1b40 100644 --- a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -202,7 +202,7 @@ slots: - back - type: Reflect - reflectProb: 0.4 + reflectProb: 0.33 - type: Item sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi From bbbfca161b75499f224862008aea519c507abdd6 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:54:18 +0900 Subject: [PATCH 07/15] - add: Pettable felinids. (#219) --- .../ru-RU/interaction/interaction-popup-component.ftl | 2 ++ Resources/Prototypes/White/Mobs/Player/felinid.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl index 3a62aeff01..612777c747 100644 --- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl @@ -61,3 +61,5 @@ petting-failure-medibot = Вы тянетесь погладить { $target }, hugging-success-generic = Вы обнимаете { $target }. hugging-success-generic-others = { CAPITALIZE($user) } обнимает { $target }. hugging-success-generic-target = { CAPITALIZE($user) } обнимает вас. + +petting-success-cat-others = { CAPITALIZE($user) } гладит { $target } по { POSS-ADJ($target) } маленькой пушистой голове. diff --git a/Resources/Prototypes/White/Mobs/Player/felinid.yml b/Resources/Prototypes/White/Mobs/Player/felinid.yml index 61cb484f76..1741b93e32 100644 --- a/Resources/Prototypes/White/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/White/Mobs/Player/felinid.yml @@ -34,9 +34,12 @@ - type: Felinid #since this just adds an action... - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + messagePerceivedByOthers: petting-success-cat-others + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/cat_meow.ogg - type: SelfHeal damageContainers: - Biological From 4a06c1509a45fc601f0ca669fb01cbe27f1b85f7 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:54:26 +0900 Subject: [PATCH 08/15] - fix: Structural damage fix. (#215) --- .../Entities/Objects/Decoration/mining.yml | 10 +++++----- .../Entities/Objects/Misc/inflatable_wall.yml | 4 ++-- .../Structures/Decoration/bonfire.yml | 2 +- .../Structures/Decoration/cobwebs.yml | 2 +- .../Structures/Decoration/crystals.yml | 2 +- .../Structures/Decoration/curtains.yml | 2 +- .../Decoration/decorated_fir_tree.yml | 2 +- .../Structures/Decoration/fireplace.yml | 4 ++-- .../Structures/Decoration/showcase.yml | 4 ++-- .../Dispensers/base_structuredispensers.yml | 4 ++-- .../Doors/Airlocks/base_assembly.yml | 6 +++--- .../Doors/Airlocks/base_structureairlocks.yml | 2 +- .../Structures/Doors/Firelocks/firelock.yml | 6 +++--- .../Structures/Doors/Firelocks/frame.yml | 6 +++--- .../Doors/MaterialDoors/material_doors.yml | 10 +++++----- .../Doors/SecretDoor/secret_door.yml | 8 ++++---- .../Structures/Doors/Shutter/blast_door.yml | 8 ++++---- .../Structures/Doors/Shutter/shutters.yml | 6 +++--- .../Structures/Doors/Windoors/assembly.yml | 6 +++--- .../Doors/Windoors/base_structurewindoors.yml | 2 +- .../Structures/Doors/Windoors/windoor.yml | 2 +- .../Furniture/Tables/base_structuretables.yml | 4 ++-- .../Structures/Furniture/Tables/tables.yml | 20 +++++++++---------- .../Entities/Structures/Furniture/altar.yml | 4 ++-- .../Entities/Structures/Furniture/beds.yml | 4 ++-- .../Structures/Furniture/bookshelf.yml | 2 +- .../Entities/Structures/Furniture/carpets.yml | 4 ++-- .../Entities/Structures/Furniture/chairs.yml | 4 ++-- .../Entities/Structures/Furniture/dresser.yml | 2 +- .../Structures/Furniture/potted_plants.yml | 2 +- .../Entities/Structures/Furniture/sink.yml | 4 ++-- .../Structures/Holographic/projections.yml | 2 +- .../Structures/Lighting/base_lighting.yml | 6 +++--- .../Structures/Lighting/ground_lighting.yml | 4 ++-- .../Machines/Computers/computers.yml | 12 +++++------ .../Structures/Machines/Computers/frame.yml | 2 +- .../Structures/Machines/Medical/cryo_pod.yml | 4 ++-- .../Machines/base_structuremachines.yml | 4 ++-- .../Structures/Machines/cloning_machine.yml | 4 ++-- .../Structures/Machines/fatextractor.yml | 4 ++-- .../Entities/Structures/Machines/frame.yml | 12 +++++------ .../Structures/Machines/medical_scanner.yml | 4 ++-- .../Structures/Machines/smartfridge.yml | 4 ++-- .../Structures/Machines/stasisbed.yml | 4 ++-- .../Machines/wireless_surveillance_camera.yml | 4 ++-- .../Structures/Piping/Atmospherics/miners.yml | 4 ++-- .../Structures/Piping/Atmospherics/pipes.yml | 4 ++-- .../Piping/Atmospherics/portable.yml | 4 ++-- .../Disposal/high_pressure_machine_frame.yml | 4 ++-- .../Structures/Piping/Disposal/pipes.yml | 4 ++-- .../Power/Generation/Singularity/emitter.yml | 4 ++-- .../Structures/Power/Generation/ame.yml | 8 ++++---- .../Power/Generation/generators.yml | 4 ++-- .../Structures/Power/Generation/solar.yml | 16 +++++++-------- .../Entities/Structures/Power/apc.yml | 8 ++++---- .../Structures/Power/cable_terminal.yml | 4 ++-- .../Entities/Structures/Power/cables.yml | 4 ++-- .../Entities/Structures/Power/debug_power.yml | 6 +++--- .../Entities/Structures/Power/smes.yml | 4 ++-- .../Entities/Structures/Power/substation.yml | 8 ++++---- .../Entities/Structures/Shuttles/cannons.yml | 6 +++--- .../Structures/Shuttles/thrusters.yml | 4 ++-- .../Specific/Atmospherics/sensor.yml | 4 ++-- .../Entities/Structures/Specific/dragon.yml | 4 ++-- .../Entities/Structures/Specific/xeno.yml | 4 ++-- .../Storage/Canisters/gas_canisters.yml | 8 ++++---- .../Storage/Closets/base_structureclosets.yml | 8 ++++---- .../Storage/Crates/base_structurecrates.yml | 2 +- .../Storage/Tanks/base_structuretanks.yml | 4 ++-- .../Structures/Storage/filing_cabinets.yml | 8 ++++---- .../Entities/Structures/Storage/glass_box.yml | 2 +- .../Entities/Structures/Storage/morgue.yml | 8 ++++---- .../Entities/Structures/Storage/ore_box.yml | 2 +- .../Entities/Structures/Storage/storage.yml | 4 ++-- .../Wallmounts/Signs/base_structuresigns.yml | 4 ++-- .../Structures/Wallmounts/air_alarm.yml | 4 ++-- .../Entities/Structures/Wallmounts/bell.yml | 2 +- .../Structures/Wallmounts/defib_cabinet.yml | 6 +++--- .../Wallmounts/extinguisher_cabinet.yml | 4 ++-- .../Structures/Wallmounts/fire_alarm.yml | 4 ++-- .../Structures/Wallmounts/fireaxe_cabinet.yml | 2 +- .../Structures/Wallmounts/intercom.yml | 4 ++-- .../Wallmounts/monitors_televisions.yml | 4 ++-- .../Structures/Wallmounts/noticeboard.yml | 4 ++-- .../Structures/Wallmounts/station_map.yml | 2 +- .../Wallmounts/surveillance_camera.yml | 8 ++++---- .../Entities/Structures/Wallmounts/switch.yml | 8 ++++---- .../Structures/Wallmounts/walldispenser.yml | 4 ++-- .../Entities/Structures/Walls/asteroid.yml | 4 ++-- .../Entities/Structures/Walls/fence_metal.yml | 2 +- .../Entities/Structures/Walls/girders.yml | 4 ++-- .../Entities/Structures/Walls/grille.yml | 6 +++--- .../Entities/Structures/Walls/railing.yml | 8 ++++---- .../Entities/Structures/Walls/walls.yml | 2 +- .../Entities/Structures/Windows/window.yml | 2 +- .../Entities/Structures/cargo_telepad.yml | 6 +++--- .../Entities/Structures/catwalk.yml | 4 ++-- .../Entities/Structures/conveyor.yml | 4 ++-- .../Entities/Structures/meat_spike.yml | 4 ++-- .../Entities/Structures/plastic_flaps.yml | 2 +- .../Prototypes/Entities/Structures/soil.yml | 4 ++-- .../Prototypes/Entities/Structures/stairs.yml | 6 +++--- .../Prototypes/Entities/Tiles/bananium.yml | 4 ++-- .../Structures/Wallmounts/consoles.yml | 6 +++--- .../White/Structures/Machines/atm.yml | 4 ++-- .../White/Structures/Windows/paper.yml | 2 +- .../Entities/Cult/Altars/cult_altars.yml | 14 ++++++------- .../_White/Entities/Cult/Effects/shield.yml | 4 ++-- .../_White/Entities/Cult/other_structures.yml | 4 ++-- 109 files changed, 264 insertions(+), 264 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml index fb5afcd3f5..6dc7eef80c 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml @@ -1,7 +1,7 @@ - type: entity id: WoodenSign name: wooden sign - description: He's pointing somewhere. + description: He's pointing somewhere. components: - type: Clickable - type: InteractionOutline @@ -18,7 +18,7 @@ bounds: "-0.35,-0.4,0.35,0.4" density: 100 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: MeleeSound soundGroups: @@ -60,7 +60,7 @@ sprite: Objects/Decoration/mines.rsi state: support - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Physics bodyType: Static @@ -128,7 +128,7 @@ sprite: Objects/Decoration/mines.rsi state: support_wall - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Physics bodyType: Static @@ -176,4 +176,4 @@ spawn: Log: min: 1 - max: 3 \ No newline at end of file + max: 3 diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml index d11aa714cb..be732c17af 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml @@ -20,7 +20,7 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Inflatable - type: Destructible thresholds: @@ -68,7 +68,7 @@ closeSound: path: /Audio/Misc/zip.ogg - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Inflatable - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml index 22aef79340..4e20d764d4 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml @@ -14,7 +14,7 @@ energy: 3 color: "#FFC90C" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml index 15897201b2..2c5040da98 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml @@ -18,7 +18,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index c1a01c423b..3e5f9ca18a 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -38,7 +38,7 @@ energy: 3 color: "#52ff39" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml index 5e9bbb3c83..16640dc4fd 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml @@ -38,7 +38,7 @@ path: /Audio/Effects/curtain_openclose.ogg - type: Appearance - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Construction graph: Curtains diff --git a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml index 6ce4326831..b2806b93c9 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml @@ -19,7 +19,7 @@ autoRot: true offset: "0, 0.6" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml index 3446c4980b..637400adc4 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml @@ -35,8 +35,8 @@ energy: 3 color: "#FF6F00" - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml index 53cc75faa6..f80dd063ea 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml @@ -7,8 +7,8 @@ components: - type: Anchorable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml index adb410562e..e30fcef0dd 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml @@ -35,8 +35,8 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml index fcdb0d2dea..17b770faec 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml @@ -28,8 +28,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -42,4 +42,4 @@ graph: Airlock node: assembly placement: - mode: SnapgridCenter \ No newline at end of file + mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 034d5fdcfa..258d785c31 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -111,7 +111,7 @@ - type: Occluder - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index cead7f3141..4c19dc57ca 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -17,8 +17,8 @@ - type: DeviceNetworkRequiresPower - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -108,7 +108,7 @@ - type: AccessReader access: [ [ "Engineering" ] ] - type: ReflectAspectMark - + - type: entity id: Firelock parent: BaseFirelock diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index 8cf75e89e1..46a174d244 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: FirelockFrame parent: BaseStructureDynamic name: firelock frame @@ -23,8 +23,8 @@ node: frame1 - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index dfe4f39ece..8970e54f5a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -42,8 +42,8 @@ - type: Airtight fixVacuum: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -95,7 +95,7 @@ closeSound: path: /Audio/Effects/door_close.ogg - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: @@ -144,8 +144,8 @@ - state: closed map: ["enum.DoorVisualLayers.Base"] - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml index 154467213a..5f81434e54 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml @@ -40,8 +40,8 @@ - type: Airtight fixVacuum: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -95,8 +95,8 @@ noRot: false - type: Rotatable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml index 97f3c1b9e3..c4060c2095 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BlastDoor parent: BaseShutter name: blast door @@ -26,7 +26,7 @@ resistance: 8 - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic + damageModifierSet: StructuralMetallicStrong - type: ContainerFill containers: board: [ DoorElectronics ] @@ -65,8 +65,8 @@ state: assembly - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index ac5becdc38..ba1640dc20 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -66,7 +66,7 @@ resistance: 2 - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -208,8 +208,8 @@ - board - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml index a86c7a44b9..b7bf63c93c 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: WindoorAssembly name: windoor assembly description: It opens, it closes, and you can see through it! @@ -24,8 +24,8 @@ - type: Pullable - type: Rotatable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 8a7e069da1..20b3ab6360 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseWindoor parent: BaseStructure abstract: true diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 0feaf81a6c..a70d738b7e 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: Windoor parent: BaseWindoor name: windoor diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml index c1b0cf0423..ac0d44b5d9 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml @@ -6,8 +6,8 @@ abstract: true components: - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PlaceableSurface - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 5425e9b240..6bd8c953c7 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -22,8 +22,8 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: IconSmooth key: state base: state_ @@ -79,7 +79,7 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: IconSmooth key: state @@ -122,8 +122,8 @@ sprite: Structures/Furniture/Tables/frame.rsi state: full - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: IconSmooth key: state base: state_ @@ -166,8 +166,8 @@ - type: Icon sprite: Structures/Furniture/Tables/generic.rsi - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -596,7 +596,7 @@ sprite: Structures/Furniture/Tables/counterwood.rsi state: full - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: @@ -639,8 +639,8 @@ sprite: Structures/Furniture/Tables/countermetal.rsi state: full - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 24578668a0..382aa477db 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml @@ -9,8 +9,8 @@ - type: Transform - type: Prayable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PlaceableSurface - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml index 02fe3e97e5..36920f5dcc 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml @@ -36,8 +36,8 @@ - type: PlaceableSurface placeCentered: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml index 24d9b8d070..cc91686c9a 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml @@ -17,7 +17,7 @@ fillBaseName: book - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml index fa6a00623b..359dffba0f 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml @@ -18,7 +18,7 @@ canCollide: false - type: Fixtures - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -134,7 +134,7 @@ canCollide: false - type: Fixtures - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index abf63e3970..1791a09f6b 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -34,8 +34,8 @@ buckleOffset: "0,-0.05" - type: Pullable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index ada913c0e9..68b94ef03b 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -9,7 +9,7 @@ state: dresser - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 53d268facf..2d0c59672d 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -32,7 +32,7 @@ stash: !type:ContainerSlot {} - type: Pullable - type: Damageable - damageContainer: Inorganic # The pot. Not the plant. Or is it plastic? + damageContainer: StructuralInorganic # The pot. Not the plant. Or is it plastic? - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml index 22f0e2dc2a..7784bc139e 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml @@ -40,8 +40,8 @@ - type: DumpableSolution solution: drainBuffer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml index d2a5853fcb..1ac47624ee 100644 --- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml @@ -16,7 +16,7 @@ - type: TimedDespawn lifetime: 90 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 9eebe0b6e8..b467f10c7f 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -35,8 +35,8 @@ softness: 1 offset: "0, -0.5" - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -235,7 +235,7 @@ softness: 1.1 enabled: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 8541412c25..16ce332b42 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -17,8 +17,8 @@ - MidImpassable - LowImpassable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 92f9787eb9..8f15113a34 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -556,8 +556,8 @@ - key: enum.BodyScannerConsoleUIKey.Key type: BodyScannerConsoleBoundUserInterface - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong # WD end - type: entity @@ -595,8 +595,8 @@ energy: 1.6 color: "#3c5eb5" - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: entity parent: ComputerComms @@ -847,8 +847,8 @@ speechVerb: Robotic speechSounds: Pai - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: GuideHelp guides: - Cloning diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index 08e3173334..4ddabbd1e2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -25,7 +25,7 @@ - type: Sprite drawdepth: Objects - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml index f150a3f63b..a842183198 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml @@ -54,8 +54,8 @@ boardName: wires-board-name-cryopod layoutId: CryoPod - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index 7861b52b65..f321c2afb0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml @@ -22,8 +22,8 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index 5d9ab0dd7e..da902dce29 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml @@ -31,8 +31,8 @@ containers: - clonepod-bodyContainer - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml index 9f09e49059..a46f53f09e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml @@ -80,8 +80,8 @@ containers: - entity_storage - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml index 3b3f0402aa..9d5a8c3885 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml @@ -37,8 +37,8 @@ machine_board: !type:Container machine_parts: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -92,8 +92,8 @@ - machine_board - machine_parts - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -141,8 +141,8 @@ graph: Machine node: destroyedMachineFrame - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index 6f05baee94..9dab23a3b4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml @@ -51,8 +51,8 @@ machine_board: !type:Container machine_parts: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml index 5a62b74ac0..fd0707ec3c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml @@ -84,8 +84,8 @@ sound: collection: MetalBreak - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: DamageOnHighSpeedImpact damage: types: diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml index 5f7182f7dd..b29be996d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml @@ -21,8 +21,8 @@ powerLoad: 1000 - type: ExtensionCableReceiver - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml index d69eb96f62..7afcb5904c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml @@ -10,8 +10,8 @@ - type: WirelessNetworkConnection range: 200 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Rotatable rotateWhileAnchored: true - type: Fixtures diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 2231fc4ddc..3aa9079206 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -14,8 +14,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index e5b77095b0..eef6707458 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -12,8 +12,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: SubFloorHide - type: CollideOnAnchor - type: PipeAppearance diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml index e3ae06fa50..17c15178f7 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml @@ -71,8 +71,8 @@ - type: Machine board: PortableScrubberMachineCircuitBoard - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml index 6f3d0705cb..5bc0f54d93 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml @@ -29,8 +29,8 @@ graph: DisposalMachine node: frame - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index ba09ca1805..1b82bf794d 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -36,8 +36,8 @@ anchored: true - type: Anchorable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index 52698f62cc..a48e2221c3 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -53,8 +53,8 @@ !type:CableDeviceNode nodeGroupID: MVPower - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index 023d2f129a..b4b0b97f37 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -29,8 +29,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -145,8 +145,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index 4948231b90..7cf59f8b44 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml @@ -52,8 +52,8 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PacifismDangerousAttack - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index 069ea4d827..8de95276b0 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -61,8 +61,8 @@ supplyRampRate: 500 - type: SolarPanel - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -90,8 +90,8 @@ - type: Sprite state: broken - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -141,8 +141,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -186,8 +186,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index beb5f31d62..9ed61ea810 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -102,8 +102,8 @@ layoutId: APC - type: WiresVisuals - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -171,8 +171,8 @@ node: apcFrame - type: WallMount - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml index da724014dc..600b97a976 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml @@ -15,8 +15,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index 60b41d53be..536f857c19 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -27,8 +27,8 @@ "/Audio/Weapons/smash.ogg" # WD edit sounds start - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml index a102516ce6..41e9efd5fc 100644 --- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml +++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: DebugGenerator parent: BaseGenerator suffix: DEBUG @@ -44,8 +44,8 @@ - type: PowerConsumer drawRate: 50 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index c2170a127a..02c4a0899b 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -81,8 +81,8 @@ highVoltageNode: input mediumVoltageNode: output - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: BatterySensor - type: DeviceNetwork deviceNetId: AtmosDevices diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 94de12be18..0e642be6ea 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -52,8 +52,8 @@ supplyRampTolerance: 5000 supplyRampRate: 1000 - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: PacifismDangerousAttack - type: Destructible thresholds: @@ -185,8 +185,8 @@ supplyRampTolerance: 5000 supplyRampRate: 1000 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PacifismDangerousAttack - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index 50f15a5c89..d2478b5977 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -30,7 +30,7 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Transform anchored: true @@ -287,8 +287,8 @@ containers: ballistic-ammo: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index f87be42659..fa8b382ade 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -40,7 +40,7 @@ powerLoad: 1500 - type: ExtensionCableReceiver - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Destructible thresholds: @@ -193,7 +193,7 @@ - !type:ChangeConstructionNodeBehavior node: machineFrame - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: StaticPrice price: 2000 diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index 8dd154af4b..da480ee1ab 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml @@ -8,8 +8,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml index 8a7f13d1a4..a705f09a91 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml @@ -32,8 +32,8 @@ # only show after making the announcement at 50% enabled: false - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 0fcca0c1d5..7b9be555a5 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml @@ -26,8 +26,8 @@ - state: wardingtower-unshaded shader: unshaded - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Physics bodyType: Static - type: Fixtures diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 7659fceef8..1bc7e871fe 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -62,8 +62,8 @@ acts: [ "Destruction" ] - !type:DumpCanisterBehavior - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Physics bodyType: Dynamic - type: Fixtures @@ -1274,8 +1274,8 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: InteractionOutline - type: Sprite sprite: Structures/Storage/canister.rsi diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 46ec7cbf6a..b4c2bd55c9 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -145,8 +145,8 @@ entity_storage: !type:Container ents: [] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -254,8 +254,8 @@ placeCentered: true isPlaceable: false - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index acf4fd2149..8df34a7b3d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -39,7 +39,7 @@ isPlaceable: false # defaults to closed. - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: Metallic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml index 01bacf11fb..b77eeb3355 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml @@ -21,8 +21,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml index d341c017a7..981c5f7e85 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml @@ -44,8 +44,8 @@ containers: storagebase: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -133,8 +133,8 @@ containers: storagebase: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml index bdb02d2bc3..d78d8c2344 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml @@ -11,7 +11,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: MeleeSound soundGroups: diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index d1e0478880..eda36f355b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -72,8 +72,8 @@ - type: StaticPrice price: 200 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -162,8 +162,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml index 961d7854c0..430501d3ab 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml @@ -9,7 +9,7 @@ - type: Anchorable - type: InteractionOutline - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index 79a1e35799..f57ade99ad 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -31,8 +31,8 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml index 10b136c093..4d355d6af0 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml @@ -26,8 +26,8 @@ shape: !type:PhysShapeAabb {} - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 76555e9602..3c7c649359 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -95,8 +95,8 @@ "/Audio/Weapons/smash.ogg" # WD edit sounds end - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml index 24e5cfda2a..10b4c7b017 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml @@ -33,7 +33,7 @@ bodyType: Static - type: Fixtures - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml index 517d2d697d..9c920365f4 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: DefibrillatorCabinet name: defibrillator cabinet description: A small wall mounted cabinet designed to hold a defibrillator. @@ -35,8 +35,8 @@ containers: ItemCabinet: !type:ContainerSlot - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml index a0775641ef..118126a66a 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml @@ -35,8 +35,8 @@ containers: ItemCabinet: !type:ContainerSlot - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index 05988fbc21..1e2409b925 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml @@ -81,8 +81,8 @@ graph: FireAlarm node: fire_alarm - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml index 070c6e526d..72ec944d25 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml @@ -4,7 +4,7 @@ description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if. components: - type: Damageable # adding destructible causes the entity inside to be deleted when the cabinet is destroyed :( - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: MeleeSound soundGroups: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 47d125023c..3d1b122dcf 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -73,8 +73,8 @@ graph: Intercom node: intercom - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml index 5b8e4a32f4..1d074d839d 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -59,8 +59,8 @@ - WallLayer - type: WallMount - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml index 4a442d0542..b46ad56f82 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: NoticeBoard name: notice board description: Is there a job for a witcher? @@ -20,7 +20,7 @@ anchored: true - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml index 94bc33a210..1a0750c531 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml @@ -16,7 +16,7 @@ layers: - state: station_map_broken - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index ce3417cc50..b2afee2444 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -25,8 +25,8 @@ alwaysRandomize: true layoutId: SurveillanceCamera - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Sprite drawdepth: WallMountedItems sprite: Structures/Wallmounts/camera.rsi @@ -210,8 +210,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Sprite drawdepth: WallMountedItems sprite: Structures/Wallmounts/camera.rsi diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 36ecad003a..67b5adbf9a 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -11,8 +11,8 @@ path: "/Audio/Weapons/smash.ogg" - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -104,8 +104,8 @@ ports: - Pressed - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml index c8778aea50..1df43be52c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml @@ -18,8 +18,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index ca5eda6792..97d7e96891 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -364,8 +364,8 @@ tags: - Pickaxe - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml index 88d2f272c0..984ec626ab 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml @@ -21,7 +21,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml index f500c1e498..7d6f6125aa 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml @@ -28,8 +28,8 @@ sprite: Structures/Walls/solid.rsi state: wall_girder - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index 61b0b64f31..07ba72c589 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -32,7 +32,7 @@ node: grille deconstructionTarget: start - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: PerforatedMetallic - type: PowerConsumer showInMonitor: false @@ -114,7 +114,7 @@ bodyType: Static canCollide: false - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -160,4 +160,4 @@ - WallLayer - type: Construction graph: GrilleDiagonal - node: grilleDiagonal \ No newline at end of file + node: grilleDiagonal diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml index 95d16742d5..3152374e46 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml @@ -27,7 +27,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -96,7 +96,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -156,7 +156,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -231,7 +231,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 2bf601c75e..ece31ec918 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -747,7 +747,7 @@ sprite: Structures/Walls/shuttle_diagonal.rsi state: state0 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: StructuralMetallic - type: Physics bodyType: Static diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 8330d71b01..835d5e46be 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -133,7 +133,7 @@ - GlassLayer - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: ExaminableDamage messages: WindowMessages diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml index d395235a53..566b553e22 100644 --- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: CargoTelepad parent: [ BaseMachinePowered, ConstructibleMachine ] name: cargo telepad @@ -30,8 +30,8 @@ map: [ "enum.CargoTelepadLayers.Beam" ] shader: unshaded - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index c727c24952..14ced18771 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -30,8 +30,8 @@ graph: Catwalk node: Catwalk - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml index 990da6fbc0..c741a0309f 100644 --- a/Resources/Prototypes/Entities/Structures/conveyor.yml +++ b/Resources/Prototypes/Entities/Structures/conveyor.yml @@ -59,8 +59,8 @@ graph: ConveyorGraph node: entity - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml index 086066f5c2..b009a257e0 100644 --- a/Resources/Prototypes/Entities/Structures/meat_spike.yml +++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml @@ -13,8 +13,8 @@ - state: spike map: ["base"] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml index 1d3efbdaef..712e0916d4 100644 --- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml +++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml @@ -28,7 +28,7 @@ - MidImpassable - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: Metallic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml index c5c8f2e61f..1bf8c03640 100644 --- a/Resources/Prototypes/Entities/Structures/soil.yml +++ b/Resources/Prototypes/Entities/Structures/soil.yml @@ -21,8 +21,8 @@ layer: - FullTileMask - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml index f2e1ae62fa..c7e990afd1 100644 --- a/Resources/Prototypes/Entities/Structures/stairs.yml +++ b/Resources/Prototypes/Entities/Structures/stairs.yml @@ -13,8 +13,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -43,4 +43,4 @@ - type: Sprite sprite: Structures/stairs.rsi state: stairs_stage - drawdepth: FloorTiles \ No newline at end of file + drawdepth: FloorTiles diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml index 7f3334fdb8..e808ba311a 100644 --- a/Resources/Prototypes/Entities/Tiles/bananium.yml +++ b/Resources/Prototypes/Entities/Tiles/bananium.yml @@ -22,8 +22,8 @@ graph: FloorBananium node: BananiumFloor - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml index 26e50e6564..f87aaff20a 100644 --- a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml +++ b/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml @@ -1,4 +1,4 @@ -# Base structure +# Base structure - type: entity id: BaseStructureWallMountConsole parent: BaseStructure @@ -29,8 +29,8 @@ - type: Sprite drawdepth: Objects - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/White/Structures/Machines/atm.yml b/Resources/Prototypes/White/Structures/Machines/atm.yml index 0c83671e71..0482a38d1b 100644 --- a/Resources/Prototypes/White/Structures/Machines/atm.yml +++ b/Resources/Prototypes/White/Structures/Machines/atm.yml @@ -46,8 +46,8 @@ sound: path: /Audio/Ambience/Objects/vending_machine_hum.ogg - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/White/Structures/Windows/paper.yml b/Resources/Prototypes/White/Structures/Windows/paper.yml index 12da8ec076..4df348afde 100644 --- a/Resources/Prototypes/White/Structures/Windows/paper.yml +++ b/Resources/Prototypes/White/Structures/Windows/paper.yml @@ -34,7 +34,7 @@ layer: - GlassLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: diff --git a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml index c4f1f47faf..ff772fa561 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml @@ -30,7 +30,7 @@ - type: PylonVisuals - type: InteractionOutline - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: @@ -100,8 +100,8 @@ map: [ "enum.CultCraftStructureVisualsLayers.Activated" ] - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -159,8 +159,8 @@ map: [ "enum.CultCraftStructureVisualsLayers.Activated" ] - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -217,8 +217,8 @@ map: [ "enum.CultCraftStructureVisualsLayers.Activated" ] - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml index 7bafba4f94..11d1bfdc28 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml @@ -25,8 +25,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml index a5ff612833..85244ec319 100644 --- a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml +++ b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml @@ -78,8 +78,8 @@ sprite: /Textures/White/Cult/Structures/cult_girder.rsi state: cultgirder - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: From f6b107353ab4e64deef52526db494cee9bd0d282 Mon Sep 17 00:00:00 2001 From: Valtos Date: Wed, 20 Mar 2024 22:54:45 +0300 Subject: [PATCH 09/15] - add: OldNeoInterface (#108) * ebal * setup gui * AAAAAAAAAA EBLAN --- .../CustomControls/PlayerListControl.xaml.cs | 2 +- .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs | 2 +- .../Atmos/Monitor/UI/AirAlarmWindow.xaml | 6 +- Content.Client/Cargo/UI/CargoBountyMenu.xaml | 2 +- .../Chemistry/UI/ChemMasterWindow.xaml | 8 +- .../Chemistry/UI/ReagentDispenserWindow.xaml | 2 +- .../Construction/UI/FlatpackCreatorMenu.xaml | 4 +- Content.Client/DoAfter/DoAfterOverlay.cs | 2 +- Content.Client/FlavorText/FlavorText.xaml | 2 +- .../Humanoid/SingleMarkingPicker.xaml | 2 +- Content.Client/Lathe/UI/LatheMenu.xaml | 2 +- Content.Client/Lathe/UI/RecipeTooltip.xaml | 8 +- .../Launcher/LauncherConnectingGui.xaml | 119 ++---- .../Launcher/LauncherConnectingGui.xaml.cs | 6 +- Content.Client/Lobby/UI/LobbyGui.xaml | 2 +- Content.Client/Lobby/UI/LobbyGui.xaml.cs | 2 + Content.Client/MainMenu/BackgroundControl.cs | 52 +++ .../MassMedia/Ui/NewsWriteMenu.xaml | 2 +- Content.Client/Mech/Ui/MechMenu.xaml | 2 +- .../NetworkConfiguratorLinkMenu.xaml.cs | 2 +- Content.Client/Options/UI/OptionsMenu.xaml | 2 +- .../Options/UI/Tabs/AdminSettingsTab.xaml | 1 + Content.Client/Options/UI/Tabs/AudioTab.xaml | 2 + .../Options/UI/Tabs/GraphicsTab.xaml | 1 + Content.Client/Options/UI/Tabs/MiscTab.xaml | 1 + .../Options/UI/Tabs/NetworkTab.xaml | 1 + .../PDA/PdaNavigationButton.xaml.cs | 6 +- Content.Client/PDA/PdaProgramItem.xaml.cs | 2 +- Content.Client/PDA/PdaSettingsButton.xaml.cs | 2 +- Content.Client/Parallax/ParallaxControl.cs | 2 +- .../UI/ParticleAcceleratorControlMenu.cs | 4 +- .../Preferences/UI/CharacterSetupGui.xaml | 22 +- .../Preferences/UI/CharacterSetupGui.xaml.cs | 14 +- .../Preferences/UI/HumanoidProfileEditor.xaml | 369 ++++++++++-------- .../UI/HumanoidProfileEditor.xaml.cs | 1 - .../Research/UI/ResearchConsoleMenu.xaml | 6 +- Content.Client/Silicons/Borgs/BorgMenu.xaml | 4 +- .../Silicons/Laws/Ui/SiliconLawMenu.xaml | 2 +- Content.Client/Stylesheets/StyleBase.cs | 21 +- Content.Client/Stylesheets/StyleNano.cs | 201 ++++++---- Content.Client/Stylesheets/StyleSpace.cs | 23 +- .../UserInterface/Controls/MenuButton.cs | 9 +- .../Screens/DefaultGameScreen.xaml.cs | 1 + .../Screens/SeparatedChatGameScreen.xaml | 2 - .../Systems/Atmos/GasTank/GasTankWindow.cs | 2 +- .../Systems/Chat/ChatUIController.cs | 3 +- .../Systems/Chat/Widgets/ChatBox.xaml | 6 +- .../MenuBar/Widgets/GameTopMenuBar.xaml | 206 +++++----- .../Ranged/Systems/GunSystem.AmmoCounter.cs | 15 +- Content.Client/Wires/UI/WiresMenu.cs | 2 +- Content.Client/_White/JoinQueue/QueueGui.xaml | 41 +- .../BodyScanner/BodyScannerConsoleWindow.xaml | 4 +- Content.Shared/_White/WhiteCVars.cs | 2 +- .../ru-RU/escape-menu/ui/escape-menu.ftl | 2 +- .../ru-RU/launcher/launcher-connecting.ftl | 49 +-- .../humanoid-character-profile.ftl | 2 +- .../preferences/ui/character-setup-gui.ftl | 1 + .../Locale/ru-RU/voting/ui/vote-call-menu.ftl | 2 +- .../ru-RU/white/join-queue/queue-screen.ftl | 5 +- Resources/Prototypes/Shaders/shaders.yml | 5 + .../Interface/Default/SlotBackground.png | Bin 318 -> 206 bytes .../Default/down_arrow.svg.192dpi.png | Bin 0 -> 898 bytes .../Default/left_arrow.svg.192dpi.png | Bin 777 -> 916 bytes .../Default/right_arrow.svg.192dpi.png | Bin 842 -> 945 bytes .../Interface/Default/slot_highlight.png | Bin 123 -> 234 bytes .../Interface/Default/up_arrow.svg.192dpi.png | Bin 0 -> 849 bytes .../ItemStatus/Bullets/chambered.png | Bin 496 -> 579 bytes .../ItemStatus/Bullets/chambered_rotated.png | Bin 496 -> 578 bytes .../Interface/ItemStatus/Bullets/empty.png | Bin 524 -> 561 bytes .../Interface/ItemStatus/Bullets/normal.png | Bin 498 -> 578 bytes .../Interface/ItemStatus/Bullets/small.png | Bin 497 -> 583 bytes .../Interface/ItemStatus/Bullets/tiny.png | Bin 479 -> 538 bytes .../Interface/Misc/progress_bar.rsi/icon.png | Bin 2107 -> 552 bytes .../Nano/black_panel_dark_thin_border.png | Bin 142 -> 163 bytes .../Nano/black_panel_light_thin_border.png | Bin 142 -> 163 bytes .../Interface/Nano/button.svg.96dpi.png | Bin 615 -> 194 bytes .../Interface/Nano/chat_sub_background.png | Bin 88 -> 163 bytes .../Interface/Nano/checkbox_checked.svg | 53 +-- .../Nano/checkbox_checked.svg.96dpi.png | Bin 333 -> 235 bytes .../Interface/Nano/checkbox_unchecked.svg | 39 +- .../Nano/checkbox_unchecked.svg.96dpi.png | Bin 252 -> 217 bytes .../Textures/Interface/Nano/cross.svg.png | Bin 237 -> 239 bytes .../Interface/Nano/filter.svg.96dpi.png | Bin 404 -> 868 bytes .../Textures/Interface/Nano/fucky_wucky.png | Bin 33061 -> 52223 bytes .../Textures/Interface/Nano/gay_shit.png | Bin 1820 -> 181 bytes .../Nano/item_status_left.svg.96dpi.png | Bin 459 -> 216 bytes .../Nano/item_status_middle.svg.96dpi.png | Bin 438 -> 220 bytes .../Nano/item_status_right.svg.96dpi.png | Bin 409 -> 225 bytes .../Nano/light_panel_background_bordered.png | Bin 88 -> 163 bytes .../Textures/Interface/Nano/lineedit.png | Bin 139 -> 163 bytes .../Textures/Interface/Nano/lobby_gay.png | Bin 1023 -> 1023 bytes .../Textures/Interface/Nano/placeholder.png | Bin 482 -> 516 bytes .../Textures/Interface/Nano/shaded_lobby.png | Bin 0 -> 4676 bytes .../Interface/Nano/slider_fill.svg.96dpi.png | Bin 267 -> 222 bytes .../Nano/slider_grabber.svg.96dpi.png | Bin 371 -> 278 bytes .../Nano/slider_outline.svg.96dpi.png | Bin 284 -> 247 bytes Resources/Textures/Interface/Nano/square.png | Bin 170 -> 154 bytes .../Textures/Interface/Nano/stripeback.svg | 42 +- .../Interface/Nano/stripeback.svg.96dpi.png | Bin 251 -> 226 bytes .../Interface/Nano/tabcontainer_panel.png | Bin 123 -> 200 bytes Resources/Textures/Interface/Nano/tooltip.png | Bin 102 -> 163 bytes ...transparent_window_background_bordered.png | Bin 88 -> 196 bytes Resources/Textures/Interface/Nano/whisper.png | Bin 103 -> 1771 bytes .../Interface/Nano/window_background.png | Bin 105 -> 163 bytes .../Nano/window_background_bordered.png | Bin 88 -> 163 bytes .../Textures/Interface/Nano/window_header.png | Bin 81 -> 237 bytes .../Interface/Nano/window_header_alert.png | Bin 85 -> 224 bytes .../VerbIcons/Spare/poweronoff.svg.192dpi.png | Bin 2010 -> 1989 bytes .../Interface/VerbIcons/anchor.svg.192dpi.png | Bin 1156 -> 902 bytes .../VerbIcons/antag-e_sword-temp.192dpi.png | Bin 1061 -> 1551 bytes .../Interface/VerbIcons/buckle.svg.192dpi.png | Bin 656 -> 1585 bytes .../Interface/VerbIcons/clock.svg.192dpi.png | Bin 1681 -> 1346 bytes .../Interface/VerbIcons/close.svg.192dpi.png | Bin 487 -> 1097 bytes .../VerbIcons/cutlery.svg.192dpi.png | Bin 855 -> 629 bytes .../Interface/VerbIcons/debug.svg.192dpi.png | Bin 1113 -> 1465 bytes .../Interface/VerbIcons/delete.svg.192dpi.png | Bin 1124 -> 293 bytes .../delete_transparent.svg.192dpi.png | Bin 650 -> 419 bytes .../Interface/VerbIcons/die.svg.192dpi.png | Bin 755 -> 387 bytes .../Interface/VerbIcons/dot.svg.192dpi.png | Bin 570 -> 1410 bytes .../Interface/VerbIcons/drink.svg.192dpi.png | Bin 2130 -> 941 bytes .../Interface/VerbIcons/drop.svg.192dpi.png | Bin 587 -> 1291 bytes .../Interface/VerbIcons/eject.svg.192dpi.png | Bin 457 -> 957 bytes .../VerbIcons/examine.svg.192dpi.png | Bin 986 -> 1285 bytes .../Interface/VerbIcons/flip.svg.192dpi.png | Bin 1863 -> 1632 bytes .../Interface/VerbIcons/fold.svg.192dpi.png | Bin 2619 -> 1867 bytes .../Interface/VerbIcons/group.svg.192dpi.png | Bin 415 -> 659 bytes .../Interface/VerbIcons/in.svg.192dpi.png | Bin 574 -> 957 bytes .../VerbIcons/information.svg.192dpi.png | Bin 1707 -> 1398 bytes .../Interface/VerbIcons/insert.svg.192dpi.png | Bin 543 -> 957 bytes .../Interface/VerbIcons/light.svg.192dpi.png | Bin 764 -> 1295 bytes .../Interface/VerbIcons/lock.svg.192dpi.png | Bin 8059 -> 3426 bytes .../Interface/VerbIcons/open.svg.192dpi.png | Bin 481 -> 977 bytes .../Interface/VerbIcons/outfit.svg.192dpi.png | Bin 1044 -> 1033 bytes .../Interface/VerbIcons/pickup.svg.192dpi.png | Bin 513 -> 1241 bytes .../Interface/VerbIcons/plus.svg.192dpi.png | Bin 693 -> 219 bytes .../Interface/VerbIcons/point.svg.192dpi.png | Bin 821 -> 1425 bytes .../VerbIcons/refresh.svg.192dpi.png | Bin 1175 -> 1730 bytes .../VerbIcons/rejuvenate.svg.192dpi.png | Bin 1577 -> 1513 bytes .../Interface/VerbIcons/remove_tape.png | Bin 973 -> 1314 bytes .../VerbIcons/rotate_ccw.svg.192dpi.png | Bin 724 -> 1690 bytes .../VerbIcons/rotate_cw.svg.192dpi.png | Bin 713 -> 1632 bytes .../VerbIcons/sentient.svg.192dpi.png | Bin 1412 -> 1200 bytes .../VerbIcons/settings.svg.192dpi.png | Bin 1139 -> 1721 bytes .../Interface/VerbIcons/smite.svg.192dpi.png | Bin 766 -> 1233 bytes .../Interface/VerbIcons/snow.svg.192dpi.png | Bin 3194 -> 1890 bytes .../Interface/VerbIcons/spill.svg.192dpi.png | Bin 872 -> 1289 bytes .../VerbIcons/unbuckle.svg.192dpi.png | Bin 730 -> 442 bytes .../Interface/VerbIcons/unlock.svg.192dpi.png | Bin 7983 -> 3492 bytes .../Interface/VerbIcons/vv.svg.192dpi.png | Bin 1052 -> 842 bytes .../Interface/VerbIcons/zap.svg.192dpi.png | Bin 1371 -> 1012 bytes .../Interface/character.svg.192dpi.png | Bin 1068 -> 327 bytes .../Interface/emotions.svg.192dpi.png | Bin 355 -> 769 bytes .../Textures/Interface/fist.svg.192dpi.png | Bin 991 -> 1023 bytes .../Textures/Interface/gavel.svg.192dpi.png | Bin 1060 -> 1254 bytes .../Interface/hamburger.svg.192dpi.png | Bin 309 -> 206 bytes .../Textures/Interface/hammer.svg.192dpi.png | Bin 808 -> 634 bytes .../Textures/Interface/info.svg.192dpi.png | Bin 1076 -> 585 bytes .../Interface/inventory.svg.192dpi.png | Bin 884 -> 328 bytes .../Textures/Interface/meatyore-shop-icon.png | Bin 2206 -> 690 bytes .../Textures/Interface/sandbox.svg.192dpi.png | Bin 1469 -> 243 bytes Resources/Textures/Logo/icon.ico | Bin 112724 -> 15406 bytes Resources/Textures/Logo/icon/icon-128x128.png | Bin 4392 -> 2893 bytes Resources/Textures/Logo/icon/icon-16x16.png | Bin 924 -> 310 bytes Resources/Textures/Logo/icon/icon-24x24.png | Bin 1297 -> 451 bytes Resources/Textures/Logo/icon/icon-256x256.png | Bin 8696 -> 8595 bytes Resources/Textures/Logo/icon/icon-32x32.png | Bin 1670 -> 546 bytes Resources/Textures/Logo/icon/icon-48x48.png | Bin 1827 -> 862 bytes Resources/Textures/Logo/icon/icon-64x64.png | Bin 2360 -> 1184 bytes Resources/Textures/Logo/logo-ru-mini.png | Bin 0 -> 30655 bytes Resources/Textures/Logo/logo-ru.pdn | Bin 0 -> 126601 bytes Resources/Textures/Logo/logo-ru.png | Bin 539450 -> 93778 bytes .../Textures/Shaders/White/bettercrt.swsl | 8 +- Resources/Textures/Shaders/White/comet.swsl | 270 +++++++++++++ .../Textures/Shaders/White/cyberglitch.swsl | 78 ++++ Resources/Textures/Shaders/White/grid.swsl | 60 +++ Resources/Textures/Shaders/White/melt.swsl | 28 ++ .../Textures/Shaders/White/postglitch.swsl | 54 +++ .../Textures/Shaders/White/starfield.swsl | 159 ++++++++ 178 files changed, 1370 insertions(+), 696 deletions(-) create mode 100644 Content.Client/MainMenu/BackgroundControl.cs create mode 100644 Resources/Textures/Interface/Default/down_arrow.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Default/up_arrow.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/shaded_lobby.png create mode 100644 Resources/Textures/Logo/logo-ru-mini.png create mode 100644 Resources/Textures/Logo/logo-ru.pdn create mode 100644 Resources/Textures/Shaders/White/comet.swsl create mode 100644 Resources/Textures/Shaders/White/cyberglitch.swsl create mode 100644 Resources/Textures/Shaders/White/grid.swsl create mode 100644 Resources/Textures/Shaders/White/melt.swsl create mode 100644 Resources/Textures/Shaders/White/postglitch.swsl create mode 100644 Resources/Textures/Shaders/White/starfield.swsl diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs index 7366fc5633..4957782a8a 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs @@ -49,7 +49,7 @@ namespace Content.Client.Administration.UI.CustomControls PopulateList(_adminSystem.PlayerList); FilterLineEdit.OnTextChanged += _ => FilterList(); _adminSystem.PlayerListChanged += PopulateList; - BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(20, 20, 20)}; + BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(11, 11, 11)}; } private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data) diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs index 222ee83324..4799d76e19 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs @@ -19,7 +19,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab private const string ArrowUp = "↑"; private const string ArrowDown = "↓"; - private readonly Color _altColor = Color.FromHex("#141414"); + private readonly Color _altColor = Color.FromHex("#050505"); private readonly Color _defaultColor = Color.FromHex("#191919"); private readonly AdminSystem _adminSystem; private IReadOnlyList _players = new List(); diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml index 1cdc1b7da7..1e6083c8b0 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml @@ -43,7 +43,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml b/Content.Client/Cargo/UI/CargoBountyMenu.xaml index bb263ff6c4..506947a774 100644 --- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml +++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml @@ -9,7 +9,7 @@ HorizontalExpand="True"> - + - + @@ -39,7 +39,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml index c83660f8f5..f118b03f92 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml @@ -40,7 +40,7 @@ SizeFlagsStretchRatio="6" MinSize="0 150"> - + - + @@ -35,7 +35,7 @@ HorizontalExpand="True" RectClipContent="True"> - + diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs index 7440f98fe6..24f139c4d9 100644 --- a/Content.Client/DoAfter/DoAfterOverlay.cs +++ b/Content.Client/DoAfter/DoAfterOverlay.cs @@ -134,7 +134,7 @@ public sealed class DoAfterOverlay : Overlay } var xProgress = (EndX - StartX) * elapsedRatio + StartX; - var box = new Box2(new Vector2(StartX, 3f) / EyeManager.PixelsPerMeter, + var box = new Box2(new Vector2(StartX, 2f) / EyeManager.PixelsPerMeter, new Vector2(xProgress, 4f) / EyeManager.PixelsPerMeter); box = box.Translated(position); diff --git a/Content.Client/FlavorText/FlavorText.xaml b/Content.Client/FlavorText/FlavorText.xaml index f36bf9fe18..3578f82d41 100644 --- a/Content.Client/FlavorText/FlavorText.xaml +++ b/Content.Client/FlavorText/FlavorText.xaml @@ -2,7 +2,7 @@ xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"> - + diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml b/Content.Client/Humanoid/SingleMarkingPicker.xaml index c816c52e9c..3b4392e030 100644 --- a/Content.Client/Humanoid/SingleMarkingPicker.xaml +++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml @@ -13,7 +13,7 @@ - + diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml index 2b97166f05..b924798395 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml +++ b/Content.Client/Lathe/UI/LatheMenu.xaml @@ -38,7 +38,7 @@ SizeFlagsStretchRatio="4"> - + - - diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml index 0e8120e958..d8ba4e8534 100644 --- a/Content.Client/Launcher/LauncherConnectingGui.xaml +++ b/Content.Client/Launcher/LauncherConnectingGui.xaml @@ -1,96 +1,37 @@ - - - - - - - - - - - -