Fixes Issue 1099 - Not being able to build rWalls with plasteel. I slipped it there, sorry.

Deleted beach.dm and moved the code to floor_types.dm, the turf/simulated/beach is now turf/simulated/floor/beach. Changed the turfs in the holodeck beach to the new type. Falsewalls and walls have the right descriptions and names now. 'bananium' and 'sand' falsewalls are deleted, we already have 'honk' and 'sandstone', that are the same thing Deleted a bunch of code that does the same thing in girders.dm (This still needs a lot of work, I'm unhappy of how it ended up) I'll keep working with sheets of minerals, they are really messy, I think some of them are defined twice (!) and there are large chunks of code that does the same thing when they are used. But, as always, to be continued~ git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5073 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 02:16:05 +00:00 · 2012-11-15 09:38:06 +00:00
parent 9afc2cbe7f
commit 8af0cf02fd
11 changed files with 330 additions and 302 deletions
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -26,6 +26,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
 	throw_speed = 4
 	throw_range = 5
 	origin_tech = "materials=1"
+	sheettype = "sandstone"

 /obj/item/stack/sheet/sandstone
 	New(var/loc, var/amount=null)
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -9,6 +9,7 @@
 	throw_range = 3
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
 	var/perunit = 3750
+	var/sheettype = null //this is used for girders in the creation of walls/false walls

 /obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/sheetsnatcher))
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -1,5 +1,6 @@
 /obj/structure/falsewall
 	name = "wall"
+	desc = "A huge chunk of metal used to seperate rooms."
 	anchored = 1
 	icon = 'icons/turf/walls.dmi'
 	var/mineral = "metal"
@@ -25,25 +26,25 @@

 /obj/structure/falsewall/gold
 	name = "gold wall"
-	desc = "A wall with gold plating. Swag"
+	desc = "A wall with gold plating. Swag!"
 	icon_state = ""
 	mineral = "gold"

 /obj/structure/falsewall/silver
 	name = "silver wall"
-	desc = "A wall with silver plating. Shiny"
+	desc = "A wall with silver plating. Shiny."
 	icon_state = ""
 	mineral = "silver"

 /obj/structure/falsewall/diamond
 	name = "diamond wall"
-	desc = "A wall with diamond plating. You monster"
+	desc = "A wall with diamond plating. You monster."
 	icon_state = ""
 	mineral = "diamond"

 /obj/structure/falsewall/uranium
 	name = "uranium wall"
-	desc = "A wall with uranium plating. This is probably a bad idea"
+	desc = "A wall with uranium plating. This is probably a bad idea."
 	icon_state = ""
 	mineral = "uranium"
 	var/active = null
@@ -51,30 +52,26 @@

 /obj/structure/falsewall/plasma
 	name = "plasma wall"
-	desc = "A wall with plasma plating. This is definately a bad idea"
+	desc = "A wall with plasma plating. This is definately a bad idea."
 	icon_state = ""
 	mineral = "plasma"

 //-----------wtf?-----------start
-/obj/structure/falsewall/bananium
-	name = "bananium wall"
-	desc = "A wall with bananium plating. Honk"
-	icon_state = ""
-
 /obj/structure/falsewall/clown
+	name = "bananium wall"
+	desc = "A wall with bananium plating. Honk!"
+	icon_state = ""
 	mineral = "clown"

-/obj/structure/falsewall/sand
+/obj/structure/falsewall/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating."
 	icon_state = ""
-
-/obj/structure/falsewall/sandstone
 	mineral = "sandstone"
 //------------wtf?------------end

 /obj/structure/falserwall
-	name = "r wall"
+	name = "reinforced wall"
 	desc = "A huge chunk of reinforced metal used to seperate rooms."
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "r_wall"
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -104,7 +104,7 @@
 								S.use(1)
 								user << "\blue Wall fully reinforced!"
 								var/turf/Tsrc = get_turf(src)
-								Tsrc.ChangeTurf(/turf/simulated/wall)
+								Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
 								for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
 									if(X)	X.add_hiddenprint(usr)
 								del(src)
@@ -120,12 +120,13 @@
 								del(src)
 							return

-				if(/obj/item/stack/sheet/gold)
+			if(S.sheettype)
 				if(!anchored)
 					if(S.amount < 2) return
 					S.use(2)
 					user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/gold (src.loc)
