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); 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 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