[MIRROR] Makes material costs use sheets amount define (#12887)

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-08-22 20:57:23 +01:00 · 2026-07-09 19:17:37 -04:00
parent 16fda18c8c
commit 435bb3079d
167 changed files with 1637 additions and 1634 deletions
@@ -4,7 +4,7 @@
 	w_class = ITEMSIZE_NORMAL
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC

-	//matter = list(MAT_STEEL = 1)
+	//matter = list(MAT_STEEL = MATERIAL_COST(0.0005))

 	var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
 	var/randpixel = 6
@@ -7,7 +7,7 @@
 	icon_state = "apc_frame"
 	refund_amt = 2
 	build_wall_only = TRUE
-	matter = list(MAT_STEEL = 100, MAT_GLASS = 30)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.015))

 /obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob)
 	if (get_dist(on_wall, user)>1)
@@ -6,7 +6,7 @@
 	force = 2
 	throwforce = 2
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025))
 	var/broken
 	attack_verb = list("annoyed")
 	var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine")
@@ -10,7 +10,7 @@
 	w_class = ITEMSIZE_SMALL
 	throw_speed = 5
 	throw_range = 10
-	matter = list(MAT_STEEL = 4000, MAT_GLASS = 6000)
+	matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(3))
 	var/datum/reagents/supply
 	var/efficiency = 15 //How many units reagent per 1 unit nanopaste
 	pickup_sound = 'sound/items/pickup/device.ogg'
@@ -11,7 +11,7 @@
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'

-	//matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
+	//matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025))

 /obj/item/binoculars/attack_self(mob/user)
 	. = ..(user)
@@ -7,7 +7,7 @@
 	item_state = "healthanalyzer"
 	slot_flags = SLOT_BELT
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 200)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.1))
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'
 	flags = NOBLUDGEON
@@ -23,7 +23,7 @@
 	slot_flags = SLOT_ID | SLOT_BELT
 	show_messages = 1

-	matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))

 	var/video_range = 3
 	var/obj/machinery/camera/communicator/video_source	// Their camera
@@ -18,7 +18,7 @@
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'

-	matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage

 /obj/item/debugger/is_used_on(obj/O, mob/user)
@@ -19,7 +19,7 @@
 	icon_state = "flashlight"
 	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
-	matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
 	actions_types = list(/datum/action/item_action/toggle_flashlight)

 	light_system = MOVABLE_LIGHT_DIRECTIONAL
@@ -345,7 +345,7 @@
 	slot_flags = SLOT_BELT
 	w_class = ITEMSIZE_SMALL
 	attack_verb = list ("smacked", "thwacked", "thunked")
-	matter = list(MAT_STEEL = 200,MAT_GLASS = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.1),MAT_GLASS = MATERIAL_COST(0.025))
 	hitsound = "swing_hit"

 /obj/item/flashlight/drone
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	icon_state = "gps-gen"
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_BELT
-	matter = list(MAT_STEEL = 500)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.25))

 	var/gps_tag = "GEN0"
 	var/emped = FALSE
@@ -6,7 +6,7 @@
 	item_state = "pen"
 	var/pointer_icon_state
 	slot_flags = SLOT_BELT
-	matter = list(MAT_GLASS = 500, MAT_STEEL = 500)
+	matter = list(MAT_GLASS = MATERIAL_COST(0.25), MAT_STEEL = MATERIAL_COST(0.25))
 	w_class = ITEMSIZE_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter.
 	var/turf/pointer_loc
 	var/energy = 8
@@ -237,7 +237,7 @@
 	color = "#bbbbff"
 	slot_flags = SLOT_BELT

-	matter = list(MAT_STEEL = 5000,MAT_GLASS = 1500)
+	matter = list(MAT_STEEL = MATERIAL_COST(2.5),MAT_GLASS = MATERIAL_COST(0.75))

 	var/static/dcolor = "#e0eff0"
 	var/static/dnightcolor = "#efcc86"
@@ -18,7 +18,7 @@
 	drop_sound = 'sound/items/drop/multitool.ogg'
 	pickup_sound = 'sound/items/pickup/multitool.ogg'

-	matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))

 	var/mode_index = 1
 	var/toolmode = MULTITOOL_MODE_STANDARD
@@ -10,7 +10,7 @@
 	throw_speed = 1
 	throw_range = 2

