diff --git a/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs b/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs deleted file mode 100644 index deb4de0a21..0000000000 --- a/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs +++ /dev/null @@ -1,178 +0,0 @@ -using System.Numerics; -using Content.Server._CP14.Footprints.Components; -using Content.Server.Decals; -using Content.Shared._CP14.Decals; -using Content.Shared.DoAfter; -using Content.Shared.Fluids; -using Content.Shared.Fluids.Components; -using Content.Shared.Interaction; -using Content.Shared.Inventory.Events; -using Content.Shared.Maps; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Map; -using Robust.Shared.Map.Components; -using Robust.Shared.Physics.Events; -using Robust.Shared.Prototypes; - -namespace Content.Server._CP14.Footprints; - -public sealed class CP14FootprintsSystem : EntitySystem -{ - [Dependency] private readonly DecalSystem _decal = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnTrailerMove); - SubscribeLocalEvent(OnTrailerCollide); - - SubscribeLocalEvent(OnHolderEquipped); - SubscribeLocalEvent(OnHolderUnequipped); - - SubscribeLocalEvent(OnAfterInteract); - SubscribeLocalEvent(OnCleanDoAfter); - } - - private void OnCleanDoAfter(Entity ent, ref CP14DecalCleanerDoAfterEvent args) - { - if (args.Cancelled || args.Handled) - return; - - var gridUid = Transform(ent).GridUid; - if (gridUid is null) - return; - - if (!TryComp(gridUid, out var map)) - return; - - var coord = EntityManager.GetCoordinates(args.ClickLocation); - _audio.PlayPvs(ent.Comp.Sound, coord); - SpawnAtPosition(ent.Comp.SpawnEffect, coord); - - var oldDecals = _decal.GetDecalsInRange(gridUid.Value, args.ClickLocation.Position, ent.Comp.Range); - foreach (var (id, decal) in oldDecals) - { - if (decal.Cleanable) - _decal.RemoveDecal(gridUid.Value, id); - } - - args.Handled = true; - } - - private void OnAfterInteract(Entity ent, ref AfterInteractEvent args) - { - if (!args.CanReach && !args.Handled) - return; - - var doAfter = new DoAfterArgs(EntityManager, - args.User, - ent.Comp.Delay, - new CP14DecalCleanerDoAfterEvent(EntityManager.GetNetCoordinates(args.ClickLocation)), - ent) - { - BreakOnMove = true, - BreakOnDamage = true, - NeedHand = true, - }; - _doAfter.TryStartDoAfter(doAfter); - - args.Handled = true; - } - - private void OnHolderUnequipped(Entity ent, ref GotUnequippedEvent args) - { - if (!TryComp(args.Equipee, out var trailer)) - return; - - trailer.holder = null; - - if (TryComp(args.Equipee, out var selfHolder)) - { - trailer.holder = selfHolder; - } - } - - private void OnHolderEquipped(Entity ent, ref GotEquippedEvent args) - { - if (!TryComp(args.Equipee, out var trailer)) - return; - - trailer.holder = ent.Comp; - } - - private void OnTrailerCollide(Entity ent, ref StartCollideEvent args) - { - if (ent.Comp.holder is null) - return; - var footprint = ent.Comp.holder; - - if (!TryComp(args.OtherEntity, out var puddle)) - return; - - if (puddle.Solution is null) - return; - - var sol = puddle.Solution; - - var splittedSol = sol.Value.Comp.Solution.SplitSolutionWithout(footprint.PickSolution, SharedPuddleSystem.EvaporationReagents); - - if (splittedSol.Volume > 0) - UpdateFootprint(footprint, splittedSol.GetColor(_proto)); - } - - private void UpdateFootprint(CP14FootprintHolderComponent comp, Color color) - { - comp.DecalColor = color; - comp.Intensity = 1f; - } - - private void OnTrailerMove(Entity ent, ref MoveEvent args) - { - //Temporaly disabled - return; - - if (ent.Comp.holder is null) - return; - var footprint = ent.Comp.holder; - - var distance = Vector2.Distance(args.OldPosition.Position, args.NewPosition.Position); - - footprint.DistanceTraveled += distance; - - if (footprint.DistanceTraveled < footprint.DecalDistance) - return; - - footprint.DistanceTraveled = 0f; - - var xform = Transform(ent); - if (!TryComp(xform.GridUid, out var mapGrid)) - return; - - var tileRef = _maps.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates); - var tileDef = (ContentTileDefinition)_tileDefManager[tileRef.Tile.TypeId]; - - if (tileDef.Weather && tileDef.Color is not null) - { - UpdateFootprint(footprint, tileDef.Color.Value); - return; - } - - if (footprint.Intensity <= 0) - return; - - _decal.TryAddDecal(footprint.DecalProto, - xform.Coordinates.Offset(new Vector2(-0.5f, -0.5f)), - out var decal, - footprint.DecalColor.WithAlpha(footprint.Intensity), - xform.LocalRotation, - cleanable: true); - - footprint.Intensity = MathF.Max(0, footprint.Intensity - footprint.DistanceIntensityCost); - } -} diff --git a/Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs b/Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs deleted file mode 100644 index 6dc10958a2..0000000000 --- a/Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Robust.Shared.Audio; -using Robust.Shared.Prototypes; - -namespace Content.Server._CP14.Footprints.Components; - -/// -/// allows you to remove cleanable decals from tiles with a short delay. -/// -[RegisterComponent, Access(typeof(CP14FootprintsSystem))] -public sealed partial class CP14DecalCleanerComponent : Component -{ - [DataField] - public SoundSpecifier Sound = new SoundCollectionSpecifier("CP14Broom") - { - Params = AudioParams.Default.WithVariation(0.2f), - }; - - [DataField] - public EntProtoId? SpawnEffect = "CP14DustEffect"; - - [DataField] - public float Range = 1.2f; - - [DataField] - public TimeSpan Delay = TimeSpan.FromSeconds(0.75f); -} diff --git a/Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs b/Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs deleted file mode 100644 index ade85f5c5f..0000000000 --- a/Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Content.Shared.Decals; -using Content.Shared.FixedPoint; -using Robust.Shared.Prototypes; - -namespace Content.Server._CP14.Footprints.Components; - -/// -/// stores the type of footprints and their settings. -/// -[RegisterComponent, Access(typeof(CP14FootprintsSystem))] -public sealed partial class CP14FootprintHolderComponent : Component -{ - [DataField] - public ProtoId DecalProto = "CP14FootprintsBoots"; - - [DataField] - public float DecalDistance = 1f; - - [DataField] - public float DistanceTraveled = 0f; - - [DataField] - public Color DecalColor = Color.White; - - [DataField] - public float Intensity = 0f; - - [DataField] - public FixedPoint2 PickSolution = 1f; - - [DataField] - public float DistanceIntensityCost = 0.2f; -} diff --git a/Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs b/Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs deleted file mode 100644 index 0af4e60444..0000000000 --- a/Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Content.Server._CP14.Footprints.Components; - -/// -/// allows an entity to leave footprints on the tiles -/// -[RegisterComponent, Access(typeof(CP14FootprintsSystem))] -public sealed partial class CP14FootprintTrailerComponent : Component -{ - /// - /// Source and type of footprint - /// - [DataField] - public CP14FootprintHolderComponent? holder = null; -} diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index c8d6b6ad9d..a60e720d06 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -130,12 +130,6 @@ namespace Content.Shared.Maps [DataField] public ProtoId? BurnedTile { get; private set; } = null; - /// - /// CP14 - color for footprints - /// - [DataField] - public Color? Color; - /// /// CP14 - auto removing spilled reagents from tile /// diff --git a/Resources/Audio/_CP14/Items/attributions.yml b/Resources/Audio/_CP14/Items/attributions.yml index 60e943073e..57e8487a59 100644 --- a/Resources/Audio/_CP14/Items/attributions.yml +++ b/Resources/Audio/_CP14/Items/attributions.yml @@ -53,11 +53,6 @@ copyright: 'by deleted_user_7146007 of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/deleted_user_7146007/sounds/383725/" -- files: ["broom1.ogg", "broom2.ogg", "broom3.ogg"] - license: "CC-BY-4.0" - copyright: 'by F.M.Audio of Freesound.org. Cropped by TheShuEd.' - source: "https://freesound.org/people/F.M.Audio/sounds/552056/" - - files: ["book1.ogg"] license: "CC-BY-4.0" copyright: 'by flag2 of Freesound.org. edit to Mono by TheShuEd.' diff --git a/Resources/Audio/_CP14/Items/broom1.ogg b/Resources/Audio/_CP14/Items/broom1.ogg deleted file mode 100644 index d2acfd0b39..0000000000 Binary files a/Resources/Audio/_CP14/Items/broom1.ogg and /dev/null differ diff --git a/Resources/Audio/_CP14/Items/broom2.ogg b/Resources/Audio/_CP14/Items/broom2.ogg deleted file mode 100644 index fa3639a308..0000000000 Binary files a/Resources/Audio/_CP14/Items/broom2.ogg and /dev/null differ diff --git a/Resources/Audio/_CP14/Items/broom3.ogg b/Resources/Audio/_CP14/Items/broom3.ogg deleted file mode 100644 index 0023861ac8..0000000000 Binary files a/Resources/Audio/_CP14/Items/broom3.ogg and /dev/null differ diff --git a/Resources/Prototypes/_CP14/Decal/footprints.yml b/Resources/Prototypes/_CP14/Decal/footprints.yml deleted file mode 100644 index b2ccce28dd..0000000000 --- a/Resources/Prototypes/_CP14/Decal/footprints.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: decal - id: CP14Footprints - showMenu: true - sprite: - sprite: _CP14/Decals/footprints.rsi - state: footprint - -- type: decal - id: CP14FootprintsBoots - showMenu: true - sprite: - sprite: _CP14/Decals/footprints.rsi - state: boots \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index 54f748ae94..053394817d 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -13,7 +13,6 @@ state: icon - type: Item size: Normal - - type: CP14FootprintHolder - type: entity parent: CP14ClothingShoesBase diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index a5f0cdafd4..0b32bff9f1 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -221,9 +221,6 @@ - type: CP14MagicUnsafeSleep - type: CP14MagicAttuningMind autoCopyToMind: true - - type: CP14FootprintHolder - decalProto: CP14Footprints - - type: CP14FootprintTrailer - type: CP14DemiplaneStabilizer requireAlive: true - type: CanEnterCryostorage diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml index a0c341f570..7545040be3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml @@ -33,31 +33,4 @@ - type: SolutionContainerManager solutions: absorbed: - maxVol: 50 - -- type: entity - id: CP14BaseBroom - parent: - - BaseItem - - CP14BaseWeaponDestructible - name: wooden broom - description: Sweeps up dried footprints and other stains from the floor - components: - - type: Item - size: Normal - storedRotation: 0 - shape: - - 0,0,0,2 - sprite: _CP14/Objects/Tools/broom.rsi - - type: Sprite - sprite: _CP14/Objects/Tools/broom.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: 10 - damage: - types: - Blunt: 5 - soundHit: - collection: MetalThud - - type: CP14DecalCleaner - delay: 0.75 \ No newline at end of file + maxVol: 50 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 85176ed07c..58ccf93ae9 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -34,16 +34,6 @@ CP14Cloth: 1 result: CP14BaseMop -- type: CP14Recipe - id: CP14BaseBroom - tag: CP14RecipeWorkbench - craftTime: 3 - entities: - CP14Wheat: 2 - stacks: - CP14WoodenPlanks: 2 - result: CP14BaseBroom - - type: CP14Recipe id: CP14BaseBattleStaff tag: CP14RecipeWorkbench diff --git a/Resources/Prototypes/_CP14/SoundCollections/items.yml b/Resources/Prototypes/_CP14/SoundCollections/items.yml index 5d13648f91..6bf907fcd6 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/items.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/items.yml @@ -29,13 +29,6 @@ - /Audio/_CP14/Items/sawing3.ogg - /Audio/_CP14/Items/sawing4.ogg - /Audio/_CP14/Items/sawing5.ogg - -- type: soundCollection - id: CP14Broom - files: - - /Audio/_CP14/Items/broom1.ogg - - /Audio/_CP14/Items/broom2.ogg - - /Audio/_CP14/Items/broom3.ogg - type: soundCollection id: CP14Parry diff --git a/Resources/Prototypes/_CP14/Tiles/base.yml b/Resources/Prototypes/_CP14/Tiles/base.yml index 56cd127ab7..61a71883cb 100644 --- a/Resources/Prototypes/_CP14/Tiles/base.yml +++ b/Resources/Prototypes/_CP14/Tiles/base.yml @@ -37,5 +37,4 @@ collection: FootstepAsteroid heatCapacity: 10000 weather: true - color: "#38373b" indestructible: true \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index 77c804f1b0..772751c8e1 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -40,7 +40,6 @@ heatCapacity: 10000 weather: true suckReagents: true - color: "#452f27" - type: tile editorHidden: false @@ -73,7 +72,6 @@ heatCapacity: 10000 weather: true suckReagents: true - color: "#dccd9e" - type: tile id: CP14FloorGrass @@ -107,7 +105,6 @@ heatCapacity: 10000 weather: true suckReagents: true - color: "#4a613a" - type: tile id: CP14FloorGrassLight @@ -141,7 +138,6 @@ heatCapacity: 10000 weather: true suckReagents: true - color: "#4a613a" - type: tile id: CP14FloorGrassTall @@ -175,7 +171,6 @@ heatCapacity: 10000 weather: true suckReagents: true - color: "#4a613a" - type: tile id: CP14FloorSnowDeepDeep diff --git a/Resources/Prototypes/_CP14/Tiles/woodplanks.yml b/Resources/Prototypes/_CP14/Tiles/woodplanks.yml index c9309ab46d..8538893525 100644 --- a/Resources/Prototypes/_CP14/Tiles/woodplanks.yml +++ b/Resources/Prototypes/_CP14/Tiles/woodplanks.yml @@ -1281,7 +1281,6 @@ collection: FootstepWood heatCapacity: 10000 weather: true - color: "#0d0906" - type: tile #Big editorHidden: false @@ -1305,7 +1304,6 @@ collection: FootstepWood heatCapacity: 10000 weather: true - color: "#0d0906" - type: tile #Cruci editorHidden: false @@ -1329,7 +1327,6 @@ collection: FootstepWood heatCapacity: 10000 weather: true - color: "#0d0906" - type: tile #Stairways editorHidden: false @@ -1353,6 +1350,5 @@ collection: FootstepWood heatCapacity: 10000 weather: true - color: "#0d0906" ### /BURNED diff --git a/Resources/Textures/_CP14/Decals/footprints.rsi/boots.png b/Resources/Textures/_CP14/Decals/footprints.rsi/boots.png deleted file mode 100644 index 184c1a8673..0000000000 Binary files a/Resources/Textures/_CP14/Decals/footprints.rsi/boots.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Decals/footprints.rsi/footprint.png b/Resources/Textures/_CP14/Decals/footprints.rsi/footprint.png deleted file mode 100644 index 0f2e6f86d4..0000000000 Binary files a/Resources/Textures/_CP14/Decals/footprints.rsi/footprint.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Decals/footprints.rsi/meta.json b/Resources/Textures/_CP14/Decals/footprints.rsi/meta.json deleted file mode 100644 index b8c8b3dfee..0000000000 --- a/Resources/Textures/_CP14/Decals/footprints.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CLA", - "copyright": "Created by TheShuEd", - "states": [ - { - "name": "boots" - }, - { - "name": "footprint" - } - ] -} diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png index 7e18a80eab..b9c7db4cd4 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png index debbcd0857..22b5b521cc 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png index b59de1d6ba..da0b99d23b 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png index 4c1c20c690..c186e2a027 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png index a513f58245..c2bf6f7296 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png index ef1f512d36..68a22b4040 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png index 4f2f69d5cd..edca645dec 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png index a94311f9a6..6914beae71 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png index 8e97f1b440..018006db63 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png index 2d243c0974..e2f4d93573 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png index b63af73579..f592de1471 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 31946a51ce..f09a0b4c37 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -202,6 +202,8 @@ CP14FloraTreeLarge06: CP14FloraTreeGreenLarge CP14DungeonEntranceAutoLink: CP14LaddersDownStoneAutoLink CP14DungeonExitAutoLink: CP14LaddersUpStoneAutoLink +CP14BaseBroom: null + # <---> CrystallEdge migration zone end