Skip to content

Dockworkers Union Dock Upgrades #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VoidedDevNull wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dockworkers Union Dock Upgrades #1048

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
c0a8e3b
Dockworkers Union Dock Upgrade
aabush64 Mar 24, 2026
e13a847
Shadekin propaganda and linter fixes
aabush64 Mar 26, 2026
1d4962b
The changes were in fact... not staged...
aabush64 Mar 26, 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
4 changes: 3 additions & 1 deletion Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@ public enum SubFloorVisuals : byte
[Serializable, NetSerializable]
public enum SubfloorLayers : byte
{
FirstLayer
FirstLayer,
// HL - Add another layer, because... reasons (Pucklight commit)
SecondLayer
}
}
// Re-enable warnings if they were disabled elsewhere
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_Mono/catwalk.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
steel-mono-catwalk = Steel mono catwalk
dark-mono-catwalk = Dark steel mono catwalk
white-mono-catwalk = White steel mono catwalk
14,139 changes: 10,955 additions & 3,184 deletions Resources/Maps/Structures/dock.yml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Tools/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@
- Deconstruct
#Hardlight
- AtmosDeviceFanDirectional
- PuckLight
- type: LimitedCharges
maxCharges: 30
- type: Sprite
Expand Down
30 changes: 23 additions & 7 deletions Resources/Prototypes/RCD/rcd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
rules:
- CanBuildOnEmptyTile
fx: EffectRCDConstruct1

- type: rcd
id: FloorXenoborg
name: tiles-xenoborg-floor
Expand All @@ -72,7 +72,7 @@
rules:
- CanBuildOnEmptyTile
fx: EffectRCDConstruct1

- type: rcd
id: FloorXeno
name: tiles-xeno-floor
Expand All @@ -86,7 +86,7 @@
rules:
- CanBuildOnEmptyTile
fx: EffectRCDConstruct1

- type: rcd
id: FloorXenoSteel
name: tiles-xeno-steel
Expand All @@ -100,7 +100,7 @@
rules:
- CanBuildOnEmptyTile
fx: EffectRCDConstruct1

- type: rcd
id: FloorXenoMaint
name: tiles-xeno-maint
Expand Down Expand Up @@ -142,7 +142,7 @@
collisionMask: FullTileMask
rotation: Fixed
fx: EffectRCDConstruct2

- type: rcd
id: WallShuttle
category: Walls
Expand All @@ -154,7 +154,7 @@
collisionMask: FullTileMask
rotation: Fixed
fx: EffectRCDConstruct2

- type: rcd
id: WallReinforced
category: Walls
Expand All @@ -166,7 +166,7 @@
collisionMask: FullTileMask
rotation: Fixed
fx: EffectRCDConstruct2

- type: rcd
id: WallXenoborg
category: Walls
Expand Down Expand Up @@ -329,6 +329,22 @@
rotation: User
fx: EffectRCDConstruct1

# HL - Lighting
- type: rcd
id: PuckLight
category: Lighting
sprite:
sprite: /Textures/_HL/Structures/pucklight.rsi
state: base
mode: ConstructObject
prototype: PoweredPuckLight
cost: 2
delay: 1
collisionMask: TabletopMachineMask
collisionBounds: "0.25,0.25,-0.25,-0.25"
rotation: Fixed
fx: EffectRCDConstruct1

# Electrical
- type: rcd
id: LVCable
Expand Down
Loading
Loading