-	matter = list(MAT_STEEL = 750)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.375))

 	var/drain_rate = 1500000		// amount of power to drain per tick
 	var/apc_drain_rate = 5000 		// Max. amount drained from single APC. In Watts.
@@ -11,7 +11,7 @@
 	slot_flags = SLOT_BACK
 	w_class = ITEMSIZE_HUGE

-	matter = list(MAT_STEEL = 10000,MAT_GLASS = 2500)
+	matter = list(MAT_STEEL = MATERIAL_COST(5),MAT_GLASS = MATERIAL_COST(1.25))

 	var/code = 2
 	electric_pack = TRUE
@@ -4,7 +4,7 @@
 	var/radio_desc = ""
 	icon_state = "headset"
 	item_state = null //To remove the radio's state
-	matter = list(MAT_STEEL = 75)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.0375))
 	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away
 	slot_flags = SLOT_EARS
@@ -36,7 +36,7 @@
 	var/bs_tx_preload_id
 	var/bs_rx_preload_id

-	matter = list(MAT_GLASS = 25,MAT_STEEL = 75)
+	matter = list(MAT_GLASS = MATERIAL_COST(0.0125),MAT_STEEL = MATERIAL_COST(0.0375))
 	var/const/FREQ_LISTENING = 1
 	var/list/internal_channels

@@ -10,7 +10,7 @@
 	throw_speed = 4
 	throw_range = 20

-	matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))


 	pickup_sound = 'sound/items/pickup/device.ogg'
@@ -11,7 +11,7 @@
 	w_class = ITEMSIZE_SMALL
 	throw_speed = 5
 	throw_range = 10
-	matter = list(MAT_STEEL = 200)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.1))
 	var/mode = 1;
 	var/advscan = SCANNABLE_BENEFICIAL
 	var/showadvscan = 1
@@ -10,7 +10,7 @@
 	throw_speed = 4
 	throw_range = 20

-	matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))

 	var/details = 0
 	var/recent_fail = 0
@@ -10,7 +10,7 @@
 	throw_speed = 4
 	throw_range = 20

-	matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))

 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'
@@ -9,7 +9,7 @@
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'

@@ -12,7 +12,7 @@ GLOBAL_DATUM(sleevemate_mob, /mob/living/carbon/human/dummy/mannequin)
 	w_class = ITEMSIZE_SMALL
 	throw_speed = 5
 	throw_range = 10
-	matter = list(MAT_STEEL = 200)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.1))

 	var/datum/mind/stored_mind

@@ -7,7 +7,7 @@
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 7
-	matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'

@@ -14,7 +14,7 @@
 	throw_range = 4
 	actions_types = list(/datum/action/item_action/toggle_heatsink)

-	matter = list(MAT_STEEL = 15000, MAT_GLASS = 3500)
+	matter = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(1.75))

 	var/on = 0				//is it turned on?
 	var/cover_open = 0		//is the cover open?
@@ -8,7 +8,7 @@
 	item_state = "t-ray"
 	slot_flags = SLOT_BELT
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 150)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.075))

 	var/scan_range = 1

@@ -142,13 +142,13 @@
 /obj/item/t_scanner/upgraded
 	name = "Upgraded T-ray Scanner"
 	desc = "An upgraded version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	matter = list(MAT_STEEL = 500, PHORON = 150)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.25), PHORON = 150)
 	scan_range = 3

 /obj/item/t_scanner/advanced
 	name = "Advanced T-ray Scanner"
 	desc = "An advanced version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	matter = list(MAT_STEEL = 1500, PHORON = 200, SILVER = 250)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.75), PHORON = 200, SILVER = 250)
 	scan_range = 7


@@ -6,7 +6,7 @@
 	item_state = "analyzer"
 	w_class = ITEMSIZE_SMALL

-	matter = list(MAT_STEEL = 60,MAT_GLASS = 30)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.03),MAT_GLASS = MATERIAL_COST(0.015))

 	var/emagged = 0.0
 	var/recording = 0.0
@@ -379,7 +379,7 @@
 	icon_state = "tape_white"
 	item_state = "analyzer"
 	w_class = ITEMSIZE_TINY
-	matter = list(MAT_STEEL=20, MAT_GLASS=5)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.01), MAT_GLASS = MATERIAL_COST(0.0025))
 	force = 1
 	throwforce = 0
 	var/max_capacity = 1800
