Merge branch 'master' into upstream-merge-26760

code/game/turfs/simulated/chasm.dm

@@ -143,14 +143,14 @@
 		qdel(S.mmi)
 
 	qdel(AM)
-	
+
 	if(AM && !QDELETED(AM))	//It's indestructible
 		visible_message("<span class='boldwarning'>[src] spits out the [AM]!</span>")
 		AM.alpha = oldalpha
 		AM.color = oldcolor
 		AM.transform = oldtransform
 		AM.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1, 10),rand(1, 10))
-	
+
 /turf/open/chasm/straight_down/lava_land_surface/normal_air
 	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
 
@@ -158,3 +158,17 @@
 
 /turf/open/chasm/CanPass(atom/movable/mover, turf/target, height=0)
 	return 1
+
+
+
+//Jungle
+
+/turf/open/chasm/jungle
+	icon = 'icons/turf/floors/junglechasm.dmi'
+	planetary_atmos = TRUE
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+/turf/open/chasm/straight_down/jungle
+	icon = 'icons/turf/floors/junglechasm.dmi'
+	planetary_atmos = TRUE
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -1,6 +1,7 @@
 /* In this file:
  * Wood floor
  * Grass floor
+ * Fake Basalt
  * Carpet floor
  * Fake pits
  * Fake space
@@ -67,6 +68,7 @@
 	broken_states = list("sand")
 	flags = NONE
 	var/ore_type = /obj/item/weapon/ore/glass
+	var/turfverb = "uproot"
 
 /turf/open/floor/grass/Initialize()
 	..()
@@ -76,7 +78,7 @@
 	if(istype(C, /obj/item/weapon/shovel) && params)
 		new ore_type(src)
 		new ore_type(src) //Make some sand if you shovel grass
-		user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You uproot [src].</span>")
+		user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You [src.turfverb] [src].</span>")
 		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
 		make_plating()
 	if(..())
@@ -93,7 +95,6 @@
 	initial_gas_mix = "o2=22;n2=82;TEMP=180"
 	slowdown = 2
 
-
 /turf/open/floor/grass/snow/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/crowbar))//You need to dig this turf out instead of crowbarring it
 		return
@@ -113,6 +114,24 @@
 		icon_state = "basalt[rand(0, 12)]"
 		set_basalt_light(src)
 
+
+/turf/open/floor/grass/fakebasalt //Heart is not a real planeteer power
+	name = "aesthetic volcanic flooring"
+	desc = "Safely recreated turf for your hellplanet-scaping"
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "basalt"
+	floor_tile = /obj/item/stack/tile/basalt
+	ore_type = /obj/item/weapon/ore/glass/basalt
+	turfverb = "dig up"
+	slowdown = 0
+
+/turf/open/floor/grass/fakebasalt/Initialize()
+	..()
+	if(prob(15))
+		icon_state = "basalt[rand(0, 12)]"
+		set_basalt_light(src)
+
+
 /turf/open/floor/carpet
 	name = "carpet"
 	desc = "Soft velvet carpeting. Feels good between your toes."

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -63,7 +63,7 @@
 			if(istype(src, /turf/open/floor/plating/asteroid))
 				to_chat(user, "<span class='notice'>You dig a hole.</span>")
 				gets_dug()
-				feedback_add_details("pick_used_mining","[W.type]")
+				SSblackbox.add_details("pick_used_mining","[W.type]")
 
 	if(istype(W,/obj/item/weapon/storage/bag/ore))
 		var/obj/item/weapon/storage/bag/ore/S = W

code/game/turfs/simulated/floor/plating/dirt.dm

@@ -3,19 +3,9 @@
 	desc = "Upon closer examination, it's still dirt."
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "dirt"
-	var/smooth_icon = 'icons/turf/floors/dirt.dmi'
-	canSmoothWith = list(/turf/closed, /turf/open/floor/plating/dirt)
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	baseturf = /turf/open/chasm/straight_down/lava_land_surface
+	baseturf = /turf/open/chasm/straight_down/jungle
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	planetary_atmos = TRUE
 
-/turf/open/floor/plating/dirt/Initialize()
-	pixel_y = -2
-	pixel_x = -2
-	icon = smooth_icon
-	..()
-
 /turf/open/floor/plating/dirt/dark
-	icon_state = "darkdirt"
-	smooth_icon = 'icons/turf/floors/darkdirt.dmi'
+	icon_state = "greenerdirt"

code/game/turfs/simulated/minerals.dm

@@ -63,7 +63,7 @@
 			if(ismineralturf(src))
 				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
 				gets_drilled(user)
-				feedback_add_details("pick_used_mining","[P.type]")
+				SSblackbox.add_details("pick_used_mining","[P.type]")
 	else
 		return attack_hand(user)
 
@@ -72,7 +72,7 @@
 		var/i
 		for(i in 1 to mineralAmt)
 			new mineralType(src)
-			feedback_add_details("ore_mined",mineralType)
+			SSblackbox.add_details("ore_mined",mineralType)
 	ChangeTurf(turf_type, defer_change)
 	addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
 	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction