Skip to content

Commit

Permalink
FixForUpstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Gersoon458 committed Sep 3, 2024
1 parent 7156aa5 commit d39617b
Show file tree
Hide file tree
Showing 162 changed files with 175 additions and 539 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- type: Transform
noRot: true
- type: Sprite
sprite: Structures/Storage/canister.rsi
sprite: _White/Structures/Storage/canister.rsi #WWDP edit
noRot: true
layers:
- state: grey
Expand Down Expand Up @@ -674,7 +674,7 @@
damageModifierSet: Metallic
- type: InteractionOutline
- type: Sprite
sprite: Structures/Storage/canister.rsi
sprite: _White/Structures/Storage/canister.rsi #WWDP edit
state: grey-1
- type: Physics
bodyType: Dynamic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
name: booze storage
description: This is where the bartender keeps the booze.
components:
- type: Sprite
sprite: _White/Structures/Storage/closet.rsi #WWDP edit
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: cabinet
stateDoorOpen: cabinet_open
stateDoorClosed: cabinet_door

- type: AccessReader
access: [["Bar"]]
- type: EntityStorage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
- type: Sprite
drawdepth: WallMountedItems
noRot: false
sprite: Structures/Storage/wall_locker.rsi
sprite: _White/Structures/Storage/wall_locker.rsi #WWDP edit
layers:
- state: generic
map: ["enum.StorageVisualLayers.Base"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,12 @@
parent: BaseWallLocker
name: medical wall locker
components:
- type: Sprite
sprite: _White/Structures/Storage/wall_locker.rsi #WWDP edit
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: med
stateDoorOpen: med_open
stateDoorClosed: med_door
- type: AccessReader
access: [["Medical"]]
access: [["Medical"]]
164 changes: 164 additions & 0 deletions Resources/Prototypes/Tiles/plating.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
- type: tile
id: Plating
name: tiles-plating
sprite: /Textures/_White/Tiles/plating.png
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ AdvancedPrying ] #WWDP edit
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingDamaged
name: tiles-plating
sprite: /Textures/_White/Tiles/plating_damaged.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ AdvancedPrying ] #WWDP edit
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingBurnt
name: tiles-plating
sprite: /Textures/_White/Tiles/plating_burnt.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ AdvancedPrying ] #WWDP edit
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingAsteroid
name: tiles-asteroid-plating
sprite: /Textures/Tiles/Asteroid/asteroid_plating.png
baseTurf: Lattice
isSubfloor: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingBrass
name: tiles-brass-plating
sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
baseTurf: Lattice
isSubfloor: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingSnow
name: tiles-snow-plating
sprite: /Textures/Tiles/snow_plating.png #Not in the snow planet RSI because it doesn't have any metadata. Should probably be moved to its own folder later.
baseTurf: Lattice
isSubfloor: true
footstepSounds:
collection: FootstepPlating
friction: 0.15 #a little less then actual snow
heatCapacity: 10000

- type: tile
id: Lattice
name: tiles-lattice
sprite: /Textures/Tiles/lattice.png
baseTurf: Space
isSubfloor: true
deconstructTools: [ Cutting ]
weather: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
isSpace: true
itemDrop: PartRodMetal1
heatCapacity: 10000

- type: tile
id: TrainLattice
name: tiles-lattice-train
sprite: /Textures/Tiles/latticeTrain.png
baseTurf: Space
isSubfloor: true
deconstructTools: [ Cutting ]
weather: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
isSpace: true
itemDrop: PartRodMetal1
heatCapacity: 10000

#WWDP add

- type: tile
id: PlatingDiagonalNE
name: tiles-plating-diagonal-NE
sprite: /Textures/_White/Tiles/plating_diagonal_ne.png
baseTurf: Lattice
isSubfloor: true
isSpace: true
deconstructTools: [ AdvancedPrying ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingDiagonalNW
name: tiles-plating-diagonal-NW
sprite: /Textures/_White/Tiles/plating_diagonal_nw.png
baseTurf: Lattice
isSubfloor: true
isSpace: true
deconstructTools: [ AdvancedPrying ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingDiagonalSE
name: tiles-plating-diagonal-SE
sprite: /Textures/_White/Tiles/plating_diagonal_se.png
baseTurf: Lattice
isSubfloor: true
isSpace: true
deconstructTools: [ AdvancedPrying ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000

- type: tile
id: PlatingDiagonalSW
name: tiles-plating-diagonal-SW
sprite: /Textures/_White/Tiles/plating_diagonal_sw.png
baseTurf: Lattice
isSubfloor: true
isSpace: true
deconstructTools: [ AdvancedPrying ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
heatCapacity: 10000
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit d39617b

Please sign in to comment.