diff --git a/code/game/objects/structures/props/rocks.dm b/code/game/objects/structures/props/rocks.dm
new file mode 100644
index 0000000000..5d343c0744
--- /dev/null
+++ b/code/game/objects/structures/props/rocks.dm
@@ -0,0 +1,41 @@
+/obj/structure/prop/rock
+	name = "rock"
+	desc = "A hard place."
+	icon = 'icons/obj/flora/rocks.dmi'
+	icon_state = "basalt2"
+
+/obj/structure/prop/rock/sharp
+	icon_state = "basalt1"
+
+/obj/structure/prop/rock/flat
+	icon_state = "basalt3"
+
+/obj/structure/prop/rock/round
+	icon_state = "basalt4"
+
+/obj/structure/prop/rock/small
+	name = "small rocks"
+	icon_state = "lavarocks1"
+	density = FALSE
+
+/obj/structure/prop/rock/small/alt
+	icon_state = "lavarocks2"
+
+//Water-trim versions for placing in water
+
+/obj/structure/prop/rock/water
+	icon_state = "basalt_water2"
+
+/obj/structure/prop/rock/watersharp
+	icon_state = "basalt_water1"
+
+/obj/structure/prop/rock/waterflat
+	icon_state = "basalt_water3"
+
+/obj/structure/prop/rock/small/water
+	name = "submerged rocks"
+	icon_state = "waterrocks1"
+	density = FALSE
+
+/obj/structure/prop/rock/small/wateralt
+	icon_state = "waterrocks2"
\ No newline at end of file
diff --git a/icons/obj/flora/rocks.dmi b/icons/obj/flora/rocks.dmi
index 12d4f2c8ee..4713360313 100644
Binary files a/icons/obj/flora/rocks.dmi and b/icons/obj/flora/rocks.dmi differ
diff --git a/icons/obj/outcrop.dmi b/icons/obj/outcrop.dmi
index bea3810fe8..eacb7bc4fe 100644
Binary files a/icons/obj/outcrop.dmi and b/icons/obj/outcrop.dmi differ
diff --git a/polaris.dme b/polaris.dme
index 593b86e8a2..0557b0430e 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1295,6 +1295,7 @@
 #include "code\game\objects\structures\props\projectile_lock.dm"
 #include "code\game\objects\structures\props\prop.dm"
 #include "code\game\objects\structures\props\puzzledoor.dm"
+#include "code\game\objects\structures\props\rocks.dm"
 #include "code\game\objects\structures\props\swarm.dm"
 #include "code\game\objects\structures\props\transmitter.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\alien_nests.dm"