diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 0be1de00c80..ba203ed7867 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL = 50, MAT_GLASS = 50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) origin_tech = "engineering=2;programming=1" req_access = list(ACCESS_ENGINE) toolspeed = 1 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index a5ce9b0b5b8..fc63ae88fa6 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -335,7 +335,7 @@ icon_state = "door_electronics" desc = "A circuit board used in construction of firelocks." w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50, MAT_GLASS=50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) origin_tech = "engineering=2;programming=1" toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 775d20741e9..2ee59981178 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -55,7 +55,7 @@ FIRE ALARM if(stat & NOPOWER) icon_state = "firealarm_off" return - + var/area/area = get_area(src) if(area.fire) icon_state = "firealarm_alarming" @@ -329,7 +329,7 @@ Just a object used in constructing fire alarms icon_state = "door_electronics" desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\"" w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50, MAT_GLASS=50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) origin_tech = "engineering=2;programming=1" toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 8cf7ebb72ba..fbc279e6440 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -7,7 +7,7 @@ w_class = WEIGHT_CLASS_SMALL flags = CONDUCT slot_flags = SLOT_BELT - materials = list(MAT_METAL=50, MAT_GLASS=20) + materials = list(MAT_METAL = 200, MAT_GLASS = 100) actions_types = list(/datum/action/item_action/toggle_light) var/on = FALSE var/brightness_on = 4 //luminosity when on diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 70b3f251d96..f48191d4d15 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -13,7 +13,7 @@ w_class = WEIGHT_CLASS_SMALL slot_flags = SLOT_BELT flags = NOBLUDGEON - materials = list(MAT_METAL = 150, MAT_GLASS = 150) + materials = list(MAT_METAL = 210, MAT_GLASS = 150) var/grace = RAD_GEIGER_GRACE_PERIOD var/datum/looping_sound/geiger/soundloop diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index d5ed752da0d..807a2682931 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -8,7 +8,7 @@ "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi' ) //We read you loud and skree-er. - materials = list(MAT_METAL=75) + materials = list(MAT_METAL = 200) canhear_range = 0 // can't hear headsets from very far away slot_flags = SLOT_EARS diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index f3bb4f95741..bfae1956d2e 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -277,7 +277,7 @@ icon_state = "door_electronics" desc = "Looks like a circuit. Probably is." w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50, MAT_GLASS=50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) origin_tech = "engineering=2;programming=1" toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index f17aee5f595..a54622a7e4a 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( throw_range = 9 w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=75) + materials = list(MAT_METAL = 200, MAT_GLASS = 100) var/const/FREQ_LISTENING = 1 var/atom/follow_target // Custom follow target for autosay-using bots diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index bd054faf646..92093fd8169 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -16,7 +16,7 @@ REAGENT SCANNER slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" - materials = list(MAT_METAL=150) + materials = list(MAT_METAL = 300) origin_tech = "magnets=1;engineering=1" /obj/item/t_scanner/Destroy() @@ -327,7 +327,7 @@ REAGENT SCANNER throwforce = 0 throw_speed = 3 throw_range = 7 - materials = list(MAT_METAL=30, MAT_GLASS=20) + materials = list(MAT_METAL = 210, MAT_GLASS = 140) origin_tech = "magnets=1;engineering=1" var/cooldown = FALSE var/cooldown_time = 250 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 4aa61015d4f..ac074ceed62 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -6,7 +6,7 @@ item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL slot_flags = SLOT_BELT - materials = list(MAT_METAL=60, MAT_GLASS=30) + materials = list(MAT_METAL = 180, MAT_GLASS = 90) force = 2 throwforce = 0 drop_sound = 'sound/items/handling/taperecorder_drop.ogg' @@ -274,7 +274,7 @@ icon_state = "tape_white" item_state = "analyzer" w_class = WEIGHT_CLASS_TINY - materials = list(MAT_METAL=20, MAT_GLASS=5) + materials = list(MAT_METAL = 40, MAT_GLASS = 10) force = 1 throwforce = 0 drop_sound = 'sound/items/handling/tape_drop.ogg' diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index c2cdfa2d2a7..e79d3bc71ed 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -11,7 +11,7 @@ force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) + materials = list(MAT_METAL = 300) drop_sound = 'sound/items/handling/crowbar_drop.ogg' pickup_sound = 'sound/items/handling/crowbar_pickup.ogg' origin_tech = "engineering=1;combat=1" @@ -51,7 +51,7 @@ w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 throw_range = 3 - materials = list(MAT_METAL=70) + materials = list(MAT_METAL = 400) icon_state = "crowbar_large" item_state = "crowbar_large" toolspeed = 0.5 diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index 9f84ed20798..b8151e40b99 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -20,7 +20,7 @@ throw_speed = 3 drop_sound = 'sound/items/handling/multitool_drop.ogg' pickup_sound = 'sound/items/handling/multitool_pickup.ogg' - materials = list(MAT_METAL=50, MAT_GLASS=20) + materials = list(MAT_METAL = 300, MAT_GLASS = 140) origin_tech = "magnets=1;engineering=2" toolspeed = 1 tool_behaviour = TOOL_MULTITOOL diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 4e6a01c83ef..7ea47648037 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -12,7 +12,7 @@ throwforce = 5 throw_speed = 3 throw_range = 5 - materials = list(MAT_METAL=75) + materials = list(MAT_METAL = 350) attack_verb = list("stabbed") hitsound = 'sound/weapons/bladeslice.ogg' usesound = 'sound/items/screwdriver.ogg' diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index d8786596fb0..af6f10c8f66 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -17,7 +17,7 @@ w_class = WEIGHT_CLASS_SMALL armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30) resistance_flags = FIRE_PROOF - materials = list(MAT_METAL = 70, MAT_GLASS = 20) + materials = list(MAT_METAL = 400, MAT_GLASS = 100) origin_tech = "engineering=1;plasmatech=1" tool_behaviour = TOOL_WELDER toolspeed = 1 @@ -198,7 +198,7 @@ icon_state = "indwelder" belt_icon = "welder_ind" maximum_fuel = 40 - materials = list(MAT_METAL=70, MAT_GLASS=60) + materials = list(MAT_METAL = 400, MAT_GLASS = 300) origin_tech = "engineering=2;plasmatech=2" /obj/item/weldingtool/largetank/cyborg @@ -212,7 +212,7 @@ icon_state = "miniwelder" maximum_fuel = 10 w_class = WEIGHT_CLASS_TINY - materials = list(MAT_METAL=30, MAT_GLASS=10) + materials = list(MAT_METAL = 200, MAT_GLASS = 50) low_fuel_changes_icon = FALSE /obj/item/weldingtool/abductor diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 4571aea66ba..877f8d4999a 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -10,7 +10,7 @@ throw_speed = 3 throw_range = 7 w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=80) + materials = list(MAT_METAL = 370) origin_tech = "materials=1;engineering=1" attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 2498e80a144..576522fb350 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -11,7 +11,7 @@ throwforce = 7 usesound = 'sound/items/ratchet.ogg' w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=150) + materials = list(MAT_METAL = 600) drop_sound = 'sound/items/handling/wrench_drop.ogg' pickup_sound = 'sound/items/handling/wrench_pickup.ogg' origin_tech = "materials=1;engineering=1" diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index ed89ab2b92c..5d16fd63781 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -12,7 +12,7 @@ throw_range = 7 force = 10 container_type = AMOUNT_VISIBLE - materials = list(MAT_METAL=90) + materials = list(MAT_METAL = 200) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") dog_fashion = /datum/dog_fashion/back resistance_flags = FIRE_PROOF diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 35ee928b8d2..6dd9c5813f2 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -12,7 +12,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - materials = list(MAT_METAL=500) + materials = list(MAT_METAL = 5000) resistance_flags = FIRE_PROOF origin_tech = "combat=1;plasmatech=2;engineering=2" var/status = FALSE diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index f0378fe0316..bcc8493f11e 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/items.dmi' icon_state = "paint_neutral" item_state = "paintcan" - materials = list(MAT_METAL=200) + materials = list(MAT_METAL = 400) w_class = WEIGHT_CLASS_NORMAL resistance_flags = FLAMMABLE max_integrity = 100 diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 287c5fdb4cb..0670293bacb 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -2,7 +2,7 @@ name = "voice analyzer" desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" - materials = list(MAT_METAL=500, MAT_GLASS=50) + materials = list(MAT_METAL = 500, MAT_GLASS = 50) origin_tech = "magnets=1;engineering=1" var/listening = FALSE var/recorded = null //the activation message @@ -61,7 +61,7 @@ name = "noise sensor" desc = "A simple noise sensor that triggers on vocalizations other than speech." icon_state = "voice" - materials = list(MAT_METAL=100, MAT_GLASS=10) + materials = list(MAT_METAL = 210, MAT_GLASS = 50) origin_tech = "magnets=1;engineering=1" bomb_name = "noise-activated bomb" diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index d6d94707a74..f1eb8c18a6f 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -1133,7 +1133,7 @@ Just an object used in constructing air alarms icon_state = "door_electronics" desc = "Looks like a circuit. Probably is." w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50, MAT_GLASS=50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) origin_tech = "engineering=2;programming=1" toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 448e784590f..31283bf3c1b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -9,7 +9,7 @@ volume = 50 lefthand_file = 'icons/goonstation/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/goonstation/mob/inhands/items_righthand.dmi' - materials = list(MAT_GLASS=500) + materials = list(MAT_GLASS = 100) max_integrity = 20 resistance_flags = ACID_PROOF drop_sound = 'sound/items/handling/drinkglass_drop.ogg' diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm index e5c5d749965..412b0344fa5 100644 --- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm @@ -5,7 +5,7 @@ custom_fire_overlay = "shotglass_fire" amount_per_transfer_from_this = 15 volume = 15 - materials = list(MAT_GLASS=100) + materials = list(MAT_GLASS = 50) var/light_intensity = 2 light_color = LIGHT_COLOR_LIGHTBLUE resistance_flags = FLAMMABLE diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index e771ac9d685..d182517f5c6 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_TINY slot_flags = SLOT_BELT origin_tech = "magnets=2;biotech=2" - materials = list(MAT_METAL = 30, MAT_GLASS = 20) + materials = list(MAT_METAL = 210, MAT_GLASS = 40) // ************************************* // Hydroponics Tools @@ -65,7 +65,7 @@ force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) + materials = list(MAT_METAL = 200) attack_verb = list("slashed", "sliced", "cut", "clawed") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 5a56e898ca2..695166efd60 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -132,7 +132,7 @@ throwforce = 4 item_state = "shovel" w_class = WEIGHT_CLASS_NORMAL - materials = list(MAT_METAL = 50) + materials = list(MAT_METAL = 200) origin_tech = "materials=2;engineering=2" attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") usesound = 'sound/effects/shovel_dig.ogg' diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8f78cd1adf9..7596b0cd25e 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -498,7 +498,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain w_class = WEIGHT_CLASS_SMALL throw_speed = 2 throw_range = 5 - materials = list(MAT_METAL=10, MAT_GLASS=5) + materials = list(MAT_METAL = 15, MAT_GLASS = 10) flags = CONDUCT slot_flags = SLOT_BELT item_state = "coil" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index c78fe50b02a..ed46f1db771 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -205,7 +205,7 @@ /// Is the light rigged to explode? var/rigged = FALSE /// Materials the light is made of - var/lightmaterials = list(MAT_GLASS=100) + var/lightmaterials = list(MAT_GLASS = 200) /// Currently in night shift mode? var/nightshift_enabled = FALSE @@ -793,7 +793,7 @@ /// How many times has the light been switched on/off? var/switchcount = 0 /// Materials the light is made of - materials = list(MAT_GLASS=100) + materials = list(MAT_GLASS = 200) /// Is the light rigged to explode? var/rigged = FALSE /// Light range diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index d7db9aa7bb9..333a77e7c63 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -124,7 +124,7 @@ icon_state = "beaker" item_state = "beaker" belt_icon = "beaker" - materials = list(MAT_GLASS=500) + materials = list(MAT_GLASS = 1000) var/obj/item/assembly_holder/assembly = null var/can_assembly = 1 diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index c776e382113..1209eba520e 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -6,7 +6,7 @@ name = "Bucket" id = "bucket" build_type = AUTOLATHE - materials = list(MAT_METAL = 200) + materials = list(MAT_METAL = 400) build_path = /obj/item/reagent_containers/glass/bucket category = list("initial","Tools") @@ -14,7 +14,7 @@ name = "Pocket Crowbar" id = "crowbar" build_type = AUTOLATHE - materials = list(MAT_METAL = 50) + materials = list(MAT_METAL = 300) build_path = /obj/item/crowbar category = list("initial","Tools") @@ -22,7 +22,7 @@ name = "Flashlight" id = "flashlight" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 20) + materials = list(MAT_METAL = 200, MAT_GLASS = 100) build_path = /obj/item/flashlight category = list("initial","Tools") @@ -30,7 +30,7 @@ name = "Fire Extinguisher" id = "extinguisher" build_type = AUTOLATHE - materials = list(MAT_METAL = 90) + materials = list(MAT_METAL = 200) build_path = /obj/item/extinguisher category = list("initial","Tools") @@ -38,7 +38,7 @@ name = "Multitool" id = "multitool" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 20) + materials = list(MAT_METAL = 300, MAT_GLASS = 140) build_path = /obj/item/multitool category = list("initial","Tools") @@ -46,7 +46,7 @@ name = "Analyzer" id = "analyzer" build_type = AUTOLATHE - materials = list(MAT_METAL = 30, MAT_GLASS = 20) + materials = list(MAT_METAL = 210, MAT_GLASS = 140) build_path = /obj/item/analyzer category = list("initial","Tools") @@ -54,7 +54,7 @@ name = "T-ray Scanner" id = "tscanner" build_type = AUTOLATHE - materials = list(MAT_METAL = 150) + materials = list(MAT_METAL = 300) build_path = /obj/item/t_scanner category = list("initial","Tools") @@ -62,15 +62,15 @@ name = "Welding Tool" id = "welding_tool" build_type = AUTOLATHE - materials = list(MAT_METAL = 70, MAT_GLASS = 20) + materials = list(MAT_METAL = 400, MAT_GLASS = 100) build_path = /obj/item/weldingtool category = list("initial","Tools") /datum/design/mini_weldingtool - name = "Emergency welding tool" + name = "Emergency Welding Tool" id = "mini_welding_tool" build_type = AUTOLATHE - materials = list(MAT_METAL = 30, MAT_GLASS = 10) + materials = list(MAT_METAL = 200, MAT_GLASS = 50) build_path = /obj/item/weldingtool/mini category = list("initial","Tools") @@ -78,7 +78,7 @@ name = "Screwdriver" id = "screwdriver" build_type = AUTOLATHE - materials = list(MAT_METAL = 75) + materials = list(MAT_METAL = 350) build_path = /obj/item/screwdriver category = list("initial","Tools") @@ -86,7 +86,7 @@ name = "Wirecutters" id = "wirecutters" build_type = AUTOLATHE - materials = list(MAT_METAL = 80) + materials = list(MAT_METAL = 370) build_path = /obj/item/wirecutters category = list("initial","Tools") @@ -94,7 +94,7 @@ name = "Wrench" id = "wrench" build_type = AUTOLATHE - materials = list(MAT_METAL = 150) + materials = list(MAT_METAL = 600) build_path = /obj/item/wrench category = list("initial","Tools") @@ -107,10 +107,10 @@ category = list("initial","Tools") /datum/design/cable_coil - name = "Cable coil" + name = "Cable Coil" id = "cable_coil" build_type = AUTOLATHE - materials = list(MAT_METAL = 10, MAT_GLASS = 5) + materials = list(MAT_METAL = 15, MAT_GLASS = 10) build_path = /obj/item/stack/cable_coil category = list("initial","Tools") maxstack = 30 @@ -124,7 +124,7 @@ category = list("initial","Tools") /datum/design/apc_board - name = "APC electronics" + name = "APC Electronics" id = "power control" build_type = AUTOLATHE materials = list(MAT_METAL = 100, MAT_GLASS = 100) @@ -135,7 +135,7 @@ name = "Airlock Electronics" id = "airlock_board" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) build_path = /obj/item/airlock_electronics category = list("initial", "Electronics") @@ -143,7 +143,7 @@ name = "Firelock Electronics" id = "firelock_board" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) build_path = /obj/item/firelock_electronics category = list("initial", "Electronics") @@ -151,7 +151,7 @@ name = "Air Alarm Electronics" id = "airalarm_electronics" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) build_path = /obj/item/airalarm_electronics category = list("initial", "Electronics") @@ -159,7 +159,7 @@ name = "Fire Alarm Electronics" id = "firealarm_electronics" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) build_path = /obj/item/firealarm_electronics category = list("initial", "Electronics") @@ -167,7 +167,7 @@ name = "Intercom Electronics" id = "intercom_electronics" build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) build_path = /obj/item/intercom_electronics category = list("initial", "Electronics") @@ -243,7 +243,7 @@ name = "Fork" id = "fork" build_type = AUTOLATHE - materials = list(MAT_METAL = 80) + materials = list(MAT_METAL = 100) build_path = /obj/item/kitchen/utensil/fork category = list("initial","Dinnerware") @@ -251,7 +251,7 @@ name = "Spoon" id = "spoon" build_type = AUTOLATHE - materials = list(MAT_METAL = 80) + materials = list(MAT_METAL = 100) build_path = /obj/item/kitchen/utensil/spoon category = list("initial","Dinnerware") @@ -259,7 +259,7 @@ name = "Spork" id = "spork" build_type = AUTOLATHE - materials = list(MAT_METAL = 80) + materials = list(MAT_METAL = 100) build_path = /obj/item/kitchen/utensil/spork category = list("initial","Dinnerware") @@ -272,18 +272,18 @@ category = list("initial","Dinnerware") /datum/design/drinking_glass - name = "Drinking glass" + name = "Drinking Glass" id = "drinking_glass" build_type = AUTOLATHE - materials = list(MAT_GLASS = 500) + materials = list(MAT_GLASS = 100) build_path = /obj/item/reagent_containers/food/drinks/drinkingglass category = list("initial","Dinnerware") /datum/design/shot_glass - name = "Shot glass" + name = "Shot Glass" id = "shot_glass" build_type = AUTOLATHE - materials = list(MAT_GLASS = 100) + materials = list(MAT_GLASS = 50) build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass category = list("initial","Dinnerware") @@ -299,7 +299,7 @@ name = "Cultivator" id = "cultivator" build_type = AUTOLATHE - materials = list(MAT_METAL=50) + materials = list(MAT_METAL=200) build_path = /obj/item/cultivator category = list("initial","Miscellaneous") @@ -307,7 +307,7 @@ name = "Plant Analyzer" id = "plant_analyzer" build_type = AUTOLATHE - materials = list(MAT_METAL = 30, MAT_GLASS = 20) + materials = list(MAT_METAL = 210, MAT_GLASS = 40) build_path = /obj/item/plant_analyzer category = list("initial","Miscellaneous") @@ -315,7 +315,7 @@ name = "Shovel" id = "shovel" build_type = AUTOLATHE - materials = list(MAT_METAL = 50) + materials = list(MAT_METAL = 200) build_path = /obj/item/shovel category = list("initial","Miscellaneous") @@ -323,7 +323,7 @@ name = "Spade" id = "spade" build_type = AUTOLATHE - materials = list(MAT_METAL = 50) + materials = list(MAT_METAL = 200) build_path = /obj/item/shovel/spade category = list("initial","Miscellaneous") @@ -411,7 +411,7 @@ name = "Beaker" id = "beaker" build_type = AUTOLATHE - materials = list(MAT_GLASS = 500) + materials = list(MAT_GLASS = 1000) build_path = /obj/item/reagent_containers/glass/beaker category = list("initial", "Medical") @@ -448,7 +448,7 @@ category = list("initial", "Security") /datum/design/rubbershot - name = "Rubber shot" + name = "Rubber Shot" id = "rubber_shot" build_type = AUTOLATHE materials = list(MAT_METAL = 4000) @@ -456,7 +456,7 @@ category = list("initial", "Security") /datum/design/e_charger - name = "E-revolver charge pack" + name = "E-revolver Charge Pack" id = "e_charger" build_type = AUTOLATHE materials = list(MAT_METAL = 30000, MAT_GLASS = 6000) @@ -467,7 +467,7 @@ name = "Universal Recorder" id = "recorder" build_type = AUTOLATHE - materials = list(MAT_METAL = 60, MAT_GLASS = 30) + materials = list(MAT_METAL = 180, MAT_GLASS = 90) build_path = /obj/item/taperecorder/empty category = list("initial", "Miscellaneous") @@ -475,7 +475,7 @@ name = "Tape" id = "tape" build_type = AUTOLATHE - materials = list(MAT_METAL = 20, MAT_GLASS = 5) + materials = list(MAT_METAL = 40, MAT_GLASS = 10) build_path = /obj/item/tape/random category = list("initial", "Miscellaneous") @@ -499,7 +499,7 @@ name = "Radio Headset" id = "radio_headset" build_type = AUTOLATHE - materials = list(MAT_METAL = 75) + materials = list(MAT_METAL = 200) build_path = /obj/item/radio/headset category = list("initial", "Communication") @@ -507,7 +507,7 @@ name = "Station Bounced Radio" id = "bounced_radio" build_type = AUTOLATHE - materials = list(MAT_METAL = 75, MAT_GLASS = 25) + materials = list(MAT_METAL = 200, MAT_GLASS = 100) build_path = /obj/item/radio/off category = list("initial", "Communication") @@ -520,7 +520,7 @@ category = list("initial", "Miscellaneous") /datum/design/health_sensor - name = "Health sensor" + name = "Health Sensor" id = "health_sensor" build_type = AUTOLATHE materials = list(MAT_METAL = 800, MAT_GLASS = 200) @@ -555,7 +555,7 @@ name = "Noise Analyser" id = "Noise_analyser" build_type = AUTOLATHE - materials = list(MAT_METAL = 100, MAT_GLASS = 10) + materials = list(MAT_METAL = 210, MAT_GLASS = 50) build_path = /obj/item/assembly/voice/noise category = list("initial", "Miscellaneous") @@ -563,7 +563,7 @@ name = "Light Tube" id = "light_tube" build_type = AUTOLATHE - materials = list(MAT_GLASS = 100) + materials = list(MAT_GLASS = 200) build_path = /obj/item/light/tube category = list("initial", "Construction") @@ -571,7 +571,7 @@ name = "Light Bulb" id = "light_bulb" build_type = AUTOLATHE - materials = list(MAT_GLASS = 100) + materials = list(MAT_GLASS = 200) build_path = /obj/item/light/bulb category = list("initial", "Construction") @@ -668,7 +668,7 @@ name = "Flamethrower" id = "flamethrower" build_type = AUTOLATHE - materials = list(MAT_METAL = 500) + materials = list(MAT_METAL = 5000) build_path = /obj/item/flamethrower/full category = list("hacked", "Security") @@ -708,7 +708,7 @@ name = "Industrial Welding Tool" id = "large_welding_tool" build_type = AUTOLATHE - materials = list(MAT_METAL = 70, MAT_GLASS = 60) + materials = list(MAT_METAL = 400, MAT_GLASS = 300) build_path = /obj/item/weldingtool/largetank category = list("hacked", "Tools") @@ -753,7 +753,7 @@ category = list("hacked", "Security") /datum/design/riot_dart - name = "Foam riot dart" + name = "Foam Riot Dart" id = "riot_dart" build_type = AUTOLATHE materials = list(MAT_METAL = 1000) //Discount for making individually - no box = less metal! @@ -761,7 +761,7 @@ category = list("hacked", "Security") /datum/design/riot_dart_sniper - name = "Foam riot sniper dart" + name = "Foam Riot Sniper Dart" id = "riot_dart_sniper" build_type = AUTOLATHE materials = list(MAT_METAL = 1800) //Discount for making individually - no box = less metal! @@ -769,7 +769,7 @@ category = list("hacked", "Security") /datum/design/riot_darts - name = "Foam riot dart box" + name = "Foam Riot Dart Box" id = "riot_darts" build_type = AUTOLATHE materials = list(MAT_METAL = 50000) //Comes with 40 darts @@ -777,7 +777,7 @@ category = list("hacked", "Security") /datum/design/riot_darts_sniper - name = "Foam riot sniper dart box" + name = "Foam Riot Sniper Dart Box" id = "riot_darts_sniper" build_type = AUTOLATHE materials = list(MAT_METAL = 90000) //Comes with 40 darts @@ -817,7 +817,7 @@ category = list("hacked", "Security") /datum/design/cleaver - name = "Butcher's cleaver" + name = "Butcher's Cleaver" id = "cleaver" build_type = AUTOLATHE materials = list(MAT_METAL = 18000) @@ -836,28 +836,28 @@ name = "Geiger Counter" id = "geigercounter" build_type = AUTOLATHE - materials = list(MAT_METAL = 150, MAT_GLASS = 150) + materials = list(MAT_METAL = 210, MAT_GLASS = 150) build_path = /obj/item/geiger_counter category = list("initial", "Tools") /datum/design/desttagger - name = "Destination tagger" + name = "Destination Tagger" id = "desttagger" build_type = AUTOLATHE - materials = list(MAT_METAL = 250, MAT_GLASS = 125) + materials = list(MAT_METAL = 250, MAT_GLASS = 150) build_path = /obj/item/destTagger category = list("initial", "Electronics") /datum/design/handlabeler - name = "Hand labeler" + name = "Hand Labeler" id = "handlabel" build_type = AUTOLATHE - materials = list(MAT_METAL = 150, MAT_GLASS = 125) + materials = list(MAT_METAL = 150, MAT_GLASS = 150) build_path = /obj/item/hand_labeler category = list("initial", "Electronics") /datum/design/conveyor_belt - name = "Conveyor belt" + name = "Conveyor Belt" id = "conveyor_belt" build_type = AUTOLATHE materials = list(MAT_METAL = 5000) @@ -865,7 +865,7 @@ category = list("initial", "Construction") /datum/design/conveyor_switch - name = "Conveyor belt switch" + name = "Conveyor Belt Switch" id = "conveyor_switch" build_type = AUTOLATHE materials = list(MAT_METAL = 450, MAT_GLASS = 190) @@ -898,7 +898,7 @@ category = list("initial", "Electronics") /datum/design/mirror - name = "mirror" + name = "Mirror" desc = "A mountable mirror." id = "mirror" build_type = AUTOLATHE