diff --git a/Content.Client/_CP14/Wallpaper/CP14ClientWallpaperSystem.cs b/Content.Client/_CP14/Wallpaper/CP14ClientWallpaperSystem.cs index 3738271cf5..9b60e39061 100644 --- a/Content.Client/_CP14/Wallpaper/CP14ClientWallpaperSystem.cs +++ b/Content.Client/_CP14/Wallpaper/CP14ClientWallpaperSystem.cs @@ -1,5 +1,6 @@ using Content.Client.IconSmoothing; using Content.Shared._CP14.Wallpaper; +using Content.Shared.IconSmoothing; using Robust.Client.GameObjects; namespace Content.Client._CP14.Wallpaper; @@ -8,8 +9,8 @@ public sealed class CP14ClientWallpaperSystem : CP14SharedWallpaperSystem { public override void Initialize() { - SubscribeLocalEvent(OnHandleState, after: new[] { typeof(IconSmoothSystem) }); - SubscribeLocalEvent(OnStartup, after: new[] { typeof(IconSmoothSystem) }); + SubscribeLocalEvent(OnHandleState, after: new[] { typeof(IconSmoothSystem), typeof(SharedRandomIconSmoothSystem), typeof(ClientRandomIconSmoothSystem) }); + SubscribeLocalEvent(OnStartup, after: new[] { typeof(IconSmoothSystem), typeof(SharedRandomIconSmoothSystem), typeof(ClientRandomIconSmoothSystem) }); } private void OnStartup(Entity holder, ref ComponentStartup args) diff --git a/Content.Shared/_CP14/Wallpaper/CP14SharedWallpaperSystem.cs b/Content.Shared/_CP14/Wallpaper/CP14SharedWallpaperSystem.cs index 5a51ddfed3..ff6de32d0b 100644 --- a/Content.Shared/_CP14/Wallpaper/CP14SharedWallpaperSystem.cs +++ b/Content.Shared/_CP14/Wallpaper/CP14SharedWallpaperSystem.cs @@ -99,6 +99,9 @@ public partial class CP14SharedWallpaperSystem : EntitySystem if (TryComp(args.Used, out var remover)) { + if (holder.Comp.Layers.Count == 0) + return; + var doAfterArgs = new DoAfterArgs(EntityManager, args.User, remover.Delay, new CP14WallpaperRemoveLayersDoAfterEvent(), holder, holder, args.Used) { BreakOnDamage = true, diff --git a/Content.Shared/_CP14/Wallpaper/CP14WallpaperComponent.cs b/Content.Shared/_CP14/Wallpaper/CP14WallpaperComponent.cs index 4c1667c90f..d694a109ee 100644 --- a/Content.Shared/_CP14/Wallpaper/CP14WallpaperComponent.cs +++ b/Content.Shared/_CP14/Wallpaper/CP14WallpaperComponent.cs @@ -6,7 +6,6 @@ namespace Content.Shared._CP14.Wallpaper; [RegisterComponent, Access(typeof(CP14SharedWallpaperSystem))] public sealed partial class CP14WallpaperComponent : Component { - [DataField] public float Delay = 1f; diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index 0578473637..0939d675a8 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -12,6 +12,7 @@ cp14-modifier-explosive = explosive mines cp14-modifier-ruins = ancient ruins cp14-modifier-xeno = xenomorphs cp14-modifier-zombie = swarms of undead +cp14-modifier-skeleton = sentient skeletons cp14-modifier-dyno = prehistoric fauna cp14-modifier-mole = predatory moles cp14-modifier-rabbits = rabbits diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl index 6df7f73f1c..1cbd025436 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -12,6 +12,7 @@ cp14-modifier-explosive = взрывных мин cp14-modifier-ruins = древних руин cp14-modifier-xeno = ксеноморфов cp14-modifier-zombie = толп нежити +cp14-modifier-skeleton = разумные скелеты cp14-modifier-dyno = доисторической фауны cp14-modifier-mole = хищных кротов cp14-modifier-rabbits = кроликов diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml index a6f800bde2..6fa9bc51ca 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml @@ -7,7 +7,7 @@ sprite: _CP14/Effects/Magic/spells_icons.rsi state: rift_arrow - type: CP14MagicEffectManaCost - manaCost: 50 + manaCost: 25 - type: CP14MagicEffect magicType: Darkness telegraphyEffects: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml index 42170c6016..8a74500922 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml @@ -7,7 +7,7 @@ sprite: _CP14/Effects/Magic/spells_icons.rsi state: demi_arrow - type: CP14MagicEffectManaCost - manaCost: 50 + manaCost: 25 - type: CP14MagicEffect magicType: Darkness telegraphyEffects: diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index 08ffd88e5a..8f299476a4 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -8,7 +8,6 @@ slotFlags: RING uiWindowPos: 0,1 strippingWindowPos: 0,3 - dependsOn: pants displayName: Ring - name: mask slotTexture: mask diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml index 5ce75be0c2..8e85758047 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml @@ -53,17 +53,4 @@ entity: CP14AstralHaze count: 10 minGroupSize: 1 - maxGroupSize: 1 - -- type: cp14DemiplaneModifier - id: TimeLimit10 - generationWeight: 0.4 - tiers: - - 1 - - 2 - name: cp14-modifier-time-limit-10 - categories: - Danger: 0.1 - components: - - type: CP14DemiplaneTimedDestruction - timeToDestruction: 600 # 10 minutes \ No newline at end of file + maxGroupSize: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index 48b5fd4ef7..5e80a2eb75 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -71,8 +71,9 @@ - type: cp14DemiplaneModifier id: EnemySkeleton tiers: + - 1 - 2 - name: cp14-modifier-zombie + name: cp14-modifier-skeleton generationWeight: 1.5 categories: Danger: 0.5 @@ -80,7 +81,7 @@ - !type:OreDunGen entity: SpawnPointGhostDemiplaneSkeleton count: 1 - minGroupSize: 2 + minGroupSize: 1 maxGroupSize: 3 - type: cp14DemiplaneModifier diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml index 0ff24ab265..85811f1dee 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml @@ -14,20 +14,6 @@ minGroupSize: 2 maxGroupSize: 3 -#- type: cp14DemiplaneModifier -# id: Ruins -# tier: 1 -# name: cp14-modifier-ruins -# generationWeight: 2 -# categories: -# Reward: 0.35 -# layers: -# - !type:OreDunGen -# entity: ##CP14DemiplanRuinsRoomSpawner -# count: 5 -# minGroupSize: 1 -# maxGroupSize: 1 - - type: cp14DemiplaneModifier id: Rabbits tiers: diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml index 432ae9f87b..7689b9e05a 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml @@ -1,11 +1,12 @@ - type: cp14DemiplaneModifier id: ArtifactRoom tiers: + - 1 - 2 - 3 - generationWeight: 0.05 + generationWeight: 0.1 categories: - Reward: 0.4 + Reward: 0.3 layers: - !type:OreDunGen entity: CP14DemiplaneArtifactRoomSpawner diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml index c359fecba8..5694066ca2 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml @@ -25,4 +25,15 @@ entity: CP14DemiplanePassway count: 2 minGroupSize: 1 - maxGroupSize: 1 \ No newline at end of file + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: TimeLimit10 + generationProb: 0.33 + tiers: + - 1 + - 2 + name: cp14-modifier-time-limit-10 + components: + - type: CP14DemiplaneTimedDestruction + timeToDestruction: 600 # 10 minutes \ No newline at end of file