diff --git a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs index 484aa6da14..669f9d6a24 100644 --- a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs +++ b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs @@ -17,7 +17,11 @@ namespace Content.Shared.Abilities.Psionics } private void OnPowerUsed(EntityUid uid, MassSleepPowerComponent component, MassSleepPowerActionEvent args) + { + if (!_psionics.OnAttemptPowerUse(args.Performer, "mass sleep", true)) + return; + foreach (var entity in _lookup.GetEntitiesInRange(args.Target, component.Radius)) { if (HasComp(entity) && entity != uid && !HasComp(entity)) diff --git a/Resources/Audio/Psionics/attributions.yml b/Resources/Audio/Psionics/attributions.yml index a1c3229458..6b85b049f4 100644 --- a/Resources/Audio/Psionics/attributions.yml +++ b/Resources/Audio/Psionics/attributions.yml @@ -2,8 +2,14 @@ license: "CC0-1.0" copyright: "Taken from greyseraphim via freesound.org" source: "https://freesound.org/people/greyseraphim/sounds/21409/" - + - files: ["wavy.ogg"] license: "CC-BY-NC-4.0" copyright: "Taken from newlocknew via freesound.org" source: "https://freesound.org/people/newlocknew/sounds/614722/" + + +- files: ["shadeskip_power.ogg"] + license: "CC-BY-NC-4.0" + copyright: "._rocket_. on Discord" + source: "https://github.com/RocketBoss360/Einstein-Engines-Rocket/blob/the-fog-is-going-(away)/Resources/Audio/Psionics/shadeskip_power.ogg" diff --git a/Resources/Audio/Psionics/shadeskip_power.ogg b/Resources/Audio/Psionics/shadeskip_power.ogg new file mode 100644 index 0000000000..0e4d942fe4 Binary files /dev/null and b/Resources/Audio/Psionics/shadeskip_power.ogg differ diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml index 21a0b9ef9f..be3cddc280 100644 --- a/Resources/Prototypes/Actions/psionics.yml +++ b/Resources/Prototypes/Actions/psionics.yml @@ -234,6 +234,7 @@ checkCanInteract: false event: !type:AnomalyPowerActionEvent settings: + checkInsulation: true powerName: "Shadeskip" minGlimmer: 6 maxGlimmer: 8 @@ -243,9 +244,9 @@ - settings: spawnOnPulse: true spawnOnSuperCritical: true - minAmount: 18 - maxAmount: 28 - maxRange: 2.5 + minAmount: 20 + maxAmount: 25 + maxRange: 2.25 spawns: - ShadowKudzuTemp - settings: @@ -269,6 +270,7 @@ checkCanInteract: false event: !type:AnomalyPowerActionEvent settings: + checkInsulation: true powerName: "Telekinetic Pulse" overchargeFeedback: "shadeskip-overcharge-feedback" # The text behind this is fine. overchargeCooldown: 120 @@ -315,6 +317,7 @@ checkCanInteract: false event: !type:AnomalyPowerActionEvent settings: + checkInsulation: true powerName: "Pyrokinetic Flare" minGlimmer: 3 maxGlimmer: 5 diff --git a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml index 3137bb5af8..e263d7cad1 100644 --- a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml +++ b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml @@ -35,10 +35,10 @@ energy: 3.5 color: "#7100bd" - type: TimedDespawn - lifetime: 1 + lifetime: 12 - type: EmitSoundOnSpawn sound: - path: /Audio/Effects/Lightning/lightningbolt.ogg + path: /Audio/Psionics/shadeskip_power.ogg - type: entity id: EffectFlashShadowkinShadeskip diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml index eb69ac821f..89ced0d834 100644 --- a/Resources/Prototypes/Entities/Effects/portal.yml +++ b/Resources/Prototypes/Entities/Effects/portal.yml @@ -51,7 +51,7 @@ radius: 3 energy: 1 netsync: false - + - type: entity id: PortalArtifact parent: BasePortal @@ -123,3 +123,12 @@ volume: -3 sound: path: /Audio/Ambience/anomaly_scary.ogg + +- type: entity + name: unstable shadow rift + id: ShadowPortalTemp + description: Its already closing! + parent: ShadowPortal + components: + - type: TimedDespawn + lifetime: 12 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml index 95a24157f9..f04212d1cf 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml @@ -23,4 +23,37 @@ rareChance: 0.05 rarePrototypes: - MobCatShadow - - ArtifactFragment \ No newline at end of file + - ArtifactFragment + +- type: entity + id: ShadowKudzuLootSpawnerTemp #literally just the other loot spawner but spawns a temp ver of the shadowportal + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Specific/Anomalies/shadow_anom.rsi + state: anom + - type: RandomSpawner + offset: 0.05 + chance: 0.7 + prototypes: + - CrystalPink + - CrystalPink + - ShadowPortalTemp + - ShadowPortalTemp + - ShadowPortalTemp + - ShadowPortalTemp + - ShadowPortalTemp + - ShadowPortalTemp + - ShadowTree01 + - ShadowTree02 + - ShadowTree03 + - ShadowTree04 + - ShadowTree05 + - ShadowTree06 + rareChance: 0.05 + rarePrototypes: + - MobCatShadow + - MobCatShadow + - ArtifactFragment diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 4bba30d31b..afa1c5b8b0 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -72,6 +72,7 @@ radius: 6 enabled: false + - type: entity id: ActionGhostBoo name: Boo! @@ -141,7 +142,7 @@ - BaseMob id: MobTelegnosisObserver name: psionic projection - description: Dancing across bridges prismatic hypereality + description: A soul dancing across the dreamlight categories: [ HideSpawnMenu ] components: - type: Sprite @@ -149,24 +150,26 @@ layers: - state: animated shader: unshaded - - type: ContentEye - type: Eye drawFov: false visMask: - TelegnosticProjection - PsionicInvisibility - - Ghost - Normal - - Ethereal - - type: Input - context: "ghost" - type: Examiner - - type: TelegnosticProjection - type: MovementSpeedModifier baseSprintSpeed: 8 baseWalkSpeed: 5 - type: Psionic removable: false roller: false + psychognomicDescriptors: + - p-descriptor-liminal # because you arnt currently in your body + - type: InnatePsionicPowers + powersToAdd: + - XenoglossyPower #Remove if a better way to have the projection understand langs is implemented, ideal is to have projection inherit user langs + - TelepathyPower + - PsychognomyPower + - type: TelegnosticProjection - type: Stealth lastVisibility: 0.66 diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml index 2161071a5b..87f65a3be9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml @@ -312,12 +312,21 @@ prototypes: - ShadowBasaltRandom - type: TimedDespawn - lifetime: 30 + lifetime: 5 - type: entity - name: Temporary haze + name: fading haze id: ShadowKudzuTemp parent: ShadowKudzuWeak components: + - type: RandomSpawner + deleteSpawnerAfterSpawn: false + rareChance: 0.2 + offset: 0.2 + chance: 0.45 + prototypes: + - ShadowBasaltRandom + rarePrototypes: + - ShadowKudzuLootSpawnerTemp - type: TimedDespawn - lifetime: 30 + lifetime: 12