- Added wood floor tiles (made from wood planks)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4160 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj.dm

@@ -1333,6 +1333,19 @@
 	max_amount = 60
 	origin_tech = "biotech=1"
 
+/obj/item/stack/tile/wood
+	name = "wood floor tiles"
+	singular_name = "wood floor tile"
+	desc = "an easy to fit wood floor tile"
+	icon_state = "tile-wood"
+	w_class = 3.0
+	force = 1.0
+	throwforce = 1.0
+	throw_speed = 5
+	throw_range = 20
+	flags = FPRINT | TABLEPASS | CONDUCT
+	max_amount = 60
+
 /obj/item/stack/light_w
 	name = "wired glass tiles"
 	singular_name = "wired glass floor tile"

code/defines/turf.dm

@@ -33,7 +33,9 @@
 		return 0
 	proc/is_grass_floor()
 		return 0
-	proc/return_siding_icon_state()
+	proc/is_wood_floor()
+		return 0
+	proc/return_siding_icon_state()		//used for grass floors, which have siding.
 		return 0
 
 /turf/space

code/game/objects/stacks/wood.dm

@@ -6,6 +6,7 @@ WOOD PLANKS
 var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \
+	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 30, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \

code/game/turf.dm

@@ -1019,9 +1019,10 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 				"asteroid","asteroid_dug",
 				"asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
 				"asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12",
-				"burning","oldburning","light-on-r","light-on-y","light-on-g","light-on-b")
+				"burning","oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken")
 
 var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3","asteroid","asteroid_dug")
+var/list/wood_icons = list("wood","wood-broken")
 
 /turf/simulated/floor
 
@@ -1038,48 +1039,53 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
 	var/burnt = 0
 	var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/plasteel
 
-	airless
-		icon_state = "floor"
-		name = "airless floor"
-		oxygen = 0.01
-		nitrogen = 0.01
-		temperature = TCMB
+/turf/simulated/floor/airless
+	icon_state = "floor"
+	name = "airless floor"
+	oxygen = 0.01
+	nitrogen = 0.01
+	temperature = TCMB
 
-		New()
-			..()
-			name = "floor"
+	New()
+		..()
+		name = "floor"
 
-	light
-		name = "Light floor"
-		luminosity = 5
-		icon_state = "light_on"
-		floor_tile = new/obj/item/stack/tile/light
+/turf/simulated/floor/light
+	name = "Light floor"
+	luminosity = 5
+	icon_state = "light_on"
+	floor_tile = new/obj/item/stack/tile/light
 
-		New()
-			floor_tile.New() //I guess New() isn't run on objects spawned without the definition of a turf to house them, ah well.
-			var/n = name //just in case commands rename it in the ..() call
-			..()
-			spawn(4)
-				if(src)
-					update_icon()
-					name = n
+	New()
+		floor_tile.New() //I guess New() isn't run on objects spawned without the definition of a turf to house them, ah well.
+		var/n = name //just in case commands rename it in the ..() call
+		..()
+		spawn(4)
+			if(src)
+				update_icon()
+				name = n
 
-	grass
-		name = "Grass patch"
-		icon_state = "grass1"
-		floor_tile = new/obj/item/stack/tile/grass
+/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 run 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
+	New()
+		floor_tile.New() //I guess New() isn't run 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/wood
+	name = "floor"
+	icon_state = "wood"
+	floor_tile = new/obj/item/stack/tile/wood
 
 /turf/simulated/floor/vault
 	icon_state = "rockvault"
@@ -1222,6 +1228,11 @@ turf/simulated/floor/proc/update_icon()
 		if(!broken && !burnt)
 			if(!(icon_state in list("grass1","grass2","grass3","grass4")))
 				icon_state = "grass[pick("1","2","3","4")]"
+	if(is_wood_floor())
+		if(!broken && !burnt)
+			if( !(icon_state in wood_icons) )
+				icon_state = "wood"
+				//world << "[icon_state]'s got [icon_state]"
 	spawn(1)
 		if(istype(src,/turf/simulated/floor)) //Was throwing runtime errors due to a chance of it changing to space halfway through.
 			if(air)
@@ -1311,6 +1322,12 @@ turf/simulated/floor/proc/update_icon()
 	else
 		return 0
 
+/turf/simulated/floor/is_wood_floor()
+	if(istype(floor_tile,/obj/item/stack/tile/wood))
+		return 1
+	else
+		return 0
+
 /turf/simulated/floor/is_plating()
 	if(!floor_tile)
 		return 1
