Merge Conflict

code/game/objects/items/stacks/rods.dm

@@ -15,6 +15,9 @@
 	attack_verb = list("hit", "bludgeoned", "whacked")
 	hitsound = 'sound/weapons/grenadelaunch.ogg'
 
+/obj/item/stack/rods/cyborg
+	materials = list()
+
 /obj/item/stack/rods/New(var/loc, var/amount=null)
 	..()
 
@@ -41,11 +44,11 @@
 			if(new_item.get_amount() <= 0)
 				// stack was moved into another one on the pile
 				new_item = locate() in user.loc
-				
+
 			user.visible_message("<span class='warning'>[user.name] shaped [src] into metal with the weldingtool.</span>", \
 						 "<span class='notice'>You shaped [src] into metal with the weldingtool.</span>", \
 						 "<span class='warning'>You hear welding.</span>")
-			
+
 			var/replace = user.get_inactive_hand() == src
 			use(2)
 			if (get_amount() <= 0 && replace)

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

@@ -24,12 +24,7 @@
 	var/full_window = /obj/structure/window/full/basic
 
 /obj/item/stack/sheet/glass/cyborg
-	name = "glass"
-	desc = "HOLY SHEET! That is a lot of glass."
-	singular_name = "glass sheet"
-	icon_state = "sheet-glass"
 	materials = list()
-	created_window = /obj/structure/window/basic
 
 /obj/item/stack/sheet/glass/attack_self(mob/user as mob)
 	construct_window(user)
@@ -159,10 +154,6 @@
 	var/full_window = /obj/structure/window/full/reinforced
 
 /obj/item/stack/sheet/rglass/cyborg
-	name = "reinforced glass"
-	desc = "Glass which seems to have rods or something stuck in them."
-	singular_name = "reinforced glass sheet"
-	icon_state = "sheet-rglass"
 	materials = list()
 
 /obj/item/stack/sheet/rglass/attack_self(mob/user as mob)

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

@@ -97,13 +97,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	origin_tech = "materials=1"
 
 /obj/item/stack/sheet/metal/cyborg
-	name = "metal"
-	desc = "Sheets made out of metal."
-	singular_name = "metal sheet"
-	icon_state = "sheet-metal"
 	materials = list()
-	throwforce = 10.0
-	flags = CONDUCT
 
 /obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
 	recipes = metal_recipes
@@ -162,12 +156,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	icon_state = "sheet-wood"
 	origin_tech = "materials=1;biotech=1"
 
-/obj/item/stack/sheet/wood/cyborg
-	name = "wooden plank"
-	desc = "One can only guess that this is a bunch of wood."
-	singular_name = "wood plank"
-	icon_state = "sheet-wood"
-
 /obj/item/stack/sheet/wood/New(var/loc, var/amount=null)
 	recipes = wood_recipes
 	return ..()

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

@@ -124,4 +124,4 @@
 	origin_tech = "materials=1"
 	turf_type = /turf/simulated/floor/silent
 	mineralType = "tranquillite"
-	materials = list(MAT_TRANQUILLITE=500)
+	materials = list(MAT_TRANQUILLITE=500)