Revert "12/21 modernizations from TG live"

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

@@ -15,9 +15,6 @@
 	icon_state = "sheet-glass"
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	origin_tech = "materials=1"
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 100)
-	resistance_flags = ACID_PROOF
-	merge_type = /obj/item/stack/sheet/glass
 
 /obj/item/stack/sheet/glass/cyborg
 	materials = list()
@@ -49,7 +46,7 @@
 			RG.add_fingerprint(user)
 			var/obj/item/stack/sheet/glass/G = src
 			src = null
-			var/replace = (user.get_inactive_held_item()==G)
+			var/replace = (user.get_inactive_hand()==G)
 			V.use(1)
 			G.use(1)
 			if (!G && replace)
@@ -63,7 +60,7 @@
 /obj/item/stack/sheet/glass/proc/construct_window(mob/user)
 	if(!user || !src)
 		return 0
-	if(!isturf(user.loc))
+	if(!istype(user.loc,/turf))
 		return 0
 	if(!user.IsAdvancedToolUser())
 		user << "<span class='warning'>You don't have the dexterity to do this!</span>"
@@ -140,26 +137,26 @@
 	icon_state = "sheet-rglass"
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	origin_tech = "materials=2"
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 100)
-	resistance_flags = ACID_PROOF
-	merge_type = /obj/item/stack/sheet/rglass
 
 /obj/item/stack/sheet/rglass/cyborg
 	materials = list()
+	var/datum/robot_energy_storage/metsource
 	var/datum/robot_energy_storage/glasource
 	var/metcost = 250
 	var/glacost = 500
 
 /obj/item/stack/sheet/rglass/cyborg/get_amount()
-	return min(round(source.energy / metcost), round(glasource.energy / glacost))
+	return min(round(metsource.energy / metcost), round(glasource.energy / glacost))
 
 /obj/item/stack/sheet/rglass/cyborg/use(amount) // Requires special checks, because it uses two storages
-	source.use_charge(amount * metcost)
+	metsource.use_charge(amount * metcost)
 	glasource.use_charge(amount * glacost)
+	return
 
 /obj/item/stack/sheet/rglass/cyborg/add(amount)
-	source.add_charge(amount * metcost)
+	metsource.add_charge(amount * metcost)
 	glasource.add_charge(amount * glacost)
+	return
 
 /obj/item/stack/sheet/rglass/attack_self(mob/user)
 	construct_window(user)
@@ -167,7 +164,7 @@
 /obj/item/stack/sheet/rglass/proc/construct_window(mob/user)
 	if(!user || !src)
 		return 0
-	if(!isturf(user.loc))
+	if(!istype(user.loc,/turf))
 		return 0
 	if(!user.IsAdvancedToolUser())
 		user << "<span class='warning'>You don't have the dexterity to do this!</span>"
@@ -278,22 +275,19 @@
 	desc = "A nasty looking shard of glass."
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "large"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	force = 5
 	throwforce = 10
 	item_state = "shard-glass"
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	resistance_flags = ACID_PROOF
-	armor = list(melee = 100, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 100)
-	obj_integrity = 40
-	max_integrity = 40
 	var/cooldown = 0
 	sharpness = IS_SHARP
 
 /obj/item/weapon/shard/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is slitting [user.p_their()] [pick("wrists", "throat")] with the shard of glass! It looks like [user.p_theyre()] trying to commit suicide.</span>")
+	user.visible_message(pick("<span class='suicide'>[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.</span>", \
+						"<span class='suicide'>[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.</span>"))
 	return (BRUTELOSS)
 
 
@@ -317,22 +311,23 @@
 		return
 	if(istype(A, /obj/item/weapon/storage))
 		return
-	var/hit_hand = ((user.active_hand_index % 2 == 0) ? "r_" : "l_") + "arm"
+
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		if(!H.gloves && !(PIERCEIMMUNE in H.dna.species.species_traits)) // golems, etc
+		if(!H.gloves && !(PIERCEIMMUNE in H.dna.species.specflags)) // golems, etc
 			H << "<span class='warning'>[src] cuts into your hand!</span>"
-			H.apply_damage(force*0.5, BRUTE, hit_hand)
+			var/organ = (H.hand ? "l_" : "r_") + "arm"
+			var/obj/item/bodypart/affecting = H.get_bodypart(organ)
+			if(affecting && affecting.take_damage(force / 2))
+				H.update_damage_overlays(0)
 	else if(ismonkey(user))
 		var/mob/living/carbon/monkey/M = user
 		M << "<span class='warning'>[src] cuts into your hand!</span>"
