Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849

[MIRROR] More baseturf helpers
2017-08-18 11:26:53 -05:00
parent 146b5880d5 7ab92ade3c
commit 094c4847f7
24 changed files with 85 additions and 31 deletions
@@ -460,7 +460,7 @@
 /area/ruin/powered/beach)
 "cz" = (
 /obj/effect/turf_decal/sand,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered/beach)
 "cR" = (
@@ -896,7 +896,7 @@
 /area/ruin/powered/clownplanet)
 "dR" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/indestructible/sound{
 	icon_state = "bananium";
 	name = "bananium floor";
@@ -809,7 +809,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "cF" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/powered/animal_hospital)

@@ -1071,7 +1071,7 @@
 /area/ruin/unpowered/ash_walkers)
 "cE" = (
 /obj/structure/stone_tile/surrounding/cracked,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "cF" = (
@@ -275,7 +275,7 @@
 	},
 /area/ruin/powered/snow_biodome)
 "bS" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/snow{
 	initial_gas_mix = "o2=22;n2=82;TEMP=180"
 	},
@@ -163,7 +163,7 @@
 /turf/open/floor/plasteel/cult{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/cult,
 /area/ruin/unpowered)

@@ -104,7 +104,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "r" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/rust,
 /area/ruin/unpowered)

@@ -29,7 +29,7 @@
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)
 "i" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)

@@ -85,7 +85,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/gluttony)
 "D" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/gluttony)
 "R" = (
@@ -285,7 +285,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered/golem_ship)
 "Y" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)

@@ -123,7 +123,7 @@
 /turf/open/floor/engine/cult,
 /area/ruin/powered/greed)
 "z" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/engine/cult,
 /area/ruin/powered/greed)
 "J" = (
@@ -180,7 +180,7 @@
 	},
 /area/ruin/powered)
 "L" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/basalt,
 /area/ruin/powered)

@@ -342,7 +342,7 @@
 /area/ruin/unpowered)
 "S" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/wood{
 	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -65,7 +65,7 @@
 /turf/open/floor/mineral/silver,
 /area/ruin/powered/pride)
 "u" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/mineral/silver,
 /area/ruin/powered/pride)
 "G" = (
@@ -262,7 +262,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "Z" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/r_wall,
 /area/ruin/powered/seedvault)

@@ -42,7 +42,7 @@
 	},
 /area/ruin/unpowered)
 "h" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/sepia{
 	blocks_air = 0;
 	slowdown = 10
@@ -169,7 +169,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "B" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/titanium/survival/pod,
 /area/ruin/powered)

@@ -22,7 +22,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered)
 "g" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/unpowered)

@@ -1285,7 +1285,7 @@
 	},
 /area/ruin/powered/syndicate_lava_base)
 "dd" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -105,7 +105,7 @@
 "s" = (
 /obj/structure/table/optable/abductor,
 /obj/item/weapon/cautery/alien,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/abductor{
 	initial_gas_mix = "o2=16;n2=23;TEMP=300"
 	},
@@ -269,7 +269,7 @@
 "W" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/xenonest)

@@ -0,0 +1,10 @@
+diff a/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm	(rejected hunks)
+@@ -269,7 +269,7 @@
+ "W" = (
+ /obj/structure/alien/weeds,
+ /obj/structure/alien/resin/wall,
+-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
+ /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+ /area/ruin/unpowered/xenonest)
+ 
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE 
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
@@ -1241,6 +1241,7 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/circuit,
 /area/mine/maintenance)
 "dy" = (
@@ -3399,17 +3400,27 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Wt" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall,
 /area/mine/laborcamp/security)
 "Wu" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall,
 /area/mine/laborcamp)
 "Ww" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
+"Wx" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/open/floor/plasteel/brown{
+	dir = 4
+	},
+/area/mine/eva)
+"Wy" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/open/floor/plasteel,
+/area/mine/production)

 (1,1,1) = {"
 aa
@@ -19057,7 +19068,7 @@ cI
 cP
 cn
 bP
-bP
+Wy
 bP
 bP
 eD
@@ -19570,7 +19581,7 @@ bf
 cK
 bq
 bq
-dt
+br
 bq
 dV
 el
@@ -20335,7 +20346,7 @@ bf
 bp
 bu
 bI
-bW
+Wx
 cr
 bf
 ad
@@ -1,10 +1,10 @@
 //These landmarks can be placed in rooms/ruins to set the baseturfs of every turf in the area. Easier than having potentially unlimited subtypes of every turf or having to manually edit the turfs in the map editor

 /obj/effect/baseturf_helper
-	name = "lava baseturf editor"
+	name = "baseturf editor"
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "syndballoon"
-	var/baseturf = /turf/open/lava/smooth/lava_land_surface
+	var/baseturf = null
 	layer = POINT_LAYER

 /obj/effect/baseturf_helper/Initialize()
@@ -13,4 +13,37 @@
 	for(var/turf/T in get_area_turfs(thearea, z))
 		if(T.baseturf != T.type) //Don't break indestructible walls and the like
 			T.baseturf = baseturf
-	qdel(src)
+	qdel(src)
+
+
+/obj/effect/baseturf_helper/asteroid
+	name = "asteroid baseturf editor"
+	baseturf = /turf/open/floor/plating/asteroid
+
+/obj/effect/baseturf_helper/asteroid/airless
+	name = "asteroid airless baseturf editor"
+	baseturf = /turf/open/floor/plating/asteroid/airless
+
+/obj/effect/baseturf_helper/asteroid/basalt
+	name = "asteroid basalt baseturf editor"
+	baseturf = /turf/open/floor/plating/asteroid/basalt
+
+/obj/effect/baseturf_helper/asteroid/snow
+	name = "asteroid snow baseturf editor"
+	baseturf = /turf/open/floor/plating/asteroid/snow
+
+/obj/effect/baseturf_helper/beach/sand
+	name = "beach sand baseturf editor"
+	baseturf = /turf/open/floor/plating/beach/sand
+
+/obj/effect/baseturf_helper/beach/water
+	name = "water baseturf editor"
+	baseturf = /turf/open/floor/plating/beach/water
+
+/obj/effect/baseturf_helper/lava
+	name = "lava baseturf editor"
+	baseturf = /turf/open/lava/smooth
+
+/obj/effect/baseturf_helper/lava_land/surface
+	name = "lavaland baseturf editor"
+	baseturf = /turf/open/lava/smooth/lava_land_surface