From 4c73dcc2c8b4cb647a79944cc8717402d11e0915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=81da?= Date: Thu, 3 Apr 2025 01:29:52 -0500 Subject: [PATCH 1/6] Diphenhydramine causes drowsiness (#36212) * nap time in medbay * suggested changes * fake test fail --- Resources/Locale/en-US/reagents/meta/medicine.ftl | 2 +- Resources/Prototypes/Reagents/medicine.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 0b6695be34..9e5dcc88d4 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -5,7 +5,7 @@ reagent-name-dylovene = dylovene reagent-desc-dylovene = A broad-spectrum anti-toxin, which treats toxin damage in organisms. Overdosing will cause vomiting, dizzyness and pain. reagent-name-diphenhydramine = diphenhydramine -reagent-desc-diphenhydramine = Rapidly purges the body of histamine, reduces jitteriness, and treats poison damage. +reagent-desc-diphenhydramine = Rapidly purges the body of histamine, reduces jitteriness, causes drowsiness, and treats poison damage. Often included in sleep medication. reagent-name-arithrazine = arithrazine reagent-desc-arithrazine = A mildly unstable medication used for the most extreme case of radiation poisoning. Exerts minor stress on the body. diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 26ca6fa266..6c676f0105 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -83,6 +83,12 @@ key: Jitter time: 3.0 type: Remove + - !type:GenericStatusEffect + key: Drowsiness + component: Drowsiness + time: 1.5 + type: Add + refresh: false - !type:HealthChange damage: types: From ce53629f1ddc4fdce68cf0c64e43505f92e8bc1d Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Apr 2025 06:31:00 +0000 Subject: [PATCH 2/6] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 17ef3994ca..1e22adcdd6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: SlamBamActionman - changes: - - message: It's no longer possible to drag an item out of a container's UI to drop - it. - type: Tweak - id: 7625 - time: '2024-11-20T01:00:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32706 - author: Plykiya changes: - message: The crew monitoring crate now contains a flatpack of the server and computers, @@ -3900,3 +3892,10 @@ id: 8124 time: '2025-04-02T18:37:35.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/36216 +- author: aada + changes: + - message: Diphenhydramine now causes light drowsiness. + type: Tweak + id: 8125 + time: '2025-04-03T06:29:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/36212 From e9b89a1c6bd093d72ff5a76240b76bed99c70953 Mon Sep 17 00:00:00 2001 From: pathetic meowmeow Date: Thu, 3 Apr 2025 02:58:05 -0400 Subject: [PATCH 3/6] Improve sprite fading behaviour (#35863) * Click through faded sprites * Count the mouse position for which sprites to fade --- Content.Client/Clickable/ClickableSystem.cs | 13 +- Content.Client/Gameplay/GameplayStateBase.cs | 12 +- Content.Client/Sprite/SpriteFadeSystem.cs | 112 ++++++++++++++---- .../Tests/ClickableTest.cs | 2 +- 4 files changed, 105 insertions(+), 34 deletions(-) diff --git a/Content.Client/Clickable/ClickableSystem.cs b/Content.Client/Clickable/ClickableSystem.cs index 15d13df625..454bff4349 100644 --- a/Content.Client/Clickable/ClickableSystem.cs +++ b/Content.Client/Clickable/ClickableSystem.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Content.Client.Sprite; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Utility; @@ -17,12 +18,14 @@ public sealed class ClickableSystem : EntitySystem private EntityQuery _clickableQuery; private EntityQuery _xformQuery; + private EntityQuery _fadingSpriteQuery; public override void Initialize() { base.Initialize(); _clickableQuery = GetEntityQuery(); _xformQuery = GetEntityQuery(); + _fadingSpriteQuery = GetEntityQuery(); } /// @@ -34,7 +37,7 @@ public sealed class ClickableSystem : EntitySystem /// The draw depth for the sprite that captured the click. /// /// True if the click worked, false otherwise. - public bool CheckClick(Entity entity, Vector2 worldPos, IEye eye, out int drawDepth, out uint renderOrder, out float bottom) + public bool CheckClick(Entity entity, Vector2 worldPos, IEye eye, bool excludeFaded, out int drawDepth, out uint renderOrder, out float bottom) { if (!_clickableQuery.Resolve(entity.Owner, ref entity.Comp1, false)) { @@ -52,6 +55,14 @@ public sealed class ClickableSystem : EntitySystem return false; } + if (excludeFaded && _fadingSpriteQuery.Resolve(entity.Owner, ref entity.Comp4, false)) + { + drawDepth = default; + renderOrder = default; + bottom = default; + return false; + } + var sprite = entity.Comp2; var transform = entity.Comp3; diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs index 162c45d412..69e6e0b58b 100644 --- a/Content.Client/Gameplay/GameplayStateBase.cs +++ b/Content.Client/Gameplay/GameplayStateBase.cs @@ -113,18 +113,18 @@ namespace Content.Client.Gameplay return first.IsValid() ? first : null; } - public IEnumerable GetClickableEntities(EntityCoordinates coordinates) + public IEnumerable GetClickableEntities(EntityCoordinates coordinates, bool excludeFaded = true) { var transformSystem = _entitySystemManager.GetEntitySystem(); - return GetClickableEntities(transformSystem.ToMapCoordinates(coordinates)); + return GetClickableEntities(transformSystem.ToMapCoordinates(coordinates), excludeFaded); } - public IEnumerable GetClickableEntities(MapCoordinates coordinates) + public IEnumerable GetClickableEntities(MapCoordinates coordinates, bool excludeFaded = true) { - return GetClickableEntities(coordinates, _eyeManager.CurrentEye); + return GetClickableEntities(coordinates, _eyeManager.CurrentEye, excludeFaded); } - public IEnumerable GetClickableEntities(MapCoordinates coordinates, IEye? eye) + public IEnumerable GetClickableEntities(MapCoordinates coordinates, IEye? eye, bool excludeFaded = true) { /* * TODO: @@ -147,7 +147,7 @@ namespace Content.Client.Gameplay foreach (var entity in entities) { if (clickQuery.TryGetComponent(entity.Uid, out var component) && - clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, eye, out var drawDepthClicked, out var renderOrder, out var bottom)) + clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, eye, excludeFaded, out var drawDepthClicked, out var renderOrder, out var bottom)) { foundEntities.Add((entity.Uid, drawDepthClicked, renderOrder, bottom)); } diff --git a/Content.Client/Sprite/SpriteFadeSystem.cs b/Content.Client/Sprite/SpriteFadeSystem.cs index 3323dd660f..949012d04a 100644 --- a/Content.Client/Sprite/SpriteFadeSystem.cs +++ b/Content.Client/Sprite/SpriteFadeSystem.cs @@ -1,8 +1,14 @@ +using System.Numerics; using Content.Client.Gameplay; using Content.Shared.Sprite; using Robust.Client.GameObjects; +using Robust.Client.Input; using Robust.Client.Player; using Robust.Client.State; +using Robust.Client.UserInterface.CustomControls; +using Robust.Client.UserInterface; +using Robust.Shared.Map; +using Robust.Shared.Physics.Systems; using Robust.Shared.Physics; namespace Content.Client.Sprite; @@ -17,6 +23,9 @@ public sealed class SpriteFadeSystem : EntitySystem [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IStateManager _stateManager = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly IUserInterfaceManager _uiManager = default!; + [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; private readonly HashSet _comps = new(); @@ -24,6 +33,11 @@ public sealed class SpriteFadeSystem : EntitySystem private EntityQuery _fadeQuery; private EntityQuery _fadingQuery; + /// + /// Radius of the mouse point for the intersection test + /// + private static Vector2 MouseRadius = new Vector2(10f * float.Epsilon, 10f * float.Epsilon); + private const float TargetAlpha = 0.4f; private const float ChangeRate = 1f; @@ -46,46 +60,82 @@ public sealed class SpriteFadeSystem : EntitySystem sprite.Color = sprite.Color.WithAlpha(component.OriginalAlpha); } - public override void FrameUpdate(float frameTime) + /// + /// Adds sprites to the fade set, and brings their alpha downwards + /// + private void FadeIn(float change) { - base.FrameUpdate(frameTime); - var player = _playerManager.LocalEntity; - var change = ChangeRate * frameTime; + // ExcludeBoundingBox is set if we don't want to fade this sprite within the collision bounding boxes for the given POI + var pointsOfInterest = new List<(MapCoordinates Point, bool ExcludeBoundingBox)>(); - if (TryComp(player, out TransformComponent? playerXform) && - _stateManager.CurrentState is GameplayState state && - _spriteQuery.TryGetComponent(player, out var playerSprite)) + if (_uiManager.CurrentlyHovered is IViewportControl vp + && _inputManager.MouseScreenPosition.IsValid) { - var mapPos = _transform.GetMapCoordinates(_playerManager.LocalEntity!.Value, xform: playerXform); + pointsOfInterest.Add((vp.PixelToMap(_inputManager.MouseScreenPosition.Position), true)); + } - // Also want to handle large entities even if they may not be clickable. - foreach (var ent in state.GetClickableEntities(mapPos)) + if (TryComp(player, out TransformComponent? playerXform)) + { + pointsOfInterest.Add((_transform.GetMapCoordinates(_playerManager.LocalEntity!.Value, xform: playerXform), false)); + } + + if (_stateManager.CurrentState is GameplayState state && _spriteQuery.TryGetComponent(player, out var playerSprite)) + { + foreach (var (mapPos, excludeBB) in pointsOfInterest) { - if (ent == player || - !_fadeQuery.HasComponent(ent) || - !_spriteQuery.TryGetComponent(ent, out var sprite) || - sprite.DrawDepth < playerSprite.DrawDepth) + // Also want to handle large entities even if they may not be clickable. + foreach (var ent in state.GetClickableEntities(mapPos, excludeFaded: false)) { - continue; - } + if (ent == player || + !_fadeQuery.HasComponent(ent) || + !_spriteQuery.TryGetComponent(ent, out var sprite) || + sprite.DrawDepth < playerSprite.DrawDepth) + { + continue; + } - if (!_fadingQuery.TryComp(ent, out var fading)) - { - fading = AddComp(ent); - fading.OriginalAlpha = sprite.Color.A; - } + if (excludeBB) + { + var test = new Box2Rotated(mapPos.Position - MouseRadius, mapPos.Position + MouseRadius); + var collided = false; + foreach (var fixture in _physics.GetCollidingEntities(mapPos.MapId, test)) + { + if (fixture.Owner == ent) + { + collided = true; + break; + } + } + if (collided) + { + break; + } + } - _comps.Add(fading); - var newColor = Math.Max(sprite.Color.A - change, TargetAlpha); + if (!_fadingQuery.TryComp(ent, out var fading)) + { + fading = AddComp(ent); + fading.OriginalAlpha = sprite.Color.A; + } - if (!sprite.Color.A.Equals(newColor)) - { - sprite.Color = sprite.Color.WithAlpha(newColor); + _comps.Add(fading); + var newColor = Math.Max(sprite.Color.A - change, TargetAlpha); + + if (!sprite.Color.A.Equals(newColor)) + { + sprite.Color = sprite.Color.WithAlpha(newColor); + } } } } + } + /// + /// Bring sprites back up to their original alpha if they aren't in the fade set, and removes their fade component when done + /// + private void FadeOut(float change) + { var query = AllEntityQuery(); while (query.MoveNext(out var uid, out var comp)) { @@ -106,6 +156,16 @@ public sealed class SpriteFadeSystem : EntitySystem RemCompDeferred(uid); } } + } + + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + var change = ChangeRate * frameTime; + + FadeIn(change); + FadeOut(change); _comps.Clear(); } diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs index 5983650908..e6d94a43f9 100644 --- a/Content.IntegrationTests/Tests/ClickableTest.cs +++ b/Content.IntegrationTests/Tests/ClickableTest.cs @@ -80,7 +80,7 @@ namespace Content.IntegrationTests.Tests var pos = clientEntManager.System().GetWorldPosition(clientEnt); - hit = clientEntManager.System().CheckClick((clientEnt, null, sprite, null), new Vector2(clickPosX, clickPosY) + pos, eye, out _, out _, out _); + hit = clientEntManager.System().CheckClick((clientEnt, null, sprite, null), new Vector2(clickPosX, clickPosY) + pos, eye, false, out _, out _, out _); }); await server.WaitPost(() => From c877941aba9ba6963b280e241c57aa21b361346f Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Apr 2025 06:59:12 +0000 Subject: [PATCH 4/6] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1e22adcdd6..dedd88d179 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: The crew monitoring crate now contains a flatpack of the server and computers, - and can be opened with science access instead of engineering access now. - type: Tweak - id: 7626 - time: '2024-11-20T01:05:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/33417 - author: Beck Thompson changes: - message: Toggle verbs are no longer duplicated on magboots and fire extinguishers! @@ -3899,3 +3891,12 @@ id: 8125 time: '2025-04-03T06:29:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/36212 +- author: sowelipililimute + changes: + - message: You can now more easily interact with objects behind faded ones, and + you can look behind fadeable objects in your FOV by hovering them with your + mouse pointer + type: Add + id: 8126 + time: '2025-04-03T06:58:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/35863 From 983cf150e0ee4efc17c396239a6d93536378741c Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Thu, 3 Apr 2025 10:45:04 -0400 Subject: [PATCH 5/6] Recipes for curtains and tables using carpets now respect stacks. (#33721) * Carpet curtain/table recipes now respect stacks * remove unused colour carpet tags * Remove the tags outright --- .../Entities/Objects/Misc/carpets.yml | 30 ------- .../Graphs/furniture/curtains.yml | 85 +++++++------------ .../Construction/Graphs/furniture/tables.yml | 63 ++++---------- Resources/Prototypes/tags.yml | 30 ------- 4 files changed, 47 insertions(+), 161 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml index dca2d40aed..5cc8035875 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml @@ -14,9 +14,6 @@ - Plating - type: Stack stackType: FloorCarpetRed - - type: Tag - tags: - - CarpetRed - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: Carpet doAfter: 0.5 @@ -33,9 +30,6 @@ heldPrefix: carpet-black - type: Stack stackType: FloorCarpetBlack - - type: Tag - tags: - - CarpetBlack - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetBlack doAfter: 0.5 @@ -52,9 +46,6 @@ heldPrefix: carpet-blue - type: Stack stackType: FloorCarpetBlue - - type: Tag - tags: - - CarpetBlue - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetBlue doAfter: 0.5 @@ -71,9 +62,6 @@ heldPrefix: carpet-green - type: Stack stackType: FloorCarpetGreen - - type: Tag - tags: - - CarpetGreen - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetGreen doAfter: 0.5 @@ -90,9 +78,6 @@ heldPrefix: carpet-orange - type: Stack stackType: FloorCarpetOrange - - type: Tag - tags: - - CarpetOrange - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetOrange doAfter: 0.5 @@ -109,9 +94,6 @@ heldPrefix: carpet-skyblue - type: Stack stackType: FloorCarpetSkyBlue - - type: Tag - tags: - - CarpetSBlue - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetSBlue doAfter: 0.5 @@ -128,9 +110,6 @@ heldPrefix: carpet-purple - type: Stack stackType: FloorCarpetPurple - - type: Tag - tags: - - CarpetPurple - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetPurple doAfter: 0.5 @@ -147,9 +126,6 @@ heldPrefix: carpet-pink - type: Stack stackType: FloorCarpetPink - - type: Tag - tags: - - CarpetPink - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetPink doAfter: 0.5 @@ -166,9 +142,6 @@ heldPrefix: carpet-cyan - type: Stack stackType: FloorCarpetCyan - - type: Tag - tags: - - CarpetCyan - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetCyan doAfter: 0.5 @@ -185,9 +158,6 @@ heldPrefix: carpet-white - type: Stack stackType: FloorCarpetWhite - - type: Tag - tags: - - CarpetWhite - type: SpawnAfterInteract #Nuke after convert to FloorTile prototype: CarpetWhite doAfter: 0.5 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml index 90e77d6720..21492af6a9 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml @@ -17,93 +17,66 @@ completed: - !type:SnapToGrid { } steps: - - tag: CarpetBlack + - material: FloorCarpetBlack + amount: 1 doAfter: 1 - name: black carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-black - to: CurtainsBlue completed: - !type:SnapToGrid { } steps: - - tag: CarpetBlue + - material: FloorCarpetBlue + amount: 1 doAfter: 1 - name: blue carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-blue - to: CurtainsCyan completed: - !type:SnapToGrid { } steps: - - tag: CarpetCyan + - material: FloorCarpetCyan + amount: 1 doAfter: 1 - name: cyan carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-cyan - to: CurtainsGreen completed: - !type:SnapToGrid { } steps: - - tag: CarpetGreen + - material: FloorCarpetGreen + amount: 1 doAfter: 1 - name: green carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-green - to: CurtainsOrange completed: - !type:SnapToGrid { } steps: - - tag: CarpetOrange + - material: FloorCarpetOrange + amount: 1 doAfter: 1 - name: orange carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-orange - to: CurtainsPink completed: - !type:SnapToGrid { } steps: - - tag: CarpetPink + - material: FloorCarpetPink + amount: 1 doAfter: 1 - name: pink carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-pink - to: CurtainsPurple completed: - !type:SnapToGrid { } steps: - - tag: CarpetPurple + - material: FloorCarpetPurple + amount: 1 doAfter: 1 - name: purple carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-purple - to: CurtainsRed completed: - !type:SnapToGrid { } steps: - - tag: CarpetRed + - material: FloorCarpetRed + amount: 1 doAfter: 1 - name: red carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-red - to: CurtainsWhite completed: - !type:SnapToGrid { } steps: - - tag: CarpetWhite + - material: FloorCarpetWhite + amount: 1 doAfter: 1 - name: white carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-white - + - node: Curtains entity: HospitalCurtains edges: @@ -126,7 +99,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsBlack entity: CurtainsBlack edges: @@ -148,8 +121,8 @@ amount: 1 steps: - tool: Cutting - doAfter: 1 - + doAfter: 1 + - node: CurtainsBlue entity: CurtainsBlue edges: @@ -172,7 +145,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsCyan entity: CurtainsCyan edges: @@ -195,7 +168,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsGreen entity: CurtainsGreen edges: @@ -218,7 +191,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsOrange entity: CurtainsOrange edges: @@ -241,7 +214,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsPink entity: CurtainsPink edges: @@ -264,7 +237,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsPurple entity: CurtainsPurple edges: @@ -287,7 +260,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsRed entity: CurtainsRed edges: @@ -310,7 +283,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsWhite entity: CurtainsWhite edges: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml index d7ef51e96b..4cee536bf9 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml @@ -218,75 +218,48 @@ - to: TableFancyBlack steps: - - tag: CarpetBlack - name: black carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-black + - material: FloorCarpetBlack + amount: 1 - to: TableFancyBlue steps: - - tag: CarpetBlue - name: blue carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-blue + - material: FloorCarpetBlue + amount: 1 - to: TableFancyCyan steps: - - tag: CarpetCyan - name: cyan carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-cyan + - material: FloorCarpetCyan + amount: 1 - to: TableFancyGreen steps: - - tag: CarpetGreen - name: green carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-green + - material: FloorCarpetGreen + amount: 1 - to: TableFancyOrange steps: - - tag: CarpetOrange - name: orange carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-orange + - material: FloorCarpetOrange + amount: 1 - to: TableFancyPurple steps: - - tag: CarpetPurple - name: purple carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-purple + - material: FloorCarpetPurple + amount: 1 - to: TableFancyPink steps: - - tag: CarpetPink - name: pink carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-pink + - material: FloorCarpetPink + amount: 1 - to: TableFancyRed steps: - - tag: CarpetRed - name: red carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-red + - material: FloorCarpetRed + amount: 1 - to: TableFancyWhite steps: - - tag: CarpetWhite - name: white carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-white + - material: FloorCarpetWhite + amount: 1 - node: TableCarpet entity: TableCarpet diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 6577b7eb89..952ab4f909 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -222,36 +222,6 @@ - type: Tag id: Carpet -- type: Tag - id: CarpetBlack - -- type: Tag - id: CarpetBlue - -- type: Tag - id: CarpetCyan - -- type: Tag - id: CarpetGreen - -- type: Tag - id: CarpetOrange - -- type: Tag - id: CarpetPink - -- type: Tag - id: CarpetPurple - -- type: Tag - id: CarpetRed - -- type: Tag - id: CarpetSBlue - -- type: Tag - id: CarpetWhite - - type: Tag id: Carrot From f2391cbcc932390f2f0c83cf5a057a5bf1265dc5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Apr 2025 14:46:11 +0000 Subject: [PATCH 6/6] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dedd88d179..41ef180a9b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Beck Thompson - changes: - - message: Toggle verbs are no longer duplicated on magboots and fire extinguishers! - type: Fix - id: 7627 - time: '2024-11-20T01:53:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32138 - author: qwerltaz changes: - message: A new grid item view is available in the construction menu, togglable @@ -3900,3 +3893,10 @@ id: 8126 time: '2025-04-03T06:58:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/35863 +- author: whatston3 + changes: + - message: Fancy tables and curtains now respect carpet stacks. + type: Fix + id: 8127 + time: '2025-04-03T14:45:04.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33721