-		M.apply_damage(force*0.5, BRUTE, hit_hand)
+		M.adjustBruteLoss(force / 2)
 
 
 /obj/item/weapon/shard/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/lightreplacer))
-		I.attackby(src, user)
-	else if(istype(I, /obj/item/weapon/weldingtool))
+	if(istype(I, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = I
 		if(WT.remove_fuel(0, user))
 			var/obj/item/stack/sheet/glass/NG = new (user.loc)
@@ -352,7 +347,7 @@
 		playsound(loc, 'sound/effects/glass_step.ogg', 50, 1)
 		if(ishuman(AM))
 			var/mob/living/carbon/human/H = AM
-			if(PIERCEIMMUNE in H.dna.species.species_traits)
+			if(PIERCEIMMUNE in H.dna.species.specflags)
 				return
 			var/picked_def_zone = pick("l_leg", "r_leg")
 			var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
@@ -362,11 +357,6 @@
 				H.apply_damage(5, BRUTE, picked_def_zone)
 				H.Weaken(3)
 				if(cooldown < world.time - 10) //cooldown to avoid message spam.
-					if(!H.incapacitated())
-						H.visible_message("<span class='danger'>[H] steps in the broken glass!</span>", \
-								"<span class='userdanger'>You step in the broken glass!</span>")
-					else
-						H.visible_message("<span class='danger'>[H] slides on the broken glass!</span>", \
-								"<span class='userdanger'>You slide on the broken glass!</span>")
-
+					H.visible_message("<span class='danger'>[H] steps in the broken glass!</span>", \
+							"<span class='userdanger'>You step in the broken glass!</span>")
 					cooldown = world.time

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

@@ -18,9 +18,9 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
 	return ..()
 
 /obj/item/stack/sheet/animalhide/generic
-	name = "skin"
-	desc = "A piece of skin."
-	singular_name = "skin piece"
+	name = "generic skin"
+	desc = "A piece of generic skin."
+	singular_name = "generic skin piece"
 	icon_state = "sheet-hide"
 
 /obj/item/stack/sheet/animalhide/corgi
@@ -104,7 +104,7 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \
 
 /obj/item/stack/sheet/hairlesshide
 	name = "hairless hide"
-	desc = "This hide was stripped of its hair, but still needs washing and tanning."
+	desc = "This hide was stripped of it's hair, but still needs tanning."
 	singular_name = "hairless hide piece"
 	icon_state = "sheet-hairlesshide"
 	origin_tech = null
@@ -152,7 +152,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	icon_state = "goliath_hide"
 	singular_name = "hide plate"
 	flags = NOBLUDGEON
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	layer = MOB_LAYER
 
 /obj/item/stack/sheet/animalhide/ashdrake
@@ -162,14 +162,14 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	icon_state = "dragon_hide"
 	singular_name = "drake plate"
 	flags = NOBLUDGEON
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	layer = MOB_LAYER
 
 
 //Step one - dehairing.
 
 /obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W, mob/user, params)
-	if(W.is_sharp())
+	if(is_sharp(W))
 		playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
 		user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
 		if(do_after(user,50, target = src))
@@ -207,4 +207,4 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 			var/obj/item/stack/sheet/leather/HS = new(src.loc)
 			HS.amount = 1
 			wetness = initial(wetness)
-			src.use(1)
+			src.use(1)

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

@@ -4,7 +4,7 @@
 	desc = "A glass tile, which is wired, somehow."
 	icon = 'icons/obj/tiles.dmi'
 	icon_state = "glass_wire"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	force = 3
 	throwforce = 5
 	throw_speed = 3
@@ -29,7 +29,7 @@
 		var/obj/item/stack/sheet/metal/M = O
 		if (M.use(1))
 			use(1)
-			var/obj/item/L = PoolOrNew(/obj/item/stack/tile/light, user.loc)
+			var/obj/item/stack/tile/light/L = new (user.loc)
 			user << "<span class='notice'>You make a light tile.</span>"
 			L.add_fingerprint(user)
 		else

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

@@ -10,8 +10,6 @@ Mineral Sheets
 		- Gold
 		- Silver
 		- Clown
-		- Titanium
-		- Plastitanium
 	Others:
 		- Adamantine
 		- Mythril
@@ -135,9 +133,8 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
 	singular_name = "plasma sheet"
 	origin_tech = "plasmatech=2;materials=2"
 	sheettype = "plasma"
-	resistance_flags = FLAMMABLE
-	obj_integrity = 100
-	max_integrity = 100
+	burn_state = FLAMMABLE
+	burntime = 5
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
 
 var/global/list/datum/stack_recipe/plasma_recipes = list ( \
@@ -160,7 +157,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
 	else
 		return ..()
 
-/obj/item/stack/sheet/mineral/plasma/fire_act(exposed_temperature, exposed_volume)
+/obj/item/stack/sheet/mineral/plasma/fire_act()
 	atmos_spawn_air("plasma=[amount*10];TEMP=1000")
 	qdel(src)
 
@@ -182,7 +179,6 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \
 	new/datum/stack_recipe("HoP Statue", /obj/structure/statue/gold/hop, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
 	new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \
 	)
 
@@ -241,60 +237,6 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \
 	pixel_y = rand(0,4)-4
 	..()
 
-/*
- * 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
-	origin_tech = "materials=4"
-	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(var/loc, var/amount=null)
-	recipes = titanium_recipes
-	pixel_x = rand(0,4)-4
-	pixel_y = rand(0,4)-4
-	..()
-
-
-/*
- * 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
-	origin_tech = "materials=4"
-	sheettype = "plastitanium"
-	materials = list(MAT_TITANIUM=6000, MAT_PLASMA=6000)
-
-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(var/loc, var/amount=null)
-	recipes = plastitanium_recipes
-	pixel_x = rand(0,4)-4
-	pixel_y = rand(0,4)-4
-	..()
-
-
 /*
  * Snow
  */

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

@@ -6,7 +6,6 @@
  *		Cloth
  *		Cardboard
  *		Runed Metal (cult)
- *		Brass (clockwork cult)
  */
 
 /*
@@ -31,7 +30,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 25, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = 1, on_floor = 1), \
@@ -61,12 +59,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	throwforce = 10
 	flags = CONDUCT
 	origin_tech = "materials=1"
-	resistance_flags = FIRE_PROOF
-	merge_type = /obj/item/stack/sheet/metal
-
-/obj/item/stack/sheet/metal/ratvar_act()
-	new /obj/item/stack/tile/brass(loc, amount)
-	qdel(src)
 
 /obj/item/stack/sheet/metal/narsie_act()
 	if(prob(20))
@@ -106,9 +98,6 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	throwforce = 10
 	flags = CONDUCT
 	origin_tech = "materials=2"
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 80)
-	resistance_flags = FIRE_PROOF
-	merge_type = /obj/item/stack/sheet/plasteel
 
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
 	recipes = plasteel_recipes
@@ -128,7 +117,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
 	new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
-	new/datum/stack_recipe("rolling pin", /obj/item/weapon/kitchen/rollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, 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), \
@@ -141,7 +129,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
 	new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
 	new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = 1, on_floor = 1),\
-	new/datum/stack_recipe("baseball bat", /obj/item/weapon/melee/baseball_bat, 5, time = 15),\
 	)
 
 /obj/item/stack/sheet/mineral/wood
@@ -152,9 +139,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	icon = 'icons/obj/items.dmi'
 	origin_tech = "materials=1;biotech=1"
 	sheettype = "wood"
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
-	resistance_flags = FLAMMABLE
-	merge_type = /obj/item/stack/sheet/mineral/wood
+	burn_state = FLAMMABLE
 
 /obj/item/stack/sheet/mineral/wood/New(var/loc, var/amount=null)
 	recipes = wood_recipes
@@ -168,7 +153,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
  */
 var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \
-	new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \
 	null, \
 	new/datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack, 4), \
 	new/datum/stack_recipe("dufflebag", /obj/item/weapon/storage/backpack/dufflebag, 6), \
@@ -181,11 +165,9 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	null, \
 	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
 	new/datum/stack_recipe("rag", /obj/item/weapon/reagent_containers/glass/rag, 1), \
+	new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \
 	new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 3), \
 	new/datum/stack_recipe("empty sandbag", /obj/item/weapon/emptysandbag, 4), \
