diff --git a/Resources/Locale/en-US/_DEN/stack/stacks.ftl b/Resources/Locale/en-US/_DEN/stack/stacks.ftl index ad65124e95..10d2ea2362 100644 --- a/Resources/Locale/en-US/_DEN/stack/stacks.ftl +++ b/Resources/Locale/en-US/_DEN/stack/stacks.ftl @@ -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 \ No newline at end of file +stack-cloth-tent-flap = cloth tent flap +stack-pool-floor-tile = pool tile +stack-dark-pool-floor-tile = dark pool tile diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 19cc4c69a4..8ba1804f1d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -704,6 +704,7 @@ - PlasticTilesStatic - CarpetTilesStatic - PreciousTilesStatic + - DenFloorPoolTilesStatic # DEN dynamicPacks: - FauxTiles - type: MaterialStorage diff --git a/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_fun.yml index 2fea64e2b2..9bd83def05 100644 --- a/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_fun.yml @@ -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 diff --git a/Resources/Prototypes/_DEN/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_DEN/Catalog/Fills/Boxes/general.yml index 47e34fbd6a..cf705cc9ad 100644 --- a/Resources/Prototypes/_DEN/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_DEN/Catalog/Fills/Boxes/general.yml @@ -1,3 +1,5 @@ +# Boxes + - type: entity parent: BoxCardboard id: BoxSprayPaintBase @@ -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 diff --git a/Resources/Prototypes/_DEN/Entities/Markers/Spawners/Random/decoration.yml b/Resources/Prototypes/_DEN/Entities/Markers/Spawners/Random/decoration.yml new file mode 100644 index 0000000000..f12c43e75b --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Markers/Spawners/Random/decoration.yml @@ -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 diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_DEN/Entities/Objects/Misc/tiles.yml new file mode 100644 index 0000000000..43c9e513ef --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Objects/Misc/tiles.yml @@ -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 diff --git a/Resources/Prototypes/_DEN/Entities/Structures/Decoration/umbrella.yml b/Resources/Prototypes/_DEN/Entities/Structures/Decoration/umbrella.yml new file mode 100644 index 0000000000..7e3d25ac3d --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Structures/Decoration/umbrella.yml @@ -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 diff --git a/Resources/Prototypes/_DEN/Entities/Structures/furniture/chairs.yml b/Resources/Prototypes/_DEN/Entities/Structures/furniture/chairs.yml new file mode 100644 index 0000000000..b4525ae644 --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Structures/furniture/chairs.yml @@ -0,0 +1,147 @@ +# beach lounge chairs + +- type: entity + abstract: true + parent: ChairBase + id: BaseChairBeachLounge + name: lounge chair + description: For sitting back, relaxing, and soaking in the solar lamp radiation. + components: + - type: Sprite + sprite: _DEN/Structures/Furniture/lounge_chair.rsi + - type: Construction + graph: ChairBeachLounge + - type: Strap + position: Down + rotation: -90 + buckleOffset: -0.05, 0 + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeBeige + suffix: beige + components: + - type: Sprite + state: beige + - type: Construction + node: beige + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeBlack + suffix: black + components: + - type: Sprite + state: black + - type: Construction + node: black + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeBlue + suffix: blue + components: + - type: Sprite + state: blue + - type: Construction + node: blue + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeBrown + suffix: brown + components: + - type: Sprite + state: brown + - type: Construction + node: brown + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeGray + suffix: gray + components: + - type: Sprite + state: gray + - type: Construction + node: gray + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeGreen + suffix: green + components: + - type: Sprite + state: green + - type: Construction + node: green + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeOrange + suffix: orange + components: + - type: Sprite + state: orange + - type: Construction + node: orange + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungePink + suffix: pink + components: + - type: Sprite + state: pink + - type: Construction + node: pink + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungePurple + suffix: purple + components: + - type: Sprite + state: purple + - type: Construction + node: purple + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeRed + suffix: red + components: + - type: Sprite + state: red + - type: Construction + node: red + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeTeal + suffix: teal + components: + - type: Sprite + state: teal + - type: Construction + node: teal + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeWhite + suffix: white + components: + - type: Sprite + state: white + - type: Construction + node: white + +- type: entity + parent: BaseChairBeachLounge + id: ChairBeachLoungeYellow + suffix: yellow + components: + - type: Sprite + state: yellow + - type: Construction + node: yellow diff --git a/Resources/Prototypes/_DEN/Entities/Structures/furniture/pool_ring.yml b/Resources/Prototypes/_DEN/Entities/Structures/furniture/pool_ring.yml new file mode 100644 index 0000000000..835ca35568 --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Structures/furniture/pool_ring.yml @@ -0,0 +1,148 @@ +- type: entity + abstract: true + parent: [SeatBase, BaseItem] + id: BaseSwimRing + name: swim ring + description: Also known as a floatie, or inner tube, or water donut. An inflatable rubber toy for resting on top of the water. + components: + - type: Sprite + sprite: _DEN/Structures/Furniture/pool_ring.rsi + - type: Item + size: Normal # should probably be "large" instead, but eh + - type: Clothing # DeltaV + slots: + - belt + - type: Strap + buckleOffset: "0,0.1" + +- type: entity + parent: BaseSwimRing + id: SwimRingBlack + name: black swim ring + components: + - type: Sprite + state: black + - type: Item # DeltaV + heldPrefix: black + - type: Clothing # DeltaV + equippedPrefix: black + +- type: entity + parent: BaseSwimRing + id: SwimRingBlue + name: blue swim ring + components: + - type: Sprite + state: blue + - type: Item # DeltaV + heldPrefix: blue + - type: Clothing # DeltaV + equippedPrefix: blue + +- type: entity + parent: BaseSwimRing + id: SwimRingCyan + name: cyan swim ring + components: + - type: Sprite + state: cyan + - type: Item # DeltaV + heldPrefix: cyan + - type: Clothing # DeltaV + equippedPrefix: cyan + +- type: entity + parent: BaseSwimRing + id: SwimRingGreen + name: green swim ring + components: + - type: Sprite + state: green + - type: Item # DeltaV + heldPrefix: green + - type: Clothing # DeltaV + equippedPrefix: green + +- type: entity + parent: BaseSwimRing + id: SwimRingMagenta + name: magenta swim ring + components: + - type: Sprite + state: magenta + - type: Item # DeltaV + heldPrefix: magenta + - type: Clothing # DeltaV + equippedPrefix: magenta + +- type: entity + parent: BaseSwimRing + id: SwimRingPink + name: pink swim ring + components: + - type: Sprite + state: pink + - type: Item # DeltaV + heldPrefix: pink + - type: Clothing # DeltaV + equippedPrefix: pink + +- type: entity + parent: BaseSwimRing + id: SwimRingPurple + name: purple swim ring + components: + - type: Sprite + state: purple + - type: Item # DeltaV + heldPrefix: purple + - type: Clothing # DeltaV + equippedPrefix: purple + +- type: entity + parent: BaseSwimRing + id: SwimRingRainbow + name: rainbow swim ring + components: + - type: Sprite + state: rainbow + - type: Item # DeltaV + heldPrefix: rainbow + - type: Clothing # DeltaV + equippedPrefix: rainbow + +- type: entity + parent: BaseSwimRing + id: SwimRingRed + name: red swim ring + components: + - type: Sprite + state: red + - type: Item # DeltaV + heldPrefix: red + - type: Clothing # DeltaV + equippedPrefix: red + +- type: entity + parent: BaseSwimRing + id: SwimRingTrans + name: pastel swim ring + components: + - type: Sprite + state: trans + - type: Item # DeltaV + heldPrefix: trans + - type: Clothing # DeltaV + equippedPrefix: trans + +- type: entity + parent: BaseSwimRing + id: SwimRingYellow + name: yellow swim ring + components: + - type: Sprite + state: yellow + - type: Item # DeltaV + heldPrefix: yellow + - type: Clothing # DeltaV + equippedPrefix: yellow diff --git a/Resources/Prototypes/_DEN/Entities/Tiles/water.yml b/Resources/Prototypes/_DEN/Entities/Tiles/water.yml new file mode 100644 index 0000000000..843f53c769 --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Tiles/water.yml @@ -0,0 +1,36 @@ +- type: entity + parent: FloorWaterEntity + id: FloorWaterEntityPool + name: pool water + description: You do NOT want to drink this. + components: + - type: Sprite + sprite: _DEN/Tiles/Planet/water.rsi + layers: + - state: pool_water + - type: Solution + id: pool + solution: + maxVol: 10000 + reagents: + - ReagentId: Water + Quantity: 9900 + - ReagentId: Chlorine + Quantity: 100 # about 1/100 chlorine + # chlorinated pool water is actually supposed to be 1-5 ppm of chlorine but solution + # transfers and metabolism in ss14 round to the nearest 0.01 and the idea of poisoning + # yourself by drinking pool water is fucking hysterical. + # for the record, a full human stomach of this stuff is 2 toxin damage. its not much + - type: SolutionRegeneration + generated: + reagents: + - ReagentId: Water + Quantity: 99 + - ReagentId: Chlorine + Quantity: 1 + - type: Edible + edible: Drink + destroyOnEmpty: false + utensil: None + solution: pool + transferAmount: 1 diff --git a/Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/chairs.yml b/Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/chairs.yml new file mode 100644 index 0000000000..cbf6a9df93 --- /dev/null +++ b/Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/chairs.yml @@ -0,0 +1,91 @@ +- type: constructionGraph + id: ChairBeachLounge + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: beige + steps: &constructBeachChairSteps + - material: Steel + amount: 1 + doAfter: 1 + - material: Cloth + amount: 2 + doAfter: 1 + - to: black + steps: *constructBeachChairSteps + - to: blue + steps: *constructBeachChairSteps + - to: brown + steps: *constructBeachChairSteps + - to: gray + steps: *constructBeachChairSteps + - to: green + steps: *constructBeachChairSteps + - to: orange + steps: *constructBeachChairSteps + - to: pink + steps: *constructBeachChairSteps + - to: purple + steps: *constructBeachChairSteps + - to: red + steps: *constructBeachChairSteps + - to: teal + steps: *constructBeachChairSteps + - to: white + steps: *constructBeachChairSteps + - to: yellow + steps: *constructBeachChairSteps + + - node: beige + entity: ChairBeachLoungeBeige + edges: &deconstructBeachChairSteps + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 1 + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + - node: black + entity: ChairBeachLoungeBlack + edges: *deconstructBeachChairSteps + - node: blue + entity: ChairBeachLoungeBlue + edges: *deconstructBeachChairSteps + - node: brown + entity: ChairBeachLoungeBrown + edges: *deconstructBeachChairSteps + - node: gray + entity: ChairBeachLoungeGray + edges: *deconstructBeachChairSteps + - node: green + entity: ChairBeachLoungeGreen + edges: *deconstructBeachChairSteps + - node: orange + entity: ChairBeachLoungeOrange + edges: *deconstructBeachChairSteps + - node: pink + entity: ChairBeachLoungePink + edges: *deconstructBeachChairSteps + - node: purple + entity: ChairBeachLoungePurple + edges: *deconstructBeachChairSteps + - node: red + entity: ChairBeachLoungeRed + edges: *deconstructBeachChairSteps + - node: teal + entity: ChairBeachLoungeTeal + edges: *deconstructBeachChairSteps + - node: white + entity: ChairBeachLoungeWhite + edges: *deconstructBeachChairSteps + - node: yellow + entity: ChairBeachLoungeYellow + edges: *deconstructBeachChairSteps diff --git a/Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/umbrella.yml b/Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/umbrella.yml new file mode 100644 index 0000000000..cabca74d34 --- /dev/null +++ b/Resources/Prototypes/_DEN/Recipes/Construction/Graphs/Furniture/umbrella.yml @@ -0,0 +1,68 @@ + +- type: constructionGraph + id: BeachUmbrella + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: BeachUmbrellaBlue + steps: &constructUmbrellaSteps + - material: MetalRod + amount: 2 + doAfter: 1 + - material: Cloth + amount: 2 + doAfter: 1 + - to: BeachUmbrellaGray + steps: *constructUmbrellaSteps + - to: BeachUmbrellaGreen + steps: *constructUmbrellaSteps + - to: BeachUmbrellaOrange + steps: *constructUmbrellaSteps + - to: BeachUmbrellaPink + steps: *constructUmbrellaSteps + - to: BeachUmbrellaPurple + steps: *constructUmbrellaSteps + - to: BeachUmbrellaRed + steps: *constructUmbrellaSteps + - to: BeachUmbrellaYellow + steps: *constructUmbrellaSteps + + # Deconstructs + - node: BeachUmbrellaBlue + entity: BeachUmbrellaBlue + edges: &deconstructUmbrellaSteps + - to: start + completed: + - !type:SpawnPrototype + prototype: PartRodMetal1 + amount: 2 + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + steps: + - tool: Screwing + doAfter: 3 + - node: BeachUmbrellaGray + entity: BeachUmbrellaGray + edges: *deconstructUmbrellaSteps + - node: BeachUmbrellaGreen + entity: BeachUmbrellaGreen + edges: *deconstructUmbrellaSteps + - node: BeachUmbrellaOrange + entity: BeachUmbrellaOrange + edges: *deconstructUmbrellaSteps + - node: BeachUmbrellaPink + entity: BeachUmbrellaPink + edges: *deconstructUmbrellaSteps + - node: BeachUmbrellaPurple + entity: BeachUmbrellaPurple + edges: *deconstructUmbrellaSteps + - node: BeachUmbrellaRed + entity: BeachUmbrellaRed + edges: *deconstructUmbrellaSteps + - node: BeachUmbrellaYellow + entity: BeachUmbrellaYellow + edges: *deconstructUmbrellaSteps diff --git a/Resources/Prototypes/_DEN/Recipes/Construction/furniture.yml b/Resources/Prototypes/_DEN/Recipes/Construction/furniture.yml new file mode 100644 index 0000000000..321e13afb5 --- /dev/null +++ b/Resources/Prototypes/_DEN/Recipes/Construction/furniture.yml @@ -0,0 +1,157 @@ +# lounge chairs + +- type: construction + id: ChairBeachLoungeBeige + graph: ChairBeachLounge + startNode: start + targetNode: beige + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeBlack + graph: ChairBeachLounge + startNode: start + targetNode: black + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeBlue + graph: ChairBeachLounge + startNode: start + targetNode: blue + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeBrown + graph: ChairBeachLounge + startNode: start + targetNode: brown + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeGray + graph: ChairBeachLounge + startNode: start + targetNode: gray + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeGreen + graph: ChairBeachLounge + startNode: start + targetNode: green + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeOrange + graph: ChairBeachLounge + startNode: start + targetNode: orange + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungePink + graph: ChairBeachLounge + startNode: start + targetNode: pink + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungePurple + graph: ChairBeachLounge + startNode: start + targetNode: purple + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeRed + graph: ChairBeachLounge + startNode: start + targetNode: red + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeTeal + graph: ChairBeachLounge + startNode: start + targetNode: teal + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeWhite + graph: ChairBeachLounge + startNode: start + targetNode: white + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: ChairBeachLoungeYellow + graph: ChairBeachLounge + startNode: start + targetNode: yellow + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/_DEN/Recipes/Construction/umbrella.yml b/Resources/Prototypes/_DEN/Recipes/Construction/umbrella.yml new file mode 100644 index 0000000000..1cac3e706d --- /dev/null +++ b/Resources/Prototypes/_DEN/Recipes/Construction/umbrella.yml @@ -0,0 +1,95 @@ +- type: construction + id: BeachUmbrellaBlue + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaBlue + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaGray + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaGray + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaGreen + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaGreen + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaOrange + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaOrange + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaPink + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaPink + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaPurple + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaPurple + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaRed + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaRed + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + id: BeachUmbrellaYellow + graph: BeachUmbrella + startNode: start + targetNode: BeachUmbrellaYellow + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridBorder + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/_DEN/Recipes/Lathes/Packs/cutter_machine.yml b/Resources/Prototypes/_DEN/Recipes/Lathes/Packs/cutter_machine.yml new file mode 100644 index 0000000000..55632cc0a5 --- /dev/null +++ b/Resources/Prototypes/_DEN/Recipes/Lathes/Packs/cutter_machine.yml @@ -0,0 +1,5 @@ +- type: latheRecipePack + id: DenFloorPoolTilesStatic + recipes: + - FloorTileItemPool + - FloorTileItemPoolDark diff --git a/Resources/Prototypes/_DEN/Recipes/Lathes/tiles.yml b/Resources/Prototypes/_DEN/Recipes/Lathes/tiles.yml new file mode 100644 index 0000000000..56cb8c87ab --- /dev/null +++ b/Resources/Prototypes/_DEN/Recipes/Lathes/tiles.yml @@ -0,0 +1,9 @@ +- type: latheRecipe + parent: BaseTileRecipe + id: FloorTileItemPool + result: FloorTileItemPool + +- type: latheRecipe + parent: BaseTileRecipe + id: FloorTileItemPoolDark + result: FloorTileItemPoolDark diff --git a/Resources/Prototypes/_DEN/Stacks/floor_tile.yml b/Resources/Prototypes/_DEN/Stacks/floor_tile.yml new file mode 100644 index 0000000000..905606fc8c --- /dev/null +++ b/Resources/Prototypes/_DEN/Stacks/floor_tile.yml @@ -0,0 +1,11 @@ +- type: stack + parent: BaseTileStack + id: FloorTilePool + name: stack-pool-floor-tile + spawn: FloorTileItemPool + +- type: stack + parent: BaseTileStack + id: FloorTilePoolDark + name: stack-dark-pool-floor-tile + spawn: FloorTileItemPoolDark diff --git a/Resources/Prototypes/_DEN/Tiles/floor.yml b/Resources/Prototypes/_DEN/Tiles/floor.yml new file mode 100644 index 0000000000..d2dc06eabd --- /dev/null +++ b/Resources/Prototypes/_DEN/Tiles/floor.yml @@ -0,0 +1,35 @@ +- type: tile + id: FloorTilePool + name: pool tile + sprite: /Textures/_DEN/Tiles/pool.rsi/pool.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepFloor + itemDrop: FloorTileItemPool + heatCapacity: 10000 + +- type: tile + id: FloorTilePoolDark + name: dark pool tile + sprite: /Textures/_DEN/Tiles/pool.rsi/pool-dark.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepFloor + itemDrop: FloorTileItemPoolDark + heatCapacity: 10000 diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/chairs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/chairs.yml new file mode 100644 index 0000000000..539812c410 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/chairs.yml @@ -0,0 +1,29 @@ +# Sublicensed under MIT with permission from original author. +# https://github.com/DeltaV-Station/Delta-v/pull/6113 +- type: entity + parent: MarkerBase + id: RandomBeachLoungeSpawner + name: random lounge chair spawner + components: + - type: Sprite + layers: + - state: red + - sprite: _DEN/Structures/Furniture/lounge_chair.rsi + state: white + - type: EntityTableSpawner + offset: 0 + table: !type:GroupSelector + children: + - id: ChairBeachLoungeBeige + - id: ChairBeachLoungeBlack + - id: ChairBeachLoungeBlue + - id: ChairBeachLoungeBrown + - id: ChairBeachLoungeGray + - id: ChairBeachLoungeGreen + - id: ChairBeachLoungeOrange + - id: ChairBeachLoungePink + - id: ChairBeachLoungePurple + - id: ChairBeachLoungeRed + - id: ChairBeachLoungeTeal + - id: ChairBeachLoungeWhite + - id: ChairBeachLoungeYellow diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/clothing.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/clothing.yml new file mode 100644 index 0000000000..1573b9070a --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/clothing.yml @@ -0,0 +1,15 @@ +# Sublicensed under MIT with permission from original author. +# https://github.com/DeltaV-Station/Delta-v/pull/6113 +- type: entity + parent: MarkerBase + id: SwimRingSpawner + name: random swim ring spawner + components: + - type: Sprite + layers: + - state: red + - sprite: _DEN/Structures/Furniture/pool_ring.rsi + state: rainbow + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: RandomSwimRingTable diff --git a/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/meta.json b/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/meta.json new file mode 100644 index 0000000000..ffb41aca38 --- /dev/null +++ b/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by portfiend (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pool" + }, + { + "name": "pool-dark" + } + ] +} diff --git a/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/pool-dark.png b/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/pool-dark.png new file mode 100644 index 0000000000..063d0d6cf5 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/pool-dark.png differ diff --git a/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/pool.png b/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/pool.png new file mode 100644 index 0000000000..67a39ba73c Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Tiles/pool.rsi/pool.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/blue.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/blue.png new file mode 100755 index 0000000000..2ab8bbd805 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/blue.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/gray.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/gray.png new file mode 100755 index 0000000000..6afa25d11d Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/gray.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/green.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/green.png new file mode 100755 index 0000000000..5ee9fcd2d8 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/green.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/meta.json b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/meta.json new file mode 100644 index 0000000000..073dc8ed25 --- /dev/null +++ b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by portfiend (GitHub)", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "blue" + }, + { + "name": "gray" + }, + { + "name": "green" + }, + { + "name": "orange" + }, + { + "name": "pink" + }, + { + "name": "purple" + }, + { + "name": "red" + }, + { + "name": "yellow" + } + ] +} diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/orange.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/orange.png new file mode 100755 index 0000000000..a0914d765b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/orange.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/pink.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/pink.png new file mode 100755 index 0000000000..8ddc0f87bc Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/pink.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/purple.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/purple.png new file mode 100755 index 0000000000..ed2b2eaf36 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/purple.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/red.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/red.png new file mode 100755 index 0000000000..7fccbe339b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/red.png differ diff --git a/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/yellow.png b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/yellow.png new file mode 100755 index 0000000000..8f6acc4721 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi/yellow.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/beige.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/beige.png new file mode 100755 index 0000000000..22b7b6b796 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/beige.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/black.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/black.png new file mode 100755 index 0000000000..7a3c8593ef Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/black.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/blue.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/blue.png new file mode 100755 index 0000000000..c2aec1ecf9 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/blue.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/brown.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/brown.png new file mode 100755 index 0000000000..77f65914fd Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/brown.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/gray.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/gray.png new file mode 100755 index 0000000000..bb65dcc042 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/gray.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/green.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/green.png new file mode 100755 index 0000000000..da0b79ae3b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/green.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/meta.json b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/meta.json new file mode 100644 index 0000000000..cc8afdd9d3 --- /dev/null +++ b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by portfiend (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beige", + "directions": 4 + }, + { + "name": "black", + "directions": 4 + }, + { + "name": "blue", + "directions": 4 + }, + { + "name": "brown", + "directions": 4 + }, + { + "name": "gray", + "directions": 4 + }, + { + "name": "green", + "directions": 4 + }, + { + "name": "orange", + "directions": 4 + }, + { + "name": "pink", + "directions": 4 + }, + { + "name": "purple", + "directions": 4 + }, + { + "name": "red", + "directions": 4 + }, + { + "name": "teal", + "directions": 4 + }, + { + "name": "white", + "directions": 4 + }, + { + "name": "yellow", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/orange.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/orange.png new file mode 100755 index 0000000000..219044309b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/orange.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/pink.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/pink.png new file mode 100755 index 0000000000..7f11476272 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/pink.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/purple.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/purple.png new file mode 100755 index 0000000000..389236a75f Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/purple.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/red.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/red.png new file mode 100755 index 0000000000..7c9d5ee447 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/red.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/teal.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/teal.png new file mode 100755 index 0000000000..461f9ea272 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/teal.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/white.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/white.png new file mode 100755 index 0000000000..077e704051 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/white.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/yellow.png b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/yellow.png new file mode 100755 index 0000000000..602eac8305 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi/yellow.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-equipped-BELT.png new file mode 100644 index 0000000000..6e49e8da82 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-inhand-left.png new file mode 100644 index 0000000000..8ac0e72b67 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-inhand-right.png new file mode 100644 index 0000000000..c8aac046f4 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black.png new file mode 100755 index 0000000000..3f140601ed Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/black.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-equipped-BELT.png new file mode 100644 index 0000000000..85a5c6d7d2 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-inhand-left.png new file mode 100644 index 0000000000..53bd94f48a Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-inhand-right.png new file mode 100644 index 0000000000..4750f56381 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue.png new file mode 100755 index 0000000000..1bd1680667 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/blue.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-equipped-BELT.png new file mode 100644 index 0000000000..0b6c86ef90 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-inhand-left.png new file mode 100644 index 0000000000..618750966e Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-inhand-right.png new file mode 100644 index 0000000000..381fa9807b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan.png new file mode 100755 index 0000000000..ec15707d7b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/cyan.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-equipped-BELT.png new file mode 100644 index 0000000000..cb0c5557f4 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-inhand-left.png new file mode 100644 index 0000000000..152800879c Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-inhand-right.png new file mode 100644 index 0000000000..659e8ae208 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green.png new file mode 100755 index 0000000000..b28ccd1022 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/green.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-equipped-BELT.png new file mode 100644 index 0000000000..4f122cd485 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-inhand-left.png new file mode 100644 index 0000000000..312d829709 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-inhand-right.png new file mode 100644 index 0000000000..b5d2e2841b Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta.png new file mode 100755 index 0000000000..425031ca02 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/magenta.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/meta.json b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/meta.json new file mode 100644 index 0000000000..6f18125183 --- /dev/null +++ b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/meta.json @@ -0,0 +1,176 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by portfiend (GitHub), equipped-BELT and Inhands Sprites by @Stxcking (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black" + }, + { + "name": "blue" + }, + { + "name": "cyan" + }, + { + "name": "green" + }, + { + "name": "magenta" + }, + { + "name": "pink" + }, + { + "name": "purple" + }, + { + "name": "rainbow" + }, + { + "name": "red" + }, + { + "name": "trans" + }, + { + "name": "yellow" + }, + { + "name": "black-equipped-BELT", + "directions": 4 + }, + { + "name": "black-inhand-left", + "directions": 4 + }, + { + "name": "black-inhand-right", + "directions": 4 + }, + { + "name": "blue-equipped-BELT", + "directions": 4 + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", + "directions": 4 + }, + { + "name": "cyan-equipped-BELT", + "directions": 4 + }, + { + "name": "cyan-inhand-left", + "directions": 4 + }, + { + "name": "cyan-inhand-right", + "directions": 4 + }, + { + "name": "green-equipped-BELT", + "directions": 4 + }, + { + "name": "green-inhand-left", + "directions": 4 + }, + { + "name": "green-inhand-right", + "directions": 4 + }, + { + "name": "magenta-equipped-BELT", + "directions": 4 + }, + { + "name": "magenta-inhand-left", + "directions": 4 + }, + { + "name": "magenta-inhand-right", + "directions": 4 + }, + { + "name": "pink-equipped-BELT", + "directions": 4 + }, + { + "name": "pink-inhand-left", + "directions": 4 + }, + { + "name": "pink-inhand-right", + "directions": 4 + }, + { + "name": "rainbow-equipped-BELT", + "directions": 4 + }, + { + "name": "rainbow-inhand-left", + "directions": 4 + }, + { + "name": "rainbow-inhand-right", + "directions": 4 + }, + { + "name": "red-equipped-BELT", + "directions": 4 + }, + { + "name": "red-inhand-left", + "directions": 4 + }, + { + "name": "red-inhand-right", + "directions": 4 + }, + { + "name": "trans-equipped-BELT", + "directions": 4 + }, + { + "name": "trans-inhand-left", + "directions": 4 + }, + { + "name": "trans-inhand-right", + "directions": 4 + }, + { + "name": "yellow-equipped-BELT", + "directions": 4 + }, + { + "name": "yellow-inhand-left", + "directions": 4 + }, + { + "name": "yellow-inhand-right", + "directions": 4 + }, + { + "name": "purple-equipped-BELT", + "directions": 4 + }, + { + "name": "purple-inhand-left", + "directions": 4 + }, + { + "name": "purple-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-equipped-BELT.png new file mode 100644 index 0000000000..a264ae5775 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-inhand-left.png new file mode 100644 index 0000000000..637df3a84f Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-inhand-right.png new file mode 100644 index 0000000000..ba21c584fb Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink.png new file mode 100755 index 0000000000..355f1d8dd8 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/pink.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-equipped-BELT.png new file mode 100644 index 0000000000..df0b95f6a1 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-inhand-left.png new file mode 100644 index 0000000000..ad55ed29d6 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-inhand-right.png new file mode 100644 index 0000000000..5e882b77ff Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple.png new file mode 100755 index 0000000000..6acb4e27bd Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/purple.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-equipped-BELT.png new file mode 100644 index 0000000000..1408583c5e Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-inhand-left.png new file mode 100644 index 0000000000..b3bd84f63f Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-inhand-right.png new file mode 100644 index 0000000000..6a4845a0d1 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow.png new file mode 100755 index 0000000000..c485c83ceb Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/rainbow.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-equipped-BELT.png new file mode 100644 index 0000000000..c7dab11d86 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-inhand-left.png new file mode 100644 index 0000000000..9907cf3d08 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-inhand-right.png new file mode 100644 index 0000000000..e194237fde Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red.png new file mode 100755 index 0000000000..31f2118536 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/red.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-equipped-BELT.png new file mode 100644 index 0000000000..7fc0d4fd2f Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-inhand-left.png new file mode 100644 index 0000000000..18a8605203 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-inhand-right.png new file mode 100644 index 0000000000..4d7c6408ba Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans.png new file mode 100755 index 0000000000..90392b6901 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/trans.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-equipped-BELT.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-equipped-BELT.png new file mode 100644 index 0000000000..0494282e39 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-equipped-BELT.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-inhand-left.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-inhand-left.png new file mode 100644 index 0000000000..d68bc51537 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-inhand-right.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-inhand-right.png new file mode 100644 index 0000000000..42f86b2640 Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow-inhand-right.png differ diff --git a/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow.png b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow.png new file mode 100755 index 0000000000..a2abd1feca Binary files /dev/null and b/Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi/yellow.png differ diff --git a/Resources/Textures/_DEN/Tiles/Planet/water.rsi/meta.json b/Resources/Textures/_DEN/Tiles/Planet/water.rsi/meta.json new file mode 100644 index 0000000000..d66d186ff9 --- /dev/null +++ b/Resources/Textures/_DEN/Tiles/Planet/water.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/tree/2ac1c566b89a6862c46380de02700c7c0d21a10d/icons/turf - edited by portfiend (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pool_water", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/_DEN/Tiles/Planet/water.rsi/pool_water.png b/Resources/Textures/_DEN/Tiles/Planet/water.rsi/pool_water.png new file mode 100644 index 0000000000..3905d09680 Binary files /dev/null and b/Resources/Textures/_DEN/Tiles/Planet/water.rsi/pool_water.png differ diff --git a/Resources/Textures/_DEN/Tiles/pool.rsi/meta.json b/Resources/Textures/_DEN/Tiles/pool.rsi/meta.json new file mode 100644 index 0000000000..ffb41aca38 --- /dev/null +++ b/Resources/Textures/_DEN/Tiles/pool.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by portfiend (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pool" + }, + { + "name": "pool-dark" + } + ] +} diff --git a/Resources/Textures/_DEN/Tiles/pool.rsi/pool-dark.png b/Resources/Textures/_DEN/Tiles/pool.rsi/pool-dark.png new file mode 100644 index 0000000000..f13b3e4c1e Binary files /dev/null and b/Resources/Textures/_DEN/Tiles/pool.rsi/pool-dark.png differ diff --git a/Resources/Textures/_DEN/Tiles/pool.rsi/pool.png b/Resources/Textures/_DEN/Tiles/pool.rsi/pool.png new file mode 100644 index 0000000000..c7b985b794 Binary files /dev/null and b/Resources/Textures/_DEN/Tiles/pool.rsi/pool.png differ