@@ -24,7 +24,7 @@
 	caliber = ".357"
 	icon_state = "r-casing"
 	projectile_type = /obj/item/projectile/bullet/spectral/strong
-	matter = list(MAT_STEEL = 210)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.105))

 //38
 /obj/item/ammo_magazine/s38/spectral
@@ -60,7 +60,7 @@
 	caliber = ".44"
 	icon_state = "r-casing"
 	projectile_type = /obj/item/projectile/bullet/spectral/strong
-	matter = list(MAT_STEEL = 210)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.105))

 //The actual spectral bullet.
 /obj/item/projectile/bullet/spectral
@@ -10,7 +10,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "jar"
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_GLASS = 200)
+	matter = list(MAT_GLASS = MATERIAL_COST(0.1))
 	flags = NOBLUDGEON
 	var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly)
 	var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling
@@ -224,7 +224,7 @@
 /obj/item/glass_jar/fish/plastic
 	name = "plastic tank"
 	desc = "A large plastic tank."
-	matter = list(MAT_PLASTIC = 4000)
+	matter = list(MAT_PLASTIC = MATERIAL_COST(2))

 #undef JAR_NOTHING
 #undef JAR_MONEY
@@ -8,7 +8,7 @@
 	desc = "This is rubbish."
 	drop_sound = 'sound/items/drop/wrapper.ogg'
 	pickup_sound = 'sound/items/pickup/wrapper.ogg'
-	matter = list(MAT_STEEL = 30)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015))
 	var/age = 0

 /obj/item/trash/Initialize(mapload, _age)
@@ -17,7 +17,7 @@ AI MODULES
 	throw_speed = 3
 	throw_range = 15
 	preserve_item = 1
-	matter = list(MAT_STEEL = 30, MAT_GLASS = 10)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005))
 	var/datum/ai_laws/laws = null

 /obj/item/aiModule/examine(mob/user)
@@ -312,11 +312,11 @@
 	icon_state = "rcd"
 	item_state = "rcdammo"
 	w_class = ITEMSIZE_SMALL
-	matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = 15000)
+	matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = MATERIAL_COST(7.5))
 	var/remaining = RCD_MAX_CAPACITY / 0.75	//CHOMPEdit

 /obj/item/rcd_ammo/large
 	name = "high-capacity matter cartridge"
 	desc = "Do not ingest."
-	matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = 22500)
+	matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = MATERIAL_COST(11.25))
 	remaining = RCD_MAX_CAPACITY * 2	//CHOMPEdit
@@ -23,7 +23,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 50000, MAT_GLASS = 25000)
+	matter = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(12.5))
 	var/datum/effect/effect/system/spark_spread/spark_system
 	var/p_dir = NORTH 			// Next pipe will be built with this dir
 	var/p_flipped = FALSE		// If the next pipe should be built flipped
@@ -10,7 +10,7 @@
 	force = 5.0
 	throwforce = 7.0
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025))
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")

 /obj/item/cane/crutch
@@ -38,7 +38,7 @@
 	name = T_BOARD("entertainment camera monitor")
 	build_path = /obj/machinery/computer/security/telescreen/entertainment
 	board_type = new /datum/frame/frame_types/display
-	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025))

 /obj/item/circuitboard/security/telescreen/entertainment/Initialize(mapload)
 	. = ..()
@@ -6,7 +6,7 @@
 	name = T_BOARD("pipe layer")
 	build_path = /obj/machinery/pipelayer
 	board_type = new /datum/frame/frame_types/machine
-	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025))
 	req_components = list(
 							/obj/item/stock_parts/motor = 1,
 							/obj/item/stock_parts/gear = 1,
@@ -153,7 +153,7 @@
 	w_class = ITEMSIZE_TINY
 	icon = 'icons/obj/ecig.dmi'
 	icon_state = "ecartridge"
-	matter = list(MAT_STEEL = 50, MAT_GLASS = 10)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.005))
 	volume = 20
 	flags = OPENCONTAINER
 	max_transfer_amount = null
@@ -10,7 +10,7 @@
 	throw_speed = 2
 	throw_range = 10
 	force = 10
-	matter = list(MAT_STEEL = 90)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.045))
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
 	drop_sound = 'sound/items/drop/gascan.ogg'
 	pickup_sound = 'sound/items/pickup/gascan.ogg'