-	null, \
-	new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), \
-	new/datum/stack_recipe("black gloves", /obj/item/clothing/gloves/color/black, 3), \
 	)
 
 /obj/item/stack/sheet/cloth
@@ -194,10 +176,9 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	singular_name = "cloth roll"
 	icon_state = "sheet-cloth"
 	origin_tech = "materials=2"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	force = 0
 	throwforce = 0
-	merge_type = /obj/item/stack/sheet/cloth
 
 /obj/item/stack/sheet/cloth/New(var/loc, var/amount=null)
 	recipes = cloth_recipes
@@ -228,8 +209,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 	singular_name = "cardboard sheet"
 	icon_state = "sheet-card"
 	origin_tech = "materials=1"
-	resistance_flags = FLAMMABLE
-	merge_type = /obj/item/stack/sheet/cardboard
+	burn_state = FLAMMABLE
 
 /obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
 		recipes = cardboard_recipes
@@ -243,26 +223,21 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
  */
 
 var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
-	new/datum/stack_recipe("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("runed door", /obj/machinery/door/airlock/cult, 3, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("pylon", /obj/structure/destructible/cult/pylon, 4, time = 40, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("forge", /obj/structure/destructible/cult/forge, 3, time = 40, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("archives", /obj/structure/destructible/cult/tome, 3, time = 40, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("altar", /obj/structure/destructible/cult/talisman, 3, time = 40, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("pylon", /obj/structure/cult/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("forge", /obj/structure/cult/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("archives", /obj/structure/cult/tome, 2, time = 40, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("altar", /obj/structure/cult/talisman, 5, time = 40, one_per_turf = 1, on_floor = 1), \
 	)
 
 /obj/item/stack/sheet/runed_metal
 	name = "runed metal"
 	desc = "Sheets of cold metal with shifting inscriptions writ upon them."
-	singular_name = "runed metal sheet"
+	singular_name = "runed metal"
 	icon_state = "sheet-runed"
 	icon = 'icons/obj/items.dmi'
 	sheettype = "runed"
-	merge_type = /obj/item/stack/sheet/runed_metal
-
-/obj/item/stack/sheet/runed_metal/ratvar_act()
-	new /obj/item/stack/tile/brass(loc, amount)
-	qdel(src)
 
 /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user)
 	if(!iscultist(user))