@@ -1324,12 +1341,15 @@ turf/simulated/floor/proc/update_icon()
 	if(is_plasteel_floor())
 		src.icon_state = "damaged[pick(1,2,3,4,5)]"
 		broken = 1
-	else if(is_plasteel_floor())
+	else if(is_light_floor())
 		src.icon_state = "light_broken"
 		broken = 1
 	else if(is_plating())
 		src.icon_state = "platingdmg[pick(1,2,3)]"
 		broken = 1
+	else if(is_wood_floor())
+		src.icon_state = "wood-broken"
+		broken = 1
 	else if(is_grass_floor())
 		src.icon_state = "sand[pick("1","2","3")]"
 		broken = 1
@@ -1347,6 +1367,9 @@ turf/simulated/floor/proc/update_icon()
 	else if(is_plating())
 		src.icon_state = "panelscorched"
 		burnt = 1
+	else if(is_wood_floor())
+		src.icon_state = "wood-broken"
+		burnt = 1
 	else if(is_grass_floor())
 		src.icon_state = "sand[pick("1","2","3")]"
 		burnt = 1
@@ -1438,6 +1461,24 @@ turf/simulated/floor/proc/update_icon()
 	update_icon()
 	levelupdate()
 
+//This proc will make a turf into a wood floor. Fun eh? Insert the wood tile to be used as the argument
+//If no argument is given a new one will be made.
+/turf/simulated/floor/proc/make_wood_floor(var/obj/item/stack/tile/wood/T = null)
+	broken = 0
+	burnt = 0
+	intact = 1
+	if(T)
+		if(istype(T,/obj/item/stack/tile/wood))
+			floor_tile = T
+			update_icon()
+			levelupdate()
+			return
+	//if you gave a valid parameter, it won't get thisf ar.
+	floor_tile = new/obj/item/stack/tile/wood
+
+	update_icon()
+	levelupdate()
+
 /turf/simulated/floor/attackby(obj/item/C as obj, mob/user as mob)
 
 	if(!C || !user)
@@ -1459,14 +1500,30 @@ turf/simulated/floor/proc/update_icon()
 		if(broken || burnt)
 			user << "\red You remove the broken plating."
 		else
-			user << "\red You remove the [floor_tile.name]."
-			new floor_tile.type(src)
+			if(is_wood_floor())
+				user << "\red You forcefully pry off the planks, destroying them in the process."
+			else
+				user << "\red You remove the [floor_tile.name]."
+				new floor_tile.type(src)
 
 		make_plating()
 		playsound(src.loc, 'Crowbar.ogg', 80, 1)
 
 		return
 
+	if(istype(C, /obj/item/weapon/screwdriver) && is_wood_floor())
+		if(broken || burnt)
+			return
+		else
+			if(is_wood_floor())
+				user << "\red You unscrew the planks."
+				new floor_tile.type(src)
+
+		make_plating()
+		playsound(src.loc, 'Screwdriver.ogg', 80, 1)
+
+		return
+
 	if(istype(C, /obj/item/stack/rods))
 		var/obj/item/stack/rods/R = C
 		if (is_plating())

html/changelog.html

@@ -48,9 +48,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
 <div class="commit sansserif">
-
-
-	<h2 class="date">July 23, 2012</h2>
+	<h2 class="date">24 July 2012</h2>
+	<h3 class="author">Errorage updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Both the chef and bartender have access to the bar area so both can serve if the other is incompetent or does not exist. Bartender's shotgun and shaker were moved to his back room and the booze-o-mat is now ID restricted to the bartender.</li>
+		<li class="rscadd">Added powercells into vending machines in engineering</li>
+		<li class="rscadd">Added wood floor tiles (made from wood planks, obviously)</li>
+	</ul>
 	<h3 class="author">Sieve updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">Made a 'default' save slot (D), and whenever you connect it automatically selects the default slot to load from, but manually selecting a different slot will allow you to play on that one before it returns to default.</li>
@@ -60,15 +64,6 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	</ul>
 </div>
 
-<div class="commit sansserif">
-	<h2 class="date">24 July 2012</h2>
-	<h3 class="author">Errorage updated:</h3>
-	<ul class="changes bgimages16">
-		<li class="tweak">Both the chef and bartender have access to the bar area so both can serve if the other is incompetent or does not exist. Bartender's shotgun and shaker were moved to his back room and the booze-o-mat is now ID restricted to the bartender.</li>
-		<li class="rscadd">Added powercells into vending machines in engineering</li>
-	</ul>
-</div>
-
 <div class="commit sansserif">
 	<h2 class="date">22 July 2012</h2>
 	<h3 class="author">Errorage updated:</h3>