@@ -16,7 +16,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 500)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.25))
 	var/status = FALSE
 	var/throw_amount = THROWER_MIN
 	var/lit = FALSE	//on or off
@@ -9,7 +9,7 @@
 	w_class = ITEMSIZE_SMALL
 	throw_speed = 2
 	throw_range = 5
-	matter = list(MAT_STEEL = 500)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.25))
 	drop_sound = 'sound/items/drop/accessory.ogg'
 	pickup_sound = 'sound/items/pickup/accessory.ogg'
 	var/elastic
@@ -6,7 +6,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 1000, MAT_GLASS = 1000)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5))
 	var/obj/item/implant/imp = null
 	var/active = 1
 	///Var for attack_self chain
@@ -71,7 +71,7 @@
 	sharp = TRUE
 	edge = TRUE
 	force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)
-	matter = list(MAT_STEEL = 12000)
+	matter = list(MAT_STEEL = MATERIAL_COST(6))
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	drop_sound = 'sound/items/drop/knife.ogg'

@@ -7,7 +7,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
-	matter = list(MAT_STEEL = 200)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.1))
 	w_class = ITEMSIZE_NORMAL
 	amount_per_transfer_from_this = 10
 	max_transfer_amount = 60
@@ -67,7 +67,7 @@
 	throw_speed = 1
 	throw_range = 4
 	w_class = ITEMSIZE_LARGE
-	matter = list(MAT_GLASS = 7500, MAT_STEEL = 1000)
+	matter = list(MAT_GLASS = MATERIAL_COST(3.75), MAT_STEEL = MATERIAL_COST(0.5))
 	attack_verb = list("shoved", "bashed")
 	var/cooldown = 0 //shield bash cooldown. based on world.time

@@ -44,7 +44,7 @@
 	name = "retractor"
 	desc = "Retracts stuff."
 	icon_state = "retractor"
-	matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000)
+	matter = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5))
 	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
@@ -54,7 +54,7 @@
 	name = "hemostat"
 	desc = "You think you have seen this before."
 	icon_state = "hemostat"
-	matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500)
+	matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25))
 	attack_verb = list("attacked", "pinched")
 	hitsound = 'sound/items/wirecutter.ogg'
 	drop_sound = 'sound/items/drop/scrap.ogg'
@@ -66,7 +66,7 @@
 	name = "cautery"
 	desc = "This stops bleeding."
 	icon_state = "cautery"
-	matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500)
+	matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25))
 	attack_verb = list("burnt")
 	drop_sound = 'sound/items/drop/scrap.ogg'

@@ -78,7 +78,7 @@
 	desc = "You can drill using this item. You dig?"
 	icon_state = "drill"
 	hitsound = 'sound/weapons/circsawhit.ogg'
-	matter = list(MAT_STEEL = 15000, MAT_GLASS = 10000)
+	matter = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(5))
 	force = 15.0
 	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("drilled")
@@ -99,7 +99,7 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
-	matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000)
+	matter = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5))
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	drop_sound = 'sound/items/drop/knife.ogg'
@@ -163,7 +163,7 @@
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
-	matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000)
+	matter = list(MAT_STEEL = MATERIAL_COST(10),MAT_GLASS = MATERIAL_COST(5))
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 	sharp = TRUE
 	edge = TRUE
@@ -176,7 +176,7 @@
 	hitsound = 'sound/weapons/emitter2.ogg'
 	damtype = SEARING
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 25000,MAT_GLASS = 20000)
+	matter = list(MAT_STEEL = MATERIAL_COST(12.5),MAT_GLASS = MATERIAL_COST(10))
 	attack_verb = list("attacked", "slashed", "seared", "cut")
 	toolspeed = 0.75

@@ -20,7 +20,7 @@
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
-	matter = list(MAT_STEEL = 400)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.2))
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'

@@ -130,7 +130,7 @@ Frequency:
 	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 5
-	matter = list(MAT_STEEL = 10000)
+	matter = list(MAT_STEEL = MATERIAL_COST(5))
 	preserve_item = 1

 /obj/item/hand_tele/attack_self(mob/user)
@@ -30,4 +30,4 @@
 	desc = "A welder made from brass fittings."
 	icon_state = "brasswelder"
 	max_fuel = 20
