Skip to content
Open
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
4 changes: 3 additions & 1 deletion Resources/Locale/en-US/_DEN/stack/stacks.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
stack-leather-tent-wall = leather tent wall
stack-cloth-tent-wall = cloth tent wall
stack-leather-tent-flap = leather tent flap
stack-cloth-tent-flap = cloth tent flap
stack-cloth-tent-flap = cloth tent flap
stack-pool-floor-tile = pool tile
stack-dark-pool-floor-tile = dark pool tile
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@
- PlasticTilesStatic
- CarpetTilesStatic
- PreciousTilesStatic
- DenFloorPoolTilesStatic # DEN
dynamicPacks:
- FauxTiles
- type: MaterialStorage
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_DEN/Catalog/Cargo/cargo_fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@
cost: 2000
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunSwimRings
icon:
sprite: _DEN/Structures/Furniture/pool_ring.rsi
state: rainbow
product: CrateFunSwimRings
cost: 1200
category: cargoproduct-category-name-fun
group: market
37 changes: 37 additions & 0 deletions Resources/Prototypes/_DEN/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Boxes

- type: entity
parent: BoxCardboard
id: BoxSprayPaintBase
Expand Down Expand Up @@ -69,3 +71,38 @@
amount: 4
- id: SprayPaintCanCopper
amount: 4

# Crates

- type: entity
parent: CratePlastic
id: CrateFunSwimRings
name: swim ring crate
description: A crate containing eight swim rings, for your beach party occasions!
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- id: SwimRingRainbow
- id: SwimRingTrans
- !type:NestedSelector
tableId: RandomSwimRingTable
rolls: !type:ConstantNumberSelector
value: 6

- type: entityTable
id: RandomSwimRingTable
table: !type:GroupSelector
children:
- id: SwimRingBlack
- id: SwimRingBlue
- id: SwimRingCyan
- id: SwimRingGreen
- id: SwimRingMagenta
- id: SwimRingPink
- id: SwimRingPurple
- id: SwimRingRainbow
- id: SwimRingRed
- id: SwimRingTrans
- id: SwimRingYellow
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: entity
parent: MarkerBase
id: RandomBeachUmbrellaSpawner
name: random beach umbrella spawner
placement:
mode: SnapgridBorder
components:
- type: Transform
anchored: false # needed for SnapgridBorder
- type: Sprite
layers:
- state: red
- sprite: _DEN/Structures/Decoration/umbrella.rsi
state: blue
offset: 0, 0.75
- type: EntityTableSpawner
offset: 0
table: !type:GroupSelector
children:
- id: BeachUmbrellaBlue
- id: BeachUmbrellaGray
- id: BeachUmbrellaGreen
- id: BeachUmbrellaOrange
- id: BeachUmbrellaPink
- id: BeachUmbrellaPurple
- id: BeachUmbrellaRed
- id: BeachUmbrellaYellow
30 changes: 30 additions & 0 deletions Resources/Prototypes/_DEN/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
- type: entity
parent: FloorTileItemSteel
id: FloorTileItemPool
name: pool tile
components:
- type: Sprite
sprite: _DEN/Objects/Tiles/pool.rsi
state: pool
- type: Item
sprite: _DEN/Objects/Tiles/pool.rsi
- type: FloorTile
outputs:
- Plating
- FloorTilePool
- type: Stack
stackType: FloorTilePool

- type: entity
parent: FloorTileItemPool
id: FloorTileItemPoolDark
name: dark pool tile
components:
- type: Sprite
state: pool-dark
- type: FloorTile
outputs:
- Plating
- FloorTilePoolDark
- type: Stack
stackType: FloorTilePoolDark
145 changes: 145 additions & 0 deletions Resources/Prototypes/_DEN/Entities/Structures/Decoration/umbrella.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
- type: entity
abstract: true
parent: BaseStructure
id: BeachUmbrellaBase
name: beach umbrella
description: A standing umbrella that blocks the sun and rain for those sitting underneath. Well, if there WAS sun and rain...
placement:
mode: SnapgridBorder
components:
- type: Transform
anchored: false # needed for SnapgridBorder; lmk if this causes issues?
- type: Fixtures
fixtures:
fix1:
shape: !type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
density: 120
hard: false
mask:
- TabletopMachineMask
layer:
- TabletopMachineLayer
- type: Sprite
sprite: _DEN/Structures/Decoration/umbrella.rsi
drawdepth: Mobs
noRot: true
offset: 0,0.75
- type: Icon
sprite: _DEN/Structures/Decoration/umbrella.rsi
- type: Construction
graph: BeachUmbrella
node: BeachUmbrellaBlue
- type: Damageable
damageModifierSet: FlimsyMetallic
- type: Injurable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 125
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 25
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
params:
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
PartRodMetal1:
min: 2
max: 2
MaterialCloth1:
min: 2
max: 2
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaBlue
suffix: blue
components:
- type: Sprite
state: blue
- type: Icon
state: blue
- type: Construction
node: BeachUmbrellaBlue

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaGray
suffix: gray
components:
- type: Sprite
state: gray
- type: Icon
state: gray

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaGreen
suffix: green
components:
- type: Sprite
state: green
- type: Icon
state: green

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaOrange
suffix: orange
components:
- type: Sprite
state: orange
- type: Icon
state: orange

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaPink
suffix: pink
components:
- type: Sprite
state: pink
- type: Icon
state: pink

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaPurple
suffix: purple
components:
- type: Sprite
state: purple
- type: Icon
state: purple

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaRed
suffix: red
components:
- type: Sprite
state: red
- type: Icon
state: red

- type: entity
parent: BeachUmbrellaBase
id: BeachUmbrellaYellow
suffix: yellow
components:
- type: Sprite
state: yellow
- type: Icon
state: yellow
Loading
Loading