diff --git a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl
index be89c8e671..e3fa1afc02 100644
--- a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl
@@ -4,6 +4,7 @@ cp14-tiles-base = rock strata
 # Natural
 cp14-tiles-grass = meadow grass
 cp14-tiles-dirt = soil
+cp14-tiles-sand = sand
 
 # Produced
 cp14-tiles-foundation = foundation
diff --git a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl
index 3e321efeb0..3d441acf11 100644
--- a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl
+++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl
@@ -4,6 +4,7 @@ cp14-tiles-base = каменная толща
 # Natural
 cp14-tiles-grass = луговая трава
 cp14-tiles-dirt = почва
+cp14-tiles-sand = песок
 
 # Produced
 cp14-tiles-foundation = фундамент
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
new file mode 100644
index 0000000000..1c7372a59c
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
@@ -0,0 +1,58 @@
+- type: entity
+  parent: BaseStructure
+  id: CP14FloorWater
+  name: water
+  description: Bruh
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: PlacementReplacement
+    key: floorTile
+  - type: Sprite
+    sprite: _CP14/Tiles/Water/water.rsi
+    drawdepth: BelowFloor
+  - type: Icon
+    sprite: _CP14/Tiles/Water/water.rsi
+    state: full
+  - type: IconSmooth
+    key: CP14Water
+    base: water
+  - type: FloorOccluder
+  - type: Transform
+    anchored: true
+  - type: SyncSprite
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.5
+    sprintSpeedModifier: 0.5
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        layer:
+          - SlipLayer
+        mask:
+          - ItemMask
+        density: 1000
+        hard: false
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepWater
+      params:
+        volume: 8
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
+        reagents:
+        - ReagentId: CP14Water
+          Quantity: 9999999
+  - type: DrainableSolution
+    solution: pool
+  - type: Drink
+    solution: pool
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml
index d15f8c0d07..5a8ba25896 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml
@@ -70,3 +70,39 @@
   - type: Construction
     graph: CP14WallmountTorch
     node: CP14WallmountTorch
+
+- type: entity
+  id: CP14WallmountLamp
+  name: eternal flame lamp
+  description: A fragile eternal blue fire as proof of the superiority of magic over nature. 
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Wallmount/wallmount_lamp.rsi
+    layers:
+      - state: base
+      - state: on
+        shader: unshaded
+        map: [ "light" ]
+  - type: PointLight
+    radius: 6
+    netsync: false
+    color: "#b0eaf6"
+  - type: Appearance
+  #TODO toggleable
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml
index 32c7958dc9..ef6228cb3b 100644
--- a/Resources/Prototypes/_CP14/Tiles/natural.yml
+++ b/Resources/Prototypes/_CP14/Tiles/natural.yml
@@ -40,6 +40,37 @@
   heatCapacity: 10000
   weather: true
 
+- type: tile
+  editorHidden: false
+  id: CP14FloorSand
+  name: cp14-tiles-sand
+  sprite: /Textures/_CP14/Tiles/Sand/sand.png
+  variants: 5
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 2
+  edgeSprites:
+    SouthEast: /Textures/_CP14/Tiles/Sand/single_edge.png
+    NorthEast: /Textures/_CP14/Tiles/Sand/single_edge.png
+    NorthWest: /Textures/_CP14/Tiles/Sand/single_edge.png
+    SouthWest: /Textures/_CP14/Tiles/Sand/single_edge.png
+    South: /Textures/_CP14/Tiles/Sand/double_edge.png
+    East: /Textures/_CP14/Tiles/Sand/double_edge.png
+    North: /Textures/_CP14/Tiles/Sand/double_edge.png
+    West: /Textures/_CP14/Tiles/Sand/double_edge.png
+  baseTurf: CP14FloorBase
+  deconstructTools: [ CP14Digging ]
+  itemDrop: CP14DirtEffect #TODO sand variant
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepSnow #TODO
+  heatCapacity: 10000
+  weather: true
+
 - type: tile
   id: CP14FloorGrass
   editorHidden: false
