Skip to content
This repository was archived by the owner on Apr 21, 2026. It is now read-only.

Changes2 #73

Merged
Triad-Sector merged 3 commits into from
Apr 1, 2026
Merged

Changes2 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b87710f
Update clothesmate.yml (#1088)
re-silvered Mar 31, 2026
7494bf8
fix rcd operation validation check
NotLivyathan Mar 31, 2026
f770280
fix rcd plating placement in space
NotLivyathan Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Content.Shared/RCD/Systems/RCDSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,17 @@
ClothingUniformJumpskirtVictorianrRed: 4
ClothingUniformJumpskirtSuitNurse: 4
ClothingUniformJumpskirtPencilTan: 4
ClothingUniformJumpskirtPencilCentcomOfficial: 4
ClothingUniformJumpskirtPencilSpecialOperationsOfficer: 4
#ClothingUniformJumpskirtPencilCentcomOfficial: 4
#ClothingUniformJumpskirtPencilSpecialOperationsOfficer: 4
ClothingUniformJumpskirtCargoSalvage: 4
ClothingUniformJumpskirtCargoSalvageFormal: 4
ClothingUniformJumpskirtSalvageLead: 4
ClothingUniformJumpskirtMiningSpecialist: 4
ClothingUniformJumpskirtCargoFormal: 4
ClothingUniformJumpskirtScientistFormal: 4
ClothingUniformJumpskirtCoroner: 4
ClothingUniformJumpskirtCentcomOfficial: 4
ClothingUniformJumpskirtCentcomOfficer: 4
#ClothingUniformJumpskirtCentcomOfficial: 4
#ClothingUniformJumpskirtCentcomOfficer: 4
ClothingUniformJumpskirtElegantMaid: 4
ClothingUniformColorJumpskirtRainbow: 4
ClothingUniformJumpskirtSchool: 4
Expand All @@ -165,7 +165,7 @@
ClothingUniformJumpsuitCoronerAlt: 4
ClothingUniformJumpsuitSuperstarCop: 4
ClothingUniformJumpsuitAerostatic: 4
ClothingUniformJumpsuitCentcomOfficerBlack: 4
#ClothingUniformJumpsuitCentcomOfficerBlack: 4
ClothingUniformJumpsuitCapTurtleneck: 4
ClothingUniformJumpsuitCaptainNoble: 4
ClothingUniformJumpsuitHoPTurtleneck: 4
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Tiles/plating.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
parent: Plating
name: tiles-rcd-plating
baseWhitelist:
- Space
- TrainLattice
- FloorPlanetDirt
- FloorDesert
Expand Down
Loading