Merge pull request #8651 from uraniummeltdown/titaniummineral

Titanium

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/items/weapons/tools.dm

@@ -58,7 +58,7 @@
 	icon_state = "drill_bolt"
 	item_state = "drill"
 	usesound = 'sound/items/drill_use.ogg'
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25)
+	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
 	origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
 	force = 8 //might or might not be too high, subject to change
 	throwforce = 8
@@ -180,7 +180,7 @@
 	desc = "A simple hand drill with a screwdriver bit attached."
 	icon_state = "drill_screw"
 	item_state = "drill"
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25)
+	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
 	origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
 	force = 8 //might or might not be too high, subject to change
 	throwforce = 8
@@ -276,7 +276,7 @@
 	icon_state = "jaws_cutter"
 	item_state = "jawsoflife"
 	origin_tech = "materials=2;engineering=2"
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25)
+	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
 	usesound = 'sound/items/jaws_cut.ogg'
 	toolspeed = 0.25
 
@@ -691,7 +691,7 @@ obj/item/weapon/weldingtool/experimental/process()
 	desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head."
 	icon_state = "jaws_pry"
 	item_state = "jawsoflife"
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_DIAMOND=25)
+	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
 	origin_tech = "materials=2;engineering=2"
 	usesound = 'sound/items/jaws_pry.ogg'
 	force = 15