From 603098e292832c04ac227da4f8164941dfd53dc5 Mon Sep 17 00:00:00 2001 From: Zekins <136648667+Zekins3366@users.noreply.github.com> Date: Mon, 3 Nov 2025 23:52:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D1=81?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20(#237)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * buildcleanup * resourcescleanup * fixlinter * fixlinter2 * final --- Content.Client/_Wega/Android/AndroidSystem.cs | 4 +- .../_Wega/BloodCult/BloodCultSystem.cs | 53 ++-- .../BloodCult/Ui/BloodConstructMenu.xaml.cs | 11 - .../Ui/BloodConstructUIController.cs | 12 +- .../_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs | 10 - .../BloodCult/Ui/BloodMagicUIController.cs | 4 +- .../_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs | 10 - .../BloodCult/Ui/BloodRitesUIController.cs | 4 +- .../BloodCult/Ui/BloodStructureMenu.xaml.cs | 11 - .../Ui/BloodStructureUIController.cs | 6 +- .../_Wega/BloodCult/Ui/RunesMenu.xaml.cs | 20 +- .../BloodCult/Ui/RunesMenuUIController.cs | 8 +- .../Cartridges/NanoChatUiFragment.xaml | 5 +- .../Cartridges/NanoChatUiFragment.xaml.cs | 4 +- .../DetailExaminableWindow.xaml.cs | 4 +- .../_Wega/Disease/DiseaseMachineSystem.cs | 5 +- .../Genetics/Systems/Disease/DizzyOverlay.cs | 3 +- .../Genetics/Ui/DnaModifierWindow.xaml.cs | 10 +- .../Genetics/Ui/MindCommunicationPanel.cs | 11 +- Content.Client/_Wega/Height/HeightSystem.cs | 30 +- .../InjectorFabticatorVisualsSystem.cs | 6 +- .../InjectorFabticatorBoundUserInterface.cs | 6 +- .../Mining/MiningServerVisualizerSystem.cs | 2 +- .../_Wega/Overlays/ColourblindnessOverlay.cs | 3 +- .../_Wega/Overlays/ListenUpOverlay.cs | 18 +- .../_Wega/Overlays/ListenUpSystem.cs | 10 +- .../_Wega/Shader/NaturalNightVisionOverlay.cs | 3 +- .../_Wega/Shader/NightVisionOverlay.cs | 3 +- .../_Wega/Shader/NoirVisionOverlay.cs | 3 +- .../Surgery/Ui/BodyScannerWindow.xaml.cs | 4 +- .../Ui/TapeRecorderBoundUserInterface.cs | 5 +- .../_Wega/Vampire/Ui/SelectClassMenu.xaml.cs | 10 - .../Vampire/Ui/SelectClassUIController.cs | 4 +- Content.Client/_Wega/Vampire/VampireSystem.cs | 9 +- Content.Client/_Wega/Vehicle/VehicleSystem.cs | 10 +- .../_Wega/Xenobiology/CellVisualsSystem.cs | 4 +- .../_Wega/Xenobiology/SlimeVisualSystem.cs | 3 +- .../Systems/AdminVerbSystem.Smites.cs | 7 +- Content.Server/_Wega/Android/AndroidSystem.cs | 5 +- .../Effects/CoreAnomChangeTempSystem.cs | 2 +- .../BloodCult/BloodCultSystem.Abilities.cs | 41 ++- .../_Wega/BloodCult/BloodCultSystem.cs | 25 +- Content.Server/_Wega/BloodCult/RuneSystem.cs | 55 ++-- .../_Wega/Dirt/WashingMachineSystem.cs | 9 +- .../_Wega/Disease/DiseaseDiagnosisSystem.cs | 14 +- Content.Server/_Wega/Disease/DiseaseSystem.cs | 53 ++-- .../_Wega/Disease/Effects/DiseasePolymorph.cs | 4 +- .../_Wega/Disease/Effects/DiseaseSnough.cs | 2 +- .../FriendlyFaction/FriendlyFactionSystem.cs | 1 - .../Genetics/Systems/Basic/HulkGenSystem.cs | 4 +- .../Systems/Basic/MatterEaterGenSystem.cs | 2 +- .../Genetics/Systems/DnaInjectorSystem.cs | 6 +- .../Systems/DnaModifierConsoleSystem.cs | 14 +- .../Genetics/Systems/DnaModifierSystem.Map.cs | 8 +- .../Genetics/Systems/DnaModifierSystem.cs | 27 +- .../Genetics/Systems/EnsureMarkingSystem.cs | 4 +- .../Intermediate/RegenerationGenSystem.cs | 8 +- .../Systems/Minor/HeatResistanceGenSystem.cs | 2 +- .../Hallucinations/HallucinationsSystem.cs | 1 + .../_Wega/Implants/BodyPartImplantSystem.cs | 5 +- .../_Wega/Implants/HandItemImplantSystem.cs | 2 +- .../_Wega/MartialArts/MartialArtsSystem.cs | 3 +- .../_Wega/MartialArts/Styles/KravMagaStyle.cs | 3 +- .../_Wega/Mining/MiningConsoleSystem.cs | 7 +- .../Operators/SlimeFindFoodOperator.cs | 30 +- .../Operators/SlimeFindTargetOperator.cs | 48 ++-- .../NightLightning/NightLightningSystem.cs | 3 +- Content.Server/_Wega/Pain/PainSystem.cs | 2 +- .../Resomi/Abilities/AgillitySkillSystem.cs | 34 ++- .../Resomi/Abilities/ListenUpSkillSystem.cs | 8 +- .../_Wega/Resomi/Abilities/ListenUpSystem.cs | 11 +- .../_Wega/Shadow/PhotophobiaSystem.cs | 4 +- .../EntitySystems/ResomiAccentSystem.cs | 58 ++-- .../Events/DiseaseOutbreakRule.cs | 16 +- .../Strangulation/StrangulationSystem.cs | 5 +- .../_Wega/Surgery/BodyScannerConsoleSystem.cs | 2 +- .../_Wega/Surgery/SurgerySystem.Graphs.cs | 2 +- .../_Wega/Surgery/SurgerySystem.Operation.cs | 1 - .../_Wega/TapeRecorder/TapeRecorderSystem.cs | 4 +- .../Assorted/UncontrollableCoughComponent.cs | 2 +- .../_Wega/Vampire/VampireSystem.Abilities.cs | 18 +- Content.Server/_Wega/Vampire/VampireSystem.cs | 4 +- .../Machines/SlimeExtractorSystem.cs | 5 +- .../Xenobiology/Mobs/SlimeGrowthSystem.cs | 3 +- .../_Wega/Xenobiology/SlimeAnalyzerSystem.cs | 4 +- .../Wieldable/SharedWieldableSystem.cs | 2 +- .../_Wega/Android/AndroidComponent.cs | 4 +- .../_Wega/Android/SharedAndroidSystem.cs | 7 +- .../_Wega/BloodCult/BloodCultComponents.cs | 24 +- .../_Wega/BloodCult/SharedBloodCultSystem.cs | 8 +- .../_Wega/Body/Systems/HeartSystem.cs | 1 - .../Cartridges/NanoChatCartridgeComponent.cs | 1 - Content.Shared/_Wega/Dirt/SharedDirtSystem.cs | 13 +- .../_Wega/Disease/SharedDiseaseSystem.cs | 10 +- Content.Shared/_Wega/ERP/ERPComponents.cs | 3 - .../Flash/Components/ImpulseFlashComponent.cs | 10 +- .../Components/Basic/HulkGenComponent.cs | 14 +- .../Components/DnaModifierComponent.cs | 10 +- .../DnaModifierInjectorComponents.cs | 2 +- Content.Shared/_Wega/Genetics/Enzymes.cs | 15 +- .../Systems/Disease/DizzyGenSystem.cs | 1 + .../_Wega/Genetics/Ui/DnaModifier.cs | 4 +- .../_Wega/Genetics/UniqueIdentifiersData.cs | 91 ++++++ .../Genetics/UniqueIdentifiersPrototype.cs | 212 -------------- .../Components/HandItemImplantComponent.cs | 1 - .../Implants/SharedInternalStorageSystem.cs | 8 +- .../_Wega/RCD/Systems/RCDUpgradeKitSystem.cs | 7 +- .../Abilities/Hearing/ListenUpComponent.cs | 2 +- .../Hearing/ListenUpSkillComponent.cs | 7 +- .../Hearing/SharedListenUpSkillSystem.cs | 22 +- .../Abilities/SharedAgillitySkillComponent.cs | 2 +- .../Abilities/SharedAgillitySkillSystem.cs | 12 +- .../Abilities/WeaponsUseInabilityComponent.cs | 2 +- Content.Shared/_Wega/Resomi/SharedResomi.cs | 9 +- .../SoundInsulation/SoundInsulationSystem.cs | 2 +- .../Strangulation/StrangulationComponent.cs | 3 - .../Conditions/InternalStorageCondition.cs | 45 +-- .../Prototypes/InternalDamagePrototype.cs | 1 - .../_Wega/Vampire/VampireComponents.cs | 18 +- Content.Shared/_Wega/Vampire/VampireEvents.cs | 11 +- .../_Wega/Vehicle/SharedVehicleSystem.cs | 7 +- Content.Shared/_Wega/Voucher/VoucherSystem.cs | 3 +- .../Components/Mobs/CellModifiedComponent.cs | 1 - .../Systems/Machines/SlimeExtractorSystem.cs | 0 .../Weapons/Guns/Gunshots/deserteagle.ogg | Bin .../Enteties/Clothing/Neck/cloaks.ftl | 4 - .../Enteties/Clothing/Uniforms/jumpskirts.ftl | 47 --- .../Enteties/Clothing/Uniforms/jumpsuits.ftl | 56 ---- .../Enteties/Clothing/shoes/magboots.ftl | 2 - .../Mobs/Customization/Markings/Human.ftl | 8 - .../Mobs/Customization/Markings/demon.ftl | 2 - .../Objects/Device/holoprojectors.ftl | 3 - .../Guns/Ammunition/Magazines/magazines.ftl | 4 - .../Structures/Holographic/projections.ftl | 2 - .../Guns/Ammunition/Magazines/magazines.ftl | 5 - .../Locale/ru-RU/_wega/markings/demon.ftl | 6 + .../Locale/ru-RU/_wega/markings/human.ftl | 9 + .../_wega/entities/clothing/neck/cloaks.ftl | 5 +- .../entities/clothing/shoes/magboots.ftl | 4 +- .../entities/clothing/uniform/jumpsuit.ftl | 4 - .../entities/clothing/uniforms/jumpskirt.ftl | 32 +++ .../entities/clothing/uniforms/jumpsuits.ftl | 42 +++ .../objects/devices/holoprojectors.ftl | 2 + .../guns/ammunition/magazines/pistol.ftl | 6 +- .../guns/ammunition/magazines/rifel.ftl | 2 + .../guns/ammunition/magazines/sniper.ftl | 2 + .../objects/weapons/guns/pistols}/pistols.ftl | 2 +- .../objects/weapons/guns/rifels/rifels.ftl} | 3 +- .../objects/weapons/guns/snipers}/snipers.ftl | 4 +- .../structures/holographic/projections.ftl | 2 + .../Inventories/cargodrobe.yml | 8 +- .../Inventories/clothesmate.yml | 4 +- .../VendingMachines/Inventories/engidrobe.yml | 10 +- .../VendingMachines/Inventories/medidrobe.yml | 16 +- .../VendingMachines/Inventories/scidrobe.yml | 16 +- .../VendingMachines/Inventories/secdrobe.yml | 12 +- .../Inventories/winterdrobe.yml | 70 ++--- .../_ADT/Enteties/Clothing/Neck/cloaks.yml | 21 -- .../_ADT/Enteties/Clothing/Shoes/magboots.yml | 33 --- .../Enteties/Clothing/Uniforms/Jumpskirts.yml | 208 -------------- .../Enteties/Clothing/Uniforms/Jumpsuits.yml | 247 ---------------- .../Mobs/Customization/Markings/tale.yml | 8 - .../Objects/Devices/holoprojectors.yml | 20 -- .../Structures/Holographic/projections.yml | 26 -- Resources/Prototypes/_ADT/tags.yml | 5 - .../Magazines/desert_eagle_mags.yml | 59 ---- Resources/Prototypes/_DeadSpace/tags.yml | 5 - .../Catalog/Fills/Backpacks/duffelbag.yml | 12 +- .../_Wega/Catalog/uplink_catalog.yml | 42 +-- .../Entities/Clothing/Belt/syndie_sheath.yml | 4 +- .../_Wega/Entities/Clothing/Neck/cloaks.yml | 22 ++ .../Entities/Clothing/Shoes/magboots.yml | 36 ++- .../Entities/Clothing/Uniforms/jumpskirt.yml | 208 ++++++++++++++ .../Clothing/Uniforms/jumpsuit_special.yml | 21 -- .../Entities/Clothing/Uniforms/jumpsuits.yml | 269 ++++++++++++++++++ .../Customization/Markings/cyberlimbs.yml | 12 +- .../Mobs/Customization/Markings/demon.yml | 9 + .../Objects/Devices/holoprojectors.yml | 21 ++ .../Guns/Ammunition/Magazines/pistol.yml | 60 ++++ .../Guns/Ammunition/Magazines/rifle.yml} | 10 +- .../Guns/Ammunition/Magazines/sniper.yml | 10 +- .../Objects/Weapons/Guns/Pistols/pistols.yml} | 32 +-- .../Objects/Weapons/Guns/Rifles/rifles.yml} | 14 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 26 +- .../_Wega/Entities/StatusEffects/body.yml | 10 + .../Structures/Holographic/projections.yml | 27 ++ .../Structures/Specific/bloodcult.yml | 15 + .../_Wega/Loadouts/Jobs/Personal/Jumpsuit.yml | 85 +++--- Resources/Prototypes/_Wega/tags.yml | 9 + .../demons/succubus.rsi/meta.json | 15 - .../darkgrey_cloak.rsi/equipped-NECK.png | Bin .../Neck/Cloaks/darkgrey_cloak.rsi/icon.png | Bin .../Cloaks/darkgrey_cloak.rsi/inhand-left.png | Bin .../darkgrey_cloak.rsi/inhand-right.png | Bin .../Neck/Cloaks/darkgrey_cloak.rsi/meta.json | 0 .../Cloaks/gothic_cloak.rsi/equipped-NECK.png | Bin .../Neck/Cloaks/gothic_cloak.rsi/icon.png | Bin .../Cloaks/gothic_cloak.rsi/inhand-left.png | Bin .../Cloaks/gothic_cloak.rsi/inhand-right.png | Bin .../Neck/Cloaks/gothic_cloak.rsi/meta.json | 0 .../Boots/advanced.rsi/equipped-FEET.png | Bin .../Shoes/Boots/advanced.rsi/icon-on.png | Bin .../Shoes/Boots/advanced.rsi/icon.png | Bin .../Shoes/Boots/advanced.rsi/inhand-left.png | Bin .../Shoes/Boots/advanced.rsi/inhand-right.png | Bin .../Shoes/Boots/advanced.rsi/meta.json | 0 .../Boots/advanced.rsi/on-equipped-FEET.png | Bin .../Boots/advanced.rsi/on-inhand-left.png | Bin .../Boots/advanced.rsi/on-inhand-right.png | Bin .../equipped-INNERCLOTHING.png | Bin .../turtleneck_aquamarine_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_aquamarine_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_azure_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_azure_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_black_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_black_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_blue_women.rsi/icon.png | Bin .../turtleneck_blue_women.rsi/inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_blue_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_brown_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_brown_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_green_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_green_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_grey_women.rsi/icon.png | Bin .../turtleneck_grey_women.rsi/inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_grey_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_orange_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_orange_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_pink_women.rsi/icon.png | Bin .../turtleneck_pink_women.rsi/inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_pink_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_purple_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_purple_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_red_women.rsi/icon.png | Bin .../turtleneck_red_women.rsi/inhand-left.png | Bin .../turtleneck_red_women.rsi/inhand-right.png | Bin .../turtleneck_red_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_salat_women.rsi/icon.png | Bin .../turtleneck_salat_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_white_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_white_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_yellow_women.rsi/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_yellow_women.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/tshirt_forchicks.rsi/icon.png | Bin .../Jumpsuit/tshirt_forchicks.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/tshirt_nochicks.rsi/icon.png | Bin .../Jumpsuit/tshirt_nochicks.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_aquamarine.rsi/icon.png | Bin .../turtleneck_aquamarine.rsi/inhand-left.png | Bin .../inhand-right.png | Bin .../turtleneck_aquamarine.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_azure.rsi/icon.png | Bin .../turtleneck_azure.rsi/inhand-left.png | Bin .../turtleneck_azure.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_azure.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_black.rsi/icon.png | Bin .../turtleneck_black.rsi/inhand-left.png | Bin .../turtleneck_black.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_black.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_blacksleeveless.rsi/icon.png | Bin .../turtleneck_blacksleeveless.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_blue.rsi/icon.png | Bin .../turtleneck_blue.rsi/inhand-left.png | Bin .../turtleneck_blue.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_blue.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_brown.rsi/icon.png | Bin .../turtleneck_brown.rsi/inhand-left.png | Bin .../turtleneck_brown.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_brown.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_green.rsi/icon.png | Bin .../turtleneck_green.rsi/inhand-left.png | Bin .../turtleneck_green.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_green.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_grey.rsi/icon.png | Bin .../turtleneck_grey.rsi/inhand-left.png | Bin .../turtleneck_grey.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_grey.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_orange.rsi/icon.png | Bin .../turtleneck_orange.rsi/inhand-left.png | Bin .../turtleneck_orange.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_orange.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_pink.rsi/icon.png | Bin .../turtleneck_pink.rsi/inhand-left.png | Bin .../turtleneck_pink.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_pink.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_purple.rsi/icon.png | Bin .../turtleneck_purple.rsi/inhand-left.png | Bin .../turtleneck_purple.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_purple.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_red.rsi/icon.png | Bin .../turtleneck_red.rsi/inhand-left.png | Bin .../turtleneck_red.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_red.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_salat.rsi/icon.png | Bin .../Jumpsuit/turtleneck_salat.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_salatblack.rsi/icon.png | Bin .../turtleneck_salatblack.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_tactick.rsi/icon.png | Bin .../Jumpsuit/turtleneck_tactick.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_white.rsi/icon.png | Bin .../turtleneck_white.rsi/inhand-left.png | Bin .../turtleneck_white.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_white.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../turtleneck_whitesleeveless.rsi/icon.png | Bin .../turtleneck_whitesleeveless.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/turtleneck_yellow.rsi/icon.png | Bin .../turtleneck_yellow.rsi/inhand-left.png | Bin .../turtleneck_yellow.rsi/inhand-right.png | Bin .../Jumpsuit/turtleneck_yellow.rsi/meta.json | 0 .../Mobs/Customization/demon.rsi/meta.json | 4 + .../Customization/demon.rsi}/succubus.png | Bin .../Customization}/headaugs.rsi/beholder.png | Bin .../Customization}/headaugs.rsi/iron_jaw.png | Bin .../Customization}/headaugs.rsi/malstrem.png | Bin .../Customization}/headaugs.rsi/meta.json | 0 .../headaugs.rsi/terminator.png | Bin .../Devices/Holoprojectors/field.rsi/icon.png | Bin .../Holoprojectors/field.rsi/meta.json | 0 .../Pistol/magazinedeserteagle.rsi/base.png | Bin .../Pistol/magazinedeserteagle.rsi/mag-1.png | Bin .../Pistol/magazinedeserteagle.rsi/meta.json | 0 .../Pistol/magazinedeserteagle.rsi/red.png | Bin .../Magazine/Rifle/ext_rifle_mag.rsi/base.png | Bin .../Rifle/ext_rifle_mag.rsi/mag-1.png | Bin .../Rifle/ext_rifle_mag.rsi/meta.json | 0 .../Magazine/Sniper/snipers.rsi/base.png | Bin .../Magazine/Sniper/snipers.rsi/mag-1.png | Bin .../Magazine/Sniper/snipers.rsi/meta.json | 0 .../Guns/Pistols/deserteagle.rsi/base.png | Bin .../Pistols/deserteagle.rsi/bolt-open.png | Bin .../Pistols/deserteagle.rsi/equipped-BELT.png | Bin .../Guns/Pistols/deserteagle.rsi/icon.png | Bin .../Pistols/deserteagle.rsi/inhand-left.png | Bin .../Pistols/deserteagle.rsi/inhand-right.png | Bin .../Guns/Pistols/deserteagle.rsi/mag-0.png | Bin .../Guns/Pistols/deserteagle.rsi/meta.json | 0 .../Weapons/Guns/Rifles/xc67.rsi/base.png | Bin .../Guns/Rifles/xc67.rsi/bolt-open.png | Bin .../Rifles/xc67.rsi/equipped-BACKPACK.png | Bin .../Rifles/xc67.rsi/equipped-SUITSTORAGE.png | Bin .../Weapons/Guns/Rifles/xc67.rsi/icon.png | Bin .../Guns/Rifles/xc67.rsi/inhand-left.png | Bin .../Guns/Rifles/xc67.rsi/inhand-right.png | Bin .../Weapons/Guns/Rifles/xc67.rsi/mag-0.png | Bin .../Weapons/Guns/Rifles/xc67.rsi/meta.json | 0 .../Rifles/xc67.rsi/wielded-inhand-left.png | Bin .../Rifles/xc67.rsi/wielded-inhand-right.png | Bin .../Guns/Snipers/new_hristov.rsi/base.png | Bin .../Snipers/new_hristov.rsi/bolt-open.png | Bin .../new_hristov.rsi/equipped-BACKPACK.png | Bin .../new_hristov.rsi/equipped-SUITSTORAGE.png | Bin .../Snipers/new_hristov.rsi/inhand-left.png | Bin .../Snipers/new_hristov.rsi/inhand-right.png | Bin .../Guns/Snipers/new_hristov.rsi/meta.json | 0 .../new_hristov.rsi/wielded-inhand-left.png | Bin .../new_hristov.rsi/wielded-inhand-right.png | Bin .../Structures/Holo/field.rsi/icon.png | Bin .../Structures/Holo/field.rsi/meta.json | 0 421 files changed, 1572 insertions(+), 1928 deletions(-) create mode 100644 Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs delete mode 100644 Content.Shared/_Wega/Genetics/UniqueIdentifiersPrototype.cs delete mode 100644 Content.Shared/_Wega/Xenobiology/Components/Mobs/CellModifiedComponent.cs delete mode 100644 Content.Shared/_Wega/Xenobiology/Systems/Machines/SlimeExtractorSystem.cs rename Resources/Audio/{_DeadSpace => _Wega}/Weapons/Guns/Gunshots/deserteagle.ogg (100%) delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Neck/cloaks.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpskirts.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpsuits.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/shoes/magboots.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/Human.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/demon.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Device/holoprojectors.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl delete mode 100644 Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Structures/Holographic/projections.ftl delete mode 100644 Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniform/jumpsuit.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/rifel.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl rename Resources/Locale/ru-RU/{_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Pistols => ss14-ru/prototypes/_wega/entities/objects/weapons/guns/pistols}/pistols.ftl (83%) rename Resources/Locale/ru-RU/{_ADT/prototypes/Enteties/Objects/Weapons/Guns/Rifles/rifle.ftl => ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl} (78%) rename Resources/Locale/ru-RU/{_ADT/prototypes/Enteties/Objects/Weapons/Guns/Snipers => ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers}/snipers.ftl (64%) delete mode 100644 Resources/Prototypes/_ADT/Enteties/Clothing/Neck/cloaks.yml delete mode 100644 Resources/Prototypes/_ADT/Enteties/Clothing/Shoes/magboots.yml delete mode 100644 Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpskirts.yml delete mode 100644 Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpsuits.yml delete mode 100644 Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/tale.yml delete mode 100644 Resources/Prototypes/_ADT/Enteties/Objects/Devices/holoprojectors.yml delete mode 100644 Resources/Prototypes/_ADT/Enteties/Structures/Holographic/projections.yml delete mode 100644 Resources/Prototypes/_ADT/tags.yml delete mode 100644 Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/desert_eagle_mags.yml delete mode 100644 Resources/Prototypes/_DeadSpace/tags.yml delete mode 100644 Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuit_special.yml rename Resources/Prototypes/{_ADT/Enteties => _Wega/Entities}/Mobs/Customization/Markings/cyberlimbs.yml (76%) rename Resources/Prototypes/{_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml => _Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml} (84%) rename Resources/Prototypes/{_ADT/Enteties => _Wega/Entities}/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml (84%) rename Resources/Prototypes/{_DeadSpace/Enteties/Objects/Weapons/Guns/Pistols/desert_eagle.yml => _Wega/Entities/Objects/Weapons/Guns/Pistols/pistols.yml} (69%) rename Resources/Prototypes/{_ADT/Enteties/Objects/Weapons/Guns/Rifles/xc67.yml => _Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml} (81%) rename Resources/Prototypes/{_ADT/Enteties => _Wega/Entities}/Objects/Weapons/Guns/Snipers/snipers.yml (71%) create mode 100644 Resources/Prototypes/_Wega/Entities/StatusEffects/body.yml delete mode 100644 Resources/Textures/_ADT/Mobs/Customization/demons/succubus.rsi/meta.json rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/equipped-NECK.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/gothic_cloak.rsi/equipped-NECK.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/gothic_cloak.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Neck/Cloaks/gothic_cloak.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/equipped-FEET.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/icon-on.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/on-equipped-FEET.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/on-inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Shoes/Boots/advanced.rsi/on-inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/meta.json (100%) rename Resources/Textures/_Wega/Clothing/{Uniform => Uniforms}/Jumpsuit/tshirt_forchicks.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/_Wega/Clothing/{Uniform => Uniforms}/Jumpsuit/tshirt_forchicks.rsi/icon.png (100%) rename Resources/Textures/_Wega/Clothing/{Uniform => Uniforms}/Jumpsuit/tshirt_forchicks.rsi/meta.json (100%) rename Resources/Textures/_Wega/Clothing/{Uniform => Uniforms}/Jumpsuit/tshirt_nochicks.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/_Wega/Clothing/{Uniform => Uniforms}/Jumpsuit/tshirt_nochicks.rsi/icon.png (100%) rename Resources/Textures/_Wega/Clothing/{Uniform => Uniforms}/Jumpsuit/tshirt_nochicks.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/meta.json (100%) rename Resources/Textures/{_ADT/Mobs/Customization/demons/succubus.rsi => _Wega/Mobs/Customization/demon.rsi}/succubus.png (100%) rename Resources/Textures/{_ADT/Mobs/Customization/augments => _Wega/Mobs/Customization}/headaugs.rsi/beholder.png (100%) rename Resources/Textures/{_ADT/Mobs/Customization/augments => _Wega/Mobs/Customization}/headaugs.rsi/iron_jaw.png (100%) rename Resources/Textures/{_ADT/Mobs/Customization/augments => _Wega/Mobs/Customization}/headaugs.rsi/malstrem.png (100%) rename Resources/Textures/{_ADT/Mobs/Customization/augments => _Wega/Mobs/Customization}/headaugs.rsi/meta.json (100%) rename Resources/Textures/{_ADT/Mobs/Customization/augments => _Wega/Mobs/Customization}/headaugs.rsi/terminator.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Devices/Holoprojectors/field.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Devices/Holoprojectors/field.rsi/meta.json (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/base.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/mag-1.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/base.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/mag-1.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/meta.json (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/base.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/bolt-open.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/equipped-BELT.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/icon.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-left.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-right.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/mag-0.png (100%) rename Resources/Textures/{_DeadSpace => _Wega}/Objects/Weapons/Guns/Pistols/deserteagle.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/base.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/bolt-open.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/mag-0.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/base.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/bolt-open.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/meta.json (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/{_ADT => _Wega}/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-right.png (100%) rename Resources/Textures/{_ADT => _Wega}/Structures/Holo/field.rsi/icon.png (100%) rename Resources/Textures/{_ADT => _Wega}/Structures/Holo/field.rsi/meta.json (100%) diff --git a/Content.Client/_Wega/Android/AndroidSystem.cs b/Content.Client/_Wega/Android/AndroidSystem.cs index 31688ebe36..7a942edd39 100644 --- a/Content.Client/_Wega/Android/AndroidSystem.cs +++ b/Content.Client/_Wega/Android/AndroidSystem.cs @@ -1,6 +1,6 @@ -using Content.Shared._Wega.Android; +using Content.Shared.Android; -namespace Content.Client._Wega.Android; +namespace Content.Client.Android; public sealed class AndroidSystem : SharedAndroidSystem { diff --git a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs index f79cb99300..1ce2472b15 100644 --- a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs +++ b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Blood.Cult.Components; using Content.Shared.StatusIcon.Components; using Robust.Client.GameObjects; using Robust.Shared.Prototypes; +using Robust.Shared.Random; using Robust.Shared.Utility; namespace Content.Client.Blood.Cult @@ -13,6 +14,8 @@ namespace Content.Client.Blood.Cult { [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SpriteSystem _sprite = default!; public override void Initialize() { @@ -28,26 +31,18 @@ namespace Content.Client.Blood.Cult private void OnRuneAppearanceChanged(Entity entity, ref AppearanceChangeEvent args) { - if (args.Sprite == null) - return; - - var sprite = args.Sprite; if (!_appearance.TryGetData(entity, RuneColorVisuals.Color, out Color color)) return; - sprite.Color = color; + _sprite.SetColor(entity.Owner, color); } private void OnRuneAppearanceChanged(Entity entity, ref AppearanceChangeEvent args) { - if (args.Sprite == null) - return; - - var sprite = args.Sprite; if (!_appearance.TryGetData(entity, RuneColorVisuals.Color, out Color color)) return; - sprite.Color = color; + _sprite.SetColor(entity.Owner, color); } private void GetCultistIcons(Entity ent, ref GetStatusIconsEvent args) @@ -61,48 +56,48 @@ namespace Content.Client.Blood.Cult if (!TryComp(uid, out var sprite)) return; - if (sprite.LayerMapTryGet(PentagramKey.Halo, out _)) + if (_sprite.LayerMapTryGet(uid, PentagramKey.Halo, out _, true)) return; - var haloVariant = new Random().Next(1, 6); + var haloVariant = _random.Next(1, 6); var haloState = $"halo{haloVariant}"; - var adj = sprite.Bounds.Height / 2 + 1.0f / 32 * 6.0f; - var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(new ResPath("_Wega/Interface/Misc/bloodcult_halo.rsi"), haloState)); - sprite.LayerMapSet(PentagramKey.Halo, layer); + var bounds = _sprite.GetLocalBounds((uid, sprite)); + var adj = bounds.Height / 2 + 1.0f / 32 * 6.0f; - sprite.LayerSetOffset(layer, new Vector2(0.0f, adj)); - sprite.LayerSetShader(layer, "unshaded"); + var layerData = new PrototypeLayerData + { + Shader = "unshaded", + RsiPath = "_Wega/Interface/Misc/bloodcult_halo.rsi", + State = haloState, + Offset = new Vector2(0.0f, adj) + }; + + var layer = _sprite.AddLayer(uid, layerData, null); + _sprite.LayerMapSet(uid, PentagramKey.Halo, layer); } private void RemoveHalo(EntityUid uid, PentagramDisplayComponent component, ComponentShutdown args) { - if (!TryComp(uid, out var sprite)) - return; - - if (sprite.LayerMapTryGet(PentagramKey.Halo, out var layer)) + if (_sprite.LayerMapTryGet(uid, PentagramKey.Halo, out var layer, true)) { - sprite.RemoveLayer(layer); + _sprite.RemoveLayer(uid, layer); } } private void OnSoulStoneAppearanceChanged(EntityUid uid, StoneSoulComponent component, ref AppearanceChangeEvent args) { - if (args.Sprite == null) - return; - - var sprite = args.Sprite; if (!_appearance.TryGetData(uid, StoneSoulVisuals.HasSoul, out bool hasSoul)) hasSoul = false; - sprite.LayerSetVisible(StoneSoulVisualLayers.Soul, hasSoul); + _sprite.LayerSetVisible(uid, StoneSoulVisualLayers.Soul, hasSoul); if (!hasSoul) { - sprite.LayerSetVisible(StoneSoulVisualLayers.Base, true); + _sprite.LayerSetVisible(uid, StoneSoulVisualLayers.Base, true); } else { - sprite.LayerSetVisible(StoneSoulVisualLayers.Base, false); + _sprite.LayerSetVisible(uid, StoneSoulVisualLayers.Base, false); } } diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs index be5201ae3e..81c261e10f 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs @@ -14,7 +14,6 @@ public sealed partial class BloodConstructMenu : RadialMenu [Dependency] private readonly ISharedPlayerManager _playerManager = default!; public event Action? OnSelectConstruct; - public bool IsDisposed { get; private set; } private NetEntity _constructUid; private NetEntity _mindUid; @@ -47,14 +46,4 @@ public sealed partial class BloodConstructMenu : RadialMenu _entityNetworkManager.SendSystemNetworkMessage(new BloodConstructMenuClosedEvent(netEntity, _constructUid, _mindUid, constructName)); Close(); } - - public new void Close() - { - if (!IsDisposed) - { - IsDisposed = true; - Dispose(); - } - } } - diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs index db1cb049fd..94dad53fe3 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs @@ -12,7 +12,6 @@ namespace Content.Client.Select.Construct.UI [Dependency] private readonly IEntityManager _entityManager = default!; private BloodConstructMenu? _menu; - private bool _menuDisposed = false; public override void Initialize() { @@ -27,10 +26,9 @@ namespace Content.Client.Select.Construct.UI if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity) { - if (_menu is null || _menu.IsDisposed) + if (_menu is null) { _menu = _uiManager.CreateWindow(); - _menu.OnClose += OnMenuClosed; _menu.SetData(args.ConstructUid, args.Mind); @@ -43,18 +41,12 @@ namespace Content.Client.Select.Construct.UI Timer.Spawn(30000, () => { - if (_menu != null && !_menuDisposed) + if (_menu != null) { _menu.Close(); } }); } } - - private void OnMenuClosed() - { - _menuDisposed = true; - _menu = null; - } } } diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs index 64cdc2ece0..c18c4038fc 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs @@ -14,7 +14,6 @@ public sealed partial class BloodMagicMenu : RadialMenu [Dependency] private readonly ISharedPlayerManager _playerManager = default!; public event Action? OnSelectSpell; - public bool IsDisposed { get; private set; } public BloodMagicMenu() { @@ -45,14 +44,5 @@ public sealed partial class BloodMagicMenu : RadialMenu _entityNetworkManager.SendSystemNetworkMessage(new BloodMagicMenuClosedEvent(netEntity, spellName)); Close(); } - - public new void Close() - { - if (!IsDisposed) - { - IsDisposed = true; - Dispose(); - } - } } diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs index 130b8d071c..49721973ff 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs @@ -11,7 +11,6 @@ namespace Content.Client.Blood.Magic.UI [Dependency] private readonly IEntityManager _entityManager = default!; private BloodMagicMenu? _menu; - private bool _menuDisposed = false; public override void Initialize() { @@ -25,7 +24,7 @@ namespace Content.Client.Blood.Magic.UI var userEntity = _entityManager.GetEntity(args.Uid); if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity) { - if (_menu is null || _menu.IsDisposed) + if (_menu is null) { _menu = _uiManager.CreateWindow(); _menu.OnClose += OnMenuClosed; @@ -40,7 +39,6 @@ namespace Content.Client.Blood.Magic.UI private void OnMenuClosed() { - _menuDisposed = true; _menu = null; } } diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs index 22bbcca667..1d6f22ead8 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs @@ -14,7 +14,6 @@ public sealed partial class BloodRitesMenu : RadialMenu [Dependency] private readonly ISharedPlayerManager _playerManager = default!; public event Action? OnSelectRites; - public bool IsDisposed { get; private set; } public BloodRitesMenu() { @@ -39,14 +38,5 @@ public sealed partial class BloodRitesMenu : RadialMenu _entityNetworkManager.SendSystemNetworkMessage(new BloodRitesMenuClosedEvent(netEntity, ritesName)); Close(); } - - public new void Close() - { - if (!IsDisposed) - { - IsDisposed = true; - Dispose(); - } - } } diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs index 20bed19af1..104175b056 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs @@ -11,7 +11,6 @@ namespace Content.Client.Blood.Rites.UI [Dependency] private readonly IEntityManager _entityManager = default!; private BloodRitesMenu? _menu; - private bool _menuDisposed = false; public override void Initialize() { @@ -25,7 +24,7 @@ namespace Content.Client.Blood.Rites.UI var userEntity = _entityManager.GetEntity(args.Uid); if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity) { - if (_menu is null || _menu.IsDisposed) + if (_menu is null) { _menu = _uiManager.CreateWindow(); _menu.OnClose += OnMenuClosed; @@ -40,7 +39,6 @@ namespace Content.Client.Blood.Rites.UI private void OnMenuClosed() { - _menuDisposed = true; _menu = null; } } diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs index cbfb0cba46..6ed14c0591 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs @@ -19,7 +19,6 @@ public sealed partial class BloodStructureMenu : RadialMenu [Dependency] private readonly ISharedPlayerManager _playerManager = default!; public event Action? OnSelectItem; - public bool IsDisposed { get; private set; } private NetEntity _structure; public BloodStructureMenu() @@ -80,14 +79,4 @@ public sealed partial class BloodStructureMenu : RadialMenu _entityNetworkManager.SendSystemNetworkMessage(new BloodStructureMenuClosedEvent(netEntity, name, _structure)); Close(); } - - public new void Close() - { - if (!IsDisposed) - { - IsDisposed = true; - Dispose(); - } - } } - diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs index e00d801010..7807859b33 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs @@ -12,7 +12,6 @@ namespace Content.Client.Structure.UI [Dependency] private readonly IEntityManager _entityManager = default!; private BloodStructureMenu? _menu; - private bool _menuDisposed = false; public override void Initialize() { @@ -26,7 +25,7 @@ namespace Content.Client.Structure.UI var userEntity = _entityManager.GetEntity(args.Uid); if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity) { - if (_menu is null || _menu.IsDisposed) + if (_menu is null) { _menu = _uiManager.CreateWindow(); _menu.OnClose += OnMenuClosed; @@ -42,7 +41,7 @@ namespace Content.Client.Structure.UI Timer.Spawn(30000, () => { - if (_menu != null && !_menuDisposed) + if (_menu != null) { _menu.Close(); } @@ -52,7 +51,6 @@ namespace Content.Client.Structure.UI private void OnMenuClosed() { - _menuDisposed = true; _menu = null; } } diff --git a/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs index 1e1b0bbc3d..33213acbcd 100644 --- a/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs @@ -78,7 +78,6 @@ public sealed partial class EmpoweringRuneMenu : RadialMenu [Dependency] private readonly ISharedPlayerManager _playerManager = default!; public event Action? OnSelectSpell; - public bool IsDisposed { get; private set; } public EmpoweringRuneMenu() { @@ -109,15 +108,6 @@ public sealed partial class EmpoweringRuneMenu : RadialMenu _entityNetworkManager.SendSystemNetworkMessage(new EmpoweringRuneMenuClosedEvent(netEntity, spellName)); Close(); } - - public new void Close() - { - if (!IsDisposed) - { - IsDisposed = true; - Dispose(); - } - } } public sealed partial class SummoningRunePanelMenu : DefaultWindow @@ -138,13 +128,11 @@ public sealed partial class SummoningRunePanelMenu : DefaultWindow private void InitializeButtons() { - foreach (var cultist in _entityManager.EntityQuery()) + var cultistQuery = _entityManager.EntityQueryEnumerator(); + while (cultistQuery.MoveNext(out var uid, out _, out var metaData)) { - if (_entityManager.TryGetComponent(cultist.Owner, out var metaData)) - { - var entityName = metaData.EntityName; - AddCultistButton(entityName, cultist.Owner); - } + var entityName = metaData.EntityName; + AddCultistButton(entityName, uid); } } diff --git a/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs b/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs index b2ba2faa8a..3d57eea8c1 100644 --- a/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs +++ b/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs @@ -12,7 +12,6 @@ namespace Content.Client.Runes.Panel.Ui [Dependency] private readonly IEntityManager _entityManager = default!; private RunesPanelMenu? _panel; - private bool _panelDisposed = false; public override void Initialize() { @@ -42,7 +41,6 @@ namespace Content.Client.Runes.Panel.Ui private void OnMenuClosed() { - _panelDisposed = true; _panel = null; } } @@ -68,7 +66,7 @@ namespace Content.Client.Runes.Panel.Ui var userEntity = _entityManager.GetEntity(args.Uid); if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity) { - if (_menu is null || _menu.IsDisposed) + if (_menu is null) { _menu = _uiManager.CreateWindow(); _menu.OnClose += OnMenuClosed; @@ -103,7 +101,6 @@ namespace Content.Client.Runes.Panel.Ui [Dependency] private readonly IEntityManager _entityManager = default!; private SummoningRunePanelMenu? _panel; - private bool _panelDisposed = false; public override void Initialize() { @@ -131,7 +128,7 @@ namespace Content.Client.Runes.Panel.Ui Timer.Spawn(30000, () => { - if (_panel != null && !_panelDisposed) + if (_panel != null) { _panel.Close(); } @@ -141,7 +138,6 @@ namespace Content.Client.Runes.Panel.Ui private void OnMenuClosed() { - _panelDisposed = true; _panel = null; } } diff --git a/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml index 07cc6cb1c5..cdab60e977 100644 --- a/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml +++ b/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml @@ -62,7 +62,7 @@ - +