-	matter = list(MAT_STEEL = 70, MAT_GLASS = 60)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.03))
@@ -12,7 +12,7 @@
 	pry = 1
 	item_state = "crowbar"
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.025))
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 	usesound = 'sound/items/crowbar.ogg'
 	drop_sound = 'sound/items/drop/crowbar.ogg'
@@ -84,7 +84,7 @@
 	throwforce = 5
 	pry = 1
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 30)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.015))
 	attack_verb = list("whapped", "smacked", "swatted", "thwacked", "hit")
 	usesound = 'sound/items/crowbar.ogg'
 	toolspeed = 1
@@ -19,7 +19,7 @@
 	usesound = 'sound/items/screwdriver.ogg'
 	drop_sound = 'sound/items/drop/screwdriver.ogg'
 	pickup_sound = 'sound/items/pickup/screwdriver.ogg'
-	matter = list(MAT_STEEL = 75)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.0375))
 	attack_verb = list("stabbed")
 	sharp  = TRUE
 	toolspeed = 1
@@ -42,7 +42,7 @@
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "jaws_pry"
 	item_state = "jawsoflife"
-	matter = list(MAT_METAL=150, MAT_SILVER=50)
+	matter = list(MAT_METAL=150, MAT_SILVER = MATERIAL_COST(0.025))
 	usesound = 'sound/items/jaws_pry.ogg'
 	force = 15
 	toolspeed = 0.25
@@ -78,7 +78,7 @@
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "drill_bolt"
 	item_state = "drill"
-	matter = list(MAT_STEEL = 150, MAT_SILVER = 50)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.075), MAT_SILVER = MATERIAL_COST(0.025))
 	hitsound = 'sound/items/drill_hit.ogg'
 	usesound = 'sound/items/drill_use.ogg'
 	force = 8
@@ -17,7 +17,7 @@
 	w_class = ITEMSIZE_SMALL

 	//Cost to make in the autolathe
-	matter = list(MAT_STEEL = 70, MAT_GLASS = 30)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.015))

 	//R&D tech level

@@ -363,7 +363,7 @@
 	desc = "A slightly larger welder with a larger tank."
 	icon_state = "indwelder"
 	max_fuel = 40
-	matter = list(MAT_STEEL = 70, MAT_GLASS = 60)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.03))

 /obj/item/weldingtool/hugetank
 	name = "upgraded welding tool"
@@ -371,7 +371,7 @@
 	icon_state = "upindwelder"
 	max_fuel = 80
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 70, MAT_GLASS = 120)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06))

 /obj/item/weldingtool/mini
 	name = "emergency welding tool"
@@ -379,7 +379,7 @@
 	icon_state = "miniwelder"
 	max_fuel = 10
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_METAL = 30, MAT_GLASS = 10)
+	matter = list(MAT_METAL = 30, MAT_GLASS = MATERIAL_COST(0.005))
 	change_icons = 0
 	toolspeed = 2
 	eye_safety_modifier = 1 // Safer on eyes.
@@ -434,7 +434,7 @@
 	icon_state = "exwelder"
 	max_fuel = 40
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 70, MAT_GLASS = 120)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06))
 	toolspeed = 0.5
 	change_icons = 0
 	flame_intensity = 3
@@ -15,7 +15,7 @@
 	throw_speed = 2
 	throw_range = 9
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 80)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.04))
 	attack_verb = list("pinched", "nipped")
 	hitsound = 'sound/items/wirecutter.ogg'
 	usesound = 'sound/items/wirecutter.ogg'
@@ -10,7 +10,7 @@
 	force = 6
 	throwforce = 7
 	w_class = ITEMSIZE_SMALL
-	matter = list(MAT_STEEL = 150)
+	matter = list(MAT_STEEL = MATERIAL_COST(0.075))
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 	usesound = 'sound/items/ratchet.ogg'
 	toolspeed = 1
@@ -17,7 +17,7 @@
 	center_of_mass_y = 0
 	throwforce = 0
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 18750)
+	matter = list(MAT_STEEL = MATERIAL_COST(9.375))
 	var/deployed = 0
 	var/camo_net = FALSE
 	var/stun_length = 0.25 SECONDS
@@ -11,7 +11,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEMSIZE_NORMAL
-	matter = list(MAT_STEEL = 3000)
+	matter = list(MAT_STEEL = MATERIAL_COST(1.5))
 	var/list/carrying = list() // List of things on the tray. - Doohl
 	var/max_carry = 10
 	var/min_bonus_damage = 3