@@ -51,7 +82,7 @@
   - 1.0
   - 1.0
   - 1.0
-  edgeSpritePriority: 2
+  edgeSpritePriority: 3
   edgeSprites:
     SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png
     NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png
index b09a239615..d27e52d380 100644
Binary files a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png
index f76a2eb767..3756d0430a 100644
Binary files a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png differ
diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/big_R.png b/Resources/Textures/_CP14/Structures/crystal.rsi/big_R.png
new file mode 100644
index 0000000000..e4aab1891d
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/crystal.rsi/big_R.png differ
diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/medium_R.png b/Resources/Textures/_CP14/Structures/crystal.rsi/medium_R.png
new file mode 100644
index 0000000000..31edb77ef6
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/crystal.rsi/medium_R.png differ
diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json b/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json
index d551c51028..a877e55c32 100644
--- a/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json
@@ -16,6 +16,15 @@
     {
       "name": "small"
     },
+    {
+      "name": "big_R"
+    },
+    {
+      "name": "medium_R"
+    },
+    {
+      "name": "small_R"
+    },
     {
       "name": "shard"
     }
diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/small_R.png b/Resources/Textures/_CP14/Structures/crystal.rsi/small_R.png
new file mode 100644
index 0000000000..486b32659d
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/crystal.rsi/small_R.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml b/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml
index f4e04eed45..1adbb66ee3 100644
--- a/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml
+++ b/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml
@@ -3,7 +3,7 @@
   copyright: "Space Station 14, recolored by TheShuEd"
   source: "https://github.com/crystallpunk-14/crystall-punk-14/"
 
-- files: ["double_edge.png", "single_edge.png", "triple_edge.png"]
+- files: ["double_edge.png", "single_edge.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Created by TheShuEd"
   source: "https://github.com/crystallpunk-14/crystall-punk-14/"
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Tiles/Dirt/triple_edge.png b/Resources/Textures/_CP14/Tiles/Dirt/triple_edge.png
deleted file mode 100644
index 757c26da89..0000000000
Binary files a/Resources/Textures/_CP14/Tiles/Dirt/triple_edge.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Tiles/Sand/attributions.yml b/Resources/Textures/_CP14/Tiles/Sand/attributions.yml
new file mode 100644
index 0000000000..dae9ad7d8e
--- /dev/null
+++ b/Resources/Textures/_CP14/Tiles/Sand/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["sand.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Space Station 14"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14/"
+
+- files: ["double_edge.png", "single_edge.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TheShuEd"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14/"
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Tiles/Sand/double_edge.png b/Resources/Textures/_CP14/Tiles/Sand/double_edge.png
new file mode 100644
index 0000000000..403d008a1a
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Sand/double_edge.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Sand/sand.png b/Resources/Textures/_CP14/Tiles/Sand/sand.png
new file mode 100644
index 0000000000..47656cca76
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Sand/sand.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Sand/single_edge.png b/Resources/Textures/_CP14/Tiles/Sand/single_edge.png
new file mode 100644
index 0000000000..b30e4bc200
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Sand/single_edge.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/full.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/full.png
new file mode 100644
index 0000000000..211044d50e
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json b/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json
new file mode 100644
index 0000000000..734c9837c5
--- /dev/null
+++ b/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json
@@ -0,0 +1,254 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by TheShuEd for CrystallPunk",
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "water0",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water1",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water2",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water3",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water4",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water5",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water6",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "water7",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png
new file mode 100644
index 0000000000..8109c3094d
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png
new file mode 100644
index 0000000000..1109563ceb
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png
new file mode 100644
index 0000000000..8109c3094d
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png
new file mode 100644
index 0000000000..16d7e137ae
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png
new file mode 100644
index 0000000000..098b30341f
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png
new file mode 100644
index 0000000000..9ae6ed3249
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png
new file mode 100644
index 0000000000..b7e6b62657
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png
new file mode 100644
index 0000000000..be3a56e6ba
Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png differ