Merge pull request #16184 from KorPhaeron/sand2

Lavaland Sand
This commit is contained in:
Cheridan
2016-03-19 20:22:36 -05:00
3 changed files with 9 additions and 5 deletions
+5 -5
View File
@@ -487,6 +487,7 @@ var/global/list/rockTurfEdgeCache
var/environment_type = "asteroid"
var/turf_type = /turf/simulated/floor/plating/asteroid //Because caves do whacky shit to revert to normal
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
var/sand_type = /obj/item/weapon/ore/glass
/turf/simulated/floor/plating/asteroid/airless
oxygen = 0.01
@@ -501,6 +502,7 @@ var/global/list/rockTurfEdgeCache
icon_state = "basalt"
icon_plating = "basalt"
environment_type = "basalt"
sand_type = /obj/item/weapon/ore/glass/basalt
/turf/simulated/floor/plating/asteroid/basalt/lava //lava underneath
baseturf = /turf/simulated/floor/plating/lava/smooth
@@ -520,6 +522,7 @@ var/global/list/rockTurfEdgeCache
temperature = 180
slowdown = 2
environment_type = "snow"
sand_type = /obj/item/stack/sheet/mineral/snow
/turf/simulated/floor/plating/asteroid/snow/airless
oxygen = 0.01
@@ -601,11 +604,8 @@ var/global/list/rockTurfEdgeCache
/turf/simulated/floor/plating/asteroid/proc/gets_dug()
if(dug)
return
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
new/obj/item/weapon/ore/glass(src)
for(var/i in 1 to 5)
new sand_type(src)
dug = 1
icon_plating = "[environment_type]_dug"
icon_state = "[environment_type]_dug"
+4
View File
@@ -60,6 +60,10 @@
qdel(src)
return
/obj/item/weapon/ore/glass/basalt
name = "volcanic ash"
icon_state = "volcanic_sand"
/obj/item/weapon/ore/plasma
name = "plasma ore"
icon_state = "Plasma ore"