From b87710f9b74cb2b42353a6c242021bf555f27628 Mon Sep 17 00:00:00 2001 From: re-silvered <254359714+re-silvered@users.noreply.github.com> Date: Wed, 1 Apr 2026 08:40:55 +1100 Subject: [PATCH 1/3] Update clothesmate.yml (#1088) --- .../VendingMachines/Inventories/clothesmate.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index f8ea3c09549..db1233fdfc9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -132,8 +132,8 @@ ClothingUniformJumpskirtVictorianrRed: 4 ClothingUniformJumpskirtSuitNurse: 4 ClothingUniformJumpskirtPencilTan: 4 - ClothingUniformJumpskirtPencilCentcomOfficial: 4 - ClothingUniformJumpskirtPencilSpecialOperationsOfficer: 4 + #ClothingUniformJumpskirtPencilCentcomOfficial: 4 + #ClothingUniformJumpskirtPencilSpecialOperationsOfficer: 4 ClothingUniformJumpskirtCargoSalvage: 4 ClothingUniformJumpskirtCargoSalvageFormal: 4 ClothingUniformJumpskirtSalvageLead: 4 @@ -141,8 +141,8 @@ ClothingUniformJumpskirtCargoFormal: 4 ClothingUniformJumpskirtScientistFormal: 4 ClothingUniformJumpskirtCoroner: 4 - ClothingUniformJumpskirtCentcomOfficial: 4 - ClothingUniformJumpskirtCentcomOfficer: 4 + #ClothingUniformJumpskirtCentcomOfficial: 4 + #ClothingUniformJumpskirtCentcomOfficer: 4 ClothingUniformJumpskirtElegantMaid: 4 ClothingUniformColorJumpskirtRainbow: 4 ClothingUniformJumpskirtSchool: 4 @@ -165,7 +165,7 @@ ClothingUniformJumpsuitCoronerAlt: 4 ClothingUniformJumpsuitSuperstarCop: 4 ClothingUniformJumpsuitAerostatic: 4 - ClothingUniformJumpsuitCentcomOfficerBlack: 4 + #ClothingUniformJumpsuitCentcomOfficerBlack: 4 ClothingUniformJumpsuitCapTurtleneck: 4 ClothingUniformJumpsuitCaptainNoble: 4 ClothingUniformJumpsuitHoPTurtleneck: 4 From 7494bf8d439a228a00086bc573aaaa15f5b40cfd Mon Sep 17 00:00:00 2001 From: Livyathan Date: Tue, 31 Mar 2026 19:53:53 -0400 Subject: [PATCH 2/3] fix rcd operation validation check --- Content.Shared/RCD/Systems/RCDSystem.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs index 94ec51fbc09..8df22e171c3 100644 --- a/Content.Shared/RCD/Systems/RCDSystem.cs +++ b/Content.Shared/RCD/Systems/RCDSystem.cs @@ -415,7 +415,9 @@ private void OnDoAfter(EntityUid uid, RCDComponent component, RCDDoAfterEvent ar // Ensure the RCD operation is still valid if (!IsRCDOperationStillValid(uid, component, gridUid, mapGrid, tile, position, args.Direction, args.Target, args.User)) + { return; + } // Finalize the operation (this should handle prediction properly) FinalizeRCDOperation(uid, component, gridUid, mapGrid, tile, position, args.Direction, args.Target, args.User); From f770280d5235deb476d45a320f2111e334f59e0f Mon Sep 17 00:00:00 2001 From: Livyathan Date: Tue, 31 Mar 2026 19:56:20 -0400 Subject: [PATCH 3/3] fix rcd plating placement in space --- Resources/Prototypes/Tiles/plating.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index f0cdfa75723..39e85240b9d 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -22,6 +22,7 @@ parent: Plating name: tiles-rcd-plating baseWhitelist: + - Space - TrainLattice - FloorPlanetDirt - FloorDesert