+					var/F = text2path("/obj/structure/falsewall/[S.sheettype]")
+					new F (src.loc)
 					del(src)
 				else
 					if(S.amount < 2) return ..()
@@ -135,133 +136,7 @@
 						S.use(2)
 						user << "\blue You added the plating!"
 						var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/gold)
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/silver)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/silver (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/silver)
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/diamond)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/diamond (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/diamond)
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/uranium)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/uranium (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/uranium)
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/plasma)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/plasma (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/plasma)
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/clown)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/clown (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/clown)
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/sandstone)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/sandstone (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/sandstone)
+						Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[S.sheettype]"))
 						for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
 							if(X)	X.add_hiddenprint(usr)
 						del(src)
--- a/code/game/turfs/simulated/beach.dm
+++ b/code/game/turfs/simulated/beach.dm
@@ -1,52 +0,0 @@
-/turf/simulated/beach
-	name = "Beach"
-	icon = 'icons/misc/beach.dmi'
-
-/turf/simulated/beach/sand
-	name = "Sand"
-	icon_state = "sand"
-
-/turf/simulated/beach/coastline
-	name = "Coastline"
-	icon = 'icons/misc/beach2.dmi'
-	icon_state = "sandwater"
-
-/turf/simulated/beach/water
-	name = "Water"
-	icon_state = "water"
-
-
-/turf/simulated/floor/grass
-	name = "Grass patch"
-	icon_state = "grass1"
-	floor_tile = new/obj/item/stack/tile/grass
-
-	New()
-		floor_tile.New() //I guess New() isn't ran on objects spawned without the definition of a turf to house them, ah well.
-		icon_state = "grass[pick("1","2","3","4")]"
-		..()
-		spawn(4)
-			if(src)
-				update_icon()
-				for(var/direction in cardinal)
-					if(istype(get_step(src,direction),/turf/simulated/floor))
-						var/turf/simulated/floor/FF = get_step(src,direction)
-						FF.update_icon() //so siding get updated properly
-
-/turf/simulated/floor/carpet
-	name = "Carpet"
-	icon_state = "carpet"
-	floor_tile = new/obj/item/stack/tile/carpet
-
-	New()
-		floor_tile.New() //I guess New() isn't ran on objects spawned without the definition of a turf to house them, ah well.
-		if(!icon_state)
-			icon_state = "carpet"
-		..()
-		spawn(4)
-			if(src)
-				update_icon()
-				for(var/direction in list(1,2,4,8,5,6,9,10))
-					if(istype(get_step(src,direction),/turf/simulated/floor))
-						var/turf/simulated/floor/FF = get_step(src,direction)
-						FF.update_icon() //so siding get updated properly
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -142,3 +142,56 @@
 /turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
 	name = "Brig floor"        // Also added it into the 2x3 brig area of the shuttle.
 	icon_state = "floor4"
+
+/turf/simulated/floor/beach
+	name = "Beach"
+	icon = 'icons/misc/beach.dmi'
+
+/turf/simulated/floor/beach/sand
+	name = "Sand"
+	icon_state = "sand"
+
+/turf/simulated/floor/beach/coastline
+	name = "Coastline"
+	icon = 'icons/misc/beach2.dmi'
+	icon_state = "sandwater"
+
+/turf/simulated/floor/beach/water
+	name = "Water"
+	icon_state = "water"
+
+
+/turf/simulated/floor/grass
+	name = "Grass patch"
+	icon_state = "grass1"
+	floor_tile = new/obj/item/stack/tile/grass
+
+	New()
+		floor_tile.New() //I guess New() isn't ran on objects spawned without the definition of a turf to house them, ah well.
+		icon_state = "grass[pick("1","2","3","4")]"
+		..()
+		spawn(4)
+			if(src)
+				update_icon()
+				for(var/direction in cardinal)
+					if(istype(get_step(src,direction),/turf/simulated/floor))
+						var/turf/simulated/floor/FF = get_step(src,direction)
+						FF.update_icon() //so siding get updated properly
+
+/turf/simulated/floor/carpet
+	name = "Carpet"
+	icon_state = "carpet"
+	floor_tile = new/obj/item/stack/tile/carpet
+
+	New()
+		floor_tile.New() //I guess New() isn't ran on objects spawned without the definition of a turf to house them, ah well.
+		if(!icon_state)
+			icon_state = "carpet"
+		..()
+		spawn(4)
+			if(src)
+				update_icon()
+				for(var/direction in list(1,2,4,8,5,6,9,10))
+					if(istype(get_step(src,direction),/turf/simulated/floor))
+						var/turf/simulated/floor/FF = get_step(src,direction)
+						FF.update_icon() //so siding get updated properly
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -34,81 +34,14 @@
 	else
 		if(!devastated)
 			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
