Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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"