a bunch of rocks you say...

baystation12.dme

@@ -1044,7 +1044,6 @@
 #include "code\game\objects\effects\item_pickup_ghost.dm"
 #include "code\game\objects\effects\landmarks.dm"
 #include "code\game\objects\effects\manifest.dm"
-#include "code\game\objects\effects\mines.dm"
 #include "code\game\objects\effects\misc.dm"
 #include "code\game\objects\effects\overlays.dm"
 #include "code\game\objects\effects\portals.dm"
@@ -1342,6 +1341,7 @@
 #include "code\game\objects\structures\lamarr.dm"
 #include "code\game\objects\structures\lattice.dm"
 #include "code\game\objects\structures\loot_piles.dm"
+#include "code\game\objects\structures\mines.dm"
 #include "code\game\objects\structures\mirror.dm"
 #include "code\game\objects\structures\mop_bucket.dm"
 #include "code\game\objects\structures\morgue.dm"

code/game/objects/effects/misc.dm

@@ -17,3 +17,14 @@
 	if(victim == O)
 		return 0
 	return 1
+
+/obj/effect/minefield
+	name = "minefield"
+	var/minerange = 9
+	var/minetype = /obj/structure/landmine
+
+/obj/effect/minefield/Initialize()
+	. = ..()
+	for(var/turf/simulated/floor/T in view(minerange,loc))
+		if(prob(5))
+			new minetype(T)

code/game/objects/structures/flora.dm

@@ -221,6 +221,17 @@
 	. = ..()
 	icon_state = "tree[rand(1, 6)]"
 
+/obj/structure/flora/tree/cactus
+	pixel_x = -16
+	pixel_y = 0
+	icon = 'icons/obj/flora/aridtrees.dmi'
+	icon_state = "cactus1"
+	cut_hits = 10
+
+/obj/structure/flora/tree/cactus/Initialize()
+	. = ..()
+	icon_state = "cactus[rand(1, 4)]"
+
 //grass
 /obj/structure/flora/grass
 	name = "grass"
@@ -249,6 +260,24 @@
 	..()
 	icon_state = "snowgrassall[rand(1, 3)]"
 
+/obj/structure/flora/grass/rockplanet
+	name = "cottongrass"
+	desc= "A variety of cold-loving prarie grass. This variety seems to thrive the frigid rockworld enviroment, so long as water can be found nearby."
+	icon = 'icons/obj/flora/grasssticks.dmi'
+	icon_state = "tall_grass_1"
+
+/obj/structure/flora/grass/rockplanet/Initialize()
+	. = ..()
+	icon_state = "tall_grass_[rand(1, 2)]"
+
+/obj/structure/flora/grass/rockplanet/dead
+	name = "dry cottongrass"
+	desc= "This patch seems to have run dry on life-giving water."
+	icon_state = "dry_grass_1"
+
+/obj/structure/flora/grass/rockplanet/dead/Initialize()
+	. = ..()
+	icon_state = "dry_grass_[rand(1, 2)]"
 
 //bushes
 /obj/structure/flora/bush
@@ -488,37 +517,37 @@
 	icon_state = "busha"
 
 /obj/structure/flora/ausbushes/jungleflora/busha/Initialize()
-	..()
+	. = ..()
 	icon_state = "busha[rand(1, 3)]"
 
 /obj/structure/flora/ausbushes/jungleflora/bushb
 	icon_state = "bushb"
 
 /obj/structure/flora/ausbushes/jungleflora/bushb/Initialize()
-	..()
+	. = ..()
 	icon_state = "bushb[rand(1, 3)]"
 
 /obj/structure/flora/ausbushes/jungleflora/bushc
 	icon_state = "bushc"
 
 /obj/structure/flora/ausbushes/jungleflora/bushc/Initialize()
-	..()
+	. = ..()
 	icon_state = "bushc[rand(1, 3)]"
 
 /obj/structure/flora/ausbushes/jungleflora/grassa
 	name = "grass"
 	icon_state = "grassa"
 
 /obj/structure/flora/ausbushes/jungleflora/grassa/Initialize()
-	..()
+	. = ..()
 	icon_state = "grassa[rand(1, 5)]"
 
 /obj/structure/flora/ausbushes/jungleflora/grassb
 	name = "grass"
 	icon_state = "grassb"
 
 /obj/structure/flora/ausbushes/jungleflora/grassb/Initialize()
-	..()
+	. = ..()
 	icon_state = "grassb[rand(1, 5)]"
 
 /obj/structure/flora/ausbushes/jungleflora/large
@@ -528,8 +557,17 @@
 	pixel_y = -12
 	layer = ABOVE_HUMAN_LAYER
 
