diff --git a/Content.Server/_RMC14/Rules/CMDistressSignalRuleComponent.cs b/Content.Server/_RMC14/Rules/CMDistressSignalRuleComponent.cs index 22f3131e444..444d7c311e3 100644 --- a/Content.Server/_RMC14/Rules/CMDistressSignalRuleComponent.cs +++ b/Content.Server/_RMC14/Rules/CMDistressSignalRuleComponent.cs @@ -132,4 +132,7 @@ public sealed partial class CMDistressSignalRuleComponent : Component [DataField] public ProtoId AllClearChannel = "MarineCommand"; + + [DataField] + public TimeSpan RoundEndCheckDelay = TimeSpan.FromMinutes(1); } diff --git a/Content.Server/_RMC14/Rules/CMDistressSignalRuleSystem.cs b/Content.Server/_RMC14/Rules/CMDistressSignalRuleSystem.cs index 1676371d00e..a0ab95aebd1 100644 --- a/Content.Server/_RMC14/Rules/CMDistressSignalRuleSystem.cs +++ b/Content.Server/_RMC14/Rules/CMDistressSignalRuleSystem.cs @@ -1373,6 +1373,19 @@ private void SpawnAdminFaxArea() private void EndRound(CMDistressSignalRuleComponent rule, DistressSignalRuleResult result) { + // you might be wondering what this check is doing here + // the answer is simple + // the absolute unit that wrote game rule system and game ticker made a conveniently named ActiveTick method + // that gets ticked BEFORE THE FUCKING ROUND IS SETUP + // so no marines and no xenos means instant mutual annihilation + // therefore we wait an arbitrary 1 minute + // i fucking hate my life dude + // i slept 3 hours and have to stay up to manually end ANOTHER ROUND OF RMC14 + // TODO RMC14 why are we still here + if (rule.StartTime == null || Timing.CurTime - rule.StartTime < rule.RoundEndCheckDelay) + return; + + Log.Info($"Attempting to set {nameof(rule)} result to {result}"); if (rule.Result != null) return; diff --git a/Content.Server/_RMC14/Rules/DistressSignalRuleResult.cs b/Content.Server/_RMC14/Rules/DistressSignalRuleResult.cs index b54834983aa..f069a0b9982 100644 --- a/Content.Server/_RMC14/Rules/DistressSignalRuleResult.cs +++ b/Content.Server/_RMC14/Rules/DistressSignalRuleResult.cs @@ -7,5 +7,5 @@ public enum DistressSignalRuleResult MinorMarineVictory, MajorXenoVictory, MinorXenoVictory, - AllDied + AllDied, } diff --git a/Content.Shared/_RMC14/Item/ItemCamouflageSystem.cs b/Content.Shared/_RMC14/Item/ItemCamouflageSystem.cs index 724c45ca406..096468fd593 100644 --- a/Content.Shared/_RMC14/Item/ItemCamouflageSystem.cs +++ b/Content.Shared/_RMC14/Item/ItemCamouflageSystem.cs @@ -1,3 +1,4 @@ +using System.Linq; using Content.Shared.Storage; using Content.Shared.Storage.EntitySystems; using Robust.Shared.Containers; @@ -30,10 +31,13 @@ public override void Update(float frameTime) if (_items.Count == 0) return; - foreach (var ent in _items) + foreach (var ent in _items.ToList()) { if (!TryComp(ent.Owner, out MetaDataComponent? meta)) + { + _items.Dequeue(); continue; + } if (meta.LastModifiedTick == _time.CurTick) continue; diff --git a/Content.Shared/_RMC14/Pulling/RMCPullingSystem.cs b/Content.Shared/_RMC14/Pulling/RMCPullingSystem.cs index 4f554f29002..59a40ed324f 100644 --- a/Content.Shared/_RMC14/Pulling/RMCPullingSystem.cs +++ b/Content.Shared/_RMC14/Pulling/RMCPullingSystem.cs @@ -421,6 +421,8 @@ public override void Update(float frameTime) continue; var puller = pullable.Puller.Value; + if (puller == default) + continue; if (_firemanQuery.TryComp(uid, out var fireman) && fireman.BeingCarried) continue; diff --git a/Content.Shared/_RMC14/Xenonids/Construction/ResinWhisper/ResinWhispererSystem.cs b/Content.Shared/_RMC14/Xenonids/Construction/ResinWhisper/ResinWhispererSystem.cs index d22412407e8..2cd06c4b278 100644 --- a/Content.Shared/_RMC14/Xenonids/Construction/ResinWhisper/ResinWhispererSystem.cs +++ b/Content.Shared/_RMC14/Xenonids/Construction/ResinWhisper/ResinWhispererSystem.cs @@ -7,6 +7,8 @@ using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Verbs; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; using Robust.Shared.Prototypes; namespace Content.Shared._RMC14.Xenonids.Construction.ResinWhisper; @@ -17,6 +19,7 @@ public sealed class ResinWhispererSystem : EntitySystem [Dependency] private readonly ExamineSystemShared _examineSystem = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedXenoWeedsSystem _weeds = default!; private readonly List _resinDoorPrototypes = new() { "DoorXenoResin", "DoorXenoResinThick" }; @@ -90,8 +93,11 @@ private void OnRemoteSecreteStructure(Entity ent, ref X if (_interaction.InRangeUnobstructed(ent, args.TargetCoordinates, ent.Comp.MaxConstructDistance.Value.Float())) return; - if (!_examineSystem.InRangeUnOccluded(ent, args.TargetCoordinates, ent.Comp.MaxRemoteConstructDistance)) + if (!TileIsVisible(ent, args.TargetCoordinates)) + { + _popup.PopupClient(Loc.GetString("rmc-xeno-construction-remote-failed-need-line-of-sight"), ent, ent); return; + } if (!_weeds.IsOnWeeds(ent.Owner)) { @@ -102,4 +108,38 @@ private void OnRemoteSecreteStructure(Entity ent, ref X constructComp.BuildDelay = ent.Comp.StandardConstructDelay.Value.Multiply(ent.Comp.RemoteConstructDelayMultiplier); constructComp.BuildRange = ent.Comp.MaxRemoteConstructDistance; } + + private bool TileIsVisible(Entity ent, EntityCoordinates targetCoordinates) + { + //Check coordinates of center, then check 4 corners and 4 edges, clockwise starting from the eastern edge + var pointCoordinates = _transform.ToMapCoordinates(targetCoordinates); + for (int i = 0; i < 9; i++) + { + switch (i) + { + case 1: case 7: case 8: + pointCoordinates = pointCoordinates.Offset(0.499f, 0); + break; + case 2: + pointCoordinates = pointCoordinates.Offset(0, -0.499f); + break; + case 3: case 4: + pointCoordinates = pointCoordinates.Offset(-0.499f, 0); + break; + case 5: case 6: + pointCoordinates = pointCoordinates.Offset(0, 0.499f); + break; + default: + break; + } + + if (_examineSystem.InRangeUnOccluded(ent, pointCoordinates, ent.Comp.MaxRemoteConstructDistance)) + { + return true; + break; + } + } + + return false; + } } diff --git a/Content.Shared/_RMC14/Xenonids/Heal/SharedXenoHealSystem.cs b/Content.Shared/_RMC14/Xenonids/Heal/SharedXenoHealSystem.cs index 148232decdb..7e3d7e6976e 100644 --- a/Content.Shared/_RMC14/Xenonids/Heal/SharedXenoHealSystem.cs +++ b/Content.Shared/_RMC14/Xenonids/Heal/SharedXenoHealSystem.cs @@ -140,7 +140,7 @@ private void OnXenoApplySalveAction(Entity ent, ref XenoApplySalv if (failureMessageId != null) { - _popup.PopupClient(Loc.GetString(failureMessageId, ("target_xeno", target.ToString())), ent); + _popup.PopupClient(Loc.GetString(failureMessageId, ("target_xeno", target)), ent); return; } @@ -238,7 +238,7 @@ private void OnXenoSacrificeHealAction(Entity ent, ref XenoSacrif if (failureMessageId != null) { - _popup.PopupClient(Loc.GetString(failureMessageId, ("target_xeno", target.ToString())), ent); + _popup.PopupClient(Loc.GetString(failureMessageId, ("target_xeno", target)), ent); return; } diff --git a/Content.Shared/_RMC14/Xenonids/Projectile/XenoProjectileSystem.cs b/Content.Shared/_RMC14/Xenonids/Projectile/XenoProjectileSystem.cs index f25a8f68a36..1de912a3749 100644 --- a/Content.Shared/_RMC14/Xenonids/Projectile/XenoProjectileSystem.cs +++ b/Content.Shared/_RMC14/Xenonids/Projectile/XenoProjectileSystem.cs @@ -1,5 +1,6 @@ using Content.Shared._RMC14.Explosion; using Content.Shared._RMC14.Weapons.Ranged; +using Content.Shared._RMC14.Xenonids.Construction; using Content.Shared._RMC14.Xenonids.Hive; using Content.Shared._RMC14.Xenonids.Plasma; using Content.Shared.FixedPoint; @@ -50,7 +51,8 @@ private void OnPreventCollide(Entity ent, ref PreventCo if (args.Cancelled || ent.Comp.DeleteOnFriendlyXeno) return; - if (_hive.FromSameHive(ent.Owner, args.OtherEntity)) + if (_hive.FromSameHive(ent.Owner, args.OtherEntity) && + (HasComp(args.OtherEntity) || HasComp(args.OtherEntity))) args.Cancelled = true; } diff --git a/Resources/Changelog/RMC14.yml b/Resources/Changelog/RMC14.yml index 4c38af160dc..328edbacf57 100644 --- a/Resources/Changelog/RMC14.yml +++ b/Resources/Changelog/RMC14.yml @@ -1,139 +1,4 @@ Entries: -- author: DrSmugleaf - changes: - - message: Added the mortar and HE/Flare mortar shells. Used by anyone with an engineering - skill of 1, they are aimed to a coordinate obtained with the rangefinder and - dialled to account for the random offset, being able to shoot shells from very - far away. More shells and mortars can be bought in Requisitions. - type: Add - - message: Added the combat technician's sentry and upgrade kit to optionally upgrade - it to a mini-sentry. The regular sentry has more health and damage, but shoots - and deploys slower than the mini-sentry. The mini-sentry also doesn't block - movement. Each combat technician only gets access to one sentry. - type: Add - - message: Added the rangefinder, used to pinpoint coordinates for mortars. - type: Add - - message: Added the engineering pamphlet to vendors. - type: Add - - message: Fixed dead xenos blocking bullets. - type: Fix - - message: Fixed tiles on the Almayer's stairs teleport points being weedable and - allowing construction. - type: Fix - - message: Fixed explosions having a lower structural damage than intended. - type: Fix - - message: Fixed xenos not being able to open the scout weapons spec's reactive - thermal tarp. - type: Fix - - message: Fixed CAS fire popups sometimes incorrectly saying that the dropship - is not in flight when trying to fire on a location that has a CAS-proof roof. - type: Fix - - message: Fixed dropship cameras being FOV. They will now allow the pilot to see - everything around the target. - type: Fix - - message: Fixed the named items Patreon perk not renaming items that are bought - within a storage, such as the MK80 and SU-6 pistol cases. - type: Fix - - message: Fixed admin-triggered bioscans not resetting the time for the next bioscan, - sometimes leading to two bioscans in quick succession. - type: Fix - - message: Fixed the dropship arrival overlay being hidden by weeds. - type: Fix - - message: Fixed the QM not spawning with an approved stamp. - type: Fix - - message: Fixed the popup for a hive core already existing being displayed for - all players instead of just the xeno that tried to build it. - type: Fix - - message: Fixed worn armor with explosion armor not reducing explosion damage. - type: Fix - - message: Fixed the global RMC admin UI counting marines and xenos without a player - inside them. - type: Fix - - message: Fixed being able to stack barricades in the same direction and tile. - type: Fix - - message: Added the 5 missing smoke grenades in the Requisitions weapon vendor. - type: Fix - - message: Fixed some replays from very long rounds being cut off early. - type: Fix - - message: Fixed some items being considered contraband. - type: Fix - id: 641 - time: '2024-08-30T11:38:12.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3885 -- author: DrSmugleaf - changes: - - message: Added Sam Ali figurine. - type: Add - id: 642 - time: '2024-08-30T12:50:01.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3889 -- author: Vermidia - changes: - - message: FTLs get insulated gloves as part of their kit - type: Fix - id: 643 - time: '2024-08-30T22:49:02.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3894 -- author: DrSmugleaf - changes: - - message: Fixed Boiler gas spreading into itself and causing massive amounts of - lag. Re-enabled Boiler evolution. - type: Fix - - message: Fixed mortars and sentries not being attackable by xenoniods. - type: Fix - - message: Fixed Requisitions not being able to buy sentry magazines. - type: Fix - id: 644 - time: '2024-08-30T22:59:42.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3897 -- author: Vermidia - changes: - - message: Fix larva burst in bags being stuck in said bags - type: Fix - id: 645 - time: '2024-08-31T23:53:57.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3899 -- author: Vermidia - changes: - - message: You can now get a general idea of a sentries health by examining it - type: Fix - - message: Fixed being able to activate sentries right next to other active sentries - type: Fix - - message: You can rotate placed sentries with a screwdriver - type: Fix - id: 646 - time: '2024-09-04T20:41:13.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3937 -- author: Vermidia - changes: - - message: Fix Lifesaver Bag not starting with an epinephrine autoinjector - type: Fix - id: 647 - time: '2024-09-04T21:07:13.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3905 -- author: Vermidia - changes: - - message: Medilathe, useable by med staff and makes various medical supplies out - of plastic, such as hyposprays, high-capacity beakers, and stasis bags. - type: Add - - message: Vial Storage Boxes, which can storage 6 vials or auto-injectors - type: Add - - message: Fix Chem Plus sprite being wrong - type: Fix - - message: Fix surgical tray slots being too few - type: Fix - - message: Lathes are no longer acidable - type: Fix - id: 648 - time: '2024-09-04T21:09:11.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3904 -- author: Vermidia - changes: - - message: Marines not wearing shoes slows them down - type: Fix - id: 649 - time: '2024-09-04T21:10:59.0000000+00:00' - url: https://github.com/RMC-14/RMC-14/pull/3910 - author: DrSmugleaf changes: - message: Fixed some areas incorrectly allowing or prohibiting mortar fire and @@ -5054,5 +4919,83 @@ id: 1140 time: '2024-12-22T14:25:02.0000000+00:00' url: https://github.com/RMC-14/RMC-14/pull/5201 +- author: DrSmugleaf + changes: + - message: Added Dave 'Big Dave' Small and Mark Sholl figurines. + type: Add + id: 1141 + time: '2024-12-22T14:54:40.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5204 +- author: DrSmugleaf + changes: + - message: Fixed comms towers not being able to be repaired. + type: Fix + - message: Fixed all xeno crit sprites. + type: Fix + - message: Fixed gardener drone overlays error sprite. + type: Fix + - message: Fixed warrior and steelcrest defender injury error sprites. + type: Fix + id: 1142 + time: '2024-12-22T21:26:40.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5207 +- author: Dutch-VanDerLinde + changes: + - message: Fixed scarves blocking feeding someone pills. + type: Fix + id: 1143 + time: '2024-12-22T21:49:49.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5208 +- author: Vermidia + changes: + - message: Fixed Medical Kit pouch being called a revival pouch in the corpsman + vendor + type: Fix + id: 1144 + time: '2024-12-22T21:50:04.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5206 +- author: DrSmugleaf + changes: + - message: Fixed rounds never ending. + type: Fix + - message: Added Cyril 'Cloves' Culkins figurine. + type: Add + id: 1145 + time: '2024-12-22T23:45:40.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5212 +- author: Rainbeon + changes: + - message: Fixed Boiler globs phasing through resin walls, membranes, and doors. + type: Fix + id: 1146 + time: '2024-12-23T03:21:22.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5215 +- author: Rainbeon + changes: + - message: Fixed the Hivelord Resin Whisperer's Remote Build being too restrictive + on Line of Sight. You now only need to see any tiny part of a tile to remote + build on it, similar to CM13. + type: Fix + id: 1147 + time: '2024-12-23T03:25:44.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5214 +- author: DrSmugleaf + changes: + - message: Fixed messages when failing to heal something as a healer drone showing + the target's numerical id instead of their name. + type: Fix + - message: Fixed rounds not ending automatically but actually. + type: Fix + id: 1148 + time: '2024-12-23T03:27:22.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5216 +- author: Vermidia + changes: + - message: Fixed Healer drone pheromones not being the same strength as warden prae + pheromones. + type: Fix + id: 1149 + time: '2024-12-23T04:08:19.0000000+00:00' + url: https://github.com/RMC-14/RMC-14/pull/5219 Name: RMC14 Order: -1 diff --git a/Resources/Locale/en-US/_RMC14/xeno/xeno-construction.ftl b/Resources/Locale/en-US/_RMC14/xeno/xeno-construction.ftl index 032735eea6e..a5cf6f58462 100644 --- a/Resources/Locale/en-US/_RMC14/xeno/xeno-construction.ftl +++ b/Resources/Locale/en-US/_RMC14/xeno/xeno-construction.ftl @@ -4,6 +4,7 @@ cm-xeno-construction-failed-cant-build = We can't build there! cm-xeno-construction-failed-select-structure = We need to select a structure to build first! Use the "Choose Resin Structure" action. cm-xeno-construction-failed-requires-support = {CAPITALIZE(MAKEPLURAL($choice))} need a wall or resin door next to them to stand up. +rmc-xeno-construction-remote-failed-need-line-of-sight = We need direct line of sight to build! rmc-xeno-construction-remote-failed-need-on-weeds = We must be standing on weeds to establish a connection to the resin. rmc-xeno-construction-remote-construct = We focus our plasma into the weeds below us and force the weeds to secrete resin! rmc-xeno-construction-remote-open-door = We focus our connection to the resin and remotely open the resin door. diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Masks/scarfs.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Masks/scarfs.yml index 0694035c316..c061111f58e 100644 --- a/Resources/Prototypes/_RMC14/Entities/Clothing/Masks/scarfs.yml +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Masks/scarfs.yml @@ -16,7 +16,6 @@ - state: icon map: ["foldedLayer"] visible: false - - type: IngestionBlocker - type: entity parent: RMCBaseScarfMask diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/medical.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/medical.yml index 07be2e91e6a..34e5e03e2e7 100644 --- a/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/medical.yml +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/medical.yml @@ -407,7 +407,7 @@ - type: Sprite sprite: _RMC14/Objects/Clothing/Pouches/medkit.rsi - type: StorageStoreSkillRequired - entries: + entries: - whitelist: tags: - DiscreteHealthAnalyzer @@ -429,7 +429,6 @@ - CMRollerBed - CMSurgicalLine - CMSynthGraft - - CMRollerBed - BodyBag # - TODO RMC14 fixovein - Hypospray @@ -437,7 +436,7 @@ - Hypospray skills: all: - RMCSkillMedical: 2 + RMCSkillMedical: 2 - type: Storage grid: - 0,0,13,1 #7 slots @@ -463,7 +462,6 @@ - CMRollerBed - CMSurgicalLine - CMSynthGraft - - CMRollerBed - BodyBag # - TODO RMC14 fixovein - Hypospray diff --git a/Resources/Prototypes/_RMC14/Entities/Mobs/Xeno/drone.yml b/Resources/Prototypes/_RMC14/Entities/Mobs/Xeno/drone.yml index bbbe584f332..8e8b6911772 100644 --- a/Resources/Prototypes/_RMC14/Entities/Mobs/Xeno/drone.yml +++ b/Resources/Prototypes/_RMC14/Entities/Mobs/Xeno/drone.yml @@ -209,7 +209,7 @@ groups: Brute: 17 - type: XenoPheromones - pheromonesMultiplier: 2.5 + pheromonesMultiplier: 3 - type: XenoStrain name: rmc-xeno-healer-name description: rmc-xeno-healer-description diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/patron_figurines.yml b/Resources/Prototypes/_RMC14/Entities/Objects/patron_figurines.yml index 6bc0a13e95f..48542374d82 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/patron_figurines.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/patron_figurines.yml @@ -875,8 +875,11 @@ name: Emily 'Klutz' Rathen figurine description: "A figurine of Emily 'Klutz' Rathen. It looks chipped and scuffed from being dropped repeatedly. The base is very small and uneven, making it want to fall over at all times." components: + - type: Transform + noRot: true - type: Sprite state: emily_klutz_rathen + rotation: 90 - type: PatronFigurine id: e8819228-95ea-4a3b-8e1c-0e7eaa55cb90 @@ -924,3 +927,37 @@ state: kael_shark_voss - type: PatronFigurine id: 58c2cefc-1796-4ca4-b6e6-5dbda5b8f506 + +- type: entity + parent: RMCBaseFigurinePatron + id: RMCFigurinePatronMarkSholl + name: Mark 'Blacklung' Sholl figurine + description: "A figurine of Mark 'Blacklung' Sholl. It depicts him with his usual 'Smokes like a chimney' nature on full display and tired eyes. Around his neck you see a well worn whistle with the words \"Cat wrangler\" engraved on the top." + components: + - type: Sprite + state: mark_sholl + - type: PatronFigurine + id: 9f601ba2-d7dd-46dd-8409-3757346d0ffd + +- type: entity + parent: RMCBaseFigurinePatron + id: RMCFigurinePatronDaveBigDaveSmall + name: Dave 'Big Dave' Small figurine + description: "Life-sized if not bigger. A companion along your travels" + components: + - type: Sprite + state: dave_big_dave_small + scale: 0.6, 0.4 + - type: PatronFigurine + id: 26df12fd-dcd8-4399-a0fa-d2c5eb4e72d8 + +- type: entity + parent: RMCBaseFigurinePatron + id: RMCFigurinePatronCyrilClovesCulkins + name: Cyril 'Cloves' Culkins figurine + description: "\"People sleep peaceably in their beds at night only because rough men stand ready to do violence on their behalf.\" - Orwell." + components: + - type: Sprite + state: cyril_cloves_culkins + - type: PatronFigurine + id: 22d7b4a3-3635-4d69-9696-c91df2047fa9 diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/medic.yml b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/medic.yml index 4e9bc2bf55e..fde8936ae8e 100644 --- a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/medic.yml +++ b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/medic.yml @@ -234,7 +234,6 @@ recommended: true - id: RMCPouchMedkit recommended: true - name: Pressurized Reagent Canister Pouch\n(Revival Mix - Tricordrazine) # - id: CMPressurizedReagentCanisterPouchPeridaxonRevivalMix # name: Pressurized Reagent Canister Pouch\n(Revival Mix - Peridaxon) # recommended: true diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/communications_tower.yml b/Resources/Prototypes/_RMC14/Entities/Structures/communications_tower.yml index aef162f1b3c..6c86bb1fe5c 100644 --- a/Resources/Prototypes/_RMC14/Entities/Structures/communications_tower.yml +++ b/Resources/Prototypes/_RMC14/Entities/Structures/communications_tower.yml @@ -41,7 +41,7 @@ acts: [ "Breakage" ] - type: CommunicationsTower - type: RMCRepairable - heal: -150 + heal: 150 skillRequired: 1 delay: 5 fuelUsed: 0 diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/meta.json index 49bf073e9fd..8a08d69324c 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Boiler/boiler.rsi/meta.json @@ -48,7 +48,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/meta.json index 2862adf2f69..3553c155c63 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Burrower/burrower.rsi/meta.json @@ -15,7 +15,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/meta.json index 1003d5eac74..b8c5f611935 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Carrier/carrier.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "para_0", diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/meta.json index 7fdaf225219..437b08f17a5 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Crusher/crusher.rsi/meta.json @@ -39,7 +39,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/meta.json index 44e8f09aa4e..c5c0d33584f 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/defender.rsi/meta.json @@ -52,7 +52,7 @@ "directions": 4 }, { - "name": "downed" + "name": "crit" }, { "name": "fortify", diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_0.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_0.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_0.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_0.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_1.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_1.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_1.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_1.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_2.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_2.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_2.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_2.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_3.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_crest_3.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_crest_3.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_0.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_0.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_0.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_0.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_1.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_1.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_1.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_1.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_2.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_2.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_2.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_2.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_3.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_downed_3.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_downed_3.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_0.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_0.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_0.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_0.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_1.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_1.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_1.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_1.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_2.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_2.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_2.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_2.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_3.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_fortify_3.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_fortify_3.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_0.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_0.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_0.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_0.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_1.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_1.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_1.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_1.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_2.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_2.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_2.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_2.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_3.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_rest_3.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_rest_3.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_0.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_0.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_0.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_0.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_1.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_1.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_1.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_1.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_2.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_2.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_2.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_2.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_3.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/steelcrest_walk_3.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/defender_walk_3.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/meta.json index 1816276d06e..e706d00b7c5 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Defender/steelcrest_defender.rsi/meta.json @@ -3,52 +3,52 @@ "license": "CC-BY-SA-3.0", "copyright": "Sprites by @aleksh and @.sigma_draconis.", "size": { - "x": 32, - "y": 32 + "x": 64, + "y": 64 }, "states": [ { - "name": "steelcrest_fortify_0", + "name": "defender_fortify_0", "directions": 4 }, { - "name": "steelcrest_fortify_1", + "name": "defender_fortify_1", "directions": 4 }, { - "name": "steelcrest_fortify_2", + "name": "defender_fortify_2", "directions": 4 }, { - "name": "steelcrest_fortify_3", + "name": "defender_fortify_3", "directions": 4 }, { - "name": "steelcrest_rest_0" + "name": "defender_rest_0" }, { - "name": "steelcrest_rest_1" + "name": "defender_rest_1" }, { - "name": "steelcrest_rest_2" + "name": "defender_rest_2" }, { - "name": "steelcrest_rest_3" + "name": "defender_rest_3" }, { - "name": "steelcrest_walk_0", + "name": "defender_walk_0", "directions": 4 }, { - "name": "steelcrest_walk_1", + "name": "defender_walk_1", "directions": 4 }, { - "name": "steelcrest_walk_2", + "name": "defender_walk_2", "directions": 4 }, { - "name": "steelcrest_walk_3", + "name": "defender_walk_3", "directions": 4 }, { @@ -63,7 +63,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "fortify", @@ -73,32 +73,32 @@ "name": "sleeping" }, { - "name": "steelcrest_crest_0", + "name": "defender_crest_0", "directions": 4 }, { - "name": "steelcrest_crest_1", + "name": "defender_crest_1", "directions": 4 }, { - "name": "steelcrest_crest_2", + "name": "defender_crest_2", "directions": 4 }, { - "name": "steelcrest_crest_3", + "name": "defender_crest_3", "directions": 4 }, { - "name": "steelcrest_downed_0" + "name": "defender_downed_0" }, { - "name": "steelcrest_downed_1" + "name": "defender_downed_1" }, { - "name": "steelcrest_downed_2" + "name": "defender_downed_2" }, { - "name": "steelcrest_downed_3" + "name": "defender_downed_3" } ] } diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/meta.json index 525eb150d08..f7bc33ce6e2 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/drone.rsi/meta.json @@ -40,7 +40,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "drone_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_dead.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_dead.png new file mode 100644 index 00000000000..311ed9dd1c8 Binary files /dev/null and b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_dead.png differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/downed_overlay.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_downed.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/downed_overlay.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_downed.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/sleeping_overlay.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_rest.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/sleeping_overlay.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_rest.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/alive_overlay.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_walk.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/alive_overlay.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/gardener_walk.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/meta.json index 05df6fd49cb..4559b4432eb 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/gardener_drone.rsi/meta.json @@ -43,24 +43,27 @@ "name": "sleeping" }, { - "name": "sleeping_overlay" + "name": "gardener_rest" + }, + { + "name": "gardener_dead" }, { "name": "alive", "directions": 4 }, { - "name": "alive_overlay", + "name": "gardener_walk", "directions": 4 }, { "name": "dead" }, { - "name": "downed" + "name": "crit" }, { - "name": "downed_overlay" + "name": "gardener_downed" }, { "name": "drone_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/meta.json index a8f3a476dc2..14921e0300b 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Drone/healer_drone.rsi/meta.json @@ -40,7 +40,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "drone_downed_0" @@ -70,4 +70,4 @@ "name": "drone_rest_1" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/meta.json index bcfa9990e0c..7e997d4559c 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/big_burrower.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/meta.json index 77b3ed93510..0f3b438b35b 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/maid_queen.rsi/meta.json @@ -46,7 +46,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "maid_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/meta.json index 9468eff4a51..5b51caf68d1 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/old_boiler.rsi/meta.json @@ -15,7 +15,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/meta.json index a0463349ff8..3d9f836a6b7 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/princess_lesser_drone.rsi/meta.json @@ -38,7 +38,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "lesser_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/meta.json index f7c0ed23aba..c0f5d893f47 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Extras/slug_larva.rsi/meta.json @@ -33,7 +33,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" } ] } diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/meta.json index 1693d99e319..4ccb8635741 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/hivelord.rsi/meta.json @@ -40,7 +40,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "hivelord_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/meta.json index 8bc4783afa8..4317467e697 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Hivelord/resin_whisperer_hivelord.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "hivelord_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/meta.json index 166f64f3b45..1523308a730 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/LesserDrone/lesser_drone.rsi/meta.json @@ -30,7 +30,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "lesser_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/meta.json index 0d1644b8044..45c7d221882 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Lurker/lurker.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "lurker_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/meta.json index f9419594831..461528d3f85 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/meta.json @@ -15,7 +15,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "impregnated" @@ -38,6 +38,9 @@ }, { "name": "sleeping" + }, + { + "name": "thrown" } ] } diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/thrown.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/thrown.png new file mode 100644 index 00000000000..0f789878fe3 Binary files /dev/null and b/Resources/Textures/_RMC14/Mobs/Xenonids/Parasite/parasite.rsi/thrown.png differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/meta.json index da2e21fd2fa..321665a9868 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/dancer_praetorian.rsi/meta.json @@ -43,7 +43,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "praetorian_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/meta.json index 34ab5518f00..8430b4064da 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/praetorian.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "praetorian_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/meta.json index 34ab5518f00..8430b4064da 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/vanguard_praetorian.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "praetorian_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/meta.json index 62c4bdaca0a..b8e661bb1e8 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Praetorian/warden_praetorian.rsi/meta.json @@ -18,7 +18,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "praetorian_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/ovipositor.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/ovipositor.rsi/meta.json index 8536928b10c..733d790f4f0 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/ovipositor.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/ovipositor.rsi/meta.json @@ -3,19 +3,19 @@ "license": "CC-BY-SA-3.0", "copyright": "Sprites by @aleksh and @.sigma_draconis.", "size": { - "x": 32, - "y": 32 + "x": 96, + "y": 96 }, "states": [ { "name": "normal", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] } diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/meta.json index 51a8edd1165..257ed4ba7e2 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Queen/queen.rsi/meta.json @@ -50,7 +50,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "queen_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/crit.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/crit.png index 27074b93aee..f342b292bb0 100644 Binary files a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/crit.png and b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/crit.png differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/downed.png deleted file mode 100644 index f342b292bb0..00000000000 Binary files a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/downed.png and /dev/null differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/meta.json index d495f9b4b3c..9e74499c773 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/acider_runner_primed.rsi/meta.json @@ -91,9 +91,6 @@ { "name": "dead" }, - { - "name": "downed" - }, { "name": "runner_downed_0" } diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/meta.json index 2a1324a3533..e53b4eb17de 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Runner/runner.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "runner_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/meta.json index 31e7a8ceb31..7e85d693285 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Sentinel/sentinel.rsi/meta.json @@ -15,7 +15,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sentinel_downed_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/meta.json index 774267f628a..87ee5119849 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Spitter/spitter.rsi/meta.json @@ -11,7 +11,7 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/downed.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/crit.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/downed.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/crit.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/meta.json b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/meta.json index 8727885f51b..5d69b377964 100644 --- a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/meta.json +++ b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/meta.json @@ -15,22 +15,22 @@ "name": "dead" }, { - "name": "downed" + "name": "crit" }, { "name": "sleeping" }, { - "name": "warrior_crit_overlay_2" + "name": "warrior_downed_1" }, { - "name": "warrior_crit_overlay_3" + "name": "warrior_downed_2" }, { - "name": "warrior_crit_overlay_4" + "name": "warrior_downed_3" }, { - "name": "warrior_downed_3" + "name": "warrior_downed_4" }, { "name": "warrior_rest_0" diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_3.png deleted file mode 100644 index 9108b741546..00000000000 Binary files a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_3.png and /dev/null differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_1.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_1.png new file mode 100644 index 00000000000..d895fab7bdf Binary files /dev/null and b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_1.png differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_2.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_2.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_2.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_2.png diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_3.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_3.png index d895fab7bdf..9108b741546 100644 Binary files a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_3.png and b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_3.png differ diff --git a/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_4.png b/Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_4.png similarity index 100% rename from Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_crit_overlay_4.png rename to Resources/Textures/_RMC14/Mobs/Xenonids/Warrior/warrior.rsi/warrior_downed_4.png diff --git a/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/cyril_cloves_culkins.png b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/cyril_cloves_culkins.png new file mode 100644 index 00000000000..1a4d360c75e Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/cyril_cloves_culkins.png differ diff --git a/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/dave_big_dave_small.png b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/dave_big_dave_small.png new file mode 100644 index 00000000000..ad4f0e5d7fd Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/dave_big_dave_small.png differ diff --git a/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/mark_sholl.png b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/mark_sholl.png new file mode 100644 index 00000000000..202fc0b79cd Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/mark_sholl.png differ diff --git a/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/meta.json b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/meta.json index 0133c3da2a7..f7598bac220 100644 --- a/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/meta.json +++ b/Resources/Textures/_RMC14/Objects/patron_figurines.rsi/meta.json @@ -249,6 +249,15 @@ }, { "name": "kael_shark_voss" + }, + { + "name": "mark_sholl" + }, + { + "name": "dave_big_dave_small" + }, + { + "name": "cyril_cloves_culkins" } ] } diff --git a/Resources/migration.yml b/Resources/migration.yml index 12a9fee1570..87fb048d311 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -930,3 +930,7 @@ ArmorHelmetM10: ArmorHelmetM10Camo WeldingFuelTank: RMCTankReagentFuel WaterTank: RMCTankReagentWater +# 2024-12-22 +WeldingFuelTankFull: RMCTankReagentFuel +WaterTankFull: RMCTankReagentWater +