Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Content.Shared/DrawDepth/DrawDepth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public enum DrawDepth
/// <summary>
/// Posters, APCs, air alarms, etc. This also includes most lights & lamps.
/// </summary>
WallMountedItems = DrawDepthTag.Default + 2,
WallMountedItems = DrawDepthTag.Default + 5,

/// <summary>
/// Generic items. Things that should be above crates & tables, but underneath mobs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
node: tubeLight
- type: Sprite
sprite: Structures/Wallmounts/Lighting/light_tube.rsi
drawdepth: WallMountedItems
drawdepth: Mobs
layers:
- map: ["enum.PoweredLightLayers.Base"]
state: base
Expand Down
23 changes: 12 additions & 11 deletions Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- type: Physics
canCollide: false
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch.rsi
state: on
- type: SignalSwitch
Expand Down Expand Up @@ -55,7 +55,7 @@
- type: Physics
canCollide: false
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch.rsi
state: dead
- type: UseDelay
Expand Down Expand Up @@ -117,7 +117,7 @@
- type: Transform
anchored: true
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch.rsi
state: on
- type: Rotatable
Expand All @@ -143,7 +143,7 @@
- type: Clickable
- type: InteractionOutline
- type: Sprite
drawdepth: HighFloorObjects
drawdepth: OverMobs
sprite: Structures/conveyor.rsi
layers:
- state: switch-off
Expand Down Expand Up @@ -234,7 +234,8 @@
- type: LockVisuals
- type: AccessReader
- type: Sprite
drawdepth: WallMountedItems
drawdepth: OverMobs

sprite: Structures/Wallmounts/locked_switch.rsi
layers:
- state: base
Expand Down Expand Up @@ -500,7 +501,7 @@
- type: Physics
canCollide: false
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch_frame.rsi
state: grey
- type: Rotatable
Expand All @@ -512,7 +513,7 @@
suffix: grey
components:
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch_frame.rsi
state: grey

Expand All @@ -522,7 +523,7 @@
suffix: caution
components:
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch_frame.rsi
state: caution

Expand All @@ -532,7 +533,7 @@
suffix: caution
components:
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch_frame.rsi
state: caution_security

Expand All @@ -542,7 +543,7 @@
suffix: exit
components:
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch_frame.rsi
state: exit

Expand All @@ -552,6 +553,6 @@
suffix: janitor
components:
- type: Sprite
drawdepth: SmallObjects
drawdepth: OverMobs
sprite: Structures/Wallmounts/switch_frame.rsi
state: janitor
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/Walls/walls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,9 @@
name: reinforced wall
components:
- type: Sprite
sprite: Structures/Walls/solid.rsi
sprite: _Encore/Structures/Walls/tall/metal.rsi
- type: Icon
sprite: Structures/Walls/solid.rsi
sprite: _Encore/Structures/Walls/tall/metal.rsi
state: rgeneric
- type: Construction
graph: Girder
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Tiles/plating.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000
weather: false

- type: tile
id: PlatingDamaged
Expand Down
Loading
Loading