From 24810d916b75da6e0a3dc1ba8ba2e3a8e3e213f3 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 10 Sep 2023 07:20:27 +0100 Subject: [PATCH] ninja 2 electric boogaloo (#15534) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Communications/CommsHackerSystem.cs | 10 + .../Ninja/Systems/NinjaGlovesSystem.cs | 10 + .../Ninja/Systems/NinjaSuitSystem.cs | 24 ++ Content.Client/Ninja/Systems/NinjaSystem.cs | 12 + .../Research/ResearchStealerSystem.cs | 10 + .../Systems/AdminVerbSystem.Antags.cs | 26 +- .../Communications/CommsHackerSystem.cs | 89 ++++++ Content.Server/Doors/Systems/DoorSystem.cs | 1 - .../Electrocution/ElectrocutionSystem.cs | 12 +- Content.Server/Emp/EmpSystem.cs | 12 + .../Components/AutomatedTimerComponent.cs | 9 + .../EntitySystems/TriggerSystem.OnUse.cs | 2 +- .../Rules/Components/NinjaRuleComponent.cs | 37 +++ .../GameTicking/Rules/NinjaRuleSystem.cs | 23 ++ Content.Server/Implants/AutoImplantSystem.cs | 21 ++ .../Components/AutoImplantComponent.cs | 17 + Content.Server/Jobs/AddImplantSpecial.cs | 17 +- Content.Server/Mind/MindSystem.cs | 13 +- .../Ninja/Systems/BatteryDrainerSystem.cs | 100 ++++++ .../Ninja/Systems/NinjaGlovesSystem.cs | 102 ++++++ .../Ninja/Systems/NinjaSuitSystem.cs | 147 +++++++++ .../Ninja/Systems/SpaceNinjaSystem.cs | 301 ++++++++++++++++++ .../Ninja/Systems/SpiderChargeSystem.cs | 78 +++++ .../Ninja/Systems/StunProviderSystem.cs | 60 ++++ .../Conditions/DoorjackCondition.cs | 70 ++++ .../Conditions/SpiderChargeCondition.cs | 75 +++++ .../Conditions/StealResearchCondition.cs | 70 ++++ .../Objectives/Conditions/SurviveCondition.cs | 58 ++++ .../Objectives/Conditions/TerrorCondition.cs | 57 ++++ .../Requirements/NinjaRequirement.cs | 18 ++ .../SpiderChargeTargetRequirement.cs | 19 ++ .../Power/EntitySystems/BatterySystem.cs | 11 + Content.Server/PowerCell/PowerCellSystem.cs | 10 + .../Research/Systems/ResearchStealerSystem.cs | 39 +++ Content.Server/Roles/NinjaRoleComponent.cs | 40 +++ Content.Server/Roles/RoleSystem.cs | 1 + .../Components/NinjaSpawnRuleComponent.cs | 16 + .../StationEvents/Events/NinjaSpawnRule.cs | 51 +++ Content.Shared/Alert/AlertType.cs | 3 +- .../Communications/CommsHackerComponent.cs | 47 +++ .../Communications/SharedCommsHackerSystem.cs | 28 ++ .../Containers/ItemSlot/ItemSlotsComponent.cs | 9 + .../Containers/ItemSlot/ItemSlotsSystem.cs | 2 +- .../SharedElectrocutionSystem.cs | 18 ++ Content.Shared/Emag/Systems/EmagSystem.cs | 15 +- .../Implants/SharedSubdermalImplantSystem.cs | 22 ++ Content.Shared/Interaction/InteractHand.cs | 14 + .../Interaction/SharedInteractionSystem.cs | 9 + Content.Shared/Mind/SharedMindSystem.cs | 34 +- .../Components/BatteryDrainerComponent.cs | 38 +++ .../Ninja/Components/DashAbilityComponent.cs | 33 ++ .../Ninja/Components/EmagProviderComponent.cs | 28 ++ .../Ninja/Components/EnergyKatanaComponent.cs | 12 + .../Ninja/Components/NinjaGlovesComponent.cs | 45 +++ .../Ninja/Components/NinjaSuitComponent.cs | 125 ++++++++ .../Ninja/Components/SpaceNinjaComponent.cs | 38 +++ .../Ninja/Components/SpiderChargeComponent.cs | 19 ++ .../Ninja/Components/StunProviderComponent.cs | 67 ++++ .../Ninja/Systems/DashAbilitySystem.cs | 118 +++++++ .../Ninja/Systems/EmagProviderSystem.cs | 72 +++++ .../Ninja/Systems/EnergyKatanaSystem.cs | 47 +++ .../Systems/SharedBatteryDrainerSystem.cs | 69 ++++ .../Ninja/Systems/SharedNinjaGlovesSystem.cs | 116 +++++++ .../Ninja/Systems/SharedNinjaSuitSystem.cs | 139 ++++++++ .../Ninja/Systems/SharedSpaceNinjaSystem.cs | 89 ++++++ .../Ninja/Systems/SharedStunProviderSystem.cs | 32 ++ .../Components/ResearchStealerComponent.cs | 17 + .../Systems/SharedResearchStealerSystem.cs | 63 ++++ .../Research/Systems/SharedResearchSystem.cs | 14 +- Resources/Audio/Misc/attributions.yml | 5 + Resources/Audio/Misc/ninja_greeting.ogg | Bin 0 -> 61293 bytes .../Locale/en-US/administration/antag.ftl | 9 +- Resources/Locale/en-US/alerts/alerts.ftl | 3 + .../components/battery-drainer-component.ftl | 3 + .../Locale/en-US/communications/terror.ftl | 2 + Resources/Locale/en-US/guidebook/guides.ftl | 1 + Resources/Locale/en-US/ninja/gloves.ftl | 6 + Resources/Locale/en-US/ninja/katana.ftl | 6 + .../Locale/en-US/ninja/ninja-actions.ftl | 21 ++ Resources/Locale/en-US/ninja/role.ftl | 8 + .../Locale/en-US/ninja/spider-charge.ftl | 2 + .../conditions/doorjack-condition.ftl | 2 + .../conditions/spider-charge-condition.ftl | 3 + .../conditions/steal-research-condition.ftl | 2 + .../conditions/survive-condition.ftl | 2 + .../conditions/terror-condition.ftl | 2 + .../Locale/en-US/prototypes/roles/antags.ftl | 3 + Resources/Prototypes/Actions/ninja.yml | 84 +++++ Resources/Prototypes/Alerts/alerts.yml | 1 + Resources/Prototypes/Alerts/ninja.yml | 23 ++ .../Fills/Backpacks/StarterGear/satchel.yml | 14 + .../Entities/Clothing/Eyes/glasses.yml | 12 + .../Entities/Clothing/Hands/gloves.yml | 13 + .../Entities/Clothing/Head/helmets.yml | 4 +- .../Entities/Clothing/Masks/masks.yml | 14 + .../Entities/Clothing/OuterClothing/suits.yml | 31 +- .../Entities/Clothing/Shoes/specific.yml | 4 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 + .../Prototypes/Entities/Effects/sparks.yml | 19 ++ .../Entities/Markers/Spawners/ghost_roles.yml | 19 ++ .../Prototypes/Entities/Mobs/Player/human.yml | 21 ++ .../Entities/Objects/Devices/pinpointer.yml | 8 + .../Entities/Objects/Weapons/Bombs/spider.yml | 47 +++ .../Entities/Objects/Weapons/Melee/sword.yml | 31 ++ .../Weapons/Throwable/throwing_stars.yml | 10 + Resources/Prototypes/GameRules/events.yml | 12 + Resources/Prototypes/GameRules/midround.yml | 19 ++ Resources/Prototypes/Guidebook/antagonist.yml | 6 + .../Prototypes/Objectives/ninjaObjectives.yml | 40 +++ Resources/Prototypes/Roles/Antags/ninja.yml | 6 + .../Roles/Jobs/Fun/misc_startinggear.yml | 21 +- .../Guidebook/Antagonist/SpaceNinja.xml | 74 +++++ .../Glasses/ninjavisor.rsi/equipped-EYES.png | Bin 0 -> 395 bytes .../Eyes/Glasses/ninjavisor.rsi/icon.png | Bin 0 -> 201 bytes .../Glasses/ninjavisor.rsi/inhand-left.png | Bin 0 -> 343 bytes .../Glasses/ninjavisor.rsi/inhand-right.png | Bin 0 -> 352 bytes .../Eyes/Glasses/ninjavisor.rsi/meta.json | 26 ++ .../spaceninja.rsi/equipped-HELMET.png | Bin 728 -> 638 bytes .../Head/Helmets/spaceninja.rsi/icon.png | Bin 242 -> 194 bytes .../Helmets/spaceninja.rsi/inhand-left.png | Bin 614 -> 564 bytes .../Helmets/spaceninja.rsi/inhand-right.png | Bin 622 -> 564 bytes .../Head/Helmets/spaceninja.rsi/meta.json | 2 +- .../Clothing/Mask/ninja.rsi/equipped-MASK.png | Bin 0 -> 834 bytes .../Textures/Clothing/Mask/ninja.rsi/icon.png | Bin 0 -> 647 bytes .../Clothing/Mask/ninja.rsi/inhand-left.png | Bin 0 -> 799 bytes .../Clothing/Mask/ninja.rsi/inhand-right.png | Bin 0 -> 750 bytes .../Clothing/Mask/ninja.rsi/meta.json | 26 ++ .../ninja.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1429 bytes .../Uniforms/Jumpsuit/ninja.rsi/icon.png | Bin 0 -> 468 bytes .../Jumpsuit/ninja.rsi/inhand-left.png | Bin 0 -> 617 bytes .../Jumpsuit/ninja.rsi/inhand-right.png | Bin 0 -> 655 bytes .../Uniforms/Jumpsuit/ninja.rsi/meta.json | 26 ++ .../Textures/Effects/sparks.rsi/meta.json | 28 ++ .../Textures/Effects/sparks.rsi/sparks.png | Bin 0 -> 1065 bytes .../Alerts/ninja_power.rsi/meta.json | 131 ++++++++ .../Alerts/ninja_power.rsi/power0.png | Bin 0 -> 1697 bytes .../Alerts/ninja_power.rsi/power1.png | Bin 0 -> 1782 bytes .../Alerts/ninja_power.rsi/power2.png | Bin 0 -> 1793 bytes .../Alerts/ninja_power.rsi/power3.png | Bin 0 -> 1797 bytes .../Alerts/ninja_power.rsi/power4.png | Bin 0 -> 1796 bytes .../Alerts/ninja_power.rsi/power5.png | Bin 0 -> 1822 bytes .../Alerts/ninja_power.rsi/power6.png | Bin 0 -> 1777 bytes .../Alerts/ninja_power.rsi/power7.png | Bin 0 -> 1729 bytes .../Weapons/Bombs/spidercharge.rsi/icon.png | Bin 0 -> 790 bytes .../Bombs/spidercharge.rsi/inhand-left.png | Bin 0 -> 752 bytes .../Bombs/spidercharge.rsi/inhand-right.png | Bin 0 -> 765 bytes .../Weapons/Bombs/spidercharge.rsi/meta.json | 31 ++ .../Weapons/Bombs/spidercharge.rsi/primed.png | Bin 0 -> 920 bytes .../Melee/energykatana.rsi/equipped-BELT.png | Bin 0 -> 468 bytes .../Weapons/Melee/energykatana.rsi/icon.png | Bin 0 -> 740 bytes .../Melee/energykatana.rsi/inhand-left.png | Bin 0 -> 875 bytes .../Melee/energykatana.rsi/inhand-right.png | Bin 0 -> 993 bytes .../Weapons/Melee/energykatana.rsi/meta.json | 26 ++ 153 files changed, 3892 insertions(+), 78 deletions(-) create mode 100644 Content.Client/Communications/CommsHackerSystem.cs create mode 100644 Content.Client/Ninja/Systems/NinjaGlovesSystem.cs create mode 100644 Content.Client/Ninja/Systems/NinjaSuitSystem.cs create mode 100644 Content.Client/Ninja/Systems/NinjaSystem.cs create mode 100644 Content.Client/Research/ResearchStealerSystem.cs create mode 100644 Content.Server/Communications/CommsHackerSystem.cs create mode 100644 Content.Server/Explosion/Components/AutomatedTimerComponent.cs create mode 100644 Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs create mode 100644 Content.Server/GameTicking/Rules/NinjaRuleSystem.cs create mode 100644 Content.Server/Implants/AutoImplantSystem.cs create mode 100644 Content.Server/Implants/Components/AutoImplantComponent.cs create mode 100644 Content.Server/Ninja/Systems/BatteryDrainerSystem.cs create mode 100644 Content.Server/Ninja/Systems/NinjaGlovesSystem.cs create mode 100644 Content.Server/Ninja/Systems/NinjaSuitSystem.cs create mode 100644 Content.Server/Ninja/Systems/SpaceNinjaSystem.cs create mode 100644 Content.Server/Ninja/Systems/SpiderChargeSystem.cs create mode 100644 Content.Server/Ninja/Systems/StunProviderSystem.cs create mode 100644 Content.Server/Objectives/Conditions/DoorjackCondition.cs create mode 100644 Content.Server/Objectives/Conditions/SpiderChargeCondition.cs create mode 100644 Content.Server/Objectives/Conditions/StealResearchCondition.cs create mode 100644 Content.Server/Objectives/Conditions/SurviveCondition.cs create mode 100644 Content.Server/Objectives/Conditions/TerrorCondition.cs create mode 100644 Content.Server/Objectives/Requirements/NinjaRequirement.cs create mode 100644 Content.Server/Objectives/Requirements/SpiderChargeTargetRequirement.cs create mode 100644 Content.Server/Research/Systems/ResearchStealerSystem.cs create mode 100644 Content.Server/Roles/NinjaRoleComponent.cs create mode 100644 Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs create mode 100644 Content.Server/StationEvents/Events/NinjaSpawnRule.cs create mode 100644 Content.Shared/Communications/CommsHackerComponent.cs create mode 100644 Content.Shared/Communications/SharedCommsHackerSystem.cs create mode 100644 Content.Shared/Ninja/Components/BatteryDrainerComponent.cs create mode 100644 Content.Shared/Ninja/Components/DashAbilityComponent.cs create mode 100644 Content.Shared/Ninja/Components/EmagProviderComponent.cs create mode 100644 Content.Shared/Ninja/Components/EnergyKatanaComponent.cs create mode 100644 Content.Shared/Ninja/Components/NinjaGlovesComponent.cs create mode 100644 Content.Shared/Ninja/Components/NinjaSuitComponent.cs create mode 100644 Content.Shared/Ninja/Components/SpaceNinjaComponent.cs create mode 100644 Content.Shared/Ninja/Components/SpiderChargeComponent.cs create mode 100644 Content.Shared/Ninja/Components/StunProviderComponent.cs create mode 100644 Content.Shared/Ninja/Systems/DashAbilitySystem.cs create mode 100644 Content.Shared/Ninja/Systems/EmagProviderSystem.cs create mode 100644 Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs create mode 100644 Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs create mode 100644 Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs create mode 100644 Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs create mode 100644 Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs create mode 100644 Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs create mode 100644 Content.Shared/Research/Components/ResearchStealerComponent.cs create mode 100644 Content.Shared/Research/Systems/SharedResearchStealerSystem.cs create mode 100644 Resources/Audio/Misc/ninja_greeting.ogg create mode 100644 Resources/Locale/en-US/battery/components/battery-drainer-component.ftl create mode 100644 Resources/Locale/en-US/communications/terror.ftl create mode 100644 Resources/Locale/en-US/ninja/gloves.ftl create mode 100644 Resources/Locale/en-US/ninja/katana.ftl create mode 100644 Resources/Locale/en-US/ninja/ninja-actions.ftl create mode 100644 Resources/Locale/en-US/ninja/role.ftl create mode 100644 Resources/Locale/en-US/ninja/spider-charge.ftl create mode 100644 Resources/Locale/en-US/objectives/conditions/doorjack-condition.ftl create mode 100644 Resources/Locale/en-US/objectives/conditions/spider-charge-condition.ftl create mode 100644 Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl create mode 100644 Resources/Locale/en-US/objectives/conditions/survive-condition.ftl create mode 100644 Resources/Locale/en-US/objectives/conditions/terror-condition.ftl create mode 100644 Resources/Prototypes/Actions/ninja.yml create mode 100644 Resources/Prototypes/Alerts/ninja.yml create mode 100644 Resources/Prototypes/Entities/Effects/sparks.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml create mode 100644 Resources/Prototypes/GameRules/midround.yml create mode 100644 Resources/Prototypes/Objectives/ninjaObjectives.yml create mode 100644 Resources/Prototypes/Roles/Antags/ninja.yml create mode 100644 Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/ninja.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/ninja.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json create mode 100644 Resources/Textures/Effects/sparks.rsi/meta.json create mode 100644 Resources/Textures/Effects/sparks.rsi/sparks.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/meta.json create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power0.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power1.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power2.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power3.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power4.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power5.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power6.png create mode 100644 Resources/Textures/Interface/Alerts/ninja_power.rsi/power7.png create mode 100644 Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json diff --git a/Content.Client/Communications/CommsHackerSystem.cs b/Content.Client/Communications/CommsHackerSystem.cs new file mode 100644 index 0000000000..3459dd1cd4 --- /dev/null +++ b/Content.Client/Communications/CommsHackerSystem.cs @@ -0,0 +1,10 @@ +using Content.Shared.Communications; + +namespace Content.Client.Communications; + +/// +/// Does nothing special, only exists to provide a client implementation. +/// +public sealed class CommsHackerSystem : SharedCommsHackerSystem +{ +} diff --git a/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs new file mode 100644 index 0000000000..7758c3d7e2 --- /dev/null +++ b/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs @@ -0,0 +1,10 @@ +using Content.Shared.Ninja.Systems; + +namespace Content.Client.Ninja.Systems; + +/// +/// Does nothing special, only exists to provide a client implementation. +/// +public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem +{ +} diff --git a/Content.Client/Ninja/Systems/NinjaSuitSystem.cs b/Content.Client/Ninja/Systems/NinjaSuitSystem.cs new file mode 100644 index 0000000000..fde1801b37 --- /dev/null +++ b/Content.Client/Ninja/Systems/NinjaSuitSystem.cs @@ -0,0 +1,24 @@ +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Ninja.Components; +using Content.Shared.Ninja.Systems; + +namespace Content.Client.Ninja.Systems; + +/// +/// Disables cloak prediction since client has no knowledge of battery power. +/// Cloak will still be enabled after server tells it. +/// +public sealed class NinjaSuitSystem : SharedNinjaSuitSystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAttemptStealth); + } + + private void OnAttemptStealth(EntityUid uid, NinjaSuitComponent comp, AttemptStealthEvent args) + { + args.Cancel(); + } +} diff --git a/Content.Client/Ninja/Systems/NinjaSystem.cs b/Content.Client/Ninja/Systems/NinjaSystem.cs new file mode 100644 index 0000000000..aa2fa2047f --- /dev/null +++ b/Content.Client/Ninja/Systems/NinjaSystem.cs @@ -0,0 +1,12 @@ +using Content.Shared.Ninja.Systems; + +namespace Content.Client.Ninja.Systems; + +/// +/// Currently does nothing special clientside. +/// All functionality is in shared and server. +/// Only exists to prevent crashing. +/// +public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem +{ +} diff --git a/Content.Client/Research/ResearchStealerSystem.cs b/Content.Client/Research/ResearchStealerSystem.cs new file mode 100644 index 0000000000..31909044e4 --- /dev/null +++ b/Content.Client/Research/ResearchStealerSystem.cs @@ -0,0 +1,10 @@ +using Content.Shared.Research.Systems; + +namespace Content.Client.Research; + +/// +/// Does nothing special, only exists to provide a client implementation. +/// +public sealed class ResearchStealerSystem : EntitySystem +{ +} diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index ccd2778008..b6e8a0d300 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -1,4 +1,5 @@ using Content.Server.GameTicking.Rules; +using Content.Server.Ninja.Systems; using Content.Server.Zombies; using Content.Shared.Administration; using Content.Shared.Database; @@ -15,6 +16,7 @@ public sealed partial class AdminVerbSystem { [Dependency] private readonly ZombieSystem _zombie = default!; [Dependency] private readonly TraitorRuleSystem _traitorRule = default!; + [Dependency] private readonly SpaceNinjaSystem _ninja = default!; [Dependency] private readonly NukeopsRuleSystem _nukeopsRule = default!; [Dependency] private readonly PiratesRuleSystem _piratesRule = default!; [Dependency] private readonly SharedMindSystem _minds = default!; @@ -35,7 +37,7 @@ public sealed partial class AdminVerbSystem Verb traitor = new() { - Text = "Make Traitor", + Text = Loc.GetString("admin-verb-text-make-traitor"), Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Structures/Wallmounts/posters.rsi"), "poster5_contraband"), Act = () => @@ -54,7 +56,7 @@ public sealed partial class AdminVerbSystem Verb zombie = new() { - Text = "Make Zombie", + Text = Loc.GetString("admin-verb-text-make-zombie"), Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/Actions/zombie-turn.png")), Act = () => @@ -69,7 +71,7 @@ public sealed partial class AdminVerbSystem Verb nukeOp = new() { - Text = "Make nuclear operative", + Text = Loc.GetString("admin-verb-text-make-nuclear-operative"), Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Wallmounts/signs.rsi"), "radiation"), Act = () => @@ -86,7 +88,7 @@ public sealed partial class AdminVerbSystem Verb pirate = new() { - Text = "Make Pirate", + Text = Loc.GetString("admin-verb-text-make-pirate"), Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hats/pirate.rsi"), "icon"), Act = () => @@ -101,5 +103,21 @@ public sealed partial class AdminVerbSystem }; args.Verbs.Add(pirate); + Verb spaceNinja = new() + { + Text = Loc.GetString("admin-verb-text-make-space-ninja"), + Category = VerbCategory.Antag, + Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Weapons/Melee/energykatana.rsi"), "icon"), + Act = () => + { + if (!_minds.TryGetMind(args.Target, out var mindId, out var mind)) + return; + + _ninja.MakeNinja(mindId, mind); + }, + Impact = LogImpact.High, + Message = Loc.GetString("admin-verb-make-space-ninja"), + }; + args.Verbs.Add(spaceNinja); } } diff --git a/Content.Server/Communications/CommsHackerSystem.cs b/Content.Server/Communications/CommsHackerSystem.cs new file mode 100644 index 0000000000..6ef9e1b1bb --- /dev/null +++ b/Content.Server/Communications/CommsHackerSystem.cs @@ -0,0 +1,89 @@ +using Content.Server.Chat.Systems; +using Content.Server.GameTicking; +using Content.Server.Ninja.Systems; +using Content.Shared.Communications; +using Content.Shared.DoAfter; +using Content.Shared.Interaction; +using Robust.Shared.Random; +using Robust.Shared.Serialization; + +namespace Content.Server.Communications; + +public sealed class CommsHackerSystem : SharedCommsHackerSystem +{ + [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly IRobustRandom _random = default!; + // TODO: remove when generic check event is used + [Dependency] private readonly NinjaGlovesSystem _gloves = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBeforeInteractHand); + SubscribeLocalEvent(OnDoAfter); + } + + /// + /// Start the doafter to hack a comms console + /// + private void OnBeforeInteractHand(EntityUid uid, CommsHackerComponent comp, BeforeInteractHandEvent args) + { + if (args.Handled || !HasComp(args.Target)) + return; + + // TODO: generic check event + if (!_gloves.AbilityCheck(uid, args, out var target)) + return; + + var doAfterArgs = new DoAfterArgs(uid, comp.Delay, new TerrorDoAfterEvent(), target: target, used: uid, eventTarget: uid) + { + BreakOnDamage = true, + BreakOnUserMove = true, + MovementThreshold = 0.5f, + CancelDuplicate = false + }; + + _doAfter.TryStartDoAfter(doAfterArgs); + args.Handled = true; + } + + /// + /// Call in a random threat and do cleanup. + /// + private void OnDoAfter(EntityUid uid, CommsHackerComponent comp, TerrorDoAfterEvent args) + { + if (args.Cancelled || args.Handled || comp.Threats.Count == 0 || args.Target == null) + return; + + var threat = _random.Pick(comp.Threats); + CallInThreat(threat); + + // prevent calling in multiple threats + RemComp(uid); + + var ev = new ThreatCalledInEvent(uid, args.Target.Value); + RaiseLocalEvent(args.User, ref ev); + } + + /// + /// Makes announcement and adds game rule of the threat. + /// + public void CallInThreat(Threat threat) + { + _gameTicker.StartGameRule(threat.Rule, out _); + _chat.DispatchGlobalAnnouncement(Loc.GetString(threat.Announcement), playSound: true, colorOverride: Color.Red); + } +} + +/// +/// Raised on the user when a threat is called in on the communications console. +/// +/// +/// If you add , make sure to use this event to prevent adding it twice. +/// For example, you could add a marker component after a threat is called in then check if the user doesn't have that marker before adding CommsHackerComponent. +/// +[ByRefEvent] +public record struct ThreatCalledInEvent(EntityUid Used, EntityUid Target); diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs index 1bb8a0505f..f9918dfb0a 100644 --- a/Content.Server/Doors/Systems/DoorSystem.cs +++ b/Content.Server/Doors/Systems/DoorSystem.cs @@ -276,4 +276,3 @@ public sealed class DoorSystem : SharedDoorSystem } } } - diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index a703086ed2..c6ce90692f 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -303,16 +303,8 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem } } - /// Entity being electrocuted. - /// Source entity of the electrocution. - /// How much shock damage the entity takes. - /// How long the entity will be stunned. - /// Should time be refreshed (instead of accumilated) if the entity is already electrocuted? - /// How insulated the entity is from the shock. 0 means completely insulated, and 1 means no insulation. - /// Status effects to apply to the entity. - /// Should the electrocution bypass the Insulated component? - /// Whether the entity was stunned by the shock. - public bool TryDoElectrocution( + /// + public override bool TryDoElectrocution( EntityUid uid, EntityUid? sourceUid, int shockDamage, TimeSpan time, bool refresh, float siemensCoefficient = 1f, StatusEffectsComponent? statusEffects = null, bool ignoreInsulation = false) { diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs index b327f086db..c95be2501e 100644 --- a/Content.Server/Emp/EmpSystem.cs +++ b/Content.Server/Emp/EmpSystem.cs @@ -31,6 +31,11 @@ public sealed class EmpSystem : SharedEmpSystem { foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range)) { + var attemptEv = new EmpAttemptEvent(); + RaiseLocalEvent(uid, attemptEv); + if (attemptEv.Cancelled) + continue; + var ev = new EmpPulseEvent(energyConsumption, false, false); RaiseLocalEvent(uid, ref ev); if (ev.Affected) @@ -100,6 +105,13 @@ public sealed class EmpSystem : SharedEmpSystem } } +/// +/// Raised on an entity before . Cancel this to prevent the emp event being raised. +/// +public sealed partial class EmpAttemptEvent : CancellableEntityEventArgs +{ +} + [ByRefEvent] public record struct EmpPulseEvent(float EnergyConsumption, bool Affected, bool Disabled); diff --git a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs new file mode 100644 index 0000000000..7019c08d43 --- /dev/null +++ b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs @@ -0,0 +1,9 @@ +namespace Content.Server.Explosion.Components; + +/// +/// Disallows starting the timer by hand, must be stuck or triggered by a system. +/// +[RegisterComponent] +public sealed partial class AutomatedTimerComponent : Component +{ +} diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs index b2ef93b74d..1a3323b1ce 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs @@ -140,7 +140,7 @@ public sealed partial class TriggerSystem private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, UseInHandEvent args) { - if (args.Handled) + if (args.Handled || HasComp(uid)) return; HandleTimerTrigger( diff --git a/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs new file mode 100644 index 0000000000..62eee90d50 --- /dev/null +++ b/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs @@ -0,0 +1,37 @@ +using Content.Server.Ninja.Systems; +using Content.Shared.Communications; +using Content.Shared.Objectives; +using Robust.Shared.Audio; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; + +namespace Content.Server.GameTicking.Rules.Components; + +[RegisterComponent, Access(typeof(SpaceNinjaSystem))] +public sealed partial class NinjaRuleComponent : Component +{ + /// + /// All ninja minds that are using this rule. + /// Their SpaceNinjaComponent Rule field should point back to this rule. + /// + [DataField("minds")] + public List Minds = new(); + + /// + /// List of objective prototype ids to add + /// + [DataField("objectives", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer))] + public List Objectives = new(); + + /// + /// List of threats that can be called in. Copied onto when gloves are enabled. + /// + [DataField("threats", required: true)] + public List Threats = new(); + + /// + /// Sound played when making the player a ninja via antag control or ghost role + /// + [DataField("greetingSound", customTypeSerializer: typeof(SoundSpecifierTypeSerializer))] + public SoundSpecifier? GreetingSound = new SoundPathSpecifier("/Audio/Misc/ninja_greeting.ogg"); +} diff --git a/Content.Server/GameTicking/Rules/NinjaRuleSystem.cs b/Content.Server/GameTicking/Rules/NinjaRuleSystem.cs new file mode 100644 index 0000000000..b75241eaf4 --- /dev/null +++ b/Content.Server/GameTicking/Rules/NinjaRuleSystem.cs @@ -0,0 +1,23 @@ +using Content.Server.GameTicking.Rules.Components; +using Content.Server.Objectives; + +namespace Content.Server.GameTicking.Rules; + +/// +/// Only handles round end text for ninja. +/// +public sealed class NinjaRuleSystem : GameRuleSystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnObjectivesTextGetInfo); + } + + private void OnObjectivesTextGetInfo(EntityUid uid, NinjaRuleComponent comp, ref ObjectivesTextGetInfoEvent args) + { + args.Minds = comp.Minds; + args.AgentName = Loc.GetString("ninja-round-end-agent-name"); + } +} diff --git a/Content.Server/Implants/AutoImplantSystem.cs b/Content.Server/Implants/AutoImplantSystem.cs new file mode 100644 index 0000000000..b854e3ca3d --- /dev/null +++ b/Content.Server/Implants/AutoImplantSystem.cs @@ -0,0 +1,21 @@ +using Content.Server.Implants.Components; + +namespace Content.Server.Implants; + +public sealed class AutoImplantSystem : EntitySystem +{ + [Dependency] private readonly SubdermalImplantSystem _subdermalImplant = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + } + + private void OnMapInit(EntityUid uid, AutoImplantComponent comp, MapInitEvent args) + { + _subdermalImplant.AddImplants(uid, comp.Implants); + RemComp(uid); + } +} diff --git a/Content.Server/Implants/Components/AutoImplantComponent.cs b/Content.Server/Implants/Components/AutoImplantComponent.cs new file mode 100644 index 0000000000..e082354d8b --- /dev/null +++ b/Content.Server/Implants/Components/AutoImplantComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; + +namespace Content.Server.Implants.Components; + +/// +/// Implants an entity automatically on MapInit. +/// +[RegisterComponent] +public sealed partial class AutoImplantComponent : Component +{ + /// + /// List of implants to inject. + /// + [DataField("implants", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer))] + public List Implants = new(); +} diff --git a/Content.Server/Jobs/AddImplantSpecial.cs b/Content.Server/Jobs/AddImplantSpecial.cs index 8eb554cc7c..83193e7056 100644 --- a/Content.Server/Jobs/AddImplantSpecial.cs +++ b/Content.Server/Jobs/AddImplantSpecial.cs @@ -1,5 +1,4 @@ using Content.Shared.Implants; -using Content.Shared.Implants.Components; using Content.Shared.Roles; using JetBrains.Annotations; using Robust.Shared.Prototypes; @@ -13,7 +12,6 @@ namespace Content.Server.Jobs; [UsedImplicitly] public sealed partial class AddImplantSpecial : JobSpecial { - [DataField("implants", customTypeSerializer: typeof(PrototypeIdHashSetSerializer))] public HashSet Implants { get; private set; } = new(); @@ -21,19 +19,6 @@ public sealed partial class AddImplantSpecial : JobSpecial { var entMan = IoCManager.Resolve(); var implantSystem = entMan.System(); - var xformQuery = entMan.GetEntityQuery(); - - if (!xformQuery.TryGetComponent(mob, out var xform)) - return; - - foreach (var implantId in Implants) - { - var implant = entMan.SpawnEntity(implantId, xform.Coordinates); - - if (!entMan.TryGetComponent(implant, out var implantComp)) - return; - - implantSystem.ForceImplant(mob, implant, implantComp); - } + implantSystem.AddImplants(mob, Implants); } } diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index 797e8a273b..aca5a9d485 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -18,12 +18,12 @@ namespace Content.Server.Mind; public sealed class MindSystem : SharedMindSystem { [Dependency] private readonly ActorSystem _actor = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly SharedGhostSystem _ghosts = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly IMapManager _maps = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly SharedGhostSystem _ghosts = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; public override void Initialize() @@ -277,10 +277,13 @@ public sealed class MindSystem : SharedMindSystem } } + /// + /// Sets the Mind's UserId, Session, and updates the player's PlayerData. This should have no direct effect on the + /// entity that any mind is connected to, except as a side effect of the fact that it may change a player's + /// attached entity. E.g., ghosts get deleted. + /// public override void SetUserId(EntityUid mindId, NetUserId? userId, MindComponent? mind = null) { - base.SetUserId(mindId, userId, mind); - if (!Resolve(mindId, ref mind)) return; diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs new file mode 100644 index 0000000000..1910969f19 --- /dev/null +++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs @@ -0,0 +1,100 @@ +using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; +using Content.Shared.DoAfter; +using Content.Shared.Interaction; +using Content.Shared.Ninja.Components; +using Content.Shared.Ninja.Systems; +using Content.Shared.Popups; +using Robust.Shared.Audio; + +namespace Content.Server.Ninja.Systems; + +/// +/// Handles the doafter and power transfer when draining. +/// +public sealed class BatteryDrainerSystem : SharedBatteryDrainerSystem +{ + [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBeforeInteractHand); + } + + /// + /// Start do after for draining a power source. + /// Can't predict PNBC existing so only done on server. + /// + private void OnBeforeInteractHand(EntityUid uid, BatteryDrainerComponent comp, BeforeInteractHandEvent args) + { + var target = args.Target; + if (args.Handled || comp.BatteryUid == null || !HasComp(target)) + return; + + // handles even if battery is full so you can actually see the poup + args.Handled = true; + + if (_battery.IsFull(comp.BatteryUid.Value)) + { + _popup.PopupEntity(Loc.GetString("battery-drainer-full"), uid, uid, PopupType.Medium); + return; + } + + var doAfterArgs = new DoAfterArgs(uid, comp.DrainTime, new DrainDoAfterEvent(), target: target, eventTarget: uid) + { + BreakOnUserMove = true, + MovementThreshold = 0.5f, + CancelDuplicate = false, + AttemptFrequency = AttemptFrequency.StartAndEnd + }; + + _doAfter.TryStartDoAfter(doAfterArgs); + } + + /// + protected override void OnDoAfterAttempt(EntityUid uid, BatteryDrainerComponent comp, DoAfterAttemptEvent args) + { + base.OnDoAfterAttempt(uid, comp, args); + + if (comp.BatteryUid == null || _battery.IsFull(comp.BatteryUid.Value)) + args.Cancel(); + } + + /// + protected override bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp, EntityUid target) + { + if (comp.BatteryUid == null || !TryComp(comp.BatteryUid.Value, out var battery)) + return false; + + if (!TryComp(target, out var targetBattery) || !TryComp(target, out var pnb)) + return false; + + if (MathHelper.CloseToPercent(targetBattery.CurrentCharge, 0)) + { + _popup.PopupEntity(Loc.GetString("battery-drainer-empty", ("battery", target)), uid, uid, PopupType.Medium); + return false; + } + + var available = targetBattery.CurrentCharge; + var required = battery.MaxCharge - battery.CurrentCharge; + // higher tier storages can charge more + var maxDrained = pnb.MaxSupply * comp.DrainTime; + var input = Math.Min(Math.Min(available, required / comp.DrainEfficiency), maxDrained); + if (!_battery.TryUseCharge(target, input, targetBattery)) + return false; + + var output = input * comp.DrainEfficiency; + _battery.SetCharge(comp.BatteryUid.Value, battery.CurrentCharge + output, battery); + Spawn("EffectSparks", Transform(target).Coordinates); + _audio.PlayPvs(comp.SparkSound, target); + _popup.PopupEntity(Loc.GetString("battery-drainer-success", ("battery", target)), uid, uid); + + // repeat the doafter until battery is full + return !battery.IsFullyCharged; + } +} diff --git a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs new file mode 100644 index 0000000000..402650d6a6 --- /dev/null +++ b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs @@ -0,0 +1,102 @@ +using Content.Server.Communications; +using Content.Server.DoAfter; +using Content.Server.Mind; +using Content.Server.Ninja.Systems; +using Content.Server.Power.Components; +using Content.Server.Roles; +using Content.Shared.Communications; +using Content.Shared.DoAfter; +using Content.Shared.Interaction.Components; +using Content.Shared.Interaction.Events; +using Content.Shared.Ninja.Components; +using Content.Shared.Ninja.Systems; +using Content.Shared.Popups; +using Content.Shared.Research.Components; +using Content.Shared.Toggleable; + +namespace Content.Server.Ninja.Systems; + +/// +/// Handles the toggle gloves action. +/// +public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem +{ + [Dependency] private readonly EmagProviderSystem _emagProvider = default!; + [Dependency] private readonly SharedBatteryDrainerSystem _drainer = default!; + [Dependency] private readonly SharedStunProviderSystem _stunProvider = default!; + [Dependency] private readonly SpaceNinjaSystem _ninja = default!; + [Dependency] private readonly CommsHackerSystem _commsHacker = default!; + [Dependency] private readonly MindSystem _mind = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnToggleAction); + } + + /// + /// Toggle gloves, if the user is a ninja wearing a ninja suit. + /// + private void OnToggleAction(EntityUid uid, NinjaGlovesComponent comp, ToggleActionEvent args) + { + if (args.Handled) + return; + + args.Handled = true; + + var user = args.Performer; + // need to wear suit to enable gloves + if (!TryComp(user, out var ninja) + || ninja.Suit == null + || !HasComp(ninja.Suit.Value)) + { + Popup.PopupEntity(Loc.GetString("ninja-gloves-not-wearing-suit"), user, user); + return; + } + + // show its state to the user + var enabling = comp.User == null; + Appearance.SetData(uid, ToggleVisuals.Toggled, enabling); + var message = Loc.GetString(enabling ? "ninja-gloves-on" : "ninja-gloves-off"); + Popup.PopupEntity(message, user, user); + + if (enabling) + { + EnableGloves(uid, comp, user, ninja); + } + else + { + DisableGloves(uid, comp); + } + } + + private void EnableGloves(EntityUid uid, NinjaGlovesComponent comp, EntityUid user, SpaceNinjaComponent ninja) + { + comp.User = user; + Dirty(uid, comp); + _ninja.AssignGloves(user, uid, ninja); + + var drainer = EnsureComp(user); + var stun = EnsureComp(user); + _stunProvider.SetNoPowerPopup(user, "ninja-no-power", stun); + if (_ninja.GetNinjaBattery(user, out var battery, out var _)) + { + _drainer.SetBattery(user, battery, drainer); + _stunProvider.SetBattery(user, battery, stun); + } + + var emag = EnsureComp(user); + _emagProvider.SetWhitelist(user, comp.DoorjackWhitelist, emag); + + EnsureComp(user); + // prevent calling in multiple threats by toggling gloves after + if (_mind.TryGetRole(user, out var role) && !role.CalledInThreat) + { + var hacker = EnsureComp(user); + var rule = _ninja.NinjaRule(user); + if (rule != null) + _commsHacker.SetThreats(user, rule.Threats, hacker); + } + } +} diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs new file mode 100644 index 0000000000..f6ad646d22 --- /dev/null +++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs @@ -0,0 +1,147 @@ +using Content.Server.Emp; +using Content.Server.Popups; +using Content.Server.Power.Components; +using Content.Server.PowerCell; +using Content.Shared.Actions; +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Ninja.Components; +using Content.Shared.Ninja.Systems; +using Content.Shared.Popups; +using Robust.Shared.Containers; + +namespace Content.Server.Ninja.Systems; + +/// +/// Handles power cell upgrading and actions. +/// +public sealed class NinjaSuitSystem : SharedNinjaSuitSystem +{ + [Dependency] private readonly EmpSystem _emp = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly SpaceNinjaSystem _ninja = default!; + [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private readonly PowerCellSystem _powerCell = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnSuitInsertAttempt); + SubscribeLocalEvent(OnEmpAttempt); + SubscribeLocalEvent(OnAttemptStealth); + SubscribeLocalEvent(OnCreateThrowingStar); + SubscribeLocalEvent(OnRecallKatana); + SubscribeLocalEvent(OnEmp); + } + + protected override void NinjaEquippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user, SpaceNinjaComponent ninja) + { + base.NinjaEquippedSuit(uid, comp, user, ninja); + + _ninja.SetSuitPowerAlert(user); + } + + // TODO: if/when battery is in shared, put this there too + // TODO: or put MaxCharge in shared along with powercellslot + private void OnSuitInsertAttempt(EntityUid uid, NinjaSuitComponent comp, ContainerIsInsertingAttemptEvent args) + { + // no power cell for some reason??? allow it + if (!_powerCell.TryGetBatteryFromSlot(uid, out var battery)) + return; + + // can only upgrade power cell, not swap to recharge instantly otherwise ninja could just swap batteries with flashlights in maints for easy power + if (!TryComp(args.EntityUid, out var inserting) || inserting.MaxCharge <= battery.MaxCharge) + { + args.Cancel(); + } + + // TODO: raise event on ninja telling it to update battery + } + + private void OnEmpAttempt(EntityUid uid, NinjaSuitComponent comp, EmpAttemptEvent args) + { + // ninja suit (battery) is immune to emp + // powercell relays the event to suit + args.Cancel(); + } + + protected override void UserUnequippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user) + { + base.UserUnequippedSuit(uid, comp, user); + + // remove power indicator + _ninja.SetSuitPowerAlert(user); + } + + private void OnAttemptStealth(EntityUid uid, NinjaSuitComponent comp, AttemptStealthEvent args) + { + var user = args.User; + // need 1 second of charge to turn on stealth + var chargeNeeded = SuitWattage(uid, comp); + // being attacked while cloaked gives no power message since it overloads the power supply or something + if (!_ninja.GetNinjaBattery(user, out var _, out var battery) || battery.CurrentCharge < chargeNeeded || UseDelay.ActiveDelay(user)) + { + _popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user); + args.Cancel(); + return; + } + + StealthClothing.SetEnabled(uid, user, true); + } + + private void OnCreateThrowingStar(EntityUid uid, NinjaSuitComponent comp, CreateThrowingStarEvent args) + { + args.Handled = true; + var user = args.Performer; + if (!_ninja.TryUseCharge(user, comp.ThrowingStarCharge) || UseDelay.ActiveDelay(user)) + { + _popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user); + return; + } + + // try to put throwing star in hand, otherwise it goes on the ground + var star = Spawn(comp.ThrowingStarPrototype, Transform(user).Coordinates); + _hands.TryPickupAnyHand(user, star); + } + + private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatanaEvent args) + { + args.Handled = true; + var user = args.Performer; + if (!TryComp(user, out var ninja) || ninja.Katana == null) + return; + + var katana = ninja.Katana.Value; + var coords = _transform.GetWorldPosition(katana); + var distance = (_transform.GetWorldPosition(user) - coords).Length(); + var chargeNeeded = (float) distance * comp.RecallCharge; + if (!_ninja.TryUseCharge(user, chargeNeeded) || UseDelay.ActiveDelay(user)) + { + _popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user); + return; + } + + // TODO: teleporting into belt slot + var message = _hands.TryPickupAnyHand(user, katana) + ? "ninja-katana-recalled" + : "ninja-hands-full"; + _popup.PopupEntity(Loc.GetString(message), user, user); + } + + private void OnEmp(EntityUid uid, NinjaSuitComponent comp, NinjaEmpEvent args) + { + args.Handled = true; + var user = args.Performer; + if (!_ninja.TryUseCharge(user, comp.EmpCharge) || UseDelay.ActiveDelay(user)) + { + _popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user); + return; + } + + // I don't think this affects the suit battery, but if it ever does in the future add a blacklist for it + var coords = Transform(user).MapPosition; + _emp.EmpPulse(coords, comp.EmpRange, comp.EmpConsumption, comp.EmpDuration); + } +} diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs new file mode 100644 index 0000000000..4c8b20d46e --- /dev/null +++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs @@ -0,0 +1,301 @@ +using Content.Server.Administration.Commands; +using Content.Server.Communications; +using Content.Server.Chat.Managers; +using Content.Server.StationEvents.Components; +using Content.Server.GameTicking; +using Content.Server.GameTicking.Rules; +using Content.Server.GameTicking.Rules.Components; +using Content.Server.Ghost.Roles.Events; +using Content.Server.Objectives; +using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; +using Content.Server.PowerCell; +using Content.Server.Research.Systems; +using Content.Server.Roles; +using Content.Server.Warps; +using Content.Shared.Alert; +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Doors.Components; +using Content.Shared.IdentityManagement; +using Content.Shared.Mind; +using Content.Shared.Mind.Components; +using Content.Shared.Ninja.Components; +using Content.Shared.Ninja.Systems; +using Content.Shared.Popups; +using Content.Shared.Roles; +using Content.Shared.PowerCell.Components; +using Content.Shared.Rounding; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics.Components; +using Robust.Shared.Player; +using Robust.Shared.Random; +using System.Diagnostics.CodeAnalysis; +using System.Linq; + +namespace Content.Server.Ninja.Systems; + +// TODO: when syndiborgs are a thing have a borg converter with 6 second doafter +// engi -> saboteur +// medi -> idk reskin it +// other -> assault +// TODO: when criminal records is merged, hack it to set everyone to arrest + +/// +/// Main ninja system that handles ninja setup and greentext, provides helper methods for the rest of the code to use. +/// +public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem +{ + [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly IChatManager _chatMan = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly PowerCellSystem _powerCell = default!; + [Dependency] private readonly RoleSystem _role = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly StealthClothingSystem _stealthClothing = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnNinjaMindAdded); + SubscribeLocalEvent(OnDoorjack); + SubscribeLocalEvent(OnResearchStolen); + SubscribeLocalEvent(OnThreatCalledIn); + } + + public override void Update(float frameTime) + { + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var ninja)) + { + UpdateNinja(uid, ninja, frameTime); + } + } + + /// + /// Turns the player into a space ninja + /// + public void MakeNinja(EntityUid mindId, MindComponent mind) + { + if (mind.OwnedEntity == null) + return; + + // prevent double ninja'ing + var user = mind.OwnedEntity.Value; + if (HasComp(user)) + return; + + AddComp(user); + SetOutfitCommand.SetOutfit(user, "SpaceNinjaGear", EntityManager); + GreetNinja(mindId, mind); + } + + /// + /// Download the given set of nodes, returning how many new nodes were downloaded. + /// + private int Download(EntityUid uid, List ids) + { + if (!_mind.TryGetRole(uid, out var role)) + return 0; + + var oldCount = role.DownloadedNodes.Count; + role.DownloadedNodes.UnionWith(ids); + var newCount = role.DownloadedNodes.Count; + return newCount - oldCount; + } + + /// + /// Returns a ninja's gamerule config data. + /// If the gamerule was not started then it will be started automatically. + /// + public NinjaRuleComponent? NinjaRule(EntityUid uid, SpaceNinjaComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return null; + + // already exists so just check it + if (comp.Rule != null) + return CompOrNull(comp.Rule); + + // start it + _gameTicker.StartGameRule("Ninja", out var rule); + comp.Rule = rule; + + if (!TryComp(rule, out var ninjaRule)) + return null; + + // add ninja mind to the rule's list for objective showing + if (TryComp(uid, out var mindContainer) && mindContainer.Mind != null) + { + ninjaRule.Minds.Add(mindContainer.Mind.Value); + } + + return ninjaRule; + } + + // TODO: can probably copy paste borg code here + /// + /// Update the alert for the ninja's suit power indicator. + /// + public void SetSuitPowerAlert(EntityUid uid, SpaceNinjaComponent? comp = null) + { + if (!Resolve(uid, ref comp, false) || comp.Deleted || comp.Suit == null) + { + _alerts.ClearAlert(uid, AlertType.SuitPower); + return; + } + + if (GetNinjaBattery(uid, out var _, out var battery)) + { + var severity = ContentHelpers.RoundToLevels(MathF.Max(0f, battery.CurrentCharge), battery.MaxCharge, 8); + _alerts.ShowAlert(uid, AlertType.SuitPower, (short) severity); + } + else + { + _alerts.ClearAlert(uid, AlertType.SuitPower); + } + } + + /// + /// Get the battery component in a ninja's suit, if it's worn. + /// + public bool GetNinjaBattery(EntityUid user, [NotNullWhen(true)] out EntityUid? uid, [NotNullWhen(true)] out BatteryComponent? battery) + { + if (TryComp(user, out var ninja) + && ninja.Suit != null + && _powerCell.TryGetBatteryFromSlot(ninja.Suit.Value, out uid, out battery)) + { + return true; + } + + uid = null; + battery = null; + return false; + } + + /// + public override bool TryUseCharge(EntityUid user, float charge) + { + return GetNinjaBattery(user, out var uid, out var battery) && _battery.TryUseCharge(uid.Value, charge, battery); + } + + /// + /// Greets the ninja when a ghost takes over a ninja, if that happens. + /// + private void OnNinjaMindAdded(EntityUid uid, SpaceNinjaComponent comp, MindAddedMessage args) + { + if (TryComp(uid, out var mind) && mind.Mind != null) + GreetNinja(mind.Mind.Value); + } + + /// + /// Set up everything for ninja to work and send the greeting message/sound. + /// + private void GreetNinja(EntityUid mindId, MindComponent? mind = null) + { + if (!Resolve(mindId, ref mind) || mind.OwnedEntity == null || mind.Session == null) + return; + + var uid = mind.OwnedEntity.Value; + var config = NinjaRule(uid); + if (config == null) + return; + + var role = new NinjaRoleComponent + { + PrototypeId = "SpaceNinja" + }; + _role.MindAddRole(mindId, role, mind); + + // choose spider charge detonation point + // currently based on warp points, something better could be done (but would likely require mapping work) + var warps = new List(); + var query = EntityQueryEnumerator(); + var map = Transform(uid).MapID; + while (query.MoveNext(out var warpUid, out var warp, out var xform)) + { + // won't be asked to detonate the nuke disk or singularity or centcomm + if (warp.Location != null && !HasComp(warpUid) && xform.MapID == map) + warps.Add(warpUid); + } + + if (warps.Count > 0) + role.SpiderChargeTarget = _random.Pick(warps); + + // assign objectives - must happen after spider charge target so that the obj requirement works + foreach (var objective in config.Objectives) + { + if (!_mind.TryAddObjective(mindId, objective, mind)) + { + Log.Error($"Failed to add {objective} to ninja {mind.OwnedEntity.Value}"); + } + } + + var session = mind.Session; + _audio.PlayGlobal(config.GreetingSound, Filter.Empty().AddPlayer(session), false, AudioParams.Default); + _chatMan.DispatchServerMessage(session, Loc.GetString("ninja-role-greeting")); + } + + // TODO: PowerCellDraw, modify when cloak enabled + /// + /// Handle constant power drains from passive usage and cloak. + /// + private void UpdateNinja(EntityUid uid, SpaceNinjaComponent ninja, float frameTime) + { + if (ninja.Suit == null) + return; + + float wattage = _suit.SuitWattage(ninja.Suit.Value); + + SetSuitPowerAlert(uid, ninja); + if (!TryUseCharge(uid, wattage * frameTime)) + { + // ran out of power, uncloak ninja + _stealthClothing.SetEnabled(ninja.Suit.Value, uid, false); + } + } + + /// + /// Increment greentext when emagging a door. + /// + private void OnDoorjack(EntityUid uid, SpaceNinjaComponent comp, ref EmaggedSomethingEvent args) + { + // incase someone lets ninja emag non-doors double check it here + if (!HasComp(args.Target)) + return; + + // this popup is serverside since door emag logic is serverside (power funnies) + _popup.PopupEntity(Loc.GetString("ninja-doorjack-success", ("target", Identity.Entity(args.Target, EntityManager))), uid, uid, PopupType.Medium); + + // handle greentext + if (_mind.TryGetRole(uid, out var role)) + role.DoorsJacked++; + } + + /// + /// Add to greentext when stealing technologies. + /// + private void OnResearchStolen(EntityUid uid, SpaceNinjaComponent comp, ref ResearchStolenEvent args) + { + var gained = Download(uid, args.Techs); + var str = gained == 0 + ? Loc.GetString("ninja-research-steal-fail") + : Loc.GetString("ninja-research-steal-success", ("count", gained), ("server", args.Target)); + + _popup.PopupEntity(str, uid, uid, PopupType.Medium); + } + + private void OnThreatCalledIn(EntityUid uid, SpaceNinjaComponent comp, ref ThreatCalledInEvent args) + { + if (_mind.TryGetRole(uid, out var role)) + { + role.CalledInThreat = true; + } + } +} diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs new file mode 100644 index 0000000000..3ffc2a8ff3 --- /dev/null +++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs @@ -0,0 +1,78 @@ +using Content.Server.Explosion.EntitySystems; +using Content.Server.Mind; +using Content.Server.Popups; +using Content.Server.Roles; +using Content.Server.Sticky.Events; +using Content.Shared.Interaction; +using Content.Shared.Ninja.Components; +using Robust.Shared.GameObjects; + +namespace Content.Server.Ninja.Systems; + +/// +/// Prevents planting a spider charge outside of its location and handles greentext. +/// +public sealed class SpiderChargeSystem : EntitySystem +{ + [Dependency] private readonly MindSystem _mind = default!; + [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(BeforePlant); + SubscribeLocalEvent(OnStuck); + SubscribeLocalEvent(OnExplode); + } + + /// + /// Require that the planter is a ninja and the charge is near the target warp point. + /// + private void BeforePlant(EntityUid uid, SpiderChargeComponent comp, BeforeRangedInteractEvent args) + { + var user = args.User; + + if (!_mind.TryGetRole(user, out var role)) + { + _popup.PopupEntity(Loc.GetString("spider-charge-not-ninja"), user, user); + args.Handled = true; + return; + } + + // allow planting anywhere if there is no target, which should never happen + if (role.SpiderChargeTarget == null) + return; + + // assumes warp point still exists + var target = Transform(role.SpiderChargeTarget.Value).MapPosition; + var coords = args.ClickLocation.ToMap(EntityManager, _transform); + if (!coords.InRange(target, comp.Range)) + { + _popup.PopupEntity(Loc.GetString("spider-charge-too-far"), user, user); + args.Handled = true; + } + } + + /// + /// Allows greentext to occur after exploding. + /// + private void OnStuck(EntityUid uid, SpiderChargeComponent comp, EntityStuckEvent args) + { + comp.Planter = args.User; + } + + /// + /// Handles greentext after exploding. + /// Assumes it didn't move and the target was destroyed so be nice. + /// + private void OnExplode(EntityUid uid, SpiderChargeComponent comp, TriggerEvent args) + { + if (comp.Planter == null || !_mind.TryGetRole(comp.Planter.Value, out var role)) + return; + + // assumes the target was destroyed, that the charge wasn't moved somehow + role.SpiderChargeDetonated = true; + } +} diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs new file mode 100644 index 0000000000..21e8b2042f --- /dev/null +++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs @@ -0,0 +1,60 @@ +using Content.Shared.Electrocution; +using Content.Shared.Interaction; +using Content.Shared.Ninja.Components; +using Content.Shared.Ninja.Systems; +using Content.Shared.Popups; +using Content.Shared.Whitelist; +using Content.Server.Power.EntitySystems; +using Robust.Shared.Timing; + +namespace Content.Server.Ninja.Systems; + +/// +/// Shocks clicked mobs using battery charge. +/// +public sealed class StunProviderSystem : SharedStunProviderSystem +{ + [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; + [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBeforeInteractHand); + } + + /// + /// Stun clicked mobs on the whitelist, if there is enough power. + /// + private void OnBeforeInteractHand(EntityUid uid, StunProviderComponent comp, BeforeInteractHandEvent args) + { + // TODO: generic check + if (args.Handled || comp.BatteryUid == null || !_gloves.AbilityCheck(uid, args, out var target)) + return; + + if (target == uid || !comp.Whitelist.IsValid(target, EntityManager)) + return; + + if (_timing.CurTime < comp.NextStun) + return; + + // take charge from battery + if (!_battery.TryUseCharge(comp.BatteryUid.Value, comp.StunCharge)) + { + _popup.PopupEntity(Loc.GetString(comp.NoPowerPopup), uid, uid); + return; + } + + // not holding hands with target so insuls don't matter + _electrocution.TryDoElectrocution(target, uid, comp.StunDamage, comp.StunTime, false, ignoreInsulation: true); + // short cooldown to prevent instant stunlocking + comp.NextStun = _timing.CurTime + comp.Cooldown; + Dirty(uid, comp); + + args.Handled = true; + } +} diff --git a/Content.Server/Objectives/Conditions/DoorjackCondition.cs b/Content.Server/Objectives/Conditions/DoorjackCondition.cs new file mode 100644 index 0000000000..0752048554 --- /dev/null +++ b/Content.Server/Objectives/Conditions/DoorjackCondition.cs @@ -0,0 +1,70 @@ +using Content.Server.Roles; +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; +using Robust.Shared.Random; +using Robust.Shared.Utility; + +namespace Content.Server.Objectives.Conditions; + +/// +/// Objective condition that requires the player to be a ninja and have doorjacked at least a random number of airlocks. +/// +[DataDefinition] +public sealed partial class DoorjackCondition : IObjectiveCondition +{ + private EntityUid? _mind; + private int _target; + + public IObjectiveCondition GetAssigned(EntityUid uid, MindComponent mind) + { + // TODO: clamp to number of doors on station incase its somehow a shittle or something + return new DoorjackCondition { + _mind = uid, + _target = IoCManager.Resolve().Next(15, 40) + }; + } + + public string Title => Loc.GetString("objective-condition-doorjack-title", ("count", _target)); + + public string Description => Loc.GetString("objective-condition-doorjack-description", ("count", _target)); + + public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResPath("Objects/Tools/emag.rsi"), "icon"); + + public float Progress + { + get + { + // prevent divide-by-zero + if (_target == 0) + return 1f; + + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(_mind, out var role)) + return 0f; + + if (role.DoorsJacked >= _target) + return 1f; + + return (float) role.DoorsJacked / (float) _target; + } + } + + public float Difficulty => 1.5f; + + public bool Equals(IObjectiveCondition? other) + { + return other is DoorjackCondition cond && Equals(_mind, cond._mind) && _target == cond._target; + } + + public override bool Equals(object? obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + return obj is DoorjackCondition cond && cond.Equals(this); + } + + public override int GetHashCode() + { + return HashCode.Combine(_mind?.GetHashCode() ?? 0, _target); + } +} diff --git a/Content.Server/Objectives/Conditions/SpiderChargeCondition.cs b/Content.Server/Objectives/Conditions/SpiderChargeCondition.cs new file mode 100644 index 0000000000..5209296842 --- /dev/null +++ b/Content.Server/Objectives/Conditions/SpiderChargeCondition.cs @@ -0,0 +1,75 @@ +using Content.Server.Roles; +using Content.Server.Warps; +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; +using Robust.Shared.Random; +using Robust.Shared.Utility; + +namespace Content.Server.Objectives.Conditions; + +/// +/// Objective condition that requires the player to be a ninja and have detonated their spider charge. +/// +[DataDefinition] +public sealed partial class SpiderChargeCondition : IObjectiveCondition +{ + private EntityUid? _mind; + + public IObjectiveCondition GetAssigned(EntityUid uid, MindComponent mind) + { + return new SpiderChargeCondition { + _mind = uid + }; + } + + public string Title + { + get + { + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(_mind, out var role) + || role.SpiderChargeTarget == null + || !entMan.TryGetComponent(role.SpiderChargeTarget, out var warp) + || warp.Location == null) + // this should never really happen but eh + return Loc.GetString("objective-condition-spider-charge-no-target"); + + return Loc.GetString("objective-condition-spider-charge-title", ("location", warp.Location)); + } + } + + public string Description => Loc.GetString("objective-condition-spider-charge-description"); + + public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResPath("Objects/Weapons/Bombs/spidercharge.rsi"), "icon"); + + public float Progress + { + get + { + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(_mind, out var role)) + return 0f; + + return role.SpiderChargeDetonated ? 1f : 0f; + } + } + + public float Difficulty => 2.5f; + + public bool Equals(IObjectiveCondition? other) + { + return other is SpiderChargeCondition cond && Equals(_mind, cond._mind); + } + + public override bool Equals(object? obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + return obj is SpiderChargeCondition cond && cond.Equals(this); + } + + public override int GetHashCode() + { + return _mind?.GetHashCode() ?? 0; + } +} diff --git a/Content.Server/Objectives/Conditions/StealResearchCondition.cs b/Content.Server/Objectives/Conditions/StealResearchCondition.cs new file mode 100644 index 0000000000..4c32f3c3fc --- /dev/null +++ b/Content.Server/Objectives/Conditions/StealResearchCondition.cs @@ -0,0 +1,70 @@ +using Content.Server.Roles; +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; +using Robust.Shared.Random; +using Robust.Shared.Utility; + +namespace Content.Server.Objectives.Conditions; + +/// +/// Objective condition that requires the player to be a ninja and have stolen at least a random number of technologies. +/// +[DataDefinition] +public sealed partial class StealResearchCondition : IObjectiveCondition +{ + private EntityUid? _mind; + private int _target; + + public IObjectiveCondition GetAssigned(EntityUid uid, MindComponent mind) + { + // TODO: clamp to number of research nodes in a single discipline maybe so easily maintainable + return new StealResearchCondition { + _mind = uid, + _target = IoCManager.Resolve().Next(5, 10) + }; + } + + public string Title => Loc.GetString("objective-condition-steal-research-title", ("count", _target)); + + public string Description => Loc.GetString("objective-condition-steal-research-description"); + + public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResPath("Structures/Machines/server.rsi"), "server"); + + public float Progress + { + get + { + // prevent divide-by-zero + if (_target == 0) + return 1f; + + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(_mind, out var role)) + return 0f; + + if (role.DownloadedNodes.Count >= _target) + return 1f; + + return (float) role.DownloadedNodes.Count / (float) _target; + } + } + + public float Difficulty => 2.5f; + + public bool Equals(IObjectiveCondition? other) + { + return other is StealResearchCondition cond && Equals(_mind, cond._mind) && _target == cond._target; + } + + public override bool Equals(object? obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + return obj is StealResearchCondition cond && cond.Equals(this); + } + + public override int GetHashCode() + { + return HashCode.Combine(_mind?.GetHashCode() ?? 0, _target); + } +} diff --git a/Content.Server/Objectives/Conditions/SurviveCondition.cs b/Content.Server/Objectives/Conditions/SurviveCondition.cs new file mode 100644 index 0000000000..98b5aa6c89 --- /dev/null +++ b/Content.Server/Objectives/Conditions/SurviveCondition.cs @@ -0,0 +1,58 @@ +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; +using Robust.Shared.Utility; + +namespace Content.Server.Objectives.Conditions; + +/// +/// Just requires that the player is not dead, ignores evac and what not. +/// +[DataDefinition] +public sealed partial class SurviveCondition : IObjectiveCondition +{ + private EntityUid? _mind; + + public IObjectiveCondition GetAssigned(EntityUid uid, MindComponent mind) + { + return new SurviveCondition {_mind = uid}; + } + + public string Title => Loc.GetString("objective-condition-survive-title"); + + public string Description => Loc.GetString("objective-condition-survive-description"); + + public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResPath("Clothing/Mask/ninja.rsi"), "icon"); + + public float Difficulty => 0.5f; + + public float Progress + { + get + { + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(_mind, out var mind)) + return 0f; + + var mindSystem = entMan.System(); + return mindSystem.IsCharacterDeadIc(mind) ? 0f : 1f; + } + } + + public bool Equals(IObjectiveCondition? other) + { + return other is SurviveCondition condition && Equals(_mind, condition._mind); + } + + public override bool Equals(object? obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + if (obj.GetType() != GetType()) return false; + return Equals((SurviveCondition) obj); + } + + public override int GetHashCode() + { + return (_mind != null ? _mind.GetHashCode() : 0); + } +} diff --git a/Content.Server/Objectives/Conditions/TerrorCondition.cs b/Content.Server/Objectives/Conditions/TerrorCondition.cs new file mode 100644 index 0000000000..28cce20aa2 --- /dev/null +++ b/Content.Server/Objectives/Conditions/TerrorCondition.cs @@ -0,0 +1,57 @@ +using Content.Server.Roles; +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; +using Robust.Shared.Utility; + +namespace Content.Server.Objectives.Conditions; + +/// +/// Objective condition that requires the player to be a ninja and have called in a threat. +/// +[DataDefinition] +public sealed partial class TerrorCondition : IObjectiveCondition +{ + private EntityUid? _mind; + + public IObjectiveCondition GetAssigned(EntityUid uid, MindComponent mind) + { + return new TerrorCondition {_mind = uid}; + } + + public string Title => Loc.GetString("objective-condition-terror-title"); + + public string Description => Loc.GetString("objective-condition-terror-description"); + + public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResPath("Objects/Fun/Instruments/otherinstruments.rsi"), "red_phone"); + + public float Progress + { + get + { + var entMan = IoCManager.Resolve(); + if (!entMan.TryGetComponent(_mind, out var role)) + return 0f; + + return role.CalledInThreat ? 1f : 0f; + } + } + + public float Difficulty => 2.75f; + + public bool Equals(IObjectiveCondition? other) + { + return other is TerrorCondition cond && Equals(_mind, cond._mind); + } + + public override bool Equals(object? obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + return obj is TerrorCondition cond && cond.Equals(this); + } + + public override int GetHashCode() + { + return _mind?.GetHashCode() ?? 0; + } +} diff --git a/Content.Server/Objectives/Requirements/NinjaRequirement.cs b/Content.Server/Objectives/Requirements/NinjaRequirement.cs new file mode 100644 index 0000000000..8a0993bed8 --- /dev/null +++ b/Content.Server/Objectives/Requirements/NinjaRequirement.cs @@ -0,0 +1,18 @@ +using Content.Server.Roles; +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; + +namespace Content.Server.Objectives.Requirements; + +/// +/// Requires the player's mind to have the ninja role component, aka be a ninja. +/// +[DataDefinition] +public sealed partial class NinjaRequirement : IObjectiveRequirement +{ + public bool CanBeAssigned(EntityUid mindId, MindComponent mind) + { + var entMan = IoCManager.Resolve(); + return entMan.HasComponent(mindId); + } +} diff --git a/Content.Server/Objectives/Requirements/SpiderChargeTargetRequirement.cs b/Content.Server/Objectives/Requirements/SpiderChargeTargetRequirement.cs new file mode 100644 index 0000000000..6bb6bbb7a8 --- /dev/null +++ b/Content.Server/Objectives/Requirements/SpiderChargeTargetRequirement.cs @@ -0,0 +1,19 @@ +using Content.Server.Roles; +using Content.Shared.Mind; +using Content.Shared.Objectives.Interfaces; + +namespace Content.Server.Objectives.Requirements; + +/// +/// Requires the player to be a ninja that has a spider charge target assigned, which is almost always the case. +/// +[DataDefinition] +public sealed partial class SpiderChargeTargetRequirement : IObjectiveRequirement +{ + public bool CanBeAssigned(EntityUid mindId, MindComponent mind) + { + var entMan = IoCManager.Resolve(); + entMan.TryGetComponent(mindId, out var role); + return role?.SpiderChargeTarget != null; + } +} diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 410aa30bba..c844988b06 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -156,5 +156,16 @@ namespace Content.Server.Power.EntitySystems UseCharge(uid, value, battery); return true; } + + /// + /// Returns whether the battery is at least 99% charged, basically full. + /// + public bool IsFull(EntityUid uid, BatteryComponent? battery = null) + { + if (!Resolve(uid, ref battery)) + return false; + + return battery.CurrentCharge / battery.MaxCharge >= 0.99f; + } } } diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs index 6633e43d42..1cfb4d1d70 100644 --- a/Content.Server/PowerCell/PowerCellSystem.cs +++ b/Content.Server/PowerCell/PowerCellSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Administration.Logs; using Content.Server.Chemistry.EntitySystems; using Content.Server.Explosion.EntitySystems; +using Content.Server.Emp; using Content.Server.Power.Components; using Content.Shared.Database; using Content.Shared.Examine; @@ -38,6 +39,7 @@ public sealed partial class PowerCellSystem : SharedPowerCellSystem SubscribeLocalEvent(OnChargeChanged); SubscribeLocalEvent(OnCellExamined); + SubscribeLocalEvent(OnCellEmpAttempt); SubscribeLocalEvent(OnUnpaused); SubscribeLocalEvent(OnDrawChargeChanged); @@ -233,6 +235,14 @@ public sealed partial class PowerCellSystem : SharedPowerCellSystem OnBatteryExamined(uid, battery, args); } + private void OnCellEmpAttempt(EntityUid uid, PowerCellComponent component, EmpAttemptEvent args) + { + var parent = Transform(uid).ParentUid; + // relay the attempt event to the slot so it can cancel it + if (HasComp(parent)) + RaiseLocalEvent(parent, args); + } + private void OnCellSlotExamined(EntityUid uid, PowerCellSlotComponent component, ExaminedEvent args) { TryGetBatteryFromSlot(uid, out var battery); diff --git a/Content.Server/Research/Systems/ResearchStealerSystem.cs b/Content.Server/Research/Systems/ResearchStealerSystem.cs new file mode 100644 index 0000000000..5bab6048de --- /dev/null +++ b/Content.Server/Research/Systems/ResearchStealerSystem.cs @@ -0,0 +1,39 @@ +using Content.Shared.Research.Components; +using Content.Shared.Research.Systems; + +namespace Content.Server.Research.Systems; + +public sealed class ResearchStealerSystem : SharedResearchStealerSystem +{ + [Dependency] private readonly SharedResearchSystem _research = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDoAfter); + } + + private void OnDoAfter(EntityUid uid, ResearchStealerComponent comp, ResearchStealDoAfterEvent args) + { + if (args.Cancelled || args.Handled || args.Target == null) + return; + + var target = args.Target.Value; + + if (!TryComp(target, out var database)) + return; + + var ev = new ResearchStolenEvent(uid, target, database.UnlockedTechnologies); + RaiseLocalEvent(uid, ref ev); + // oops, no more advanced lasers! + _research.ClearTechs(target, database); + } +} + +/// +/// Event raised on the user when research is stolen from a R&D server. +/// Techs contains every technology id researched. +/// +[ByRefEvent] +public record struct ResearchStolenEvent(EntityUid Used, EntityUid Target, List Techs); diff --git a/Content.Server/Roles/NinjaRoleComponent.cs b/Content.Server/Roles/NinjaRoleComponent.cs new file mode 100644 index 0000000000..aa9e1cfa32 --- /dev/null +++ b/Content.Server/Roles/NinjaRoleComponent.cs @@ -0,0 +1,40 @@ +using Content.Shared.Roles; + +namespace Content.Server.Roles; + +/// +/// Stores the ninja's objectives on the mind so if they die the rest of the greentext persists. +/// +[RegisterComponent] +public sealed partial class NinjaRoleComponent : AntagonistRoleComponent +{ + /// + /// Number of doors that have been doorjacked, used for objective + /// + [DataField("doorsJacked")] + public int DoorsJacked; + + /// + /// Research nodes that have been downloaded, used for objective + /// + [DataField("downloadedNodes")] + public HashSet DownloadedNodes = new(); + + /// + /// Warp point that the spider charge has to target + /// + [DataField("spiderChargeTarget")] + public EntityUid? SpiderChargeTarget; + + /// + /// Whether the spider charge has been detonated on the target, used for objective + /// + [DataField("spiderChargeDetonated")] + public bool SpiderChargeDetonated; + + /// + /// Whether the comms console has been hacked, used for objective + /// + [DataField("calledInThreat")] + public bool CalledInThreat; +} diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs index 12962b2b50..4ca6c0ac80 100644 --- a/Content.Server/Roles/RoleSystem.cs +++ b/Content.Server/Roles/RoleSystem.cs @@ -10,6 +10,7 @@ public sealed class RoleSystem : SharedRoleSystem base.Initialize(); SubscribeAntagEvents(); + SubscribeAntagEvents(); SubscribeAntagEvents(); SubscribeAntagEvents(); SubscribeAntagEvents(); diff --git a/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs new file mode 100644 index 0000000000..d758247eca --- /dev/null +++ b/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs @@ -0,0 +1,16 @@ +using Content.Server.StationEvents.Events; + +namespace Content.Server.StationEvents.Components; + +/// +/// Configuration component for the Space Ninja antag. +/// +[RegisterComponent, Access(typeof(NinjaSpawnRule))] +public sealed partial class NinjaSpawnRuleComponent : Component +{ + /// + /// Distance that the ninja spawns from the station's half AABB radius + /// + [DataField("spawnDistance")] + public float SpawnDistance = 20f; +} diff --git a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs new file mode 100644 index 0000000000..c60f3298e7 --- /dev/null +++ b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs @@ -0,0 +1,51 @@ +using Content.Server.GameTicking.Rules.Components; +using Content.Server.Ninja.Systems; +using Content.Server.Station.Components; +using Content.Server.StationEvents.Components; +using Robust.Server.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Map.Components; +using Robust.Shared.Random; + +namespace Content.Server.StationEvents.Events; + +/// +/// Event for spawning a Space Ninja mid-game. +/// +public sealed class NinjaSpawnRule : StationEventSystem +{ + [Dependency] private readonly SpaceNinjaSystem _ninja = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args) + { + base.Started(uid, comp, gameRule, args); + + if (!TryGetRandomStation(out var station)) + return; + + var stationData = Comp(station.Value); + + // find a station grid + var gridUid = StationSystem.GetLargestGrid(stationData); + if (gridUid == null || !TryComp(gridUid, out var grid)) + { + Sawmill.Warning("Chosen station has no grids, cannot spawn space ninja!"); + return; + } + + // figure out its AABB size and use that as a guide to how far ninja should be + var size = grid.LocalAABB.Size.Length() / 2; + var distance = size + comp.SpawnDistance; + var angle = RobustRandom.NextAngle(); + // position relative to station center + var location = angle.ToVec() * distance; + + // create the spawner, the ninja will appear when a ghost has picked the role + var xform = Transform(gridUid.Value); + var position = _transform.GetWorldPosition(xform) + location; + var coords = new MapCoordinates(position, xform.MapID); + Sawmill.Info($"Creating ninja spawnpoint at {coords}"); + Spawn("SpawnPointGhostSpaceNinja", coords); + } +} diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs index 7f74612010..8ba35ae282 100644 --- a/Content.Shared/Alert/AlertType.cs +++ b/Content.Shared/Alert/AlertType.cs @@ -47,7 +47,8 @@ namespace Content.Shared.Alert Debug3, Debug4, Debug5, - Debug6 + Debug6, + SuitPower } } diff --git a/Content.Shared/Communications/CommsHackerComponent.cs b/Content.Shared/Communications/CommsHackerComponent.cs new file mode 100644 index 0000000000..9116899cca --- /dev/null +++ b/Content.Shared/Communications/CommsHackerComponent.cs @@ -0,0 +1,47 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Communications; + +/// +/// Component for hacking a communications console to call in a threat. +/// Can only be done once, the component is remove afterwards. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedCommsHackerSystem))] +public sealed partial class CommsHackerComponent : Component +{ + /// + /// Time taken to hack the console + /// + [DataField("delay")] + public TimeSpan Delay = TimeSpan.FromSeconds(20); + + /// + /// Possible threats to choose from. + /// + [DataField("threats", required: true)] + public List Threats = new(); +} + +/// +/// A threat that can be called in to the station by a ninja hacking a communications console. +/// Generally some kind of mid-round minor antag, though you could make it call in scrubber backflow if you wanted to. +/// You wouldn't do that, right? +/// +[DataDefinition] +public sealed partial class Threat +{ + /// + /// Locale id for the announcement to be made from CentCom. + /// + [DataField("announcement")] + public string Announcement = default!; + + /// + /// The game rule for the threat to be added, it should be able to work when added mid-round otherwise this will do nothing. + /// + [DataField("rule", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string Rule = default!; +} diff --git a/Content.Shared/Communications/SharedCommsHackerSystem.cs b/Content.Shared/Communications/SharedCommsHackerSystem.cs new file mode 100644 index 0000000000..94c530878a --- /dev/null +++ b/Content.Shared/Communications/SharedCommsHackerSystem.cs @@ -0,0 +1,28 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Communications; + +/// +/// Only exists in shared to provide API and for access. +/// All logic is serverside. +/// +public abstract class SharedCommsHackerSystem : EntitySystem +{ + /// + /// Set the list of threats to choose from when hacking a comms console. + /// + public void SetThreats(EntityUid uid, List threats, CommsHackerComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return; + + comp.Threats = threats; + } +} + +/// +/// DoAfter event for comms console terror ability. +/// +[Serializable, NetSerializable] +public sealed partial class TerrorDoAfterEvent : SimpleDoAfterEvent { } diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs index a895311fb2..effba18210 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs @@ -112,6 +112,15 @@ namespace Content.Shared.Containers.ItemSlots [ViewVariables(VVAccess.ReadWrite)] public bool Locked = false; + /// + /// Prevents adding the eject alt-verb, but still lets you swap items. + /// + /// + /// This does not affect EjectOnInteract, since if you do that you probably want ejecting to work. + /// + [DataField("disableEject"), ViewVariables(VVAccess.ReadWrite)] + public bool DisableEject = false; + /// /// Whether the item slots system will attempt to insert item from the user's hands into this slot when interacted with. /// It doesn't block other insertion methods, like verbs. diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index f69e8d4d2f..594479d0df 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -477,7 +477,7 @@ namespace Content.Shared.Containers.ItemSlots // Add the eject-item verbs foreach (var slot in itemSlots.Slots.Values) { - if (slot.EjectOnInteract) + if (slot.EjectOnInteract || slot.DisableEject) // For this item slot, ejecting/inserting is a primary interaction. Instead of an eject category // alt-click verb, there will be a "Take item" primary interaction verb. continue; diff --git a/Content.Shared/Electrocution/SharedElectrocutionSystem.cs b/Content.Shared/Electrocution/SharedElectrocutionSystem.cs index d7848c073b..67a395bb81 100644 --- a/Content.Shared/Electrocution/SharedElectrocutionSystem.cs +++ b/Content.Shared/Electrocution/SharedElectrocutionSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Inventory; +using Content.Shared.StatusEffect; using Robust.Shared.GameStates; namespace Content.Shared.Electrocution @@ -25,6 +26,23 @@ namespace Content.Shared.Electrocution Dirty(insulated); } + /// Entity being electrocuted. + /// Source entity of the electrocution. + /// How much shock damage the entity takes. + /// How long the entity will be stunned. + /// Should time be refreshed (instead of accumilated) if the entity is already electrocuted? + /// How insulated the entity is from the shock. 0 means completely insulated, and 1 means no insulation. + /// Status effects to apply to the entity. + /// Should the electrocution bypass the Insulated component? + /// Whether the entity was stunned by the shock. + public virtual bool TryDoElectrocution( + EntityUid uid, EntityUid? sourceUid, int shockDamage, TimeSpan time, bool refresh, float siemensCoefficient = 1f, + StatusEffectsComponent? statusEffects = null, bool ignoreInsulation = false) + { + // only done serverside + return false; + } + private void OnInsulatedElectrocutionAttempt(EntityUid uid, InsulatedComponent insulated, ElectrocutionAttemptEvent args) { args.SiemensCoefficient *= insulated.SiemensCoefficient; diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs index 7d30438155..ebbd4c02ac 100644 --- a/Content.Shared/Emag/Systems/EmagSystem.cs +++ b/Content.Shared/Emag/Systems/EmagSystem.cs @@ -7,8 +7,6 @@ using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Tag; -using Robust.Shared.Network; -using Robust.Shared.Timing; namespace Content.Shared.Emag.Systems; @@ -22,10 +20,8 @@ public sealed class EmagSystem : EntitySystem { [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedChargesSystem _charges = default!; - [Dependency] private readonly INetManager _net = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly IGameTiming _timing = default!; public override void Initialize() { @@ -56,8 +52,7 @@ public sealed class EmagSystem : EntitySystem TryComp(uid, out var charges); if (_charges.IsEmpty(uid, charges)) { - if (_net.IsClient && _timing.IsFirstTimePredicted) - _popup.PopupEntity(Loc.GetString("emag-no-charges"), user, user); + _popup.PopupClient(Loc.GetString("emag-no-charges"), user, user); return false; } @@ -65,12 +60,8 @@ public sealed class EmagSystem : EntitySystem if (!handled) return false; - // only do popup on client - if (_net.IsClient && _timing.IsFirstTimePredicted) - { - _popup.PopupEntity(Loc.GetString("emag-success", ("target", Identity.Entity(target, EntityManager))), user, - user, PopupType.Medium); - } + _popup.PopupClient(Loc.GetString("emag-success", ("target", Identity.Entity(target, EntityManager))), user, + user, PopupType.Medium); _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target}"); diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs index 15780138f9..6d43c3dea1 100644 --- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs +++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs @@ -85,6 +85,28 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem } } + /// + /// Add a list of implants to a person. + /// Logs any implant ids that don't have . + /// + public void AddImplants(EntityUid uid, IEnumerable implants) + { + var coords = Transform(uid).Coordinates; + foreach (var id in implants) + { + var ent = Spawn(id, coords); + if (TryComp(ent, out var implant)) + { + ForceImplant(uid, ent, implant); + } + else + { + Log.Warning($"Found invalid starting implant '{id}' on {uid} {ToPrettyString(uid):implanted}"); + Del(ent); + } + } + } + /// /// Forces an implant into a person /// Good for on spawn related code or admin additions diff --git a/Content.Shared/Interaction/InteractHand.cs b/Content.Shared/Interaction/InteractHand.cs index 32e250b0f1..63ea3b6f30 100644 --- a/Content.Shared/Interaction/InteractHand.cs +++ b/Content.Shared/Interaction/InteractHand.cs @@ -38,6 +38,20 @@ namespace Content.Shared.Interaction } } + /// + /// Raised on the user before interacting on an entity with bare hand. + /// Interaction is cancelled if this event is handled, so set it to true if you do custom interaction logic. + /// + public sealed class BeforeInteractHandEvent : HandledEntityEventArgs + { + public EntityUid Target { get; } + + public BeforeInteractHandEvent(EntityUid target) + { + Target = target; + } + } + /// /// Low-level interaction event used for entities without hands. /// diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index f00d9c8c38..bf276dff0b 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -380,6 +380,15 @@ namespace Content.Shared.Interaction public void InteractHand(EntityUid user, EntityUid target) { + // allow for special logic before main interaction + var ev = new BeforeInteractHandEvent(target); + RaiseLocalEvent(user, ev); + if (ev.Handled) + { + _adminLogger.Add(LogType.InteractHand, LogImpact.Low, $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target}, but it was handled by another system"); + return; + } + // all interactions should only happen when in range / unobstructed, so no range check is needed var message = new InteractHandEvent(user, target); RaiseLocalEvent(target, message, true); diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index 7bada2303f..fc6cb8d570 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -12,14 +12,16 @@ using Content.Shared.Players; using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Players; +using Robust.Shared.Prototypes; using Robust.Shared.Utility; namespace Content.Shared.Mind; public abstract class SharedMindSystem : EntitySystem { - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly SharedPlayerSystem _playerSystem = default!; // This is dictionary is required to track the minds of disconnected players that may have had their entity deleted. @@ -268,6 +270,23 @@ public abstract class SharedMindSystem : EntitySystem return true; } + /// + /// Adds an objective, by id, to this mind. + /// + public bool TryAddObjective(EntityUid mindId, string name, MindComponent? mind = null) + { + if (!Resolve(mindId, ref mind)) + return false; + + if (!_proto.TryIndex(name, out var objective)) + { + Log.Error($"Tried to add unknown objective prototype: {name}"); + return false; + } + + return TryAddObjective(mindId, mind, objective); + } + /// /// Removes an objective to this mind. /// @@ -340,6 +359,19 @@ public abstract class SharedMindSystem : EntitySystem return _playerSystem.ContentData(player) is { } data && TryGetMind(data, out mindId, out mind); } + /// + /// Gets a role component from a player's mind. + /// + /// Whether a role was found + public bool TryGetRole(EntityUid user, [NotNullWhen(true)] out T? role) where T : Component + { + role = null; + if (!TryComp(user, out var mindContainer) || mindContainer.Mind == null) + return false; + + return TryComp(mindContainer.Mind, out role); + } + /// /// Sets the Mind's OwnedComponent and OwnedEntity /// diff --git a/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs b/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs new file mode 100644 index 0000000000..55bcdd0f0a --- /dev/null +++ b/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs @@ -0,0 +1,38 @@ +using Content.Shared.Ninja.Systems; +using Robust.Shared.Audio; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for draining power from APCs/substations/SMESes, when ProviderUid is set to a battery cell. +/// Does not rely on relay, simply being on the user and having BatteryUid set is enough. +/// +[RegisterComponent, Access(typeof(SharedBatteryDrainerSystem))] +public sealed partial class BatteryDrainerComponent : Component +{ + /// + /// The powercell entity to drain power into. + /// Determines whether draining is possible. + /// + [DataField("batteryUid"), ViewVariables(VVAccess.ReadWrite)] + public EntityUid? BatteryUid; + + /// + /// Conversion rate between joules in a device and joules added to battery. + /// Should be very low since powercells store nothing compared to even an APC. + /// + [DataField("drainEfficiency"), ViewVariables(VVAccess.ReadWrite)] + public float DrainEfficiency = 0.001f; + + /// + /// Time that the do after takes to drain charge from a battery, in seconds + /// + [DataField("drainTime"), ViewVariables(VVAccess.ReadWrite)] + public float DrainTime = 1f; + + /// + /// Sound played after the doafter ends. + /// + [DataField("sparkSound")] + public SoundSpecifier SparkSound = new SoundCollectionSpecifier("sparks"); +} diff --git a/Content.Shared/Ninja/Components/DashAbilityComponent.cs b/Content.Shared/Ninja/Components/DashAbilityComponent.cs new file mode 100644 index 0000000000..85e0963af1 --- /dev/null +++ b/Content.Shared/Ninja/Components/DashAbilityComponent.cs @@ -0,0 +1,33 @@ +using Content.Shared.Actions; +using Content.Shared.Ninja.Systems; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +/// +/// Adds an action to dash, teleport to clicked position, when this item is held. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(DashAbilitySystem))] +public sealed partial class DashAbilityComponent : Component +{ + /// + /// The action id for dashing. + /// + [DataField("dashAction", required: true, customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] + public string DashAction = string.Empty; + + [DataField("dashActionEntity")] + public EntityUid? DashActionEntity; + + /// + /// Sound played when using dash action. + /// + [DataField("blinkSound"), ViewVariables(VVAccess.ReadWrite)] + public SoundSpecifier BlinkSound = new SoundPathSpecifier("/Audio/Magic/blink.ogg") + { + Params = AudioParams.Default.WithVolume(5f) + }; +} + +public sealed partial class DashEvent : WorldTargetActionEvent { } diff --git a/Content.Shared/Ninja/Components/EmagProviderComponent.cs b/Content.Shared/Ninja/Components/EmagProviderComponent.cs new file mode 100644 index 0000000000..db7678f61d --- /dev/null +++ b/Content.Shared/Ninja/Components/EmagProviderComponent.cs @@ -0,0 +1,28 @@ +using Content.Shared.Ninja.Systems; +using Content.Shared.Tag; +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for emagging things on click. +/// No charges but checks against a whitelist. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(EmagProviderSystem))] +public sealed partial class EmagProviderComponent : Component +{ + /// + /// The tag that marks an entity as immune to emagging. + /// + [DataField("emagImmuneTag", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string EmagImmuneTag = "EmagImmune"; + + /// + /// Whitelist that entities must be on to work. + /// + [DataField("whitelist"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public EntityWhitelist? Whitelist = null; +} diff --git a/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs b/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs new file mode 100644 index 0000000000..33b8fc7893 --- /dev/null +++ b/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for a Space Ninja's katana, controls ninja related dash logic. +/// Requires a ninja with a suit for abilities to work. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class EnergyKatanaComponent : Component +{ +} diff --git a/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs b/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs new file mode 100644 index 0000000000..b104312b20 --- /dev/null +++ b/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs @@ -0,0 +1,45 @@ +using Content.Shared.DoAfter; +using Content.Shared.Ninja.Systems; +using Content.Shared.Toggleable; +using Content.Shared.Whitelist; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Utility; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for toggling glove powers. +/// Powers being enabled is controlled by User not being null. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(SharedNinjaGlovesSystem))] +public sealed partial class NinjaGlovesComponent : Component +{ + /// + /// Entity of the ninja using these gloves, usually means enabled + /// + [DataField("user"), AutoNetworkedField] + public EntityUid? User; + + /// + /// The action id for toggling ninja gloves abilities + /// + [DataField("toggleAction", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string ToggleAction = "ActionToggleNinjaGloves"; + + [DataField("toggleActionEntity")] + public EntityUid? ToggleActionEntity; + + /// + /// The whitelist used for the emag provider to emag airlocks only (not regular doors). + /// + [DataField("doorjackWhitelist")] + public EntityWhitelist DoorjackWhitelist = new() + { + Components = new[] {"Airlock"} + }; +} diff --git a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs new file mode 100644 index 0000000000..816cc9d731 --- /dev/null +++ b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs @@ -0,0 +1,125 @@ +using Content.Shared.Actions; +using Content.Shared.Ninja.Systems; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Utility; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for ninja suit abilities and power consumption. +/// As an implementation detail, dashing with katana is a suit action which isn't ideal. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedNinjaSuitSystem))] +public sealed partial class NinjaSuitComponent : Component +{ + /// + /// Battery charge used passively, in watts. Will last 1000 seconds on a small-capacity power cell. + /// + [DataField("passiveWattage")] + public float PassiveWattage = 0.36f; + + /// + /// Battery charge used while cloaked, stacks with passive. Will last 200 seconds while cloaked on a small-capacity power cell. + /// + [DataField("cloakWattage")] + public float CloakWattage = 1.44f; + + /// + /// Sound played when a ninja is hit while cloaked. + /// + [DataField("revealSound")] + public SoundSpecifier RevealSound = new SoundPathSpecifier("/Audio/Effects/chime.ogg"); + + /// + /// How long to disable all abilities for when revealed. + /// This adds a UseDelay to the ninja so it should not be set by anything else. + /// + [DataField("disableTime")] + public TimeSpan DisableTime = TimeSpan.FromSeconds(5); + + /// + /// The action id for creating throwing stars. + /// + [DataField("createThrowingStarAction", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string CreateThrowingStarAction = "ActionCreateThrowingStar"; + + [DataField("createThrowingStarActionEntity")] + public EntityUid? CreateThrowingStarActionEntity; + + /// + /// Battery charge used to create a throwing star. Can do it 25 times on a small-capacity power cell. + /// + [DataField("throwingStarCharge")] + public float ThrowingStarCharge = 14.4f; + + /// + /// Throwing star item to create with the action + /// + [DataField("throwingStarPrototype", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string ThrowingStarPrototype = "ThrowingStarNinja"; + + /// + /// The action id for recalling a bound energy katana + /// + [DataField("recallKatanaAction", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string RecallKatanaAction = "ActionRecallKatana"; + + [DataField("recallKatanaActionEntity")] + public EntityUid? RecallKatanaActionEntity; + + /// + /// Battery charge used per tile the katana teleported. + /// Uses 1% of a default battery per tile. + /// + [DataField("recallCharge")] + public float RecallCharge = 3.6f; + + /// + /// The action id for creating an EMP burst + /// + [DataField("empAction", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string EmpAction = "ActionNinjaEmp"; + + [DataField("empActionEntity")] + public EntityUid? EmpActionEntity; + + /// + /// Battery charge used to create an EMP burst. Can do it 2 times on a small-capacity power cell. + /// + [DataField("empCharge")] + public float EmpCharge = 180f; + + /// + /// Range of the EMP in tiles. + /// + [DataField("empRange")] + public float EmpRange = 6f; + + /// + /// Power consumed from batteries by the EMP + /// + [DataField("empConsumption")] + public float EmpConsumption = 100000f; + + /// + /// How long the EMP effects last for, in seconds + /// + [DataField("empDuration")] + public float EmpDuration = 60f; +} + +public sealed partial class CreateThrowingStarEvent : InstantActionEvent +{ +} + +public sealed partial class RecallKatanaEvent : InstantActionEvent +{ +} + +public sealed partial class NinjaEmpEvent : InstantActionEvent +{ +} diff --git a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs new file mode 100644 index 0000000000..dff4b56aa4 --- /dev/null +++ b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs @@ -0,0 +1,38 @@ +using Content.Shared.Ninja.Systems; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component placed on a mob to make it a space ninja, able to use suit and glove powers. +/// Contains ids of all ninja equipment and the game rule. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(SharedSpaceNinjaSystem))] +public sealed partial class SpaceNinjaComponent : Component +{ + /// + /// The ninja game rule that spawned this ninja. + /// + [DataField("rule")] + public EntityUid? Rule; + + /// + /// Currently worn suit + /// + [DataField("suit"), AutoNetworkedField] + public EntityUid? Suit; + + /// + /// Currently worn gloves + /// + [DataField("gloves"), AutoNetworkedField] + public EntityUid? Gloves; + + /// + /// Bound katana, set once picked up and never removed + /// + [DataField("katana"), AutoNetworkedField] + public EntityUid? Katana; +} diff --git a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs new file mode 100644 index 0000000000..dacf47bb23 --- /dev/null +++ b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs @@ -0,0 +1,19 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for the Space Ninja's unique Spider Charge. +/// Only this component detonating can trigger the ninja's objective. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class SpiderChargeComponent : Component +{ + /// Range for planting within the target area + [DataField("range")] + public float Range = 10f; + + /// The ninja that planted this charge + [DataField("planter")] + public EntityUid? Planter = null; +} diff --git a/Content.Shared/Ninja/Components/StunProviderComponent.cs b/Content.Shared/Ninja/Components/StunProviderComponent.cs new file mode 100644 index 0000000000..653b125478 --- /dev/null +++ b/Content.Shared/Ninja/Components/StunProviderComponent.cs @@ -0,0 +1,67 @@ +using Content.Shared.Ninja.Systems; +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; + +namespace Content.Shared.Ninja.Components; + +/// +/// Component for stunning mobs on click outside of harm mode. +/// Knocks them down for a bit and deals shock damage. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStunProviderSystem))] +public sealed partial class StunProviderComponent : Component +{ + /// + /// The powercell entity to take power from. + /// Determines whether stunning is possible. + /// + [DataField("batteryUid"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public EntityUid? BatteryUid; + + /// + /// Joules required in the battery to stun someone. Defaults to 10 uses on a small battery. + /// + [DataField("stunCharge"), ViewVariables(VVAccess.ReadWrite)] + public float StunCharge = 36.0f; + + /// + /// Shock damage dealt when stunning someone + /// + [DataField("stunDamage"), ViewVariables(VVAccess.ReadWrite)] + public int StunDamage = 5; + + /// + /// Time that someone is stunned for, stacks if done multiple times. + /// + [DataField("stunTime"), ViewVariables(VVAccess.ReadWrite)] + public TimeSpan StunTime = TimeSpan.FromSeconds(3); + + /// + /// How long stunning is disabled after stunning something. + /// + [DataField("cooldown"), ViewVariables(VVAccess.ReadWrite)] + public TimeSpan Cooldown = TimeSpan.FromSeconds(1); + + /// + /// Locale string to popup when there is no power + /// + [DataField("noPowerPopup", required: true), ViewVariables(VVAccess.ReadWrite)] + public string NoPowerPopup = string.Empty; + + /// + /// Whitelist for what counts as a mob. + /// + [DataField("whitelist")] + public EntityWhitelist Whitelist = new() + { + Components = new[] {"Stamina"} + }; + + /// + /// When someone can next be stunned. + /// Essentially a UseDelay unique to this component. + /// + [DataField("nextStun", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] + public TimeSpan NextStun = TimeSpan.Zero; +} diff --git a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs new file mode 100644 index 0000000000..bd6320de68 --- /dev/null +++ b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs @@ -0,0 +1,118 @@ +using Content.Shared.Actions; +using Content.Shared.Charges.Components; +using Content.Shared.Charges.Systems; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Interaction; +using Content.Shared.Ninja.Components; +using Content.Shared.Physics; +using Content.Shared.Popups; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Timing; + +namespace Content.Shared.Ninja.Systems; + +/// +/// Handles dashing logic including charge consumption and checking attempt events. +/// +public sealed class DashAbilitySystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedChargesSystem _charges = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGetItemActions); + SubscribeLocalEvent(OnDash); + } + + private void OnGetItemActions(EntityUid uid, DashAbilityComponent comp, GetItemActionsEvent args) + { + var ev = new AddDashActionEvent(args.User); + RaiseLocalEvent(uid, ev); + + if (ev.Cancelled) + return; + + args.AddAction(ref comp.DashActionEntity, comp.DashAction); + } + + /// + /// Handle charges and teleport to a visible location. + /// + private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args) + { + if (!_timing.IsFirstTimePredicted) + return; + + var user = args.Performer; + args.Handled = true; + + var ev = new DashAttemptEvent(user); + RaiseLocalEvent(uid, ev); + if (ev.Cancelled) + return; + + if (!_hands.IsHolding(user, uid, out var _)) + { + _popup.PopupClient(Loc.GetString("dash-ability-not-held", ("item", uid)), user, user); + return; + } + + TryComp(uid, out var charges); + if (_charges.IsEmpty(uid, charges)) + { + _popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user); + return; + } + + var origin = Transform(user).MapPosition; + var target = args.Target.ToMap(EntityManager, _transform); + // prevent collision with the user duh + if (!_interaction.InRangeUnobstructed(origin, target, 0f, CollisionGroup.Opaque, uid => uid == user)) + { + // can only dash if the destination is visible on screen + _popup.PopupClient(Loc.GetString("dash-ability-cant-see", ("item", uid)), user, user); + return; + } + + _transform.SetCoordinates(user, args.Target); + _transform.AttachToGridOrMap(user); + _audio.PlayPredicted(comp.BlinkSound, user, user); + if (charges != null) + _charges.UseCharge(uid, charges); + } +} + +/// +/// Raised on the item before adding the dash action +/// +public sealed class AddDashActionEvent : CancellableEntityEventArgs +{ + public EntityUid User; + + public AddDashActionEvent(EntityUid user) + { + User = user; + } +} + +/// +/// Raised on the item before dashing is done. +/// +public sealed class DashAttemptEvent : CancellableEntityEventArgs +{ + public EntityUid User; + + public DashAttemptEvent(EntityUid user) + { + User = user; + } +} diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs new file mode 100644 index 0000000000..df9cf8ac82 --- /dev/null +++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs @@ -0,0 +1,72 @@ +using Content.Shared.Administration.Logs; +using Content.Shared.Emag.Systems; +using Content.Shared.Database; +using Content.Shared.Interaction; +using Content.Shared.Ninja.Components; +using Content.Shared.Tag; +using Content.Shared.Whitelist; + +namespace Content.Shared.Ninja.Systems; + +/// +/// Handles emagging whitelisted objects when clicked. +/// +public sealed class EmagProviderSystem : EntitySystem +{ + [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private readonly TagSystem _tags = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBeforeInteractHand); + } + + /// + /// Emag clicked entities that are on the whitelist. + /// + private void OnBeforeInteractHand(EntityUid uid, EmagProviderComponent comp, BeforeInteractHandEvent args) + { + // TODO: change this into a generic check event thing + if (args.Handled || !_gloves.AbilityCheck(uid, args, out var target)) + return; + + // only allowed to emag entities on the whitelist + if (comp.Whitelist != null && !comp.Whitelist.IsValid(target, EntityManager)) + return; + + // only allowed to emag non-immune entities + if (_tags.HasTag(target, comp.EmagImmuneTag)) + return; + + var handled = _emag.DoEmagEffect(uid, target); + if (!handled) + return; + + _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(uid):player} emagged {ToPrettyString(target):target}"); + var ev = new EmaggedSomethingEvent(target); + RaiseLocalEvent(uid, ref ev); + args.Handled = true; + } + + /// + /// Set the whitelist for emagging something outside of yaml. + /// + public void SetWhitelist(EntityUid uid, EntityWhitelist? whitelist, EmagProviderComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return; + + comp.Whitelist = whitelist; + Dirty(uid, comp); + } +} + +/// +/// Raised on the player when emagging something. +/// +[ByRefEvent] +public record struct EmaggedSomethingEvent(EntityUid Target); diff --git a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs new file mode 100644 index 0000000000..d427ffa39b --- /dev/null +++ b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs @@ -0,0 +1,47 @@ +using Content.Shared.Inventory.Events; +using Content.Shared.Ninja.Components; + +namespace Content.Shared.Ninja.Systems; + +/// +/// System for katana binding and dash events. Recalling is handled by the suit. +/// +public sealed class EnergyKatanaSystem : EntitySystem +{ + [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnAddDashAction); + SubscribeLocalEvent(OnDashAttempt); + } + + /// + /// When equipped by a ninja, try to bind it. + /// + private void OnEquipped(EntityUid uid, EnergyKatanaComponent comp, GotEquippedEvent args) + { + // check if user isnt a ninja or already has a katana bound + var user = args.Equipee; + if (!TryComp(user, out var ninja) || ninja.Katana != null) + return; + + // bind it since its unbound + _ninja.BindKatana(user, uid, ninja); + } + + private void OnAddDashAction(EntityUid uid, EnergyKatanaComponent comp, AddDashActionEvent args) + { + if (!HasComp(args.User)) + args.Cancel(); + } + + private void OnDashAttempt(EntityUid uid, EnergyKatanaComponent comp, DashAttemptEvent args) + { + if (!TryComp(args.User, out var ninja) || ninja.Katana != uid) + args.Cancel(); + } +} diff --git a/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs b/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs new file mode 100644 index 0000000000..ac11063eb7 --- /dev/null +++ b/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs @@ -0,0 +1,69 @@ +using Content.Shared.Ninja.Components; +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Ninja.Systems; + +/// +/// Basic draining prediction and API, all real logic is handled serverside. +/// +public abstract class SharedBatteryDrainerSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent>(OnDoAfterAttempt); + SubscribeLocalEvent(OnDoAfter); + } + + /// + /// Cancel any drain doafters if the battery is removed or gets filled. + /// + protected virtual void OnDoAfterAttempt(EntityUid uid, BatteryDrainerComponent comp, DoAfterAttemptEvent args) + { + if (comp.BatteryUid == null) + { + args.Cancel(); + } + } + + /// + /// Drain power from a power source (on server) and repeat if it succeeded. + /// Client will predict always succeeding since power is serverside. + /// + private void OnDoAfter(EntityUid uid, BatteryDrainerComponent comp, DrainDoAfterEvent args) + { + if (args.Cancelled || args.Handled || args.Target == null) + return; + + // repeat if there is still power to drain + args.Repeat = TryDrainPower(uid, comp, args.Target.Value); + } + + /// + /// Attempt to drain as much power as possible into the powercell. + /// Client always predicts this as succeeding since power is serverside and it can only fail once, when the powercell is filled or the target is emptied. + /// + protected virtual bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp, EntityUid target) + { + return true; + } + + /// + /// Sets the battery field on the drainer. + /// + public void SetBattery(EntityUid uid, EntityUid? battery, BatteryDrainerComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return; + + comp.BatteryUid = battery; + } +} + +/// +/// DoAfter event for . +/// +[Serializable, NetSerializable] +public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent { } diff --git a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs new file mode 100644 index 0000000000..45c97fd1aa --- /dev/null +++ b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs @@ -0,0 +1,116 @@ +using Content.Shared.Actions; +using Content.Shared.CombatMode; +using Content.Shared.Communications; +using Content.Shared.Doors.Components; +using Content.Shared.DoAfter; +using Content.Shared.Examine; +using Content.Shared.Hands.Components; +using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Inventory.Events; +using Content.Shared.Ninja.Components; +using Content.Shared.Popups; +using Content.Shared.Research.Components; +using Content.Shared.Timing; +using Content.Shared.Toggleable; +using Robust.Shared.Timing; +using System.Diagnostics.CodeAnalysis; + +namespace Content.Shared.Ninja.Systems; + +/// +/// Provides the toggle action and handles examining and unequipping. +/// +public abstract class SharedNinjaGlovesSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; + [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; + [Dependency] protected readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] protected readonly SharedInteractionSystem Interaction = default!; + [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!; + [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] private readonly UseDelaySystem _useDelay = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGetItemActions); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnUnequipped); + } + + /// + /// Disable glove abilities and show the popup if they were enabled previously. + /// + public void DisableGloves(EntityUid uid, NinjaGlovesComponent? comp = null) + { + // already disabled? + if (!Resolve(uid, ref comp) || comp.User == null) + return; + + var user = comp.User.Value; + comp.User = null; + Dirty(uid, comp); + + Appearance.SetData(uid, ToggleVisuals.Toggled, false); + Popup.PopupClient(Loc.GetString("ninja-gloves-off"), user, user); + + RemComp(user); + RemComp(user); + RemComp(user); + RemComp(user); + RemComp(user); + } + + /// + /// Adds the toggle action when equipped. + /// + private void OnGetItemActions(EntityUid uid, NinjaGlovesComponent comp, GetItemActionsEvent args) + { + if (HasComp(args.User)) + args.AddAction(ref comp.ToggleActionEntity, comp.ToggleAction); + } + + /// + /// Show if the gloves are enabled when examining. + /// + private void OnExamined(EntityUid uid, NinjaGlovesComponent comp, ExaminedEvent args) + { + if (!args.IsInDetailsRange) + return; + + args.PushText(Loc.GetString(comp.User != null ? "ninja-gloves-examine-on" : "ninja-gloves-examine-off")); + } + + /// + /// Disable gloves when unequipped and clean up ninja's gloves reference + /// + private void OnUnequipped(EntityUid uid, NinjaGlovesComponent comp, GotUnequippedEvent args) + { + if (comp.User != null) + { + var user = comp.User.Value; + Popup.PopupClient(Loc.GetString("ninja-gloves-off"), user, user); + DisableGloves(uid, comp); + } + } + + + // TODO: generic event thing + /// + /// GloveCheck but for abilities stored on the player, skips some checks. + /// Intended to be more generic, doesn't require the user to be a ninja or have any ninja equipment. + /// + public bool AbilityCheck(EntityUid uid, BeforeInteractHandEvent args, out EntityUid target) + { + target = args.Target; + return _timing.IsFirstTimePredicted + && !_combatMode.IsInCombatMode(uid) + && !_useDelay.ActiveDelay(uid) + && TryComp(uid, out var hands) + && hands.ActiveHandEntity == null + && Interaction.InRangeUnobstructed(uid, target); + } +} diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs new file mode 100644 index 0000000000..83fcba4ac6 --- /dev/null +++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs @@ -0,0 +1,139 @@ +using Content.Shared.Actions; +using Content.Shared.Clothing.Components; +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Inventory.Events; +using Content.Shared.Ninja.Components; +using Content.Shared.Timing; +using Robust.Shared.Audio; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Ninja.Systems; + +/// +/// Handles (un)equipping and provides some API functions. +/// +public abstract class SharedNinjaSuitSystem : EntitySystem +{ + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; + [Dependency] protected readonly SharedSpaceNinjaSystem _ninja = default!; + [Dependency] protected readonly StealthClothingSystem StealthClothing = default!; + [Dependency] protected readonly UseDelaySystem UseDelay = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnGetItemActions); + SubscribeLocalEvent(OnAddStealthAction); + SubscribeLocalEvent(OnUnequipped); + } + + /// + /// Call the shared and serverside code for when a ninja equips the suit. + /// + private void OnEquipped(EntityUid uid, NinjaSuitComponent comp, GotEquippedEvent args) + { + var user = args.Equipee; + if (!TryComp(user, out var ninja)) + return; + + NinjaEquippedSuit(uid, comp, user, ninja); + } + + /// + /// Add all the actions when a suit is equipped by a ninja. + /// + private void OnGetItemActions(EntityUid uid, NinjaSuitComponent comp, GetItemActionsEvent args) + { + if (!HasComp(args.User)) + return; + + args.AddAction(ref comp.RecallKatanaActionEntity, comp.RecallKatanaAction); + args.AddAction(ref comp.CreateThrowingStarActionEntity, comp.CreateThrowingStarAction); + args.AddAction(ref comp.EmpActionEntity, comp.EmpAction); + } + + /// + /// Only add stealth clothing's toggle action when equipped by a ninja. + /// + private void OnAddStealthAction(EntityUid uid, NinjaSuitComponent comp, AddStealthActionEvent args) + { + if (!HasComp(args.User)) + args.Cancel(); + } + + /// + /// Call the shared and serverside code for when anyone unequips a suit. + /// + private void OnUnequipped(EntityUid uid, NinjaSuitComponent comp, GotUnequippedEvent args) + { + UserUnequippedSuit(uid, comp, args.Equipee); + } + + /// + /// Called when a suit is equipped by a space ninja. + /// In the future it might be changed to an explicit activation toggle/verb like gloves are. + /// + protected virtual void NinjaEquippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user, SpaceNinjaComponent ninja) + { + // mark the user as wearing this suit, used when being attacked among other things + _ninja.AssignSuit(user, uid, ninja); + + // initialize phase cloak, but keep it off + StealthClothing.SetEnabled(uid, user, false); + } + + /// + /// Force uncloaks the user and disables suit abilities. + /// + public void RevealNinja(EntityUid uid, EntityUid user, NinjaSuitComponent? comp = null, StealthClothingComponent? stealthClothing = null) + { + if (!Resolve(uid, ref comp, ref stealthClothing)) + return; + + if (!StealthClothing.SetEnabled(uid, user, false, stealthClothing)) + return; + + // previously cloaked, disable abilities for a short time + _audio.PlayPredicted(comp.RevealSound, uid, user); + // all abilities check for a usedelay on the ninja + var useDelay = EnsureComp(user); + useDelay.Delay = comp.DisableTime; + UseDelay.BeginDelay(user, useDelay); + } + + // TODO: modify PowerCellDrain + /// + /// Returns the power used by a suit + /// + public float SuitWattage(EntityUid uid, NinjaSuitComponent? suit = null) + { + if (!Resolve(uid, ref suit)) + return 0f; + + float wattage = suit.PassiveWattage; + if (TryComp(uid, out var stealthClothing) && stealthClothing.Enabled) + wattage += suit.CloakWattage; + return wattage; + } + + /// + /// Called when a suit is unequipped, not necessarily by a space ninja. + /// In the future it might be changed to also have explicit deactivation via toggle. + /// + protected virtual void UserUnequippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user) + { + if (!TryComp(user, out var ninja)) + return; + + // mark the user as not wearing a suit + _ninja.AssignSuit(user, null, ninja); + // disable glove abilities + if (ninja.Gloves != null && TryComp(ninja.Gloves.Value, out var gloves)) + _gloves.DisableGloves(ninja.Gloves.Value, gloves); + } +} diff --git a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs new file mode 100644 index 0000000000..d8ff07c27a --- /dev/null +++ b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs @@ -0,0 +1,89 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Ninja.Components; +using Content.Shared.Weapons.Melee.Events; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Popups; + +namespace Content.Shared.Ninja.Systems; + +/// +/// Provides shared ninja API, handles being attacked revealing ninja and stops guns from shooting. +/// +public abstract class SharedSpaceNinjaSystem : EntitySystem +{ + [Dependency] protected readonly SharedNinjaSuitSystem _suit = default!; + [Dependency] protected readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnNinjaAttacked); + SubscribeLocalEvent(OnShotAttempted); + } + + /// + /// Set the ninja's worn suit entity + /// + public void AssignSuit(EntityUid uid, EntityUid? suit, SpaceNinjaComponent? comp = null) + { + if (!Resolve(uid, ref comp) || comp.Suit == suit) + return; + + comp.Suit = suit; + Dirty(uid, comp); + } + + /// + /// Set the ninja's worn gloves entity + /// + public void AssignGloves(EntityUid uid, EntityUid? gloves, SpaceNinjaComponent? comp = null) + { + if (!Resolve(uid, ref comp) || comp.Gloves == gloves) + return; + + comp.Gloves = gloves; + Dirty(uid, comp); + } + + /// + /// Bind a katana entity to a ninja, letting it be recalled and dash. + /// + public void BindKatana(EntityUid uid, EntityUid? katana, SpaceNinjaComponent? comp = null) + { + if (!Resolve(uid, ref comp) || comp.Katana == katana) + return; + + comp.Katana = katana; + Dirty(uid, comp); + } + + /// + /// Gets the user's battery and tries to use some charge from it, returning true if successful. + /// Serverside only. + /// + public virtual bool TryUseCharge(EntityUid user, float charge) + { + return false; + } + + /// + /// Handle revealing ninja if cloaked when attacked. + /// + private void OnNinjaAttacked(EntityUid uid, SpaceNinjaComponent comp, AttackedEvent args) + { + if (comp.Suit != null && TryComp(comp.Suit, out var stealthClothing) && stealthClothing.Enabled) + { + _suit.RevealNinja(comp.Suit.Value, uid, null, stealthClothing); + } + } + + /// + /// Require ninja to fight with HONOR, no guns! + /// + private void OnShotAttempted(EntityUid uid, SpaceNinjaComponent comp, ref ShotAttemptedEvent args) + { + _popup.PopupClient(Loc.GetString("gun-disabled"), uid, uid); + args.Cancel(); + } +} diff --git a/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs b/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs new file mode 100644 index 0000000000..61b6e4313e --- /dev/null +++ b/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs @@ -0,0 +1,32 @@ +using Content.Shared.Ninja.Components; + +namespace Content.Shared.Ninja.Systems; + +/// +/// All interaction logic is implemented serverside. +/// This is in shared for API and access. +/// +public abstract class SharedStunProviderSystem : EntitySystem +{ + /// + /// Set the battery field on the stun provider. + /// + public void SetBattery(EntityUid uid, EntityUid? battery, StunProviderComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return; + + comp.BatteryUid = battery; + } + + /// + /// Set the no power popup field on the stun provider. + /// + public void SetNoPowerPopup(EntityUid uid, string popup, StunProviderComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return; + + comp.NoPowerPopup = popup; + } +} diff --git a/Content.Shared/Research/Components/ResearchStealerComponent.cs b/Content.Shared/Research/Components/ResearchStealerComponent.cs new file mode 100644 index 0000000000..e0331fad1b --- /dev/null +++ b/Content.Shared/Research/Components/ResearchStealerComponent.cs @@ -0,0 +1,17 @@ +using Content.Shared.Research.Systems; +using Robust.Shared.GameStates; + +namespace Content.Shared.Research.Components; + +/// +/// Component for stealing technologies from a R&D server, when gloves are enabled. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedResearchStealerSystem))] +public sealed partial class ResearchStealerComponent : Component +{ + /// + /// Time taken to steal research from a server + /// + [DataField("delay"), ViewVariables(VVAccess.ReadWrite)] + public TimeSpan Delay = TimeSpan.FromSeconds(20); +} diff --git a/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs b/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs new file mode 100644 index 0000000000..64f596023d --- /dev/null +++ b/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs @@ -0,0 +1,63 @@ +using Content.Shared.DoAfter; +using Content.Shared.Interaction; +using Content.Shared.Ninja.Systems; +using Content.Shared.Popups; +using Content.Shared.Research.Components; +using Robust.Shared.Serialization; + +namespace Content.Shared.Research.Systems; + +public abstract class SharedResearchStealerSystem : EntitySystem +{ + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBeforeInteractHand); + } + + /// + /// Start do after for downloading techs from a r&d server. + /// Will only try if there is at least 1 tech researched. + /// + private void OnBeforeInteractHand(EntityUid uid, ResearchStealerComponent comp, BeforeInteractHandEvent args) + { + // TODO: generic event + if (args.Handled || !_gloves.AbilityCheck(uid, args, out var target)) + return; + + // can only hack the server, not a random console + if (!TryComp(target, out var database) || HasComp(target)) + return; + + args.Handled = true; + + // fail fast if theres no techs to steal right now + if (database.UnlockedTechnologies.Count == 0) + { + _popup.PopupClient(Loc.GetString("ninja-download-fail"), uid, uid); + return; + } + + var doAfterArgs = new DoAfterArgs(uid, comp.Delay, new ResearchStealDoAfterEvent(), target: target, used: uid, eventTarget: uid) + { + BreakOnDamage = true, + BreakOnUserMove = true, + MovementThreshold = 0.5f + }; + + _doAfter.TryStartDoAfter(doAfterArgs); + } +} + +/// +/// Raised on the research stealer when the doafter completes. +/// +[Serializable, NetSerializable] +public sealed partial class ResearchStealDoAfterEvent : SimpleDoAfterEvent +{ +} diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs index fffbad847e..e0cc937b00 100644 --- a/Content.Shared/Research/Systems/SharedResearchSystem.cs +++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs @@ -169,6 +169,18 @@ public abstract class SharedResearchSystem : EntitySystem if (prototype.Tier < discipline.LockoutTier) return; component.MainDiscipline = prototype.Discipline; - Dirty(component); + Dirty(uid, component); + } + + /// + /// Clear all unlocked technologies from the database. + /// + public void ClearTechs(EntityUid uid, TechnologyDatabaseComponent? comp = null) + { + if (!Resolve(uid, ref comp) || comp.UnlockedTechnologies.Count == 0) + return; + + comp.UnlockedTechnologies.Clear(); + Dirty(uid, comp); } } diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml index 773d1e6e4e..fc70e1a9ca 100644 --- a/Resources/Audio/Misc/attributions.yml +++ b/Resources/Audio/Misc/attributions.yml @@ -2,3 +2,8 @@ license: "CC-BY-3.0" copyright: "Created by qwertyquerty" source: "https://www.youtube.com/@qwertyquerty" + +- files: ["ninja_greeting.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from TG station." + source: "https://github.com/tgstation/tgstation/blob/b02b93ce2ab891164511a973493cdf951b4120f7/sound/effects/ninja_greeting.ogg" diff --git a/Resources/Audio/Misc/ninja_greeting.ogg b/Resources/Audio/Misc/ninja_greeting.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e8f17bdea6cd3c93cdbd377cd8ed2fa0da16860a GIT binary patch literal 61293 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 F{{bx@H)#L> literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/administration/antag.ftl b/Resources/Locale/en-US/administration/antag.ftl index 529e960fb3..68f33f8c4d 100644 --- a/Resources/Locale/en-US/administration/antag.ftl +++ b/Resources/Locale/en-US/administration/antag.ftl @@ -2,4 +2,11 @@ verb-categories-antag = Antag ctrl admin-verb-make-traitor = Make the target into a traitor. admin-verb-make-zombie = Zombifies the target immediately. admin-verb-make-nuclear-operative = Make target a into lone Nuclear Operative. -admin-verb-make-pirate = Make the target into a pirate. Note this doesn't configure the game rule. +admin-verb-make-pirate = Make the target into a pirate. Note that this doesn't configure the game rule. +admin-verb-make-space-ninja = Make the target into a space ninja. + +admin-verb-text-make-traitor = Make Traitor +admin-verb-text-make-zombie = Make Zombie +admin-verb-text-make-nuclear-operative = Make Nuclear Operative +admin-verb-text-make-pirate = Make Pirate +admin-verb-text-make-space-ninja = Make Space Ninja diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl index d5f14c5fc8..33642b44b5 100644 --- a/Resources/Locale/en-US/alerts/alerts.ftl +++ b/Resources/Locale/en-US/alerts/alerts.ftl @@ -95,3 +95,6 @@ alerts-bleed-desc = You're [color=red]bleeding[/color]. alerts-pacified-name = [color=green]Pacified[/color] alerts-pacified-desc = You're pacified; you won't be able to attack anyone directly. + +alerts-suit-power-name = Suit Power +alerts-suit-power-desc = How much power your space ninja suit has. diff --git a/Resources/Locale/en-US/battery/components/battery-drainer-component.ftl b/Resources/Locale/en-US/battery/components/battery-drainer-component.ftl new file mode 100644 index 0000000000..2f9b06ef58 --- /dev/null +++ b/Resources/Locale/en-US/battery/components/battery-drainer-component.ftl @@ -0,0 +1,3 @@ +battery-drainer-full = Your battery is already full +battery-drainer-empty = {CAPITALIZE(THE($battery))} does not have enough power to drain +battery-drainer-success = You drain power from {THE($battery)}! diff --git a/Resources/Locale/en-US/communications/terror.ftl b/Resources/Locale/en-US/communications/terror.ftl new file mode 100644 index 0000000000..4bc80c0bd6 --- /dev/null +++ b/Resources/Locale/en-US/communications/terror.ftl @@ -0,0 +1,2 @@ +terror-dragon = Attention crew, it appears that someone on your station has made an unexpected communication with a strange fish in nearby space. +terror-revenant = Attention crew, it appears that someone on your station has made an unexpected communication with an otherworldly energy in nearby space. diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index 1ece42a5b1..4fa42ecede 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/Resources/Locale/en-US/guidebook/guides.ftl @@ -49,5 +49,6 @@ guide-entry-nuclear-operatives = Nuclear Operatives guide-entry-traitors = Traitors guide-entry-zombies = Zombies guide-entry-minor-antagonists = Minor Antagonists +guide-entry-space-ninja = Space Ninja guide-entry-writing = Writing diff --git a/Resources/Locale/en-US/ninja/gloves.ftl b/Resources/Locale/en-US/ninja/gloves.ftl new file mode 100644 index 0000000000..cb43208675 --- /dev/null +++ b/Resources/Locale/en-US/ninja/gloves.ftl @@ -0,0 +1,6 @@ +ninja-gloves-on = The gloves surge with power! +ninja-gloves-off = The gloves power down... +ninja-gloves-not-wearing-suit = You aren't wearing a ninja suit +ninja-gloves-examine-on = All abilities are enabled. +ninja-gloves-examine-off = Boring old gloves... +ninja-doorjack-success = The gloves zap something in {THE($target)}. diff --git a/Resources/Locale/en-US/ninja/katana.ftl b/Resources/Locale/en-US/ninja/katana.ftl new file mode 100644 index 0000000000..678d8779ec --- /dev/null +++ b/Resources/Locale/en-US/ninja/katana.ftl @@ -0,0 +1,6 @@ +ninja-katana-recalled = Your Energy Katana teleports into your hand! +ninja-hands-full = Your hands are full! + +dash-ability-not-held = You aren't holding your katana! +dash-ability-no-charges = No charges left! +dash-ability-cant-see = You can't see that! diff --git a/Resources/Locale/en-US/ninja/ninja-actions.ftl b/Resources/Locale/en-US/ninja/ninja-actions.ftl new file mode 100644 index 0000000000..28d2237c5a --- /dev/null +++ b/Resources/Locale/en-US/ninja/ninja-actions.ftl @@ -0,0 +1,21 @@ +action-name-toggle-ninja-gloves = Toggle ninja gloves +action-desc-toggle-ninja-gloves = Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies, downloading research and calling in a threat. + +action-name-toggle-phase-cloak = Phase cloak +action-desc-toggle-phase-cloak = Toggles your suit's phase cloak. Beware that if you are hit, all abilities are disabled for 5 seconds, including your cloak! +ninja-no-power = Not enough charge in suit battery! + +action-name-create-throwing-star = Create throwing star +action-desc-create-throwing-star = Channels suit power into creating a throwing star that deals extra stamina damage. + +action-name-recall-katana = Recall katana +action-desc-recall-katana = Teleports the Energy Katana linked to this suit to its wearer, cost based on distance. + +action-name-katana-dash = Katana dash +action-desc-katana-dash = Teleport to anywhere you can see, if your Energy Katana is in your hand. + +action-name-em-burst = EM Burst +action-desc-em-burst = Disable any nearby technology with an electro-magnetic pulse. + +ninja-research-steal-fail = No new research nodes were stolen... +ninja-research-steal-success = Stole {$count} new nodes from {THE($server)}. diff --git a/Resources/Locale/en-US/ninja/role.ftl b/Resources/Locale/en-US/ninja/role.ftl new file mode 100644 index 0000000000..24de27fa84 --- /dev/null +++ b/Resources/Locale/en-US/ninja/role.ftl @@ -0,0 +1,8 @@ +ninja-round-end-agent-name = ninja + +objective-issuer-spiderclan = [color=#33cc00]Spider Clan[/color] + +ninja-role-greeting = + I am an elite mercenary of the mighty Spider Clan! + Surprise is my weapon. Shadows are my armor. Without them, I am nothing. + Use your pinpointer to find the station. Good luck! diff --git a/Resources/Locale/en-US/ninja/spider-charge.ftl b/Resources/Locale/en-US/ninja/spider-charge.ftl new file mode 100644 index 0000000000..78a7b8688d --- /dev/null +++ b/Resources/Locale/en-US/ninja/spider-charge.ftl @@ -0,0 +1,2 @@ +spider-charge-not-ninja = While it appears normal, you can't seem to detonate the charge. +spider-charge-too-far = This isn't the location you're supposed to use this! diff --git a/Resources/Locale/en-US/objectives/conditions/doorjack-condition.ftl b/Resources/Locale/en-US/objectives/conditions/doorjack-condition.ftl new file mode 100644 index 0000000000..e2bed1cef8 --- /dev/null +++ b/Resources/Locale/en-US/objectives/conditions/doorjack-condition.ftl @@ -0,0 +1,2 @@ +objective-condition-doorjack-title = Doorjack {$count} doors on the station. +objective-condition-doorjack-description = Your gloves can emag airlocks. Do this {$count} doors on the station. diff --git a/Resources/Locale/en-US/objectives/conditions/spider-charge-condition.ftl b/Resources/Locale/en-US/objectives/conditions/spider-charge-condition.ftl new file mode 100644 index 0000000000..3ce7a983b2 --- /dev/null +++ b/Resources/Locale/en-US/objectives/conditions/spider-charge-condition.ftl @@ -0,0 +1,3 @@ +objective-condition-spider-charge-title = Detonate the spider clan charge in {$location} +objective-condition-spider-charge-no-target = Detonate the spider clan charge... somewhere? +objective-condition-spider-charge-description = This bomb can be detonated in a specific location. Note that the bomb will not work anywhere else! diff --git a/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl b/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl new file mode 100644 index 0000000000..a9a820c3c5 --- /dev/null +++ b/Resources/Locale/en-US/objectives/conditions/steal-research-condition.ftl @@ -0,0 +1,2 @@ +objective-condition-steal-research-title = Steal {$count} technologies. +objective-condition-steal-research-description = Your gloves can be used to hack a research server and steal its precious data. If science has been slacking you'll have to get to work. diff --git a/Resources/Locale/en-US/objectives/conditions/survive-condition.ftl b/Resources/Locale/en-US/objectives/conditions/survive-condition.ftl new file mode 100644 index 0000000000..5c9115a79f --- /dev/null +++ b/Resources/Locale/en-US/objectives/conditions/survive-condition.ftl @@ -0,0 +1,2 @@ +objective-condition-survive-title = Survive +objective-condition-survive-description = You wouldn't be a very good ninja if you died, now would you? diff --git a/Resources/Locale/en-US/objectives/conditions/terror-condition.ftl b/Resources/Locale/en-US/objectives/conditions/terror-condition.ftl new file mode 100644 index 0000000000..104f5782dd --- /dev/null +++ b/Resources/Locale/en-US/objectives/conditions/terror-condition.ftl @@ -0,0 +1,2 @@ +objective-condition-terror-title = Call in a threat +objective-condition-terror-description = Use your gloves on a communication console in order to bring another threat to the station. diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl index 1c6d6cef26..f771b5d911 100644 --- a/Resources/Locale/en-US/prototypes/roles/antags.ftl +++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl @@ -24,3 +24,6 @@ roles-antag-nuclear-operative-objective = Find the nuke disk and blow up the sta roles-antag-subverted-silicon-name = Subverted silicon roles-antag-subverted-silicon-objective = Follow your new laws and do bad unto the station. + +roles-antag-space-ninja-name = Space Ninja +roles-antag-space-ninja-objective = Use your stealth to sabotage the station, nom on electrical wires. diff --git a/Resources/Prototypes/Actions/ninja.yml b/Resources/Prototypes/Actions/ninja.yml new file mode 100644 index 0000000000..cd1b5afde4 --- /dev/null +++ b/Resources/Prototypes/Actions/ninja.yml @@ -0,0 +1,84 @@ +# gloves +- type: entity + id: ActionToggleNinjaGloves + name: action-name-toggle-ninja-gloves + description: action-desc-toggle-ninja-gloves + noSpawn: true + components: + - type: InstantAction + priority: -13 + event: !type:ToggleActionEvent {} + +# suit +- type: entity + id: ActionCreateThrowingStar + name: action-name-create-throwing-star + description: action-desc-create-throwing-star + noSpawn: true + components: + - type: InstantAction + useDelay: 0.5 + icon: + sprite: Objects/Weapons/Throwable/throwing_star.rsi + state: icon + itemIconStyle: NoItem + priority: -10 + event: !type:CreateThrowingStarEvent {} + +- type: entity + id: ActionRecallKatana + name: action-name-recall-katana + description: action-desc-recall-katana + noSpawn: true + components: + - type: InstantAction + useDelay: 1 + icon: + sprite: Objects/Weapons/Melee/energykatana.rsi + state: icon + itemIconStyle: NoItem + priority: -11 + event: !type:RecallKatanaEvent {} + +- type: entity + id: ActionNinjaEmp + name: action-name-em-burst + description: action-desc-em-burst + noSpawn: true + components: + - type: InstantAction + icon: + sprite: Objects/Weapons/Grenades/empgrenade.rsi + state: icon + itemIconStyle: BigAction + priority: -13 + event: !type:NinjaEmpEvent {} + +- type: entity + id: ActionTogglePhaseCloak + name: action-name-toggle-phase-cloak + description: action-desc-toggle-phase-cloak + noSpawn: true + components: + - type: InstantAction + # have to plan (un)cloaking ahead of time + useDelay: 5 + priority: -9 + event: !type:ToggleStealthEvent + +# katana +- type: entity + id: ActionEnergyKatanaDash + name: action-name-katana-dash + description: action-desc-katana-dash + noSpawn: true + components: + - type: WorldTargetAction + icon: + sprite: Objects/Magic/magicactions.rsi + state: blink + itemIconStyle: NoItem + priority: -12 + event: !type:DashEvent + checkCanAccess: false + range: 0 diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index 0b7148b4d5..ce6b2d0510 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -6,6 +6,7 @@ order: - category: Health - category: Stamina + - alertType: SuitPower - category: Internals - alertType: Fire - alertType: Handcuffed diff --git a/Resources/Prototypes/Alerts/ninja.yml b/Resources/Prototypes/Alerts/ninja.yml new file mode 100644 index 0000000000..1190b753e4 --- /dev/null +++ b/Resources/Prototypes/Alerts/ninja.yml @@ -0,0 +1,23 @@ +- type: alert + id: SuitPower + icons: + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power0 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power1 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power2 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power3 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power4 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power5 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power6 + - sprite: /Textures/Interface/Alerts/ninja_power.rsi + state: power7 + name: alerts-suit-power-name + description: alerts-suit-power-desc + minSeverity: 0 + maxSeverity: 7 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index e6ef82570d..bdedcd69a1 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -9,6 +9,20 @@ - type: entity noSpawn: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelTools + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Crowbar + - id: Wrench + - id: Screwdriver + - id: Wirecutter + - id: Welder + - id: Multitool + +- type: entity parent: ClothingBackpackSatchelClown id: ClothingBackpackSatchelClownFilled components: diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index f9e8a27ad6..c97290fdaa 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -174,3 +174,15 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/science.rsi - type: SolutionScanner + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesVisorNinja + name: ninja visor + description: An advanced visor protecting a ninja's eyes from flashing lights. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/ninjavisor.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/ninjavisor.rsi + - type: FlashImmunity diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 40f144e0d2..8b76554f92 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -191,8 +191,18 @@ components: - type: Sprite sprite: Clothing/Hands/Gloves/spaceninja.rsi + layers: + - state: icon + map: [ "enum.ToggleVisuals.Layer" ] - type: Clothing sprite: Clothing/Hands/Gloves/spaceninja.rsi + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: icon-green} + False: {state: icon} - type: GloveHeatResistance heatResistance: 1400 - type: Insulated @@ -202,6 +212,9 @@ - type: Thieving stripTimeReduction: 1 stealthy: true + - type: NinjaGloves + # not actually electrified, just used to make stun ability work + - type: Electrified - type: entity parent: ClothingHandsBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 97b8742b71..ddebd4b0fd 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -156,7 +156,7 @@ #Space Ninja Helmet - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetSpaceNinja name: space ninja helmet description: What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear. @@ -165,11 +165,11 @@ sprite: Clothing/Head/Helmets/spaceninja.rsi - type: Clothing sprite: Clothing/Head/Helmets/spaceninja.rsi - - type: IngestionBlocker - type: Tag tags: - HidesHair - WhitelistChameleon + - type: IngestionBlocker - type: IdentityBlocker #Templar Helmet diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 61acf0d6e1..1d2f1fb2ce 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -491,3 +491,17 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: italian + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskNinja + name: ninja mask + description: A close-fitting nano-enhanced mask that acts both as an air filter and a post-modern fashion statement. + components: + - type: Sprite + sprite: Clothing/Mask/ninja.rsi + - type: Clothing + sprite: Clothing/Mask/ninja.rsi + - type: EyeProtection + - type: BreathMask + - type: IdentityBlocker diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 280d05697f..aee07bfdb4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -93,7 +93,7 @@ - type: entity parent: ClothingOuterBase - id: ClothingOuterSuitSpaceninja + id: ClothingOuterSuitSpaceNinja name: space ninja suit description: This black technologically advanced, cybernetically-enhanced suit provides good protection and many abilities like invisibility or teleportation. components: @@ -102,7 +102,8 @@ - type: Clothing sprite: Clothing/OuterClothing/Suits/spaceninja.rsi - type: StealthClothing - visibility: 0.3 + visibility: 1.1 + toggleAction: ActionTogglePhaseCloak - type: PressureProtection highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 @@ -115,18 +116,20 @@ Slash: 0.6 Piercing: 0.6 Heat: 0.6 - -- type: entity - id: ActionTogglePhaseCloak - name: action-name-toggle-phase-cloak - description: action-desc-toggle-phase-cloak - noSpawn: true - components: - - type: InstantAction - # have to plan (un)cloaking ahead of time - useDelay: 5 - priority: -9 - event: !type:ToggleStealthEvent + - type: NinjaSuit + - type: PowerCellSlot + cellSlotId: cell_slot + # throwing in a recharger would bypass glove charging mechanic + fitsInCharger: false + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellSmall + disableEject: true - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index c341f2ae22..7b864e806e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -81,6 +81,10 @@ - type: Clothing sprite: Clothing/Shoes/Specific/spaceninja.rsi - type: NoSlip + - type: ClothingSpeedModifier + # ninja are masters of sneaking around relatively quickly, won't break cloak + walkModifier: 1.1 + sprintModifier: 1.3 - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index e7f8f1b511..d7625bbde1 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -932,6 +932,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi +- type: entity + parent: UnsensoredClothingUniformBase + id: ClothingUniformJumpsuitNinja + name: ninja jumpsuit + description: A nano-enhanced jumpsuit designed for maximum comfort and tacticality. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitAtmos diff --git a/Resources/Prototypes/Entities/Effects/sparks.yml b/Resources/Prototypes/Entities/Effects/sparks.yml new file mode 100644 index 0000000000..53542a9b7b --- /dev/null +++ b/Resources/Prototypes/Entities/Effects/sparks.yml @@ -0,0 +1,19 @@ +- type: entity + id: EffectSparks + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.5 + - type: Sprite + drawdepth: Effects + noRot: true + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Effects/sparks.rsi + state: sparks + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + - type: AnimationPlayer diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 18c86443b5..75f7b59f14 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -111,3 +111,22 @@ - state: green - sprite: Mobs/Aliens/Carps/dragon.rsi state: alive + +- type: entity + id: SpawnPointGhostSpaceNinja + name: ghost role spawn point + suffix: space ninja + parent: MarkerBase + components: + - type: GhostRole + name: Space Ninja + description: Use stealth and deception to sabotage the station. + rules: You are an elite mercenary of the Spider Clan. You aren't required to follow your objectives, yet your NINJA HONOR demands you try. + - type: GhostRoleMobSpawner + prototype: MobHumanSpaceNinja + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: Objects/Weapons/Melee/energykatana.rsi + state: icon diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index ba1d475b34..5d26e155e9 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -53,3 +53,24 @@ - type: NpcFactionMember factions: - Syndicate + +# Space Ninja +- type: entity + noSpawn: true + name: Space Ninja + parent: MobHuman + id: MobHumanSpaceNinja + components: + - type: Loadout + prototypes: [SpaceNinjaGear] + - type: NpcFactionMember + factions: + - Syndicate + - type: SpaceNinja + - type: AutoImplant + implants: + - MicroBombImplant + - type: RandomMetadata + nameSegments: + - names_ninja_title + - names_ninja diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index 2490c3a3d6..e00ba1ed08 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -54,3 +54,11 @@ - type: Pinpointer updateTargetName: true canRetarget: true + +- type: entity + parent: PinpointerBase + id: PinpointerStation + components: + - type: Pinpointer + component: BecomesStation + targetName: the station diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml new file mode 100644 index 0000000000..50a7ea8687 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml @@ -0,0 +1,47 @@ +- type: entity + name: spider clan charge + description: A modified C-4 charge supplied to you by the Spider Clan. Its explosive power has been juiced up, but only works in one specific area. + # not actually modified C-4! oh the horror! + parent: BaseItem + id: SpiderCharge + components: + - type: Sprite + sprite: Objects/Weapons/Bombs/spidercharge.rsi + state: icon + - type: Item + sprite: Objects/Weapons/Bombs/spidercharge.rsi + size: 10 + - type: SpiderCharge + - type: OnUseTimerTrigger + delay: 10 + delayOptions: [5, 10, 30, 60] + initialBeepDelay: 0 + beepSound: /Audio/Machines/Nuke/general_beep.ogg + startOnStick: true + - type: AutomatedTimer + - type: Sticky + stickDelay: 5 + stickPopupStart: comp-sticky-start-stick-bomb + stickPopupSuccess: comp-sticky-success-stick-bomb + # can only stick it in target area, no reason to unstick + canUnstick: false + blacklist: # can't stick it to movable things, even if they are in the target area + components: + - Anchorable + - Item + - Body + - type: Explosive # Powerful explosion in a large radius. Will break underplating. + explosionType: DemolitionCharge + totalIntensity: 360 + intensitySlope: 10 + maxIntensity: 120 + canCreateVacuum: true + - type: ExplodeOnTrigger + - type: StickyVisualizer + - type: Appearance + - type: GenericVisualizer + visuals: + enum.Trigger.TriggerVisuals.VisualState: + base: + Primed: { state: primed } + Unprimed: { state: complete } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 3ced854c5a..dbbe0febfd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -51,6 +51,37 @@ sprite: Objects/Weapons/Melee/katana.rsi - type: DisarmMalus +- type: entity + name: energy katana + parent: Katana + id: EnergyKatana + description: A katana infused with strong energy. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/energykatana.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 30 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/energykatana.rsi + - type: EnergyKatana + - type: DashAbility + dashAction: ActionEnergyKatanaDash + - type: LimitedCharges + maxCharges: 3 + charges: 3 + - type: AutoRecharge + rechargeDuration: 20 + - type: Clothing + sprite: Objects/Weapons/Melee/energykatana.rsi + slots: + - Back + - Belt + - type: Reflect + - type: entity name: machete parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml index 198f634c16..b0fa94d440 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml @@ -24,3 +24,13 @@ types: Slash: 8 Piercing: 10 + +- type: entity + parent: ThrowingStar + id: ThrowingStarNinja + name: ninja throwing star + components: + # prevent ninja crashing server + filling bag with 20 stars to instakill a single person + # also limits the crew's use + - type: TimedDespawn + lifetime: 30 diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 8668a0193c..c8ef28395d 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -68,6 +68,18 @@ - type: RandomSpawnRule prototype: SpawnPointGhostDragon +- type: entity + parent: BaseGameRule + id: NinjaSpawn + noSpawn: true + components: + - type: StationEvent + weight: 10 + duration: 1 + earliestStart: 45 + minimumPlayers: 15 + - type: NinjaSpawnRule + - type: entity parent: BaseGameRule id: RevenantSpawn diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml new file mode 100644 index 0000000000..0d5983b178 --- /dev/null +++ b/Resources/Prototypes/GameRules/midround.yml @@ -0,0 +1,19 @@ +# doesnt spawn a ninja or anything, just stores configuration for it +# see NinjaSpawn event for spawning +- type: entity + id: Ninja + parent: BaseGameRule + noSpawn: true + components: + - type: NinjaRule + objectives: + - StealResearchObjective + - DoorjackObjective + - SpiderChargeObjective + - TerrorObjective + - SurviveObjective + threats: + - announcement: terror-dragon + rule: Dragon + - announcement: terror-revenant + rule: RevenantSpawn diff --git a/Resources/Prototypes/Guidebook/antagonist.yml b/Resources/Prototypes/Guidebook/antagonist.yml index 32dda63590..e6e9afa017 100644 --- a/Resources/Prototypes/Guidebook/antagonist.yml +++ b/Resources/Prototypes/Guidebook/antagonist.yml @@ -7,6 +7,7 @@ - NuclearOperatives - Zombies - MinorAntagonists + - SpaceNinja - type: guideEntry id: Traitors @@ -27,3 +28,8 @@ id: MinorAntagonists name: guide-entry-minor-antagonists text: "/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml" + +- type: guideEntry + id: SpaceNinja + name: guide-entry-space-ninja + text: "/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml" diff --git a/Resources/Prototypes/Objectives/ninjaObjectives.yml b/Resources/Prototypes/Objectives/ninjaObjectives.yml new file mode 100644 index 0000000000..f3df853d28 --- /dev/null +++ b/Resources/Prototypes/Objectives/ninjaObjectives.yml @@ -0,0 +1,40 @@ +- type: objective + id: StealResearchObjective + issuer: spiderclan + requirements: + - !type:NinjaRequirement {} + conditions: + - !type:StealResearchCondition {} + +- type: objective + id: DoorjackObjective + issuer: spiderclan + requirements: + - !type:NinjaRequirement {} + conditions: + - !type:DoorjackCondition {} + +- type: objective + id: SpiderChargeObjective + issuer: spiderclan + requirements: + - !type:NinjaRequirement {} + - !type:SpiderChargeTargetRequirement {} + conditions: + - !type:SpiderChargeCondition {} + +- type: objective + id: TerrorObjective + issuer: spiderclan + requirements: + - !type:NinjaRequirement {} + conditions: + - !type:TerrorCondition {} + +- type: objective + id: SurviveObjective + issuer: spiderclan + requirements: + - !type:NinjaRequirement {} + conditions: + - !type:SurviveCondition {} diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml new file mode 100644 index 0000000000..a7492bd1b1 --- /dev/null +++ b/Resources/Prototypes/Roles/Antags/ninja.yml @@ -0,0 +1,6 @@ +- type: antag + id: SpaceNinja + name: roles-antag-space-ninja-name + antagonist: true + setPreference: false + objective: roles-antag-space-ninja-objective diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index e09f7e362f..367ffb9dea 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -23,16 +23,23 @@ - type: startingGear id: SpaceNinjaGear equipment: - jumpsuit: ClothingUniformJumpsuitColorBlack - back: ClothingBackpackFilled + jumpsuit: ClothingUniformJumpsuitNinja + # belt holds katana so satchel has the tools for sabotaging things + back: ClothingBackpackSatchelTools + mask: ClothingMaskNinja head: ClothingHeadHelmetSpaceNinja + eyes: ClothingEyesVisorNinja gloves: ClothingHandsGlovesSpaceNinja - outerClothing: ClothingOuterSuitSpaceninja + outerClothing: ClothingOuterSuitSpaceNinja shoes: ClothingShoesSpaceNinja - id: PassengerPDA - innerclothingskirt: ClothingUniformJumpskirtColorBlack - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + id: AgentIDCard + ears: ClothingHeadsetGrey + pocket1: SpiderCharge + pocket2: PinpointerStation + belt: EnergyKatana + suitstorage: YellowOxygenTankFilled + inhand: + left hand: JetpackBlackFilled #Deathsquad Outfit - type: startingGear diff --git a/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml new file mode 100644 index 0000000000..7fed84da73 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml @@ -0,0 +1,74 @@ + +# Space Ninja + +The Space Ninja is a ghost role randomly available mid-late game. If you pick it you will be given your gear, your objectives and the greeting. + +You are a ninja, but in space. The Spider Clan has sent you to the station to wreak all kinds of havoc, from bolting the armory open and killing the entire station to engaging in a slipping war with the clown and fighting in rage cages. + +# Equipment + +You start with a microbomb implant, so if you get KIA or seppuku you will leave behind a nice crater and all your precious equipment is kept out of enemy hands. + +Your bag is full of tools for more subtle sabotage, along with a survival box if you need a snack. + +You have a jetpack and pinpointer that will let you find the station. + + + +## Ninja Suit + + + +Your single most important item is your suit, without it none of your abilities would work. +Your suit requires power to function, its internal battery can be replaced by clicking on it **with a better one**. +You can see the current charge by examining the suit or in a sweet battery alert at the top right of your screen. + +If you run out of power and need to recharge your battery, just use your gloves to drain an APC, substation or a SMES. + +## Ninja Gloves + + + +These bad boys are your bread and butter. + +They are insulated so you can nom on wires in peace. Obviously they block your fingerprints from being left on things you touch. + +You have an action to toggle gloves. When the gloves are turned on, they allow you to use special abilities, which are triggered by interacting with things with an empty hand and with combat mode disabled. + +Your glove abilities include: +- Emagging an unlimited number of doors. +- Draining power from transformers such as APCs, substations or SMESes. The higher the voltage, the more efficient the draining is. +- You can shock any mob, stunning and slightly damaging them. +- You can download technologies from a R&D server for one of your objectives. +- You can hack a communications console to call in a threat. + +## Energy Katana + + + +Deals a lot of damage and can be recalled at will, costing suit power proportional to the distance teleported. +While in hand you can teleport to anywhere that you can see, meaning most doors and windows, but not past solid walls. +This has a limited number of charges which regenerate slowly, so keep a charge or two spare incase you need a quick getaway. + +## Spider Clan Charge + + + +A modified C-4 explosive, you start with this in your pocket. Creates a large explosion but must be armed in your target area. +A random area on the map is selected for you to blow up, which is one of your objectives. It can't be activated manually, simply plant it on a wall or something. +Can't be unstuck once planted. + +## Ninja Shoes + +Special noslips that make you go really fast. +Energy not required. + +# Objectives + +- Download X research nodes: Use your gloves on an R&D server with a number of unlocked technologies +- Doorjack X doors on the station: Use your gloves to emag a number of doors. +- Detonate the spider clan charge: Plant your spider clan charge at a random location and watch it go boom. +- Call in a threat: Use your gloves on a communications console. +- Survive: Don't die. + + diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..483d40449fb4b088e65038ff037cdeab462fe691 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~qfaSW+oe0ytS)}a8AhKG{_ zJe(EYsRlgH$zpHKs}*xJ(y;4%F=1(Ryc%C=PFgJsdtvqy79LgJL%f|CztcZHn^k;n z@BDk3?k(JmEdMq)grF8=I4 z*ZgcL_j&2RS%D&{uT=!IlTIfne6sv^?)!&NdCwm|%up$mk$!68IKzMW&Ai=H|33Vn zz2_o_kO zgcVwA&I;~(-)-g>^Y~JfuW5?S480$BR02h}-wZixX1!ci^Y~Lk|0uVN-HwkR`F+Wc zjJt5OVOD%ruUfyu*;Iix1||-L25iIuTdp|_P6p0TA2~)g0t1=B)78&qol`;+079>u AR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0911957a8d2bb0273acc245138a91645920d52cd GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*7@Hb7I5?!Fq=bfs z8qYM=JH=4_-{6Vu{pmn8j3q&S!3+-1ZlnP@@t!V@AsQ2t6D0B)0s}le89UD}dGkmq zWl4*GfS^$!PjFe|>ckSA@G_pzGLaVUj-~1|IXES`xDK$mT%OcW)gmhKFv@9atBiB2 u1dBkMl+g+ft%GM7tehJfIZs|wTtJRScf4elF{r5}E*n^*%cQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ebd7858dabbd7755e1bb3924007751d8d24192f4 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hN8aSW-L^Y)fv-eCigV;|Qm zGhgLmI(@3FdCtKUuFaXdsKCfI1b@;Em^xMYo6BO7NImyJPc#)7ChnSuZ9bN1ix zzoz_C1!y7=JXog_BwkZl-RJ+>z4iLmRjZ_8?@I`8c3!;h<=1_`J?ieYPdWO@rvLh5 zx7f?t)+SnAN_{KCMUH-dy8d|YCmZ?D_v)U~0oT7OwJf;&O~*6po&Kh4|6X0Vc5BC- zcoom(ZzC01u9p7YAK&ohD$DaZDl4$@VEAnpW_<+<1DV}qBtPkPS$&ui6}6FSlpjBJfo lv-wPvn|YTXaSW-L^Y)fvQL}@@(T~$- zb@>RM*sh@j-$)8^wM9lzA_G6`H-i&=}M|-5vzt;((0hgOuT1(%rE~xzv)cP zed(}|DnJu~;6eP%UfC0$ZI;ZA%DwyY?a$gTf8wjFYI*p(tA9>!UA0PT?)SVGiGd>X zPtPy&PK^{>Xa4Fdkn-ET^wzH6T`NOHj=tElmr)}5P)+R=mAB#SmG4v6_Wt7DaP8cl z@3+?TOb~?Sf}XY@8)> vV2YaC8Z}mh*n3AhuC9Nt=gY%z;O#Gl+43Fj^Zy8M18MVg^>bP0l+XkKM#`Jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json new file mode 100644 index 0000000000..f803400908 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station https://github.com/ParadiseSS13/Paradise/commit/ede55cc8f5b50abcd4f51d37779b56853a440a9a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png index 123fa579d585ed1a53106291d43057788e16ee37..f5f0257ff7030e83d6fb6fe14e76dec159bd82c7 100644 GIT binary patch delta 613 zcmcb?`j2ITO1-P6i(^OyH_EGLAZhf%Aek6e%l{(oVCbbHXAReh&dp7wQ+h_2s%$8~<)&Yzp^*QfW!N+x$PT$+FW zzSB?6CI6xpGyK|oGqa(NPjVUiQEvwtlM=b9D|9Qm*sh7s{elhUbip<*=e!r&pvoS|UgP2q8XVF8s!o4}4 zgmfAi8{F^nFdUL?d2&cQE^kqNzWgtV(;W`CH&>o1W<20B%i*?m-_CoRa%Oc;J^g!?7~Au7aYMsHB{wD<>Cv?InS6%F(D}5~v1`1HQdgSi zugN{fle|yUvWqj7u{I^^W3%KuKg;^O9y@b?+YEl)XB;Q|=f7tuQm(9Cv9rkTdRnhP zzucxTdn~!m2r>lDG4X56%=#nlyG1hj9{bXthQA8mevxC$ZD`P2e135*+lDMa8bY-=jE#4;o_xLrv5DDfc1d#`V9w|}oFzL1!!{DGHA WhC6j(fY)aRAn{|&k$L9B( zO|W9iRA|5WFrZj7^%rBAzuo^5>YHg^R-#|SVl-ZgOi^a$j_3Oar1t!r$Wmf$oB7Q5;f`hpC!nG}>jP(I zE4{N#nEU?h?}erL_nx1dUQx#px$UIiy}i8a?tWDHW-cFYH=TiD#r4+*uP?Zmq4Mq7 zci!y{|67~?t7@lNpY%9jpW&D z{LifR8-8B4F|X}Pv!jG4E(S89c=Bma}U{c{KOv+*g_1LV(J-Pma!{x T&j?-zOtB1}u6{1-oD!M<89GO< diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png index b814dfe5a57664f296a61fb5260deb400e0493c0..78bbbcfd04171fa64c5745bcf6bfd45508be61d5 100644 GIT binary patch delta 166 zcmV;X09pU?0m1>0B!3uCOjJd{z`zw06d@oYFD@}7A|@fFE(BdagWD_Z{I8+_0004W zQchCPx#07*qoM6N<$g4|&|DgXcg delta 214 zcmV;{04e{%0rCNmB!3=IOjJd{z`!UfC0ANUXl-~54GT|GSvxyBF)}qGAR$^;V8VMt zSO5S30d!JMQvg8b*k%9#0D?(GK~yM_V_+CmKoAI!`HV_HAb=zwq-1QYq==-zRoU3s zC!lJ>0zR9FKi1HRPE!y;&lX=Xcwy&)Q{bcVgeF zUz0_!YtI&|&ku{n|;!gok`i*+)YjEAj`rvD~tp z(|%8fVZjW)1+vM1Vk+0HR$@|8z>6*@PteuB5Um>c{99VGu$s?gU*8=(Gbfr@+iaGOKCNf&w>3S5m!4#3rPtb)$Vn#K-1r%iDk$jC9;uw(Va?)q%hrlZOpwuR?Y(=( z35P_^DN7ZIy!m}%LIg`g`}Xd4^BRl4DaXF+)_tU(u>arNTIQC0(Gr4&k{K@|Sr{Zv zl~~HA-8lbORFAEJn=yCVjk(MBWC;p1K34l6%I(5@?6;hl{X_;J@O1TaS?83{1OP7Y B=luWx delta 590 zcmV-U0=A-L#j;{KVzPWS!69(I;z zc<0&q$IJ^51VIo4K@bE%5Cjo75>YE?wOSm)2#;YHk@TNe)AeIm_RA(r_0G6GSMH44zVu<>J_)MH zO;jtjxj?Ix8h=xho4)nxmX1e9aUXR{hhKeAxEj!?Hxu`xA-esxYeKbBW8Hom_oE?J zjp3<&^l&>@K6<$Ir4NIUjgV!VZ12sk``+&j0tFvLA9W)nY$sSO7TsY`DwTvRVL)^P zgscL9*hcdt_B%l`VBG<%o7fvb5ClOG1VIo4K@ddz_L>V$gz}`#@_yGjGY4jz+LATQd;`| zHvoXAkw;Gn6e%r@-#6EhRsv}ZXw;jD=_;V@WN`lNGnY9*8Up|bNs*Cq666UPuQ%?SNpkgj_xrf9Tf*A>}W$MOPSL> zxwC1n7a6==y-Mq8?N+XHx%KL*S0onI-@m@LyVvqd{MzCMgOLC0-mCuF_qon~i`w;# zek>Y$pMLWFqkQ4ZxW=EcR$SHFGt%lGByUO!=LmkNG9vC~zI&2--6 z$HDcpXG&(hw}0l(^nlBaMM1e+U7cg@Z^m`b^;_@Wz5bh}VZqVd*AZP`UvONQaJ(c delta 598 zcmV-c0;&D91nvZoBYy%lNklvF86%k;T{g+ zzdy%E7u^F81VIo4K@bE%5CkC_(qJ$s^Z-rMN)eKmqWbTZBY%Tmgg4-RTJYlXoUO;c ze)%SCUrsq}qCa7PVd_jbUnCL@Q)jm2RNe%`)YCr5my;TaGjfrWkp{$b??E&qm%5vtWv< z_kgATz;|Quz;`qCryhh1Q)iF&A4O|#JjvXA6%Rt2=ud5ew&h6ec02kT@bn4a=SBFFAQ`Z00lP+c0|*faz4^A-;WpsNVnK$}_Suo|M8Ro74 z+j6AqpHEk4Hd+XL7lH3$xp{9qDO2NCDO3TgjqcOu?=0}$e-0y5k;3PICGX#zakJ@F kgg*(A0lOBkYlJu8FQ0YNvvs&!h5!Hn07*qoM6N<$f0v@6ul8O7)7iF7gABwZ2W51e&9oJW9(KC+*V3)r@Iuo%1&2GDF`m>P6drF6v-b@ z2!#T zZ!G{&kKbFOb8oALz~iGOs%|n<@xjo}BecEHF*rZk5TkD9HUq0O04f)Yhg9<4&rVU} z^Ah0|VqhKb+ko5NtMS__3q2pjoQrQI08k5CHq*>>g?2ohRV46=Io1bp0jIFFNT|C0 z!<>t6B>?vLx7HVGG#6CTNEpduj&MWM z{T{f)X9)l@<#O5V_e!NAe)`7+a5-iR;F82z#|ccIE|O{Sf+BHKHi$dz*96 z_5~4I$h-rB07B04CT#c`^rlooM8g>%B&;`Kg9E%Nl@QV303l($2^$>XO{s*41_uZU z>rL3;0B=eqL^L=+NLX*eX5Inpe~Kob&J40Y0QQRa2&8#3#c}|WkD^O-@W2@w9otXC zL%YPE49E8r@PP?zZ~zyq#qU||*jfN6f8z8h6Cb?-7hZg&S1;>q5+>Lx21pcGzy!9w zz$xwuz5c&fYXOo04?nwQ`UM_5xz8ezjQO`Y5(I|sNdR`*%US^Jx5kG>gL~)Zyc+9% z0rQ67Kx1iaK!Fpu*P6H7DO$ykDXjIaT3aw>Q$#V$UR;(A}Poo5qfBmM;>QPAjT;TeRyIlyuC15K6 z?$-rCv(&Y#7gO~nq!xgaz}DcK2MrXDI$$&eMniyw)SQ)(mHHo-9t|y3h8fdlGs5K2%LQy@ z4oMCGS*~xO1T!Bi4N`;b2xLVd2cbKH5nTXT12P-kazSB3WNC)?Z_mT|7cbmH2?@9a z76ws?5M=q2$Ilpk{1gHkfo?fS5GDpv15yjpgT+1!A)=xHWT1?!6vNHyXP^e$V-OY; zLow{_`&V!|kXn!)VgNx0`1pE*eZt8hz>sk5BZKyyDGXd35N)FTvS2%2e|!w4zy0{b zaMdM;VSyGukpGMUq<72at?)#N%|Qem0MewYs>N{o_BEj8>lyfCy20lBUQ>x;9&1QD z1ISvC18;i*fTfYgB0f&fe}n1h2LDg?fL|Hbg+;THx_Ayk@Q%K%F8^VZCS8wpAeNpb1m zoB>h;QVY^U3?Qi>Qr9$L;AUY5oBQy|ZLmW?98i{&mr(_afBo|loLzC1hG0cV1W_RX zQ~&10BL;4$MIZ}dmcrygG)N68fM6Pc83yvv#Y-0$Kt99;Kyn~8#QGj&4$%$(DFziP zdv|RDJK`_%a|S*!2`~n+L6(E$2o*dabC3biX#iOhu5z9fpTo=}%K1A^@v@h_svt;U zAQI4nH}4)+|4VA9t@L#FcK1RLsk!u5RdxM;)6=`mv@v=q0VSXWlzo!fkCXf_BzdpM8KSr_+0Hrb#hk$qizgnlI=DZt^E}ZX z6Pw4NdUgO57^O{sD{-5>FCHI{sV4)FN#EM6W=G$frS}#YM~dNbT@a<8ubp)dK$3Uv z-fZVYyKVfhAn`7tHc{LkanZKf@i~^QFMX%FCb+hKbyoi!n)}}lTa%Bsx6HG(U*^l_ zucoT1g}I~<3C0!g!~4TFmh@{U53FQc0adj*7yswpt~vSr!=MBV^!voya&^VC*~j)} z190W?CG+BWZLWXXo9BWOZS>P6?>hCPlw%?BxPNTDT}rV5xZh|rn%&r_%)_TUX8-kp zIr-U`>2$g*~wg->^z~FZf{jyEAC6vj3gro?0M@klt z+_O9a2n3-JPbKrvr;vR*s@p0E^+G5+O<+lJPA1we|zXE=TyAqGZo0pR?=ljDJT z_418rnr1c}4(II$+gt6oLgv9gqQq3vD)IKAVc+JfwQ1t3V# dl1Aqqz&}U|4@G)}L)ZWS002ovPDHLkV1kUmd8_~c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..def44f1b59beb3bdbae0c6cda145b125efdb4964 GIT binary patch literal 750 zcmVhYS-m{~oC*wfyWQaIJl3XB zhk4Y|j=E0?+M_7?C%svpscQgCp#z-`Fnd}1o&4D9YQMjZWADuKg|O+(n#b4_0B)Wp z_T4n;q}-&}WSsh^08nF9^E{)2JoT;tgF1|QdtU^Up;%=|V;=!kUOdq*1cZPP5CTF# z2nYcoAOwVf5D)@FKnRp0V13H#`hO&bvpDR9_x6^a0u=X>thi|2JNwkoFp*K90vBU5*K?e8aM z6TCk_AJoxq96V}`OUrd_{QHZQ>FGC7!&;lzO(LgK`q#t8}K#(@*u*aJjDBxbS6 zMoIjk$OfUTfC!9~4EyWRTeru%vs3Mzg@`W6TRr{ts$O?jx2MOsB#D8(!|LJF+bnWU^C`nYVytK5GO-@d_xtRsGwc9$@rSjYDwre(0L#uP)Cc8{~ay`wy{6eKJS*r%>1YWsfn$M26$JQIre;IRZGxzh{Yws!l5 z$H#`PiueN!T)woJ0ruqam}3?o5B7Gv^NI)P^V74wY=3{>jh%kt)9bf32KMhOmi&bH zIJWo8w#SDA%{pcx_z=$^S@6e7upQvbi`N`~9Y%dsoJZs|8c{y=)JDep3K2j3@WUBE zw>-zQ|N0 z7;x{N4`@zWodT#CAfr@<-rW4QL(bl@c43_=Y2iw%4eMUGXa*o8MfIiCu9r5g(bryI z$Y2@+5J1B;q-_4!GWFTZsD61x{IH$|#fo1#1401O&y0`zk;hSpAnH4p&jyvF>lCm< ze9k63$4aFb5Oz+qJ$>p~Kk`InW&qFH1;V;@q=f^n@WD~O71J~W)H%RxH*AY+d)l5< zUbn_s*1jaxdD@!@;4C1K(`ZRpuDm)l`+f0L%K0EhOauVH)`xuc^_N~Zf4c47dHdaN zzR#@rhk$qIe!kVBU%fcjIf73_p_&ND4?`C_KrQ#^w}*bu<*1551VkN{qAaPaABV)kPt~CAXjsb@;=-(>3?tQd-!2<#a#h?@-`^uGS*B0&cFZO2i}j3R@43Y zSKHsreE!AtC<9^$kqx{Ve*U>hx45w6yNR*EL;%2-FJ193AbB~;g@mr9bU9J?jL?Yd zhDujtycETzo439<4TR~9kVcD3P&teNTv9+p%u7l2Syh7p7MQvlz!u#OSM5jjOa!p* zf0^?eXKEpM*9nOxk!D#~#Y8|p?ej~J5J-lMat3JR zWk>#Ewq>4$=3St;*M@iY5D|VqDC35y`6iK(7U{)Zhn=cuV;R0_2K4G^6r*0mmGi^E zHthmMLwJ5`<(kiqS%1CytCA-yVOMF>ua233H?OYvqbD7%t*vGHP>SeV_w)x746q1< zU}FRMNN8K0Gx*mO1L#htLDHPQbWd+RfzduzWCJsS?*bqKiLt>P0|+pki0eO{1(@|1 z103r-?XaPP*&TTXf-hAp!B6<+B|t;&=l}#*_k!whlp1U~AA2tuMSz^t_d$9dwdV62 zY&eOSV*p_Kbe%M#z_$UT2!P;8I1dP$Jkl{=sGn#C$e5>Dn}Zc-&2`e%1A7tPkIYAt)3=ckk00000NkvXXu0mjf2(`CE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..447174a09ebc78c57dc9f4a70c269e001daaa784 GIT binary patch literal 468 zcmV;_0W1EAP)aqsSpuO5kF1^HC93Jlv{qc-pol5w8pPqY!z*+(xCPbtVZ9~X#-U{a}s0+ zlHHwsJ2U%cc9+PCWxz6E8TexcN*ez`5adst2b!B*peTw4Yk$*AY!8f#1N*+8yRJ*C zOBHI|)<@v1Pt%m*I2PNT7_sz&A`HVEYIcGaAK2hNfjK?sRKBLpj|94o4z&(F$0a}wQ+FQx-l&~8lJ+pJpbusVgBbZ6Yq1ws0*sd6e&8%%ya?U$5fSnh07iV>qO>qi} zY=VKEYCu_*nU)zTVx)ah5wbDRi=E@cu5spx`qTr1d9A2dpxTop`9A-BcL)S0r2TlW z^-t;m;DPT1I7KiRx7tm$b1YERz{mR#&KC~1Fjkz$SRzA<67&}ag$LO`*rWLJ%Cs1> z9(|3dQh-MWj}i*6``n?|mu_i#W-7-WpnZfiL0YV3z%uZ^8TbTFFuFNk1KNZD0000< KMNUMnLSTZo-^~aB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..558124e55c0d316d394a71f5296e3b55d89d58d0 GIT binary patch literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^4J@aSW+od^>Z$_hAQ-^qb8uILT*9pGDd+Qp-~K!~*QR^3`k5K_atBk}4!yn8|Jz+P zbFW5pT=a{q3fZc&KbIa|J@35e%CPNLmdrbMZu_-Od9Aove}tTX+N$8aCo~`U&Iq3! zy!c{9tZupW4pHW~C0|1h3w&j`_uJ-Yj@j#HF@2MPBFTcR2iSg?e0ZLxc+53Q-$G=g z?uB1B3b&q~I(b`fw3e>x{;$o=AEz(<`sdcaYD4}9`nI>XWuBU`VEgo{reZz*BBl=v zK)K1sY&jYju%iqQ2dyfdZ_8g8NP4;TAN?mHE5`6LqvXEf?nK{^)aUw(jz?7*L5rK&Zi4BuLITujd0-VpL7BAVaf%Z+MbCHBS$ bmVJ!&i+!uO8gA?WCLsn-S3j3^P6M} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e1db9b0bda2c09bf71dc67e16befed54285fdc14 GIT binary patch literal 655 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<&heaSW+od^>Z$_hAQ-KC#S)HPFCOSw{Pf@TYEke}SFNPKy-i$6*LkA;vIXDDo|Nt6weE*) z#=7_KioVy*ub%EOkAs_Y0s}6@p`#=AT8nc_<<`}YCvEt<<>i-Udyh=>TKenLrKsrZ zKW;2}(Ee}RITq;!$FD9s)gbR!b(OliiDw>&o3T z-ASSLxchexA7m zHS24)rv512@}0&-6LAGI4gyq8Gd@4Cx=uGSQnP(o@ZR!1KkYOWBX4y|-(= zQD+oVz=jOk8p4-}=El7})^UyF<6pHE_u5rb^iz96|JIecGu+|HS)bDLch1+W>va!% zm6=~}-JqF!i=#uCIlF6foYfY=3pK%4cyd0=Ec<)its%4N@wLUiy(_uhP99iQJR_yO zuR%jHVzNxw))uw~&O>PlS6zKKImn})guC@j zVomr+IAqFz!q-aI9DY%pcKAcFxe%KHx9S;4|6%P9>lrgAJS-f{WlQ?+JnBol$^7EH z)Lz+rSj3nmOaP4%>trc1A~i3WHTI3xd~+1Uqs!Z%j46&Z8S#chElJm;)RgE+d9svM z?*H?&QsZMzcW)Rx&$j(O0ByTat=RVWv29mRpydfJ^L2kga+>@Uy;9eLhv3_S^Q*e1 z?ZL%1^gJ2~Gf|UTWV=%-csqlxIQVa&W5vnp_ngxQSlESdFvjP*v;CfwUrn(w@c3+OG7JC!000000001>#XNn@9=8PmP+oxFAG6eU zj&AFPW(NSTNiKsC0RnU=ft<2)>%Ane>2l6kZ=a)3y++T+2e{ZL7LV03cyHOLSJkzt>-)9W}bw2oS1~LyrQgNq{+RCw*>dAH!??Ia#C0JuHD3RdCOGQe6XWmRwTEMXsuAY7oAb?Ic#k+V_QeH%^qQ7l%pvxPU zC;5QR^rfzd7r^kvqQ0G8I00000NkvXXu0mjfmk97< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Alerts/ninja_power.rsi/meta.json b/Resources/Textures/Interface/Alerts/ninja_power.rsi/meta.json new file mode 100644 index 0000000000..1985bc0236 --- /dev/null +++ b/Resources/Textures/Interface/Alerts/ninja_power.rsi/meta.json @@ -0,0 +1,131 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by @deltanedas (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "power7", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power6", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power5", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power4", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power3", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power2", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power1", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "power0", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + } + ] +} diff --git a/Resources/Textures/Interface/Alerts/ninja_power.rsi/power0.png b/Resources/Textures/Interface/Alerts/ninja_power.rsi/power0.png new file mode 100644 index 0000000000000000000000000000000000000000..f9adec28ce457f6818bbf70ea628d0f18d81d4f7 GIT binary patch literal 1697 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Alerts/ninja_power.rsi/power4.png b/Resources/Textures/Interface/Alerts/ninja_power.rsi/power4.png new file mode 100644 index 0000000000000000000000000000000000000000..39007c5bb9f0f3c6ea12ac2ac845df77704652bd GIT binary patch literal 1796 zcmV+f2mAPmP)lpp1w4s2lS9n&@^pdblLwKvCS-dAaq~sDQ z;S*uME&~eRT6(ggmn4ak7n-oL&%~6!sPJWu-Zf^(F4Ky0R>J zRL&R%Q9=aqlBCQgc}fH%tFp7szNxxziK2KEd23YA#gQc^Ucabi>6(_D5j`zWo{F{i z|NAsDGt-Uk?jSf{P4jacT>DU~n&$7RY1Yob@dDRs%U_f|&3%hrZE3z^@a(|lO-oB2 zz|}5{JZlL(QI{NY?3oOFT);pa2JfM7y|Jt2J?Bpl+m>H+2Zu*6A@!b(Kl*NH2R?eq z%m4rY32;bRa{vGi!~g&e!~vBn4jTXf1wBbbK~#9!?OZWy8!;3-e<>{176-3|g@vTuZ6}A%50j&ZM|u19_I59{@y8#Jo&1eA4Jd!(MZ?Lj zxRLydTlv7o-+bR>^QXQSL535m)oPNaY5r1w=SsZaS0Y_RNGSfamOA;fI~kOp`nU0S z?sf8aCB)D;`Fzs$+ID(3@l#ta#Dl;BP@}uk>hwF`Pm;4gXT#HpHbT{ugoKG-7b${Y z7l4VM+La#={JMQ6e*HRp`7^HZr0!dHe-_pE>p@|JqG94Ek)ogr+{8~lLivGa7#lwc zgfj!BT;oS|PH_;SelG_BG3tkn5rTZ$Ap#)deJ>(3=mygz1bu`~0x0ow1;FtG+he0T zM+v}3-7!OuOQbPEkjqCLKd^r->ip@;#lq)b-(gn*ojRzYcK0iZF;$*37%R#!nOX9SG8 z5aeC3gdj`^Vhg}^r;EG`o~95qO{<`w8$rm87zsg`5X9aHa{Un0h6n``f-oT{4LJgQ zFY+b=kPwtkP5{2603iSgL6{Jfu}5Kx)}3{uK)6q%#tlIx{z3@a$Ls@8-!A)6AxQ7r z#6ONuvvHiDuylJV$+GKzKmC0=5D0R#kPuA#=n$lAr!ZsUM?Q`&`_#lgP6+byRJYw7 z54($@m~;LLhn!Nx)mEd*OV@GUJ|DEN zAFKy;0*Al$td`W@)?xhF<1F85w(+a&*o~cyiP*1d2dLZtj{p7Z1HA5&(|)rnKOU8z zufxQj8&pdn{FI+h&m(O7svW_vic^g8KeRqT`EjTzKOOlv)Tcgy0_sFg`8G+%c0PV z$qB$WDFJyZ*e5Rm9)fN-K#+)bDAbgl8na54D?1l?DtJ@~inR&~6@r4!0OOP>kq|W5 z5R`?yh?rHfT%#mL2r|t;F;_t*{&7}8tSg?yDp~Ws3JNOOX{?ep?;$9tr>3z=*1WHR zf)Q42mO_oQ6@u6$Vx&;xY=t1H6+Gu5DB~JWo!j!$xlf}wqgyXm@2U?F z1F`D^==&@-e!W~hWFts-vMoP7R-r~$eSjE{CLXGCjr>_RXc)z?aNx>UL<;b01y95 meE{Ky@e2e3fj}UbE&K&G>-qRSv0l*t0000lpp1w4s2lS9n&@^pdblLwKvCS-dAaq~sDQ z;S*uME&~eRT6(ggmn4ak7n-oL&%~6!sPJWu-Zf^(F4Ky0R>J zRL&R%Q9=aqlBCQgc}fH%tFp7szNxxziK2KEd23YA#gQc^Ucabi>6(_D5j`zWo{F{i z|NAsDGt-Uk?jSf{P4jacT>DU~n&$7RY1Yob@dDRs%U_f|&3%hrZE3z^@a(|lO-oB2 zz|}5{JZlL(QI{NY?3oOFT);pa2JfM7y|Jt2J?Bpl+m>H+2Zu*6A@!b(Kl*NH2R?eq z%m4rY32;bRa{vGi!~g&e!~vBn4jTXf1y@N#K~#9!?OZ`?6G0T-Otuiwf`X?CBD9d+ zid009iWi|LkAg=};vewfxhS5*U*Nq*PX!UY6g()>Lk>B%;;BM~))Gq6=xlxM>}F;% zZ#&<{B=3Wewv*1c@9lf@ZFc9qBoPP%0)apPf1=79=7 zhF@{W+jra9OJlY%d-|H0nMpdmPV)89*JSI?RyMx6y4sIz{Pyc@FMsQK3(DVm-172k zZY00v);@6Yw_mo|{3`Sy$Z$fvUQd)#*-QVNMdFQ^3C*t>%FCZ#PNDoXzl*!3K#Yy=Z@-_MuzxI$S^W@^{{M zpn7TA=dwT9NpgV_+je@l@zYoqh@T?|fX?pjPWNQ;%_P}7*c)69#oY!wm|GS2Zs$~B%Qzx`x3H{MzsjMA7WN|24;%+OJw zc%6ilAm2F04{VPOn;eyeA<1i69~iBR8j{J=h2!zM?46W~Y?A`6T2+E$<{zXjR& z%Se#oI3Pxpp4a$L9Ykff&kz5D1i=Cz)Hw7qED{t~f}#fi8X*#d47^GE7Noct;5!hM z@ghMu31SC;Z<#?}1&ah>Bq-{QAmoi0ksyo&DX!tZ6G3ALDG&+5NRWz|0ig$Zo&XRD zQlkri&@4a%fJhKVf>L%C{=3iLT5DPZg!?qAtOVKka}u-}e+ANa`DkvR{U`}C=eF^e z3DmTV6Ev<|x{{>n*}w1p+C2>rWVTQs*!a;Bq-`gevGF4xM;Co+<1ZsYL7wV$dIJH_ z@As3VqoZtRivHOgkFA5mZ)SmwA0-8vzbHXI`(wl8C;04#Tmvk8T*w_nuh&bCkB?8^ zP3JT>o6()1`OOn+A?05E0$Co}Y zMRfv)zwxkf;goMJK!X$p^9dL;PRYXZ1%3;kWHb;UBRQ;6dGz%RT4DJPthfysKc)Q z0A&uM%o132b?!KA3g!4fmC3?kS%TaZ98#A6m!QA6aL~)WP%EDcHvTd`D7`7v86XvP z$r>s_pk2WvGqx3|%5Oog6__hQQC9#OM`hwD>k>k0^Tx3*LB%|XGA&9(g33wIc@m^_ z08C<+tZDxi6g6bg7eOLH@g*p#r^c~M*0f7d)Fx5VsB!!xNO7}!(z;|#y9BXY#7LvY z$&w)H6+GnTFVicSeY7;Wt3Dm|K&JRG$k!jB z3RK-6pcvq;{tVpmd{%z|b0u)qry~L&v_2n|g_^%OZ`J()iV|ewhxQ8A_4&Djvec(j zlp^ZmsXm_qz{Rh}5&Vnq7IW7kmG=h-@W1p25PlfHKp+qZ1cJ%JAD6)ox0ANcn*aa+ M07*qoM6N<$g6i6Sp#T5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Alerts/ninja_power.rsi/power6.png b/Resources/Textures/Interface/Alerts/ninja_power.rsi/power6.png new file mode 100644 index 0000000000000000000000000000000000000000..be02bf0fde84fbba85e0d3621d1610d6148b018a GIT binary patch literal 1777 zcmVlpp1w4s2lS9n&@^pdblLwKvCS-dAaq~sDQ z;S*uME&~eRT6(ggmn4ak7n-oL&%~6!sPJWu-Zf^(F4Ky0R>J zRL&R%Q9=aqlBCQgc}fH%tFp7szNxxziK2KEd23YA#gQc^Ucabi>6(_D5j`zWo{F{i z|NAsDGt-Uk?jSf{P4jacT>DU~n&$7RY1Yob@dDRs%U_f|&3%hrZE3z^@a(|lO-oB2 zz|}5{JZlL(QI{NY?3oOFT);pa2JfM7y|Jt2J?Bpl+m>H+2Zu*6A@!b(Kl*NH2R?eq z%m4rY32;bRa{vGi!~g&e!~vBn4jTXf1u98IK~#9!?OZWy6hRc;o7=z^1`XI~Az}iT zMuMafB$7r*WhwXzM9|j4AD~!?U~iw&Dj-6dK$;*auDC|XrLc$)Arg*om($tHyUgy* z%*|}(+vV=w2gerp&&Gn1xPuBaUv80}i{B3J%s}^#i z%#Yz0KIE-Ot@I@^pUe+mb8~Z1r`L)0p6x~Z5BJmYjg5_d=->}N99a3AZ<h*dggh*fVbE?F<10~WVLPGM3L|FOb8!?ohj&I`c z-sz_AQi!2(_~~%)gI(l6$4_HE@yD)Tl)=UA%dgjJwN!bTgZ)oXH|oOt>U8te%HR3g zf%>HypDF&R9c6?PI(B;3@zYo;#NEIGkgL1f?hX#V6Gg{=k4Lu?WrfNu2?-s)DpCZ$ zDgYfnjmtbB_|^Dy{OUYh`D5SUN!_+E!FTl^>sQje|UFCx^qND?F#t}R4yeEIK3 ze~yL%L9P}Of{q_;K{9r-867|Jc62_cI{qRSpmrpV9gcxWFa zesvY-_)%6M`STWJi$63}eu6E2$T`5$_od7vdc9tBettfDSCiA&X#`J#+jh{$qM5&1eg=cV zU@#aA27|$1Fc^~$?hi2I{52nPDiN2L8f9I&ij&UCaC~KVC1?_S_>-qe)Og!~@yCzj z^is2lUtW$~-CV6Ce%U)f)&}_G-@QM;%Kf~Lv{7($lIYV{Rt#cPvqpEM=E zVB+_!&h~yP*yW*6_JrwF1Q&|=?E>FQNKlPGLvgnf_wxIA96f{$l*d=S$EhuP{C~nj^c@`vmSNF7a$(nTw z@@^5sjT)!Rg1A@kj9XCQUcsjN^s;&d+xi2PfwKDpP;TiuzmC61uVC-l(!ovj>8Kkr z`I|wu{s3j5?EV0Gft&g>_?G8;^#@RQ0#kiDLIAGy`KVPW`SZsuyFWnQf^_`QUcs_H zKQk#!eLATWQ6EqB`6K`nzZ^&KFMnCioQss+AHX61+#i7XVf+jRgTY`hrVIZ7*!}2b T98$`v00000NkvXXu0mjfYXxS% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Alerts/ninja_power.rsi/power7.png b/Resources/Textures/Interface/Alerts/ninja_power.rsi/power7.png new file mode 100644 index 0000000000000000000000000000000000000000..24438495858053eb4bf8bbd0fd9c1185faa759a2 GIT binary patch literal 1729 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 U`Pg=jUH||907*qoM6N<$f@dpY)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0b7ddbf8ff4a94050b716ffccf2e1d2542ba29b5 GIT binary patch literal 752 zcmV)=vEY6V|Q6O&d*+mNJ4aTQz~1P9T@ z*WiDktKh022#O%$=I(0|iRaovi|7qE=f`*NcR2Y1p}1{iy}B{T=6p9X8Pn$G7qsv* zAzFzrNN>vUobl=DIRCDXTWVCj=~un}zxU^ATsA!eY9hiThU5CeG7a%n-%-3N+-_u2 z%fbi3eXa~Be5rK3#7~OTC4N)vCKD47Qa!bF73)=OWZbN9uW&SL7mV^e>Pwo;-0Y0h zPT5^}B$y6>xNLN#;CAuk(O;P3k zJ5SFV9x8Qjib4Hj5WIFncpJX9g5dKo2)>S>_5sdw6@OlG8hsaitD;5sp=BLTFDjb8 z17{o1aqpzu)Q?mvJ7ih#astis&~^0i}=N#Wba!r2G73}UokKAur`UWhXXddy& z8`=N>010qNS#tmY3labT3lag+-G2N400AgTL_t(|+U?r0YQj(y#_`i4y2MDqj+v{2 z_yW57PM!Ns-F=9SK|K3m;XrR zo!wqnWZ%#u;L8hTFTkS6@ZY^7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9147eb7598d9f16cba99b5c7f4f3fc480e79712a GIT binary patch literal 765 zcmV)=vEY6V|Q6O&d*+mNJ4aTQz~1P9T@ z*WiDktKh022#O%$=I(0|iRaovi|7qE=f`*NcR2Y1p}1{iy}B{T=6p9X8Pn$G7qsv* zAzFzrNN>vUobl=DIRCDXTWVCj=~un}zxU^ATsA!eY9hiThU5CeG7a%n-%-3N+-_u2 z%fbi3eXa~Be5rK3#7~OTC4N)vCKD47Qa!bF73)=OWZbN9uW&SL7mV^e>Pwo;-0Y0h zPT5^}B$y6>xNLN#;CAuk(O;P3k zJ5SFV9x8Qjib4Hj5WIFncpJX9g5dKo2)>S>_5sdw6@OlG8hsaitD;5sp=BLTFDjb8 z17{o1aqpzu)Q?mvJ7ih#astis&~^0i}=N#Wba!r2G73}UokKAur`UWhXXddy& z8`=N>010qNS#tmY3labT3lag+-G2N400A{gL_t(|+U?rEPQx$|$MGYI$`Xo@+A%XQ zpuRx6_nnw|C-y!>*)viBl`KVc30x>0Sg@_jA6MUxWGNY9UrtF>)jtsc00000008)7 zKASZ<&avLyXR_P7`=67SZS%U@U5x$aL+Z_aCf$GRlX_x9>ixF?htGpJ=T66C7g}%T zHS1F$)v8S9321BmuGxoI1FGj6DcA4GG(c1yN8(twWb0r7HMZ(%7^@+J>Y>imTw_P;d}k zd=35wx(coef}jW@ZtlJok$7%fsEEDc=KT2X{SGHzz!Nj|tkXOR*<8U+L?eNP#ic;& z3m&@g;b&aa9cwBckI`^_-qED$ZCLeceDB}YzM67$Xz~e<>6Tp(mT8Es7c9lw!aaIM zTNOSO4%srG@Rib&Ren~SuJXHLdoD2z9@R6D{>8~(tY_@3@Q`pYYZmp|JnBn2Qn~qA zseQ8haYzs)LVzSi)-Wj$mYS2y{`U=6d^6<5qs!Z(ge{IV8S#chElSsvR73QXJSHWT z``t2Ja(WU;KfH#4|*_$XYhg&ZYDh_sKlZXB*;u`v#nCPb?4Omlg*Uf+5NhI zhf-?P>vf2;5)gA~1GE9!0BwLaAkIq3PT1c&7zK?V9UmH;C#;%p$UF!kywz$3=G1B{ zY$kBL!TrN~Jm#j=~(womQ$c z;^c?A3HCqx6x*FAilxP}d+bQ;!((TT3UTtKeg$x0=R_>C0C3X)*f1$pg>f#4{Pal~ z9AuA7ngQqKVhcAXbCPtiZlAaQ+h^BAM@LmOb*Hl$}W)V>A-@8-u5``R~+l^?1C&MwZ4=S~}viIivY$MrHb@d{xM z=HeVx8=u6_omQ#+hcESCU}tN4l$p!ApNGQ%#bk2E?fZD|Dcw9b-;jMPj3+VeYH>ab usOB5`wYYvGqz%vpXalqX+5l}pT=flNT~f@2$W0ai0000s%j` z`27>zmsePo)8(Go;+}`c^z?N-5i)x{^0tnR^3lA}vFrXD|N|vv&>Gf=~bV*qi(~b;)7Z z_P7Mb1-?2{|0n%=|GIjouDq^n-AeDQ<^})NYv-9R_ucV#%GScxqtmvAA7~a(U|_<6 z6x0~&tTm%pmc4ZpHY zx}`GtEqmM*bw0<+XP3REtYuN28Slu!|L6471f9>?93^q0&IYr7inc8BGMERXCV5?` pyR}?x`!n~?o1cpB-^}@k`TmoBJFOyre_(7ec)I$ztaD0e0sz(N$fW=P literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e185890fbf360ec5e9d1430d45e43b02e2574214 GIT binary patch literal 740 zcmVY}yv(*JWnR?5dqL&FrSlRk=7Q2XXQ1 z;6LE1Tq&hUNp9|bU8M26W@|U`PVYRQzVG{edgeP2P3BC;uNeg=U+~fs32k<6UaNa1 zN(<1&fNuKkSSpp|-}P}zMAe&q)$9Lzf3C(Q%QqoXFFb6zUO`xkc+npu5G z_&~VNlL3VQ&@=}v*U+#KW>r4t_ztGm24FsiIRpe=y?#wIN3fs^AX^S%!yH8`hp=E11X&KUj5W>yY_aU& z$24;YBQdohxPy! W(5qCqTG2}Y0000Y}yv(*JWnR?5dqL&FrSlRk=7Q2XXQ1 z;6LE1Tq&hUNp9|bU8M26W@|U`PVYRQzVG{edgeP2P3BC;uNeg=U+~fs32k<6UaNa1 zN(<1&fNuKkSSpp|-}P}zMAe&q)$9Lzf3C(Q%QqoXFFb6zUO`xkc+npu5G z_&~VNlL3VQ&@=}v*U+#KW>r4t_ztGmj`5 zBUo8m$4+c~0P_S^!3WR>un{}0wY3s##6T(w3qcSA;&GKk*38Mqmcb(fm)foJ=*}kvKv*yh3w-4g!TB-T{ z&%t}6Y9A@YA*i(v;*(ZC000000000000000057mT(2#Xr-t&zQNbo>I8KW&qme13r z^A1!5ri%&>7rquPN{Zr14;%6vGRwYh)`>2aS*#}A9S?-Tqp=#oH5mzF0E&#dUYxYX774Fvu|fhyz~IlK`_6`D{&6V z<}8A9T~l2=E2N1CfNwu9$>dJLv!b002ovPDHLkV1oB~ Blm`F+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5926122d27bfe0b4623bcf94a44ba3a8ac46fa4f GIT binary patch literal 993 zcmV<710MW|P)Y}yv(*JWnR?5dqL&FrSlRk=7Q2XXQ1 z;6LE1Tq&hUNp9|bU8M26W@|U`PVYRQzVG{edgeP2P3BC;uNeg=U+~fs32k<6UaNa1 zN(<1&fNuKkSSpp|-}P}zMAe&q)$9Lzf3C(Q%QqoXFFb6zUO`xkc+npu5G z_&~VNlL3VQ&@=}v*U+#KW>r4t_ztGmM2JN#2)S`p9UUz^n1d^sBIK2LyY%^c-lI$* zQrtiA5nvY)ZE`}qzwZL@X9xly00000000000001hVZbd_?$lPX!|e8a)${eWC&*Lf z0-h@8?XXhjykJ9qzAFA?hA4H+K~Px+uNxpYRbz0jl^8utoc|`yW{h@Yx2d#$+D(Yc zgX0o--GE-Kn*(e%X|JEae-p3mRH%m+)O!T@L4NBR`AL@-3F|!PBf_kSAC#xb#qF3i z@t{!NdFC>2Oh810+o!>Efahy(R+~?pW0wz99RbP(h!7Ta17dPcBIHEq@nSX9`hs{+ z9b2JW&b8I+*{l(LE2;=A0_@&$XSjEUy6O-QU4R=Wk6FjOf7k*50MX_ffJW7s7@3p5 P00000NkvXXu0mjfm{iK| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json new file mode 100644 index 0000000000..1dfa76c4e3 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}