+/obj/structure/flora/ausbushes/jungleflora/large/bush1
+	icon_state = "bush1"
+
+/obj/structure/flora/ausbushes/jungleflora/large/bush2
+	icon_state = "bush2"
+
+/obj/structure/flora/ausbushes/jungleflora/large/bush3
+	icon_state = "bush3"
+
 /obj/structure/flora/ausbushes/jungleflora/large/Initialize()
-	..()
+	. = ..()
 	icon_state = "bush[rand(1, 3)]"
 
 /obj/structure/flora/jungleflora/rock
@@ -540,7 +578,7 @@
 	layer = BELOW_DOOR_LAYER
 
 /obj/structure/flora/jungleflora/rock/Initialize()
-	..()
+	. = ..()
 	icon_state = "rock[rand(1, 5)]"
 
 /obj/structure/flora/jungleflora/rock/large
@@ -550,7 +588,7 @@
 	pixel_y = -16
 
 /obj/structure/flora/jungleflora/rock/large/Initialize()
-	..()
+	. = ..()
 	icon_state = "rocks[rand(1, 3)]"
 
 /obj/structure/flora/goonbushes
@@ -724,25 +762,6 @@
 	name = "bush"
 	icon_state = "junglebush3"
 
-/obj/structure/flora/jungleplants/junglebushlarge
-	name = "bush"
-	icon = 'icons/obj/flora/junglebushlarge.dmi'
-	icon_state = "bush1"
-	pixel_x = -16
-	pixel_y = -8
-
-/obj/structure/flora/jungleplants/junglebushlarge/bush1
-	icon_state = "bush1"
-
-/obj/structure/flora/jungleplants/junglebushlarge/bush2
-	icon_state = "bush2"
-
-/obj/structure/flora/jungleplants/junglebushlarge/bush3
-	icon_state = "bush3"
-
-/obj/structure/flora/jungleplants/junglebushlarge/bush4
-	icon_state = "bush4"
-
 /obj/structure/flora/jungleplants/alienplant1
 	name = "alien plant"
 	icon_state = "alienplant1"

code/game/objects/effects/mines.dm → code/game/objects/structures/mines.dm

@@ -1,4 +1,4 @@
-/obj/effect/mine
+/obj/structure/landmine
 	name = "Mine"
 	desc = "I Better stay away from that thing."
 	density = 1
@@ -9,13 +9,13 @@
 	var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
 	var/triggered = 0
 
-/obj/effect/mine/New()
+/obj/structure/landmine/New()
 	icon_state = "uglyminearmed"
 
-/obj/effect/mine/Crossed(AM as mob|obj)
+/obj/structure/landmine/Crossed(AM as mob|obj)
 	Bumped(AM)
 
-/obj/effect/mine/Bumped(mob/M as mob|obj)
+/obj/structure/landmine/Bumped(mob/M as mob|obj)
 
 	if(triggered) return
 
@@ -25,15 +25,15 @@
 		triggered = 1
 		call(src,triggerproc)(M)
 
-/obj/effect/mine/proc/triggerrad(obj)
+/obj/structure/landmine/proc/triggerrad(obj)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
 	s.set_up(3, 1, src)
 	s.start()
 	obj:radiation += 50
 	spawn(0)
 		qdel(src)
 
-/obj/effect/mine/proc/triggerstun(obj)
+/obj/structure/landmine/proc/triggerstun(obj)
 	if(ismob(obj))
 		var/mob/M = obj
 		M.Stun(30)
@@ -43,7 +43,7 @@
 	spawn(0)
 		qdel(src)
 
-/obj/effect/mine/proc/triggern2o(obj)
+/obj/structure/landmine/proc/triggern2o(obj)
 	//example: n2o triggerproc
 	//note: im lazy
 
@@ -54,7 +54,7 @@
 	spawn(0)
 		qdel(src)
 
-/obj/effect/mine/proc/triggerplasma(obj)
+/obj/structure/landmine/proc/triggerplasma(obj)
 	for (var/turf/simulated/floor/target in range(1,src))
 		if(!target.blocks_air)
 			target.assume_gas("plasma", 30)
@@ -64,40 +64,40 @@
 	spawn(0)
 		qdel(src)
 
-/obj/effect/mine/proc/triggerkick(obj)
+/obj/structure/landmine/proc/triggerkick(obj)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
 	s.set_up(3, 1, src)
 	s.start()
 	qdel(obj:client)
 	spawn(0)
 		qdel(src)
 
-/obj/effect/mine/proc/explode(obj)
+/obj/structure/landmine/proc/explode(obj)
 	explosion(loc, 1, 2, 3, 4)
 	spawn(0)
 		qdel(src)
 
-/obj/effect/mine/dnascramble
+/obj/structure/landmine/dnascramble
 	name = "Radiation Mine"
 	icon_state = "uglymine"
 	triggerproc = "triggerrad"
 
-/obj/effect/mine/plasma
+/obj/structure/landmine/plasma
 	name = "Plasma Mine"
 	icon_state = "uglymine"
 	triggerproc = "triggerplasma"
 