-			switch(mineral)
-				if("metal")
 			new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/metal( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("gold")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/gold( src )
-					new /obj/item/stack/sheet/gold( src )
-				if("silver")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/silver( src )
-					new /obj/item/stack/sheet/silver( src )
-				if("diamond")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/diamond( src )
-					new /obj/item/stack/sheet/diamond( src )
-				if("uranium")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/uranium( src )
-					new /obj/item/stack/sheet/uranium( src )
-				if("plasma")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/plasma( src )
-					new /obj/item/stack/sheet/plasma( src )
-				if("clown")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/clown( src )
-					new /obj/item/stack/sheet/clown( src )
-				if("sandstone")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/sandstone( src )
-					new /obj/item/stack/sheet/sandstone( src )
-				if("wood")
-					new /obj/structure/girder(src)
-					new /obj/item/stack/sheet/wood( src )
-					new /obj/item/stack/sheet/wood( src )
-
+			var/M = text2path("/obj/item/stack/sheet/[mineral]")
+			new M( src )
+			new M( src )
 		else
-			switch(mineral)
-				if("metal")
-					new /obj/item/stack/sheet/metal( src )
-					new /obj/item/stack/sheet/metal( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("gold")
-					new /obj/item/stack/sheet/gold( src )
-					new /obj/item/stack/sheet/gold( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("silver")
-					new /obj/item/stack/sheet/silver( src )
-					new /obj/item/stack/sheet/silver( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("diamond")
-					new /obj/item/stack/sheet/diamond( src )
-					new /obj/item/stack/sheet/diamond( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("uranium")
-					new /obj/item/stack/sheet/uranium( src )
-					new /obj/item/stack/sheet/uranium( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("plasma")
-					new /obj/item/stack/sheet/plasma( src )
-					new /obj/item/stack/sheet/plasma( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("clown")
-					new /obj/item/stack/sheet/clown( src )
-					new /obj/item/stack/sheet/clown( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("sandstone")
-					new /obj/item/stack/sheet/sandstone( src )
-					new /obj/item/stack/sheet/sandstone( src )
-					new /obj/item/stack/sheet/metal( src )
-				if("wood")
-					new /obj/item/stack/sheet/wood( src )
-					new /obj/item/stack/sheet/wood( src )
+			var/M = text2path("/obj/item/stack/sheet/[mineral]")
+			new M( src )
+			new M( src )
 			new /obj/item/stack/sheet/metal( src )

 	for(var/obj/O in src.contents) //Eject contents!
@@ -119,12 +52,6 @@
 			O.loc = src
 	ChangeTurf(/turf/simulated/floor/plating)

-/turf/simulated/wall/examine()
-	set src in oview(1)
-
-	usr << "[desc]"
-	return
-
 /turf/simulated/wall/ex_act(severity)
 	switch(severity)
 		if(1.0)
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -1,5 +1,5 @@
 /turf/simulated/wall/r_wall
-	name = "r wall"
+	name = "reinforced wall"
 	desc = "A huge chunk of reinforced metal used to seperate rooms."
 	icon_state = "r_wall"
 	opacity = 1
--- a/code/modules/mining/ores_materials_coins.dm
+++ b/code/modules/mining/ores_materials_coins.dm
@@ -157,6 +157,7 @@
 	throw_range = 3
 	origin_tech = "materials=4"
 	perunit = 2000
+	sheettype = "gold"

 /obj/item/stack/sheet/gold/New(loc,amount)
 	..()
@@ -179,6 +180,7 @@
 	throw_range = 3
 	origin_tech = "materials=3"
 	perunit = 2000
+	sheettype = "silver"

 /obj/item/stack/sheet/silver/New(loc,amount)
 	..()
@@ -194,6 +196,7 @@
 	throw_range = 3
 	origin_tech = "materials=6"
 	perunit = 3750
+	sheettype = "diamond"

 /obj/item/stack/sheet/diamond/New(loc,amount)
 	..()
@@ -210,6 +213,7 @@
 	throw_range = 3
 	origin_tech = "materials=5"
 	perunit = 2000
+	sheettype = "uranium"

 /obj/item/stack/sheet/enruranium
 	name = "enriched uranium"
@@ -232,6 +236,7 @@
 	throw_range = 3
 	origin_tech = "plasmatech=2;materials=2"
 	perunit = 2000
+	sheettype = "plasma"

 /obj/item/stack/sheet/adamantine
 	name = "adamantine"
@@ -265,6 +270,7 @@
 	throw_range = 3
 	origin_tech = "materials=4"
 	perunit = 2000
+	sheettype = "clown"

 /obj/item/stack/sheet/clown/New(loc,amount)
 	..()
--- a/maps/tgstation.2.0.9.dmm
+++ b/maps/tgstation.2.0.9.dmm
@@ -6043,7 +6043,7 @@
 "cmk" = (/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_basketball)
 "cml" = (/obj/structure/holohoop,/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_basketball)
 "cmm" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_basketball)
-"cmn" = (/turf/simulated/beach/sand,/area/holodeck/source_beach)
+"cmn" = (/turf/simulated/floor/beach/sand,/area/holodeck/source_beach)
 "cmo" = (/obj/structure/table/holotable,/obj/machinery/readybutton,/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
 "cmp" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/under/color/red,/obj/item/weapon/holo/esword/red,/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
 "cmq" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
@@ -6054,8 +6054,8 @@
 "cmv" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_basketball)
 "cmw" = (/turf/simulated/floor/holofloor,/area/holodeck/source_basketball)
 "cmx" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_basketball)
-"cmy" = (/obj/effect/overlay/palmtree_r,/turf/simulated/beach/sand,/area/holodeck/source_beach)
-"cmz" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/simulated/beach/sand,/area/holodeck/source_beach)
+"cmy" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/beach/sand,/area/holodeck/source_beach)
+"cmz" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/simulated/floor/beach/sand,/area/holodeck/source_beach)
 "cmA" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
 "cmB" = (/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt)
 "cmC" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
@@ -6082,7 +6082,7 @@
 "cmX" = (/turf/simulated/floor/holofloor{dir = 10; icon_state = "red"},/area/holodeck/source_basketball)
 "cmY" = (/turf/simulated/floor/holofloor{dir = 2; icon_state = "red"},/area/holodeck/source_basketball)
 "cmZ" = (/turf/simulated/floor/holofloor{dir = 6; icon_state = "red"},/area/holodeck/source_basketball)
-"cna" = (/obj/item/clothing/under/rainbow,/obj/item/clothing/glasses/sunglasses,/turf/simulated/beach/sand,/area/holodeck/source_beach)
+"cna" = (/obj/item/clothing/under/rainbow,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/beach/sand,/area/holodeck/source_beach)
 "cnb" = (/obj/structure/holowindow,/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
 "cnc" = (/obj/structure/holowindow,/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt)
 "cnd" = (/obj/structure/holowindow,/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
@@ -6094,7 +6094,7 @@
 "cnj" = (/turf/simulated/floor/holofloor{dir = 9; icon_state = "green"},/area/holodeck/source_basketball)
 "cnk" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "green"},/area/holodeck/source_basketball)
 "cnl" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "green"},/area/holodeck/source_basketball)
-"cnm" = (/obj/item/weapon/beach_ball,/turf/simulated/beach/sand,/area/holodeck/source_beach)
+"cnm" = (/obj/item/weapon/beach_ball,/turf/simulated/floor/beach/sand,/area/holodeck/source_beach)
 "cnn" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor{dir = 8; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
 "cno" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt)
 "cnp" = (/obj/structure/holowindow{dir = 1},/turf/simulated/floor/holofloor{dir = 4; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
@@ -6111,12 +6111,12 @@
 "cnA" = (/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_basketball)
 "cnB" = (/turf/simulated/floor/holofloor{icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach)
 "cnC" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns9,/area)
-"cnD" = (/turf/simulated/beach/coastline,/area/holodeck/source_beach)
+"cnD" = (/turf/simulated/floor/beach/coastline,/area/holodeck/source_beach)
 "cnE" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area)
 "cnF" = (/turf/simulated/floor/holofloor{dir = 10; icon_state = "green"},/area/holodeck/source_basketball)
 "cnG" = (/obj/structure/holohoop{dir = 1},/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_basketball)
 "cnH" = (/turf/simulated/floor/holofloor{dir = 6; icon_state = "green"},/area/holodeck/source_basketball)
-"cnI" = (/turf/simulated/beach/water,/area/holodeck/source_beach)
+"cnI" = (/turf/simulated/floor/beach/water,/area/holodeck/source_beach)
 "cnJ" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 10; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
 "cnK" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/holo/esword/green,/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
 "cnL" = (/obj/structure/table/holotable,/obj/machinery/readybutton,/turf/simulated/floor/holofloor{dir = 6; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,6 +6,227 @@

 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "code"
+#define FILE_DIR "code/__HELPERS"
+#define FILE_DIR "code/ATMOSPHERICS"
+#define FILE_DIR "code/ATMOSPHERICS/components"
+#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices"
+#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices"
+#define FILE_DIR "code/ATMOSPHERICS/components/unary"
+#define FILE_DIR "code/controllers"
+#define FILE_DIR "code/datums"
+#define FILE_DIR "code/datums/diseases"
+#define FILE_DIR "code/datums/diseases/advance"
+#define FILE_DIR "code/datums/diseases/advance/symptoms"
+#define FILE_DIR "code/datums/helper_datums"
+#define FILE_DIR "code/datums/organs"
+#define FILE_DIR "code/datums/spells"
+#define FILE_DIR "code/defines"
+#define FILE_DIR "code/defines/obj"
+#define FILE_DIR "code/defines/procs"
+#define FILE_DIR "code/FEA"
+#define FILE_DIR "code/game"
+#define FILE_DIR "code/game/area"
+#define FILE_DIR "code/game/gamemodes"
+#define FILE_DIR "code/game/gamemodes/blob"
+#define FILE_DIR "code/game/gamemodes/blob/blobs"
+#define FILE_DIR "code/game/gamemodes/changeling"
+#define FILE_DIR "code/game/gamemodes/cult"
+#define FILE_DIR "code/game/gamemodes/events"
+#define FILE_DIR "code/game/gamemodes/events/holidays"
+#define FILE_DIR "code/game/gamemodes/extended"
+#define FILE_DIR "code/game/gamemodes/malfunction"
+#define FILE_DIR "code/game/gamemodes/meteor"
+#define FILE_DIR "code/game/gamemodes/nuclear"
+#define FILE_DIR "code/game/gamemodes/revolution"
+#define FILE_DIR "code/game/gamemodes/sandbox"
+#define FILE_DIR "code/game/gamemodes/traitor"
+#define FILE_DIR "code/game/gamemodes/wizard"
+#define FILE_DIR "code/game/jobs"
+#define FILE_DIR "code/game/jobs/job"
+#define FILE_DIR "code/game/machinery"
+#define FILE_DIR "code/game/machinery/atmoalter"
+#define FILE_DIR "code/game/machinery/bots"
+#define FILE_DIR "code/game/machinery/camera"
+#define FILE_DIR "code/game/machinery/computer"
+#define FILE_DIR "code/game/machinery/doors"
+#define FILE_DIR "code/game/machinery/embedded_controller"
+#define FILE_DIR "code/game/machinery/kitchen"
+#define FILE_DIR "code/game/machinery/pipe"
+#define FILE_DIR "code/game/machinery/telecomms"
+#define FILE_DIR "code/game/mecha"
+#define FILE_DIR "code/game/mecha/combat"
+#define FILE_DIR "code/game/mecha/equipment"
+#define FILE_DIR "code/game/mecha/equipment/tools"
+#define FILE_DIR "code/game/mecha/equipment/weapons"
+#define FILE_DIR "code/game/mecha/medical"
+#define FILE_DIR "code/game/mecha/working"
+#define FILE_DIR "code/game/objects"
+#define FILE_DIR "code/game/objects/effects"
+#define FILE_DIR "code/game/objects/effects/decals"
+#define FILE_DIR "code/game/objects/effects/decals/Cleanable"
+#define FILE_DIR "code/game/objects/effects/spawners"
+#define FILE_DIR "code/game/objects/items"
+#define FILE_DIR "code/game/objects/items/devices"
+#define FILE_DIR "code/game/objects/items/devices/PDA"
+#define FILE_DIR "code/game/objects/items/devices/radio"
+#define FILE_DIR "code/game/objects/items/robot"
+#define FILE_DIR "code/game/objects/items/stacks"
+#define FILE_DIR "code/game/objects/items/stacks/sheets"
+#define FILE_DIR "code/game/objects/items/stacks/tiles"
+#define FILE_DIR "code/game/objects/items/weapons"
+#define FILE_DIR "code/game/objects/items/weapons/grenades"
+#define FILE_DIR "code/game/objects/items/weapons/implants"
+#define FILE_DIR "code/game/objects/items/weapons/secstorage"
+#define FILE_DIR "code/game/objects/items/weapons/storage"
+#define FILE_DIR "code/game/objects/items/weapons/tanks"
+#define FILE_DIR "code/game/objects/structures"
+#define FILE_DIR "code/game/objects/structures/crates_lockers"
+#define FILE_DIR "code/game/objects/structures/crates_lockers/closets"
+#define FILE_DIR "code/game/objects/structures/crates_lockers/closets/secure"
+#define FILE_DIR "code/game/objects/structures/stool_bed_chair_nest"
+#define FILE_DIR "code/game/turfs"
+#define FILE_DIR "code/game/turfs/simulated"
+#define FILE_DIR "code/game/turfs/space"
+#define FILE_DIR "code/game/turfs/unsimulated"
+#define FILE_DIR "code/game/vehicles"
+#define FILE_DIR "code/game/vehicles/airtight"
+#define FILE_DIR "code/game/verbs"
+#define FILE_DIR "code/js"
+#define FILE_DIR "code/modules"
+#define FILE_DIR "code/modules/admin"
+#define FILE_DIR "code/modules/admin/DB ban"
+#define FILE_DIR "code/modules/admin/permissionverbs"
+#define FILE_DIR "code/modules/admin/verbs"
+#define FILE_DIR "code/modules/assembly"
+#define FILE_DIR "code/modules/awaymissions"
+#define FILE_DIR "code/modules/awaymissions/maploader"
+#define FILE_DIR "code/modules/client"
+#define FILE_DIR "code/modules/clothing"
+#define FILE_DIR "code/modules/clothing/glasses"
+#define FILE_DIR "code/modules/clothing/gloves"
+#define FILE_DIR "code/modules/clothing/head"
+#define FILE_DIR "code/modules/clothing/masks"
+#define FILE_DIR "code/modules/clothing/shoes"
+#define FILE_DIR "code/modules/clothing/spacesuits"
+#define FILE_DIR "code/modules/clothing/suits"
+#define FILE_DIR "code/modules/clothing/under"
+#define FILE_DIR "code/modules/clothing/under/jobs"
+#define FILE_DIR "code/modules/critters"
+#define FILE_DIR "code/modules/critters/hivebots"
+#define FILE_DIR "code/modules/detectivework"
+#define FILE_DIR "code/modules/flufftext"
+#define FILE_DIR "code/modules/food"
+#define FILE_DIR "code/modules/library"
+#define FILE_DIR "code/modules/liquid"
+#define FILE_DIR "code/modules/mining"
+#define FILE_DIR "code/modules/mob"
+#define FILE_DIR "code/modules/mob/dead"
+#define FILE_DIR "code/modules/mob/dead/observer"
+#define FILE_DIR "code/modules/mob/living"
+#define FILE_DIR "code/modules/mob/living/blob"
+#define FILE_DIR "code/modules/mob/living/carbon"
+#define FILE_DIR "code/modules/mob/living/carbon/alien"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/special"
+#define FILE_DIR "code/modules/mob/living/carbon/brain"
+#define FILE_DIR "code/modules/mob/living/carbon/human"
+#define FILE_DIR "code/modules/mob/living/carbon/metroid"
+#define FILE_DIR "code/modules/mob/living/carbon/monkey"
+#define FILE_DIR "code/modules/mob/living/silicon"
+#define FILE_DIR "code/modules/mob/living/silicon/ai"
+#define FILE_DIR "code/modules/mob/living/silicon/ai/freelook"
+#define FILE_DIR "code/modules/mob/living/silicon/decoy"
+#define FILE_DIR "code/modules/mob/living/silicon/pai"
+#define FILE_DIR "code/modules/mob/living/silicon/robot"
+#define FILE_DIR "code/modules/mob/living/simple_animal"
+#define FILE_DIR "code/modules/mob/living/simple_animal/friendly"
+#define FILE_DIR "code/modules/mob/living/simple_animal/hostile"
+#define FILE_DIR "code/modules/mob/new_player"
+#define FILE_DIR "code/modules/paperwork"
+#define FILE_DIR "code/modules/power"
+#define FILE_DIR "code/modules/power/antimatter"
+#define FILE_DIR "code/modules/power/singularity"
+#define FILE_DIR "code/modules/power/singularity/particle_accelerator"
+#define FILE_DIR "code/modules/projectiles"
+#define FILE_DIR "code/modules/projectiles/ammunition"
+#define FILE_DIR "code/modules/projectiles/guns"
+#define FILE_DIR "code/modules/projectiles/guns/energy"
+#define FILE_DIR "code/modules/projectiles/guns/projectile"
+#define FILE_DIR "code/modules/projectiles/projectile"
+#define FILE_DIR "code/modules/reagents"
+#define FILE_DIR "code/modules/reagents/reagent_containers"
+#define FILE_DIR "code/modules/reagents/reagent_containers/food"
+#define FILE_DIR "code/modules/reagents/reagent_containers/food/drinks"
+#define FILE_DIR "code/modules/reagents/reagent_containers/food/drinks/bottle"
+#define FILE_DIR "code/modules/reagents/reagent_containers/food/snacks"
+#define FILE_DIR "code/modules/reagents/reagent_containers/glass"
+#define FILE_DIR "code/modules/reagents/reagent_containers/glass/bottle"
+#define FILE_DIR "code/modules/recycling"
+#define FILE_DIR "code/modules/research"
+#define FILE_DIR "code/modules/scripting"
+#define FILE_DIR "code/modules/scripting/AST"
+#define FILE_DIR "code/modules/scripting/AST/Operators"
+#define FILE_DIR "code/modules/scripting/Implementations"
+#define FILE_DIR "code/modules/scripting/Interpreter"
+#define FILE_DIR "code/modules/scripting/Parser"
+#define FILE_DIR "code/modules/scripting/Scanner"
+#define FILE_DIR "code/modules/security levels"
+#define FILE_DIR "code/unused"
+#define FILE_DIR "code/unused/beast"
+#define FILE_DIR "code/unused/computer2"
+#define FILE_DIR "code/unused/disease2"
+#define FILE_DIR "code/unused/gamemodes"
+#define FILE_DIR "code/unused/hivebot"
+#define FILE_DIR "code/unused/mining"
+#define FILE_DIR "code/unused/optics"
+#define FILE_DIR "code/unused/pda2"
+#define FILE_DIR "code/unused/powerarmor"
+#define FILE_DIR "code/unused/spacecraft"
+#define FILE_DIR "code/WorkInProgress"
+#define FILE_DIR "code/WorkInProgress/carn"
+#define FILE_DIR "code/WorkInProgress/mapload"
+#define FILE_DIR "code/WorkInProgress/organs"
+#define FILE_DIR "code/WorkInProgress/virus2"
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vehicles"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "interface"
+#define FILE_DIR "maps"
+#define FILE_DIR "maps/RandomZLevels"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/weapons"
+#define FILE_DIR "tools"
+#define FILE_DIR "tools/Redirector"
 // END_FILE_DIR

 // BEGIN_PREFERENCES
@@ -577,7 +798,6 @@
 #include "code\game\turfs\turf.dm"
 #include "code\game\turfs\unsimulated.dm"
 #include "code\game\turfs\simulated\asteroid.dm"
-#include "code\game\turfs\simulated\beach.dm"
 #include "code\game\turfs\simulated\floor.dm"
 #include "code\game\turfs\simulated\floor_types.dm"
 #include "code\game\turfs\simulated\walls.dm"