Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:23:00 +00:00
parent ca058b1266 cc0cb03046
commit d2ec28b1e6
29 changed files with 207 additions and 153 deletions
@@ -345,7 +345,7 @@

 /obj/structure/flora/rock
 	icon_state = "basalt"
-	desc = "A volcanic rock."
+	desc = "A volcanic rock. Pioneers used to ride these babies for miles."
 	icon = 'icons/obj/flora/rocks.dmi'
 	resistance_flags = FIRE_PROOF
 	density = TRUE