diff --git a/Resources/Locale/en-US/_DV/prayers/prayers.ftl b/Resources/Locale/en-US/_DV/prayers/prayers.ftl new file mode 100644 index 0000000000..b3359b745d --- /dev/null +++ b/Resources/Locale/en-US/_DV/prayers/prayers.ftl @@ -0,0 +1,3 @@ +prayer-verbs-fountainwish = Wish +prayer-chat-notify-fountainwish = FOUNTAIN WISH +prayer-popup-notify-fountainwish-sent = You tossed a coin in the fountain, and made a wish... diff --git a/Resources/Prototypes/_DV/Entities/Structures/Decoration/fountains.yml b/Resources/Prototypes/_DV/Entities/Structures/Decoration/fountains.yml new file mode 100644 index 0000000000..e500ff166b --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Structures/Decoration/fountains.yml @@ -0,0 +1,72 @@ +- type: entity + parent: BaseStructure + id: FountainLargeRound + name: large round fountain + description: A fountain full of yummy water's. + components: + - type: Sprite + noRot: true + drawdepth: FloorObjects + offset: "0.0,0.1" + sprite: _DV/Structures/Decoration/fountains.rsi + layers: + - state: large-round-base + - state: large-round-base-water + - type: SolutionContainerManager + solutions: + fountain: + maxVol: 100 + - type: SolutionRegeneration + solution: fountain + generated: + reagents: + - ReagentId: Water + Quantity: 100 + - type: Drink + solution: fountain + - type: DrawableSolution + solution: fountain + - type: DrainableSolution + solution: fountain + - type: ExaminableSolution + solution: fountain + - type: InteractionOutline + - type: Prayable + sentMessage: prayer-popup-notify-fountainwish-sent + notificationPrefix: prayer-chat-notify-fountainwish + verb: prayer-verbs-fountainwish + verbImage: null + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.75 + density: 400 + hard: false + +- type: entity + parent: BaseStructure + id: FountainLargeRoundTop + name: large round fountain top + description: Sprinkel! + components: + - type: SpriteFade + - type: Sprite + noRot: true + drawdepth: Overdoors + offset: "0.0,0.1" + sprite: _DV/Structures/Decoration/fountains.rsi + layers: + - state: large-round-top + - state: large-round-top-water + - state: large-round-flows + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.5 + density: 400 + layer: + - WallLayer diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml index 5b220c7074..de2b82e549 100644 --- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml +++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml @@ -638,6 +638,21 @@ heatCapacity: 10000 weather: true + +- type: tile + id: FloorMS13CarpetFancyRedDiamond + name: red carpet fancy diamond + sprite: /Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_red_diamond.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepCarpet + # itemDrop: FloorTileItemCarpetRed + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + - type: tile id: FloorMS13CarpetBlue name: blue carpet @@ -666,6 +681,20 @@ heatCapacity: 10000 weather: true +- type: tile + id: FloorMS13CarpetFancyBlueDiamond + name: blue carpet fancy diamond + sprite: /Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_blue_diamond.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepCarpet + # itemDrop: FloorTileItemCarpetRed + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + - type: tile id: FloorMS13CarpetGreen name: green carpet @@ -708,6 +737,20 @@ heatCapacity: 10000 weather: true +- type: tile + id: FloorMS13CarpetVioletDiamond + name: carpet violet diamond + sprite: /Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_violet_diamond.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepCarpet + # itemDrop: FloorTileItemCarpetRed + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + # Paths and Roads # Concrete - type: tile diff --git a/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-base-water.png b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-base-water.png new file mode 100644 index 0000000000..ccb174ea4d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-base-water.png differ diff --git a/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-base.png b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-base.png new file mode 100644 index 0000000000..6ca8febb42 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-base.png differ diff --git a/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-flows.png b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-flows.png new file mode 100644 index 0000000000..beec5ab7ce Binary files /dev/null and b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-flows.png differ diff --git a/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-top-water.png b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-top-water.png new file mode 100644 index 0000000000..a186d9200a Binary files /dev/null and b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-top-water.png differ diff --git a/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-top.png b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-top.png new file mode 100644 index 0000000000..83d3b0b58d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/large-round-top.png differ diff --git a/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/meta.json b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/meta.json new file mode 100644 index 0000000000..8cd0c8031b --- /dev/null +++ b/Resources/Textures/_DV/Structures/Decoration/fountains.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "rosieposieeee (Github)", + "size": { + "x": 128, + "y": 128 + }, + "states": [ + { + "name": "large-round-base" + }, + { + "name": "large-round-base-water", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "large-round-top" + }, + { + "name": "large-round-top-water", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "large-round-flows", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_blue_diamond.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_blue_diamond.png new file mode 100644 index 0000000000..1d2b1c0e35 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_blue_diamond.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_red_diamond.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_red_diamond.png new file mode 100644 index 0000000000..88de3189bd Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_red_diamond.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_violet_diamond.png b/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_violet_diamond.png new file mode 100644 index 0000000000..0e19069853 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/ms13/Carpet/carpet_fancy_violet_diamond.png differ