@@ -283,45 +258,6 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 	recipes = runed_metal_recipes
 	return ..()
 
-/*
- * Brass
- */
-var/global/list/datum/stack_recipe/brass_recipes = list ( \
-	new/datum/stack_recipe("wall gear", /obj/structure/destructible/clockwork/wall_gear, 3, time = 30, one_per_turf = 1, on_floor = 1), \
-	null,
-	new/datum/stack_recipe("pinion airlock", /obj/machinery/door/airlock/clockwork, 5, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("brass pinion airlock", /obj/machinery/door/airlock/clockwork/brass, 5, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, one_per_turf = 1, on_floor = 1), \
-	null,
-	new/datum/stack_recipe("directional brass window", /obj/structure/window/reinforced/clockwork, time = 15, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 30, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = 1, on_floor = 1) \
-)
-
-/obj/item/stack/tile/brass
-	name = "brass"
-	desc = "Sheets made out of brass."
-	singular_name = "brass sheet"
-	icon_state = "sheet-brass"
-	icon = 'icons/obj/items.dmi'
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-	throwforce = 10
-	max_amount = 50
-	throw_speed = 1
-	throw_range = 3
-	turf_type = /turf/open/floor/clockwork
-
-/obj/item/stack/tile/brass/narsie_act()
-	if(prob(20))
-		new /obj/item/stack/sheet/runed_metal(loc, amount)
-		qdel(src)
-
-/obj/item/stack/tile/brass/New(var/loc, var/amount=null)
-	recipes = brass_recipes
-	..()
-	pixel_x = 0
-	pixel_y = 0
-
 /obj/item/stack/sheet/lessergem
 	name = "lesser gems"
 	desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects."
@@ -348,7 +284,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list ( \
 	desc = "Someone's been drinking their milk."
 	force = 7
 	throwforce = 5
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	throw_speed = 1
 	throw_range = 3
 	origin_tech = "materials=2;biotech=2"

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

@@ -1,6 +1,6 @@
 /obj/item/stack/sheet
 	name = "sheet"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	force = 5
 	throwforce = 5
 	max_amount = 50