-/obj/effect/mine/kick
+/obj/structure/landmine/kick
 	name = "Kick Mine"
 	icon_state = "uglymine"
 	triggerproc = "triggerkick"
 
-/obj/effect/mine/n2o
+/obj/structure/landmine/n2o
 	name = "N2O Mine"
 	icon_state = "uglymine"
 	triggerproc = "triggern2o"
 
-/obj/effect/mine/stun
+/obj/structure/landmine/stun
 	name = "Stun Mine"
 	icon_state = "uglymine"
 	triggerproc = "triggerstun"

code/game/objects/structures/rock.dm

@@ -66,15 +66,47 @@
 			M.selected.action(src)
 
 /obj/structure/rock/basalt
+	name = "basalt"
+	desc = "Huge chunk of volcanic rock that contain various minerals."
 	icon_state = "asteroid_bigstone_basalt1"
 
 /obj/structure/rock/basalt/Initialize()
-	..()
+	. = ..()
 	icon_state = "asteroid_bigstone_basalt[rand(1, 3)]"
 
 /obj/structure/rock/lavarocks
-	icon_state = "asteroid_bigstone_lavarocks1"
+	name = "lava rocks"
+	desc = "Small pile of volcanic rocks that contain various minerals."
+	icon_state = "asteroid_lavarocks1"
 
 /obj/structure/rock/lavarocks/Initialize()
-	..()
-	icon_state = "asteroid_bigstone_lavarocks[rand(1, 3)]"
+	. = ..()
+	icon_state = "asteroid_lavarocks[rand(1, 3)]"
+
+/obj/structure/rock/rockplanet
+	name = "russet stone"
+	desc = "A raised knurl of red rock."
+	icon_state = "asteroid_bigstone_redrock1"
+
+/obj/structure/rock/rockplanet/Initialize()
+	. = ..()
+	icon_state = "asteroid_bigstone_redrock[rand(1, 3)]"
+
+/obj/structure/rock/rockplanet/Destroy()
+	var/mineralSpawnChanceList = list(glass = 10)
+	if(prob(20))
+		var/mineral_name = util_pick_weight(mineralSpawnChanceList) //temp mineral name
+		mineral_name = lowertext(mineral_name)
+		var/ore = text2path("/obj/item/ore/[mineral_name]")
+		for(var/i=1,i <= rand(2,6),i++)
+			new ore(get_turf(src))
+	return ..()
+
+/obj/structure/rock/rockplanet/pile
+	name = "russet stones"
+	desc = "A pile of rust-red rocks."
+	icon_state = "asteroid_redrocks1"
+
+/obj/structure/rock/rockplanet/pile/Initialize()
+	. = ..()
+	icon_state = "asteroid_redrocks[rand(1, 3)]"

code/game/turfs/flooring/flooring_premade.dm

@@ -655,15 +655,54 @@
 		var/mob/living/M = AM
 		M.slip(src, 4)
 
+///PLANETOID FLOORING
+
 /turf/simulated/floor/natural/jungle/wasteland
 	name = "cracked earth"
 	desc = "Looks a bit dry."
 	icon = 'icons/turf/flooring/wasteland.dmi'
-	icon_state = "wasteland"
-	//slowdown = 1
+	icon_state = "wasteland1"
+	//slowdown = 1 //<add that shet, i am too stupid and lazy to do it myself
 	var/floor_variance = 15
 
 /turf/simulated/floor/natural/jungle/wasteland/Initialize(mapload, inherited_virtual_z)
 	. = ..()
 	if(prob(floor_variance))
-		icon_state = "[initial(icon_state)][rand(1, 13)]"
+		icon_state = "wasteland[rand(1, 13)]"
+
+/turf/simulated/floor/natural/rockplanet
+	name = "iron sand"
+	icon = 'icons/turf/flooring/sand.dmi'
+	icon_state = "dry_soft1"
+	var/floor_variance = 100
+
+/turf/simulated/floor/natural/rockplanet/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		icon_state = "dry_soft[rand(1, 8)]"
+
+/turf/simulated/floor/natural/rockplanet/cracked
+	name = "iron cracked sand"
+	icon_state = "dry_cracked1"
+
+/turf/simulated/floor/natural/rockplanet/cracked/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		icon_state = "dry_cracked[rand(1, 8)]"
+
+/turf/simulated/floor/natural/rockplanet/wet
+	icon_state = "wet_soft1"
+
+/turf/simulated/floor/natural/rockplanet/wet/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		icon_state = "wet_soft[rand(1, 8)]"
+
+/turf/simulated/floor/natural/rockplanet/wet/cracked
+	name = "iron cracked sand"
+	icon_state = "wet_cracked1"
+
+/turf/simulated/floor/natural/rockplanet/wet/cracked/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		icon_state = "wet_cracked[rand(1, 8)]"