From a3cf11aa6021ca0cd1d545125c33a809084555da Mon Sep 17 00:00:00 2001 From: JJ <47927305+PHCodes@users.noreply.github.com> Date: Wed, 25 Oct 2023 10:20:39 -0400 Subject: [PATCH] Mimes are Psionists too. (#299) * Mimes are Psionists too. Fixes #290 * Update mime.yml --- Content.Server/Abilities/Mime/MimePowersSystem.cs | 8 ++++++++ Resources/Prototypes/Roles/Jobs/Civilian/mime.yml | 1 + 2 files changed, 9 insertions(+) diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index abc3b080fc..7553ffd507 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Physics; using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Timing; +using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic. namespace Content.Server.Abilities.Mime { @@ -19,6 +20,7 @@ namespace Content.Server.Abilities.Mime [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; + [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly TurfSystem _turf = default!; [Dependency] private readonly IMapManager _mapMan = default!; [Dependency] private readonly SharedContainerSystem _container = default!; @@ -55,6 +57,9 @@ namespace Content.Server.Abilities.Mime EnsureComp(uid); _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence); _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid); + //Nyano - Summary: Add Psionic Ability to Mime. + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) + psionic.PsionicAbility = component.InvisibleWallActionEntity; } /// @@ -92,6 +97,9 @@ namespace Content.Server.Abilities.Mime return; } } + // Begin Nyano-code: mime powers are psionic. + _psionics.LogPowerUsed(uid, "invisible wall"); + // End Nyano-code. _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-popup", ("mime", uid)), uid); // Make sure we set the invisible wall to despawn properly Spawn(component.WallPrototype, _turf.GetTileCenter(tile.Value)); diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 6edef06c7e..31007c6a2d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -15,6 +15,7 @@ special: - !type:AddComponentSpecial components: + - type: Psionic # Nyano - Summary: Makes the mime psionic. - type: MimePowers - type: startingGear