moves material defines to construction.dm

adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3

code/game/objects/items/stacks/sheets/mineral.dm

@@ -103,9 +103,8 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
 	)
 
 /obj/item/stack/sheet/mineral
-	force = 5.0
+	force = 5
 	throwforce = 5
-	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 3
 
 /obj/item/stack/sheet/mineral/New()
@@ -226,6 +225,56 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
 	..()
 	recipes = tranquillite_recipes
 
+/*
+ * Titanium
+ */
+/obj/item/stack/sheet/mineral/titanium
+	name = "titanium"
+	icon_state = "sheet-titanium"
+	singular_name = "titanium sheet"
+	force = 5
+	throwforce = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	throw_speed = 1
+	throw_range = 3
+	sheettype = "titanium"
+	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
+
+var/global/list/datum/stack_recipe/titanium_recipes = list (
+	new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20),
+	)
+
+/obj/item/stack/sheet/mineral/titanium/New(loc, amount=null)
+	recipes = titanium_recipes
+	..()
+
+/obj/item/stack/sheet/mineral/titanium/fifty
+	amount = 50
+
+
+/*
+ * Plastitanium
+ */
+/obj/item/stack/sheet/mineral/plastitanium
+	name = "plastitanium"
+	icon_state = "sheet-plastitanium"
+	singular_name = "plastitanium sheet"
+	force = 5
+	throwforce = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	throw_speed = 1
+	throw_range = 3
+	sheettype = "plastitanium"
+	materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000)
+
+var/global/list/datum/stack_recipe/plastitanium_recipes = list (
+	new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20),
+	)
+
+/obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null)
+	recipes = plastitanium_recipes
+	..()
+
 /obj/item/stack/sheet/mineral/enruranium
 	name = "enriched uranium"
 	icon_state = "sheet-enruranium"

code/game/objects/items/stacks/tiles/tile_mineral.dm

@@ -111,4 +111,22 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \
 	icon_state = "tile_abductor"
 	origin_tech = "materials=6;abductor=1"
 	turf_type = /turf/simulated/floor/mineral/abductor
-	mineralType = "abductor"
+	mineralType = "abductor"
+
+/obj/item/stack/tile/mineral/titanium
+	name = "titanium tile"
+	singular_name = "titanium floor tile"
+	desc = "A tile made of titanium, used for shuttles."
+	icon_state = "tile_shuttle"
+	turf_type = /turf/simulated/floor/mineral/titanium
+	mineralType = "titanium"
+	materials = list(MAT_TITANIUM=500)
+
+/obj/item/stack/tile/mineral/plastitanium
+	name = "plas-titanium tile"
+	singular_name = "plas-titanium floor tile"
+	desc = "A tile made of plas-titanium, used for very evil shuttles."
+	icon_state = "tile_darkshuttle"
+	turf_type = /turf/simulated/floor/mineral/plastitanium
+	mineralType = "plastitanium"
+	materials = list(MAT_TITANIUM=250, MAT_PLASMA=250)

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -100,6 +100,14 @@
 		if(pickednum >= 40)
 			new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
 
+		//Titanium (rare ore)
+		if(pickednum >= 40)
+			new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
+
+		//Plastitanium (rare ore)
+		if(pickednum >= 40)
+			new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
+
 		//Diamond (rare HONK)
 		if(pickednum >= 45)
 			new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
@@ -122,6 +130,8 @@
 		/obj/item/stack/sheet/mineral/uranium,
 		/obj/item/stack/sheet/mineral/diamond,
 		/obj/item/stack/sheet/mineral/bananium,
+		/obj/item/stack/sheet/mineral/titanium,
+		/obj/item/stack/sheet/mineral/plastitanium,
 		/obj/item/stack/sheet/plasteel,
 		/obj/item/stack/rods
 		)

code/game/objects/structures/door_assembly_types.dm

@@ -246,6 +246,15 @@
 	mineral = "sandstone"
 	glass_type = /obj/machinery/door/airlock/sandstone/glass
 
+/obj/structure/door_assembly/door_assembly_titanium
+	name = "titanium airlock assembly"
+	icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
+	base_name = "shuttle airlock"
+	overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
+	glass_type = /obj/machinery/door/airlock/titanium/glass
+	airlock_type = /obj/machinery/door/airlock/titanium
+	mineral = "titanium"
+
 /obj/structure/door_assembly/door_assembly_wood
 	name = "wooden airlock assembly"
 	icon = 'icons/obj/doors/airlocks/station/wood.dmi'

code/game/objects/structures/false_walls.dm

@@ -80,9 +80,9 @@
 
 /obj/structure/falsewall/update_icon()
 	if(density)
+		icon_state = initial(icon_state)
 		smooth = SMOOTH_TRUE
 		smooth_icon(src)
-		icon_state = ""
 	else
 		icon_state = "fwall_open"
 
@@ -304,4 +304,22 @@
 	icon_state = "abductor"
 	mineral = "abductor"
 	walltype = "abductor"
-	canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor)
+	canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor)
+
+/obj/structure/falsewall/titanium
+	desc = "A light-weight titanium wall used in shuttles."
+	icon = 'icons/turf/walls/shuttle_wall.dmi'
+	icon_state = "shuttle"
+	mineral = /obj/item/stack/sheet/mineral/titanium
+	walltype = /turf/simulated/wall/mineral/titanium
+	smooth = SMOOTH_MORE
+	canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+
+/obj/structure/falsewall/plastitanium
+	desc = "An evil wall of plasma and titanium."
+	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	icon_state = "shuttle"
+	mineral = /obj/item/stack/sheet/mineral/plastitanium
+	walltype = /turf/simulated/wall/mineral/plastitanium
+	smooth = SMOOTH_MORE
+	canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)

code/game/objects/structures/fullwindow.dm

@@ -94,6 +94,7 @@
 	basestate = "window"
 	health = 160
 	reinf = 1
+	explosion_block = 3
 
 /obj/structure/window/full/shuttle/New()
 	..()