diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index b2bdc2b99d1..6b8836f67a9 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -73,8 +73,14 @@ //windows affected by Nar'Sie turn this color. #define NARSIE_WINDOW_COLOUR "#7D1919" -//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc -#define MINERAL_MATERIAL_AMOUNT 2000 +// Defines related to the custom materials used on objects. +///The amount of materials you get from a sheet of mineral like iron/diamond/glass etc. 2000 Units. +#define SHEET_MATERIAL_AMOUNT 2000 +///The amount of materials you get from half a sheet. Used in standard object quantities. 1000 units. +#define HALF_SHEET_MATERIAL_AMOUNT (SHEET_MATERIAL_AMOUNT/2) +///The amount of materials used in the smallest of objects, like pens and screwdrivers. 100 units. +#define SMALL_MATERIAL_AMOUNT (HALF_SHEET_MATERIAL_AMOUNT/10) + //The maximum size of a stack object. #define MAX_STACK_SIZE 50 //maximum amount of cable in a coil diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index 727b4256196..6ffcc733928 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -64,7 +64,7 @@ // Slowdown values. -/// The slowdown value of one [MINERAL_MATERIAL_AMOUNT] of plasteel. +/// The slowdown value of one [SHEET_MATERIAL_AMOUNT] of plasteel. #define MATERIAL_SLOWDOWN_PLASTEEL (0.05) -/// The slowdown value of one [MINERAL_MATERIAL_AMOUNT] of alien alloy. +/// The slowdown value of one [SHEET_MATERIAL_AMOUNT] of alien alloy. #define MATERIAL_SLOWDOWN_ALIEN_ALLOY (0.1) diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index b0aa310bbd9..0a42b2edd84 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -11,7 +11,7 @@ /obj/item/weaponcrafting/stock name = "rifle stock" desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood." - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 6) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 6) resistance_flags = FLAMMABLE icon = 'icons/obj/weapons/improvised.dmi' icon_state = "riflestock" diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 08ff2bbe08a..07c347b31b1 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -2,7 +2,7 @@ This datum should be used for handling mineral contents of machines and whatever else is supposed to hold minerals and make use of them. Variables: - amount - raw amount of the mineral this container is holding, calculated by the defined value MINERAL_MATERIAL_AMOUNT=2000. + amount - raw amount of the mineral this container is holding, calculated by the defined value SHEET_MATERIAL_AMOUNT=SHEET_MATERIAL_AMOUNT. max_amount - max raw amount of mineral this container can hold. sheet_type - type of the mineral sheet the container handles, used for output. parent - object that this container is being used by, used for output. @@ -295,7 +295,7 @@ return (max_amount - total_amount) -/// For consuming a dictionary of materials. mats is the map of materials to use and the corresponding amounts, example: list(M/datum/material/glass =100, datum/material/iron=200) +/// For consuming a dictionary of materials. mats is the map of materials to use and the corresponding amounts, example: list(M/datum/material/glass =100, datum/material/iron=SMALL_MATERIAL_AMOUNT * 2) /datum/component/material_container/proc/use_materials(list/mats, multiplier=1) if(!mats || !length(mats)) return FALSE @@ -333,18 +333,18 @@ if(!target) var/atom/parent_atom = parent target = parent_atom.drop_location() - if(materials[M] < (sheet_amt * MINERAL_MATERIAL_AMOUNT)) - sheet_amt = round(materials[M] / MINERAL_MATERIAL_AMOUNT) + if(materials[M] < (sheet_amt * SHEET_MATERIAL_AMOUNT)) + sheet_amt = round(materials[M] / SHEET_MATERIAL_AMOUNT) var/count = 0 while(sheet_amt > MAX_STACK_SIZE) - new M.sheet_type(target, MAX_STACK_SIZE, null, list((M) = MINERAL_MATERIAL_AMOUNT)) + new M.sheet_type(target, MAX_STACK_SIZE, null, list((M) = SHEET_MATERIAL_AMOUNT)) count += MAX_STACK_SIZE - use_amount_mat(sheet_amt * MINERAL_MATERIAL_AMOUNT, M) + use_amount_mat(sheet_amt * SHEET_MATERIAL_AMOUNT, M) sheet_amt -= MAX_STACK_SIZE if(sheet_amt >= 1) - new M.sheet_type(target, sheet_amt, null, list((M) = MINERAL_MATERIAL_AMOUNT)) + new M.sheet_type(target, sheet_amt, null, list((M) = SHEET_MATERIAL_AMOUNT)) count += sheet_amt - use_amount_mat(sheet_amt * MINERAL_MATERIAL_AMOUNT, M) + use_amount_mat(sheet_amt * SHEET_MATERIAL_AMOUNT, M) return count @@ -410,14 +410,14 @@ /// Turns a material amount into the amount of sheets it should output /datum/component/material_container/proc/amount2sheet(amt) - if(amt >= MINERAL_MATERIAL_AMOUNT) - return round(amt / MINERAL_MATERIAL_AMOUNT) + if(amt >= SHEET_MATERIAL_AMOUNT) + return round(amt / SHEET_MATERIAL_AMOUNT) return FALSE /// Turns an amount of sheets into the amount of material amount it should output /datum/component/material_container/proc/sheet2amount(sheet_amt) if(sheet_amt > 0) - return sheet_amt * MINERAL_MATERIAL_AMOUNT + return sheet_amt * SHEET_MATERIAL_AMOUNT return FALSE @@ -450,8 +450,8 @@ "name" = material.name, "ref" = REF(material), "amount" = amount, - "sheets" = round(amount / MINERAL_MATERIAL_AMOUNT), - "removable" = amount >= MINERAL_MATERIAL_AMOUNT, + "sheets" = round(amount / SHEET_MATERIAL_AMOUNT), + "removable" = amount >= SHEET_MATERIAL_AMOUNT, "color" = material.greyscale_colors )) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 5147afc9d76..3828dab28f1 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -223,7 +223,7 @@ desc = "Stores recorder holocalls." icon_state = "holodisk" obj_flags = UNIQUE_RENAME - custom_materials = list(/datum/material/iron = 100, /datum/material/glass = 100) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT) var/datum/holorecord/record //Preset variables var/preset_image_type diff --git a/code/datums/materials/alloys.dm b/code/datums/materials/alloys.dm index 2fdaad45089..af208fdc5a4 100644 --- a/code/datums/materials/alloys.dm +++ b/code/datums/materials/alloys.dm @@ -46,7 +46,7 @@ if(!istype(target_item)) return - target_item.slowdown += MATERIAL_SLOWDOWN_PLASTEEL * amount / MINERAL_MATERIAL_AMOUNT + target_item.slowdown += MATERIAL_SLOWDOWN_PLASTEEL * amount / SHEET_MATERIAL_AMOUNT /datum/material/alloy/plasteel/on_removed_obj(obj/item/target_item, amount, material_flags) . = ..() @@ -54,7 +54,7 @@ if(!istype(target_item)) return - target_item.slowdown -= MATERIAL_SLOWDOWN_PLASTEEL * amount / MINERAL_MATERIAL_AMOUNT + target_item.slowdown -= MATERIAL_SLOWDOWN_PLASTEEL * amount / SHEET_MATERIAL_AMOUNT /** Plastitanium * @@ -163,7 +163,7 @@ if(!istype(target_item)) return - target_item.slowdown += MATERIAL_SLOWDOWN_ALIEN_ALLOY * amount / MINERAL_MATERIAL_AMOUNT + target_item.slowdown += MATERIAL_SLOWDOWN_ALIEN_ALLOY * amount / SHEET_MATERIAL_AMOUNT /datum/material/alloy/alien/on_removed_obj(obj/item/target_item, amount, material_flags) . = ..() @@ -172,4 +172,4 @@ if(!istype(target_item)) return - target_item.slowdown -= MATERIAL_SLOWDOWN_ALIEN_ALLOY * amount / MINERAL_MATERIAL_AMOUNT + target_item.slowdown -= MATERIAL_SLOWDOWN_ALIEN_ALLOY * amount / SHEET_MATERIAL_AMOUNT diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm index b1eae19ee62..162f0f2643e 100644 --- a/code/datums/materials/meat.dm +++ b/code/datums/materials/meat.dm @@ -28,8 +28,8 @@ make_edible(T, amount, material_flags) /datum/material/meat/proc/make_edible(atom/source, amount, material_flags) - var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT) - var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT) + var/nutriment_count = 3 * (amount / SHEET_MATERIAL_AMOUNT) + var/oil_count = 2 * (amount / SHEET_MATERIAL_AMOUNT) source.AddComponent(/datum/component/edible, \ initial_reagents = list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), \ foodtypes = RAW | MEAT | GROSS, \ diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm index 054eb1c0080..6a7c4a6922a 100644 --- a/code/datums/materials/pizza.dm +++ b/code/datums/materials/pizza.dm @@ -26,8 +26,8 @@ make_edible(T, amount, material_flags) /datum/material/pizza/proc/make_edible(atom/source, amount, material_flags) - var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT) - var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT) + var/nutriment_count = 3 * (amount / SHEET_MATERIAL_AMOUNT) + var/oil_count = 2 * (amount / SHEET_MATERIAL_AMOUNT) source.AddComponent(/datum/component/edible, \ initial_reagents = list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), \ foodtypes = GRAIN | MEAT | DAIRY | VEGETABLES, \ diff --git a/code/datums/mutations/tongue_spike.dm b/code/datums/mutations/tongue_spike.dm index fd561fdfc34..37867ce5306 100644 --- a/code/datums/mutations/tongue_spike.dm +++ b/code/datums/mutations/tongue_spike.dm @@ -56,7 +56,7 @@ ) w_class = WEIGHT_CLASS_SMALL sharpness = SHARP_POINTY - custom_materials = list(/datum/material/biomass = 500) + custom_materials = list(/datum/material/biomass = SMALL_MATERIAL_AMOUNT * 5) /// What mob "fired" our tongue var/datum/weakref/fired_by_ref /// if we missed our target diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index da59dab769f..e4c26ef0073 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -304,7 +304,7 @@ /obj/machinery/autolathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted) if(istype(item_inserted, /obj/item/stack/ore/bluespace_crystal)) - use_power(MINERAL_MATERIAL_AMOUNT / 10) + use_power(SHEET_MATERIAL_AMOUNT / 10) else if(item_inserted.has_material_type(/datum/material/glass)) flick("autolathe_r", src)//plays glass insertion animation by default otherwise else diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 014cb3cf9de..b6adc596881 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -354,5 +354,5 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/door, 24) desc = "Used for building buttons." icon_state = "button" result_path = /obj/machinery/button - custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT) pixel_shift = 24 diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index dcc71005d67..69732938de3 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -8,7 +8,7 @@ desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." icon = 'icons/obj/machines/camera.dmi' icon_state = "cameracase" - custom_materials = list(/datum/material/iron=400, /datum/material/glass=250) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 4, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 2.5) result_path = /obj/structure/camera_assembly wall_external = TRUE diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index f7e1fb51d55..e72f3f4ddf5 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -212,7 +212,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28) desc = "A frame for a defibrillator mount. Once placed, it can be removed with a wrench." icon = 'icons/obj/machines/defib_mount.dmi' icon_state = "defibrillator_mount" - custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 100) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT) w_class = WEIGHT_CLASS_BULKY result_path = /obj/machinery/defibrillator_mount pixel_shift = 28 @@ -221,5 +221,5 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28) name = "unhooked PENLITE defibrillator mount" desc = "A frame for a PENLITE defibrillator mount. Unlike the normal mount, it can passively recharge the unit inside." icon_state = "penlite_mount" - custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 100, /datum/material/silver = 50) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.5) result_path = /obj/machinery/defibrillator_mount/charging diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index c9d37a32315..0d5ea4c8bb0 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -245,7 +245,7 @@ material_modifier = 0.25 /obj/machinery/door/airlock/plasma/Initialize(mapload) - custom_materials = custom_materials ? custom_materials : list(/datum/material/plasma = 20000) + custom_materials = custom_materials ? custom_materials : list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10) . = ..() /obj/machinery/door/airlock/plasma/block_superconductivity() //we don't stop the heat~ diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 9a784b89d67..47dd5ca2037 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -21,8 +21,8 @@ var/list/using_materials var/starting_amount = 0 - var/iron_cost = 1000 - var/glass_cost = 1000 + var/iron_cost =HALF_SHEET_MATERIAL_AMOUNT + var/glass_cost =HALF_SHEET_MATERIAL_AMOUNT var/power_used = 1000 var/mode = DRONE_READY @@ -50,7 +50,7 @@ /obj/machinery/drone_dispenser/Initialize(mapload) . = ..() - var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_DRONE_DISPENSER, allowed_items=/obj/item/stack) + var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_DRONE_DISPENSER, allowed_items=/obj/item/stack) materials.insert_amount_mat(starting_amount) materials.precise_insertion = TRUE using_materials = list(/datum/material/iron = iron_cost, /datum/material/glass = glass_cost) @@ -80,8 +80,8 @@ dispense_type = /obj/effect/mob_spawn/ghost_role/drone/snowflake end_create_message = "dispenses a snowflake drone shell." // Those holoprojectors aren't cheap - iron_cost = 2000 - glass_cost = 2000 + iron_cost =SHEET_MATERIAL_AMOUNT + glass_cost =SHEET_MATERIAL_AMOUNT power_used = 2000 starting_amount = 10000 diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index afcfde27a2b..03a71e486f6 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -184,11 +184,11 @@ while(nutrients >= nutrient_to_meat) nutrients -= nutrient_to_meat var/atom/meat = new C.type_of_meat (drop_location()) - meat.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, C) = MINERAL_MATERIAL_AMOUNT * 4)) + meat.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, C) = SHEET_MATERIAL_AMOUNT * 4)) while(nutrients >= nutrient_to_meat / 3) nutrients -= nutrient_to_meat / 3 var/atom/meat = new /obj/item/food/meat/rawcutlet/plain (drop_location()) - meat.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, C) = round(MINERAL_MATERIAL_AMOUNT * (4/3)))) + meat.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, C) = round(SHEET_MATERIAL_AMOUNT * (4/3)))) nutrients = 0 /obj/machinery/fat_sucker/screwdriver_act(mob/living/user, obj/item/I) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 09a7fdcbca5..545b5c719f6 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -811,7 +811,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) name = "newscaster frame" desc = "Used to build newscasters, just secure to the wall." icon_state = "newscaster" - custom_materials = list(/datum/material/iron=14000, /datum/material/glass=8000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 7, /datum/material/glass= SHEET_MATERIAL_AMOUNT * 4) result_path = /obj/machinery/newscaster pixel_shift = 30 diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 4d3b4b262f4..c7a1542180c 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -1061,7 +1061,7 @@ DEFINE_BITFIELD(turret_flags, list( icon = 'icons/obj/machines/turret_control.dmi' icon_state = "control_frame" result_path = /obj/machinery/turretid - custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT) pixel_shift = 29 /obj/item/gun/proc/get_turret_properties() diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm index 82eae7d395f..5b01dd99018 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -11,7 +11,7 @@ /obj/machinery/sheetifier/Initialize(mapload) . = ..() - AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials))) + AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials))) /obj/machinery/sheetifier/update_overlays() . = ..() diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index ec7489c6173..34676c2ab11 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -34,7 +34,7 @@ name = "status display frame" desc = "Used to build status displays, just secure to the wall." icon_state = "unanchoredstatusdisplay" - custom_materials = list(/datum/material/iron=14000, /datum/material/glass=8000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 7, /datum/material/glass= SHEET_MATERIAL_AMOUNT * 4) result_path = /obj/machinery/status_display/evac pixel_shift = 32 diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm index 918f47ffcfb..d8497dad746 100644 --- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm +++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm @@ -176,7 +176,7 @@ * * affected_turf - Turf to transform. */ /datum/dimension_theme/proc/apply_materials(turf/affected_turf) - var/list/custom_materials = list(GET_MATERIAL_REF(material) = MINERAL_MATERIAL_AMOUNT) + var/list/custom_materials = list(GET_MATERIAL_REF(material) = SHEET_MATERIAL_AMOUNT) if (istype(affected_turf, /turf/open/floor/material) || istype(affected_turf, /turf/closed/wall/material)) affected_turf.set_custom_materials(custom_materials) diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index e46b7033892..c8c84ad86c8 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -15,7 +15,7 @@ throwforce = 0 throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/gold = 50) + custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.5) /// This is where our laws get put at for the module var/list/laws = list() /// Used to skip laws being checked (for reset & remove boards that have no laws) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index f115443ba0a..4ca687b0ff5 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -8,7 +8,7 @@ worn_icon_state = "painter" w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5) flags_1 = CONDUCT_1 item_flags = NOBLUDGEON @@ -157,7 +157,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "decal_sprayer" inhand_icon_state = "decal_sprayer" - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5) initial_ink_type = /obj/item/toner/large /// The current direction of the decal being printed var/stored_dir = 2 diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 00d532189ab..78904a16551 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -15,7 +15,7 @@ throw_speed = 2 throw_range = 4 demolition_mod = 1.5 - custom_materials = list(/datum/material/iron=13000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 6.5) attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") hitsound = SFX_SWING_HIT diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 9249126afcc..465fef5c625 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -115,7 +115,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "firebrand" desc = "An unlit firebrand. It makes you wonder why it's not just called a stick." smoketime = 40 SECONDS - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/carbon = 2) /obj/item/match/firebrand/Initialize(mapload) diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index a44a3c50f94..a2caca56213 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -12,7 +12,7 @@ inhand_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' - custom_materials = list(/datum/material/glass = 1000) + custom_materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT) w_class = WEIGHT_CLASS_SMALL grind_results = list(/datum/reagent/silicon = 20) greyscale_colors = CIRCUIT_COLOR_GENERIC diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index e31bce29a7c..51bf6c35113 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -678,7 +678,7 @@ icon = 'icons/obj/art/crayons.dmi' icon_state = "crayonbox" w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/cardboard = 2000) + custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT) /obj/item/storage/crayons/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 6d0c6466f15..c95657ca0ed 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -8,7 +8,7 @@ item_flags = NOBLUDGEON lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' - custom_materials = list(/datum/material/iron=250, /datum/material/glass=500) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 5) var/max_duration = 3000 var/duration = 300 var/last_use = 0 diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index 6d6c82cdefd..7366422011c 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/module.dmi' icon_state = "boris" w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 300) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3) var/recharging = FALSE var/circuits = 5 //How many circuits the pseudocircuit has left var/static/recycleable_circuits = typecacheof(list( diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 0a3efb443ef..80d7e0aedab 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -17,7 +17,7 @@ w_class = WEIGHT_CLASS_SMALL flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.2) actions_types = list(/datum/action/item_action/toggle_light) light_system = MOVABLE_LIGHT_DIRECTIONAL light_range = 4 @@ -327,7 +327,7 @@ var/trash_type = /obj/item/trash/flare /// If the light source can be extinguished var/can_be_extinguished = FALSE - custom_materials = list(/datum/material/plastic=50) + custom_materials = list(/datum/material/plastic= SMALL_MATERIAL_AMOUNT * 0.5) /obj/item/flashlight/flare/Initialize(mapload) . = ..() @@ -352,7 +352,7 @@ if(on && victim.ignite_mob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(victim)] on fire with [src] at [AREACOORD(user)]") user.log_message("set [key_name(victim)] on fire with [src]", LOG_ATTACK) - + return ..() /obj/item/flashlight/flare/toggle_light() @@ -466,7 +466,7 @@ current_wax_level = 2 if(0 to 15 MINUTES) current_wax_level = 3 - + if(last_wax_level != current_wax_level) last_wax_level = current_wax_level update_appearance(UPDATE_ICON | UPDATE_NAME) @@ -519,7 +519,7 @@ /obj/item/flashlight/flare/candle/attackby(obj/item/attacking_item, mob/user, params) if(try_light_candle(attacking_item, user, silent = istype(attacking_item, src.type))) // so we don't double balloon alerts when a candle is used to light another candle return COMPONENT_CANCEL_ATTACK_CHAIN - else + else return ..() // allows lighting an unlit candle from some fire source by left clicking the source with the candle @@ -833,7 +833,7 @@ light_range = 1 light_power = 0.07 -#undef FAILURE -#undef SUCCESS -#undef NO_FUEL -#undef ALREADY_LIT +#undef FAILURE +#undef SUCCESS +#undef NO_FUEL +#undef ALREADY_LIT diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index ea192dec263..1d1d29f8c8e 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -10,7 +10,7 @@ worn_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' - custom_materials = list(/datum/material/iron=250, /datum/material/glass=500) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 5) var/max_shield_integrity = 250 var/shield_integrity = 250 var/max_fields = 3 diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 137dd3b9a64..e506a320c76 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT item_flags = NOBLUDGEON - custom_materials = list(/datum/material/iron = 150, /datum/material/glass = 150) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5) var/last_perceived_radiation_danger = null diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index eec85c955eb..380a7c82b56 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -9,7 +9,7 @@ flags_1 = CONDUCT_1 item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=500, /datum/material/glass=500) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 5) w_class = WEIGHT_CLASS_SMALL var/turf/pointer_loc var/energy = 10 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 464cd3c5395..bd900edd349 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -26,7 +26,7 @@ throw_speed = 3 drop_sound = 'sound/items/handling/multitool_drop.ogg' pickup_sound = 'sound/items/handling/multitool_pickup.ogg' - custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.2) custom_premium_price = PAYCHECK_COMMAND * 3 toolspeed = 1 usesound = 'sound/weapons/empty.ogg' @@ -131,7 +131,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "multitool" belt_icon_state = "multitool_alien" - custom_materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 5000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 1.25, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT) toolspeed = 0.1 /obj/item/multitool/cyborg diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index ce8e6a71536..546b8cabfaa 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -7,7 +7,7 @@ item_flags = NOBLUDGEON var/paint_color = "grey" - custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT) /obj/item/pipe_painter/afterattack(atom/A, mob/user, proximity_flag) . = ..() diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 150106e9214..51ab6ec94f5 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -22,7 +22,7 @@ throwforce = 5 throw_speed = 1 throw_range = 2 - custom_materials = list(/datum/material/iron=750) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT* 7.5) var/max_heat = 5e7 // Maximum contained heat before exploding. Not actual temperature. var/internal_heat = 0 // Contained heat, goes down every tick. var/mode = DISCONNECTED // DISCONNECTED, CLAMPED_OFF, OPERATING diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 63f12d9038c..ce87739d114 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -9,7 +9,7 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE - custom_materials = list(/datum/material/iron=10000, /datum/material/glass=2500) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT *5, /datum/material/glass=SHEET_MATERIAL_AMOUNT * 1.25) var/on = TRUE var/code = 2 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 31f033ed529..9df83a5c4cb 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' worn_icon_state = "headset" - custom_materials = list(/datum/material/iron=75) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.75) subspace_transmission = TRUE canhear_range = 0 // can't hear headsets from very far away diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index e472b991d67..dee816618eb 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -178,7 +178,7 @@ icon_state = "intercom" result_path = /obj/item/radio/intercom/unscrewed pixel_shift = 26 - custom_materials = list(/datum/material/iron = 75, /datum/material/glass = 25) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.25) MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 26) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 468fe8419fc..522cef62552 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -16,7 +16,7 @@ throw_speed = 3 throw_range = 7 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=75, /datum/material/glass=25) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.25) obj_flags = USES_TGUI ///if FALSE, broadcasting and listening dont matter and this radio shouldnt do anything diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm index 38c6760690f..75ecbf8fe28 100644 --- a/code/game/objects/items/devices/scanners/gas_analyzer.dm +++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm @@ -15,7 +15,7 @@ throw_speed = 3 throw_range = 7 tool_behaviour = TOOL_ANALYZER - custom_materials = list(/datum/material/iron=30, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.2) grind_results = list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) var/cooldown = FALSE var/cooldown_time = 250 @@ -206,7 +206,7 @@ icon_state = "analyzerranged" worn_icon_state = "analyzer" w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron = 100, /datum/material/glass = 20, /datum/material/gold = 300, /datum/material/bluespace=200) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.2, /datum/material/gold = SMALL_MATERIAL_AMOUNT*3, /datum/material/bluespace=SMALL_MATERIAL_AMOUNT*2) grind_results = list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) /obj/item/analyzer/ranged/afterattack(atom/target, mob/user, proximity_flag, click_parameters) diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index 6fa12aaf244..be6e19d7210 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -21,7 +21,7 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron=200) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT *2) var/mode = SCANNER_VERBOSE var/scanmode = SCANMODE_HEALTH var/advanced = FALSE diff --git a/code/game/objects/items/devices/scanners/sequence_scanner.dm b/code/game/objects/items/devices/scanners/sequence_scanner.dm index 2422b262f32..7c42aa3c3b1 100644 --- a/code/game/objects/items/devices/scanners/sequence_scanner.dm +++ b/code/game/objects/items/devices/scanners/sequence_scanner.dm @@ -14,7 +14,7 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron=200) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2) var/list/discovered = list() //hit a dna console to update the scanners database var/list/buffer diff --git a/code/game/objects/items/devices/scanners/slime_scanner.dm b/code/game/objects/items/devices/scanners/slime_scanner.dm index 81b197bfaf8..340c5f05c3d 100644 --- a/code/game/objects/items/devices/scanners/slime_scanner.dm +++ b/code/game/objects/items/devices/scanners/slime_scanner.dm @@ -11,7 +11,7 @@ throwforce = 0 throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron=30, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.30, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.20) /obj/item/slime_scanner/attack(mob/living/M, mob/living/user) if(user.stat || !user.can_read(src) || user.is_blind()) diff --git a/code/game/objects/items/devices/scanners/t_scanner.dm b/code/game/objects/items/devices/scanners/t_scanner.dm index 482f8cef8ce..6168d0f8380 100644 --- a/code/game/objects/items/devices/scanners/t_scanner.dm +++ b/code/game/objects/items/devices/scanners/t_scanner.dm @@ -11,7 +11,7 @@ worn_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' - custom_materials = list(/datum/material/iron=150) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 1.5) /obj/item/t_scanner/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] begins to emit terahertz-rays into [user.p_their()] brain with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 0627a51dce3..997f548a0ee 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -9,7 +9,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=60, /datum/material/glass=30) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.6, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.3) force = 2 throwforce = 2 speech_span = SPAN_TAPE_RECORDER @@ -374,7 +374,7 @@ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron=20, /datum/material/glass=5) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.05) force = 1 throwforce = 0 obj_flags = UNIQUE_RENAME //my mixtape diff --git a/code/game/objects/items/door_seal.dm b/code/game/objects/items/door_seal.dm index 3c5f091965f..7223692445b 100644 --- a/code/game/objects/items/door_seal.dm +++ b/code/game/objects/items/door_seal.dm @@ -13,7 +13,7 @@ throw_speed = 2 throw_range = 1 w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=5000,/datum/material/plasma=500) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/plasma= SMALL_MATERIAL_AMOUNT * 5) /// how long the seal takes to place on the door var/seal_time = 3 SECONDS /// how long it takes to remove the seal from a door diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index acffe969677..04ac9fa33a5 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -13,7 +13,7 @@ throw_range = 7 force = 10 demolition_mod = 1.25 - custom_materials = list(/datum/material/iron = 90) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.9) attack_verb_continuous = list("slams", "whacks", "bashes", "thunks", "batters", "bludgeons", "thrashes") attack_verb_simple = list("slam", "whack", "bash", "thunk", "batter", "bludgeon", "thrash") dog_fashion = /datum/dog_fashion/back @@ -57,7 +57,7 @@ throwforce = 2 w_class = WEIGHT_CLASS_SMALL force = 3 - custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 40) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT* 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4) max_water = 30 sprite_name = "miniFE" dog_fashion = null @@ -76,7 +76,7 @@ throwforce = 1 w_class = WEIGHT_CLASS_SMALL force = 3 - custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 40) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4) max_water = 30 sprite_name = "coolant" dog_fashion = null diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index ba26b133783..9be8532e036 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -12,7 +12,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=500) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT * 0.5) resistance_flags = FIRE_PROOF trigger_guard = TRIGGER_GUARD_NORMAL light_system = MOVABLE_LIGHT diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index 18d3a6076f3..3c0c27a2695 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -353,7 +353,7 @@ icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "popsicle_stick" desc = "This humble little stick usually carries a frozen treat, at the moment it seems freed from this Atlassian burden." - custom_materials = list(/datum/material/wood = 20) + custom_materials = list(/datum/material/wood = SMALL_MATERIAL_AMOUNT * 0.20) resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_TINY force = 0 diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 4dd48c7b40e..07638067d29 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -1,5 +1,5 @@ /obj/item/food/meat - custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4) + custom_materials = list(/datum/material/meat = SHEET_MATERIAL_AMOUNT * 4) w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/food/meat.dmi' var/subjectname = "" diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index 0c4dd9a59d6..1d565060755 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -166,7 +166,7 @@ icon_state = "bowl" base_icon_state = "bowl" reagent_flags = OPENCONTAINER | DUNKABLE - custom_materials = list(/datum/material/glass = 500) + custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*5) w_class = WEIGHT_CLASS_NORMAL custom_price = PAYCHECK_CREW * 0.6 fill_icon_thresholds = list(0) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 3d121f854f8..bffd8aeabba 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -38,7 +38,7 @@ w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 5 - custom_materials = list(/datum/material/iron=500) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 5) breakouttime = 1 MINUTES armor_type = /datum/armor/restraints_handcuffs custom_price = PAYCHECK_COMMAND * 0.35 @@ -148,7 +148,7 @@ var/cable_color = CABLE_COLOR_RED lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - custom_materials = list(/datum/material/iron=150, /datum/material/glass=75) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.75) breakouttime = 30 SECONDS cuffsound = 'sound/weapons/cablecuff.ogg' diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 32039874cb3..23f87ad0f95 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -12,7 +12,7 @@ throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/glass=500) + custom_materials = list(/datum/material/glass= SMALL_MATERIAL_AMOUNT * 5) ///the implant within the case var/obj/item/implant/imp = null ///Type of implant this will spawn as imp upon being spawned diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 454ebb07747..a5242e292a1 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -12,7 +12,7 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=600, /datum/material/glass=200) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass=SMALL_MATERIAL_AMOUNT *2) ///The implant in our implanter var/obj/item/implant/imp = null ///Type of implant this will spawn as imp upon being spawned diff --git a/code/game/objects/items/kirbyplants.dm b/code/game/objects/items/kirbyplants.dm index 32271c21ac8..88700c36c6e 100644 --- a/code/game/objects/items/kirbyplants.dm +++ b/code/game/objects/items/kirbyplants.dm @@ -79,7 +79,7 @@ name = "plastic potted plant" desc = "A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch." icon_state = "plant-26" - custom_materials = (list(/datum/material/plastic = 8000)) + custom_materials = (list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4)) trimmable = FALSE /obj/item/kirbyplants/fullysynthetic/Initialize(mapload) diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 04990f7d4bd..b6f80363b61 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -26,7 +26,7 @@ throwforce = 0 throw_speed = 3 throw_range = 5 - custom_materials = list(/datum/material/iron=80) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.8) flags_1 = CONDUCT_1 attack_verb_continuous = list("attacks", "stabs", "pokes") attack_verb_simple = list("attack", "stab", "poke") @@ -72,7 +72,7 @@ force = 0 w_class = WEIGHT_CLASS_TINY throwforce = 0 - custom_materials = list(/datum/material/plastic=80) + custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.8) custom_price = PAYCHECK_LOWER * 1 /obj/item/kitchen/fork/plastic/Initialize(mapload) @@ -92,7 +92,7 @@ w_class = WEIGHT_CLASS_TINY throwforce = 0 throw_range = 5 - custom_materials = list(/datum/material/plastic = 100) + custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT) attack_verb_continuous = list("prods", "whiffs", "scratches", "pokes") attack_verb_simple = list("prod", "whiff", "scratch", "poke") sharpness = SHARP_EDGED @@ -150,7 +150,7 @@ throwforce = 5 throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.5) resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_NORMAL attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks") @@ -165,7 +165,7 @@ inhand_icon_state = "metal_rolling_pin" force = 12 flags_1 = CONDUCT_1 - custom_materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT * 1.5, /datum/material/plastic = MINERAL_MATERIAL_AMOUNT * 1.5) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 1.5) custom_price = PAYCHECK_CREW * 2 bare_wound_bonus = 14 @@ -187,7 +187,7 @@ attack_verb_simple = list("whack", "spoon", "tap") attack_verb_continuous = list("whacks", "spoons", "taps") armor_type = /datum/armor/kitchen_spoon - custom_materials = list(/datum/material/iron=120) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.2) custom_price = PAYCHECK_LOWER * 2 tool_behaviour = TOOL_MINING toolspeed = 25 // Literally 25 times worse than the base pickaxe @@ -295,7 +295,7 @@ name = "plastic spoon" icon_state = "plastic_spoon" force = 0 - custom_materials = list(/datum/material/plastic=120) + custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 1.2) toolspeed = 75 // The plastic spoon takes 5 minutes to dig through a single mineral turf... It's one, continuous, breakable, do_after... custom_price = PAYCHECK_LOWER * 1 diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm index c181f6f374f..c8eccd25407 100644 --- a/code/game/objects/items/knives.dm +++ b/code/game/objects/items/knives.dm @@ -16,7 +16,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' throw_speed = 3 throw_range = 6 - custom_materials = list(/datum/material/iron=12000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6) attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") sharpness = SHARP_EDGED @@ -94,7 +94,7 @@ flags_1 = CONDUCT_1 force = 15 throwforce = 10 - custom_materials = list(/datum/material/iron=18000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6) attack_verb_continuous = list("slices", "dices", "chops", "cubes", "minces", "juliennes", "chiffonades", "batonnets") attack_verb_simple = list("slice", "dice", "chop", "cube", "mince", "julienne", "chiffonade", "batonnet") w_class = WEIGHT_CLASS_NORMAL @@ -171,7 +171,7 @@ attack_verb_continuous = list("shanks", "shivs") attack_verb_simple = list("shank", "shiv") armor_type = /datum/armor/none - custom_materials = list(/datum/material/glass=400) + custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT * 4) /obj/item/knife/shiv/Initialize(mapload) flags_1 &= ~CONDUCT_1 @@ -185,7 +185,7 @@ force = 9 throwforce = 13 armor_type = /datum/armor/shiv_plasma - custom_materials = list(/datum/material/glass=400, /datum/material/plasma=200) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT *4, /datum/material/plasma=SMALL_MATERIAL_AMOUNT * 2) /datum/armor/shiv_plasma melee = 25 @@ -205,7 +205,7 @@ throw_range = 7 wound_bonus = 10 armor_type = /datum/armor/shiv_titanium - custom_materials = list(/datum/material/glass=400, /datum/material/titanium=200) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4, /datum/material/titanium=SMALL_MATERIAL_AMOUNT * 2) /datum/armor/shiv_titanium melee = 25 @@ -228,7 +228,7 @@ wound_bonus = 10 bare_wound_bonus = 20 armor_type = /datum/armor/shiv_plastitanium - custom_materials = list(/datum/material/glass=400, /datum/material/alloy/plastitanium=200) + custom_materials = list(/datum/material/glass= SMALL_MATERIAL_AMOUNT * 4, /datum/material/alloy/plastitanium= SMALL_MATERIAL_AMOUNT * 2) /datum/armor/shiv_plastitanium melee = 50 diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 62635514186..dae493a6908 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -727,7 +727,7 @@ cell_hit_cost = 2000 throw_stun_chance = 99 //Have you prayed today? convertible = FALSE - custom_materials = list(/datum/material/iron = 10000, /datum/material/glass = 4000, /datum/material/silver = 10000, /datum/material/gold = 2000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*5, /datum/material/gold = SHEET_MATERIAL_AMOUNT) /obj/item/melee/baton/security/boomerang/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 0a7bae3603e..95d9fba9b73 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -29,7 +29,7 @@ attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines") attack_verb_simple = list("flog", "whip", "lash", "discipline") hitsound = 'sound/weapons/chainhit.ogg' - custom_materials = list(/datum/material/iron = 1000) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT) /obj/item/melee/chainofcommand/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -79,7 +79,7 @@ attack_verb_continuous = list("slashes", "cuts") attack_verb_simple = list("slash", "cut") hitsound = 'sound/weapons/rapierhit.ogg' - custom_materials = list(/datum/material/iron = 1000) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT) wound_bonus = 10 bare_wound_bonus = 25 @@ -446,7 +446,7 @@ greyscale_colors = "#FFFFFF" material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color. - custom_materials = list(/datum/material/iron = 12000) //Defaults to an Iron Mace. + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) //Defaults to an Iron Mace. slot_flags = ITEM_SLOT_BELT force = 14 w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 36f526a787d..6d7e13a5ff1 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -17,7 +17,7 @@ w_class = WEIGHT_CLASS_BULKY throw_speed = 2 throw_range = 3 - custom_materials = list(/datum/material/iron = 7500, /datum/material/glass = 100) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 7.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT) var/open = TRUE var/locked = FALSE var/list/occupants = list() diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index e671fe94c41..a324214e87d 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -13,7 +13,7 @@ righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron = 500, /datum/material/glass = 250) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.5) var/active = FALSE var/atom/movable/target //The thing we're searching for var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm index a2189f396db..0ddc3163162 100644 --- a/code/game/objects/items/rcd/RCD.dm +++ b/code/game/objects/items/rcd/RCD.dm @@ -644,11 +644,11 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) w_class = WEIGHT_CLASS_TINY lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - custom_materials = list(/datum/material/iron=12000, /datum/material/glass=8000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT *6, /datum/material/glass=SHEET_MATERIAL_AMOUNT*4) var/ammoamt = 40 /obj/item/rcd_ammo/large - custom_materials = list(/datum/material/iron=48000, /datum/material/glass=32000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*24, /datum/material/glass=SHEET_MATERIAL_AMOUNT*16) ammoamt = 160 /obj/item/construction/rcd/combat/admin diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm index 41aee46f28d..50ebce21c92 100644 --- a/code/game/objects/items/rcd/RHD.dm +++ b/code/game/objects/items/rcd/RHD.dm @@ -13,7 +13,7 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=100000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*50) req_access = list(ACCESS_ENGINE_EQUIP) armor_type = /datum/armor/item_construction resistance_flags = FIRE_PROOF diff --git a/code/game/objects/items/rcd/RPD.dm b/code/game/objects/items/rcd/RPD.dm index 684d19c2bfa..6aca5a1e8e9 100644 --- a/code/game/objects/items/rcd/RPD.dm +++ b/code/game/objects/items/rcd/RPD.dm @@ -221,7 +221,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( throw_range = 5 w_class = WEIGHT_CLASS_NORMAL slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=75000, /datum/material/glass=37500) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*37.5, /datum/material/glass=SHEET_MATERIAL_AMOUNT*18.75) armor_type = /datum/armor/item_pipe_dispenser resistance_flags = FIRE_PROOF ///Sparks system used when changing device in the UI diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index cf487dfcd3c..ab13b448704 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -77,7 +77,7 @@ desc = "A medieval wooden buckler." icon_state = "buckler" inhand_icon_state = "buckler" - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 10) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10) resistance_flags = FLAMMABLE block_chance = 30 max_integrity = 55 @@ -88,7 +88,7 @@ desc = "Bears an inscription on the inside: \"Romanes venio domus\"." icon_state = "roman_shield" inhand_icon_state = "roman_shield" - custom_materials = list(/datum/material/iron=8500) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4.25) max_integrity = 65 shield_break_sound = 'sound/effects/grillehit.ogg' shield_break_leftover = /obj/item/stack/sheet/iron @@ -104,7 +104,7 @@ desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." icon_state = "riot" inhand_icon_state = "riot" - custom_materials = list(/datum/material/glass=7500, /datum/material/iron=1000) + custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT * 3.75, /datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT) transparent = TRUE max_integrity = 75 shield_break_sound = 'sound/effects/glassbr3.ogg' @@ -287,7 +287,7 @@ icon_state = "teleriot" inhand_icon_state = "teleriot" worn_icon_state = "teleriot" - custom_materials = list(/datum/material/iron = 3600, /datum/material/glass = 3600, /datum/material/silver = 270, /datum/material/titanium = 180) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 3.6, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 3.6, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2.7, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 1.8) slot_flags = null force = 3 throwforce = 3 diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm index db4cc6789b3..f0839543cb1 100644 --- a/code/game/objects/items/shrapnel.dm +++ b/code/game/objects/items/shrapnel.dm @@ -1,6 +1,6 @@ /obj/item/shrapnel // frag grenades name = "shrapnel shard" - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5) weak_against_armour = TRUE icon = 'icons/obj/shards.dmi' icon_state = "large" @@ -84,6 +84,6 @@ /obj/item/shrapnel/capmine name = "\improper AP shrapnel shard" - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5) weak_against_armour = TRUE diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index a7c7564537f..f6d628ad4f9 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -14,7 +14,7 @@ demolition_mod = 0.75 embedding = list("impact_pain_mult" = 2, "remove_pain_mult" = 4, "jostle_chance" = 2.5) armour_penetration = 10 - custom_materials = list(/datum/material/iron=1000, /datum/material/glass=2000) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass= HALF_SHEET_MATERIAL_AMOUNT * 2) hitsound = 'sound/weapons/bladeslice.ogg' attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores") attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore") @@ -70,7 +70,7 @@ if(/obj/item/shard/plasma) force = 11 throwforce = 21 - custom_materials = list(/datum/material/iron=1000, /datum/material/alloy/plasmaglass=2000) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT, /datum/material/alloy/plasmaglass= HALF_SHEET_MATERIAL_AMOUNT * 2) icon_prefix = "spearplasma" force_unwielded = 11 force_wielded = 19 @@ -80,7 +80,7 @@ throwforce = 21 throw_range = 8 throw_speed = 5 - custom_materials = list(/datum/material/iron=1000, /datum/material/alloy/titaniumglass=2000) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT, /datum/material/alloy/titaniumglass= HALF_SHEET_MATERIAL_AMOUNT * 2) wound_bonus = -10 force_unwielded = 13 force_wielded = 18 @@ -91,7 +91,7 @@ throwforce = 22 throw_range = 9 throw_speed = 5 - custom_materials = list(/datum/material/iron=1000, /datum/material/alloy/plastitaniumglass=2000) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT, /datum/material/alloy/plastitaniumglass= HALF_SHEET_MATERIAL_AMOUNT * 2) wound_bonus = -10 bare_wound_bonus = 20 force_unwielded = 13 @@ -216,7 +216,7 @@ throwforce = 22 armour_penetration = 15 //Enhanced armor piercing - custom_materials = list(/datum/material/bone=7000) + custom_materials = list(/datum/material/bone = HALF_SHEET_MATERIAL_AMOUNT * 7) force_unwielded = 12 force_wielded = 20 @@ -231,6 +231,6 @@ desc = "A haphazardly-constructed bamboo stick with a sharpened tip, ready to poke holes into unsuspecting people." throwforce = 22 //Better to throw - custom_materials = list(/datum/material/bamboo=40000) + custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 20) force_unwielded = 10 force_wielded = 18 diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 5576f378f30..de827380948 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -7,7 +7,7 @@ singular_name = "bluespace crystal" dye_color = DYE_COSMIC w_class = WEIGHT_CLASS_TINY - mats_per_unit = list(/datum/material/bluespace=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bluespace=SHEET_MATERIAL_AMOUNT) points = 50 refined_type = /obj/item/stack/sheet/bluespace_crystal grind_results = list(/datum/reagent/bluespace = 20) @@ -54,7 +54,7 @@ /obj/item/stack/ore/bluespace_crystal/artificial name = "artificial bluespace crystal" desc = "An artificially made bluespace crystal, it looks delicate." - mats_per_unit = list(/datum/material/bluespace=MINERAL_MATERIAL_AMOUNT*0.5) + mats_per_unit = list(/datum/material/bluespace=SHEET_MATERIAL_AMOUNT*0.5) blink_range = 4 // Not as good as the organic stuff! points = 0 //nice try refined_type = null @@ -69,7 +69,7 @@ inhand_icon_state = null singular_name = "bluespace polycrystal" desc = "A stable polycrystal, made of fused-together bluespace crystals. You could probably break one off." - mats_per_unit = list(/datum/material/bluespace=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bluespace=SHEET_MATERIAL_AMOUNT) attack_verb_continuous = list("bluespace polybashes", "bluespace polybatters", "bluespace polybludgeons", "bluespace polythrashes", "bluespace polysmashes") attack_verb_simple = list("bluespace polybash", "bluespace polybatter", "bluespace polybludgeon", "bluespace polythrash", "bluespace polysmash") novariants = TRUE diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 7de898a044b..28c1a928353 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ color = "#5286b9ff" flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_NORMAL - mats_per_unit = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000) + mats_per_unit = list(/datum/material/iron=1000, /datum/material/plasma=SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium=SHEET_MATERIAL_AMOUNT) max_amount = 30 resistance_flags = FIRE_PROOF | LAVA_PROOF merge_type = /obj/item/stack/rods/lava diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 2f23e3c83c0..0e94271d053 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ singular_name = "glass sheet" icon_state = "sheet-glass" inhand_icon_state = "sheet-glass" - mats_per_unit = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT) armor_type = /datum/armor/sheet_glass resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/glass @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ singular_name = "plasma glass sheet" icon_state = "sheet-pglass" inhand_icon_state = "sheet-pglass" - mats_per_unit = list(/datum/material/alloy/plasmaglass=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/alloy/plasmaglass=SHEET_MATERIAL_AMOUNT) material_type = /datum/material/alloy/plasmaglass armor_type = /datum/armor/sheet_plasmaglass resistance_flags = ACID_PROOF @@ -151,7 +151,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \ singular_name = "reinforced glass sheet" icon_state = "sheet-rglass" inhand_icon_state = "sheet-rglass" - mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/glass=SHEET_MATERIAL_AMOUNT) armor_type = /datum/armor/sheet_rglass resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/rglass @@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \ singular_name = "reinforced plasma glass sheet" icon_state = "sheet-prglass" inhand_icon_state = "sheet-prglass" - mats_per_unit = list(/datum/material/alloy/plasmaglass=MINERAL_MATERIAL_AMOUNT, /datum/material/iron = MINERAL_MATERIAL_AMOUNT * 0.5) + mats_per_unit = list(/datum/material/alloy/plasmaglass=SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.5) armor_type = /datum/armor/sheet_plasmarglass resistance_flags = ACID_PROOF material_flags = NONE @@ -221,7 +221,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( singular_name = "titanium glass sheet" icon_state = "sheet-titaniumglass" inhand_icon_state = "sheet-titaniumglass" - mats_per_unit = list(/datum/material/alloy/titaniumglass=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/alloy/titaniumglass=SHEET_MATERIAL_AMOUNT) material_type = /datum/material/alloy/titaniumglass armor_type = /datum/armor/sheet_titaniumglass resistance_flags = ACID_PROOF @@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( singular_name = "plastitanium glass sheet" icon_state = "sheet-plastitaniumglass" inhand_icon_state = "sheet-plastitaniumglass" - mats_per_unit = list(/datum/material/alloy/plastitaniumglass=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/alloy/plastitaniumglass=SHEET_MATERIAL_AMOUNT) material_type = /datum/material/alloy/plastitaniumglass armor_type = /datum/armor/sheet_plastitaniumglass material_flags = NONE @@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( inhand_icon_state = "shard-glass" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - custom_materials = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT) attack_verb_continuous = list("stabs", "slashes", "slices", "cuts") attack_verb_simple = list("stab", "slash", "slice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -394,7 +394,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( throwforce = 11 icon_state = "plasmalarge" inhand_icon_state = "shard-plasma" - custom_materials = list(/datum/material/alloy/plasmaglass=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/alloy/plasmaglass=SHEET_MATERIAL_AMOUNT) icon_prefix = "plasma" weld_material = /obj/item/stack/sheet/plasmaglass shiv_type = /obj/item/knife/shiv/plasma @@ -406,7 +406,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( throwforce = 12 icon_state = "titaniumlarge" inhand_icon_state = "shard-titanium" - custom_materials = list(/datum/material/alloy/titaniumglass=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/alloy/titaniumglass=SHEET_MATERIAL_AMOUNT) icon_prefix = "titanium" weld_material = /obj/item/stack/sheet/titaniumglass shiv_type = /obj/item/knife/shiv/titanium @@ -419,7 +419,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( throwforce = 12 icon_state = "plastitaniumlarge" inhand_icon_state = "shard-plastitanium" - custom_materials = list(/datum/material/alloy/plastitaniumglass=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/alloy/plastitaniumglass=SHEET_MATERIAL_AMOUNT) icon_prefix = "plastitanium" weld_material = /obj/item/stack/sheet/plastitaniumglass shiv_type = /obj/item/knife/shiv/plastitanium diff --git a/code/game/objects/items/stacks/sheets/hot_ice.dm b/code/game/objects/items/stacks/sheets/hot_ice.dm index 69b96bc541f..cb7b016c8e3 100644 --- a/code/game/objects/items/stacks/sheets/hot_ice.dm +++ b/code/game/objects/items/stacks/sheets/hot_ice.dm @@ -4,7 +4,7 @@ inhand_icon_state = null singular_name = "hot ice piece" icon = 'icons/obj/stack_objects.dmi' - mats_per_unit = list(/datum/material/hot_ice=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/hot_ice=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/toxin/hot_ice = 25) material_type = /datum/material/hot_ice merge_type = /obj/item/stack/sheet/hot_ice diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 3be68a0f7a4..fb6540461f4 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ inhand_icon_state = null throw_speed = 3 throw_range = 5 - mats_per_unit = list(/datum/material/sandstone=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/sandstone=SHEET_MATERIAL_AMOUNT) sheettype = "sandstone" merge_type = /obj/item/stack/sheet/mineral/sandstone walltype = /turf/closed/wall/mineral/sandstone @@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ inhand_icon_state = "sheet-diamond" singular_name = "diamond" sheettype = "diamond" - mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/carbon = 20) point_value = 25 merge_type = /obj/item/stack/sheet/mineral/diamond @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ inhand_icon_state = "sheet-uranium" singular_name = "uranium sheet" sheettype = "uranium" - mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/uranium = 20) point_value = 20 merge_type = /obj/item/stack/sheet/mineral/uranium @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ sheettype = "plasma" resistance_flags = FLAMMABLE max_integrity = 100 - mats_per_unit = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/toxin/plasma = 20) point_value = 20 merge_type = /obj/item/stack/sheet/mineral/plasma @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \ inhand_icon_state = "sheet-gold" singular_name = "gold bar" sheettype = "gold" - mats_per_unit = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/gold = 20) point_value = 20 merge_type = /obj/item/stack/sheet/mineral/gold @@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \ inhand_icon_state = "sheet-silver" singular_name = "silver bar" sheettype = "silver" - mats_per_unit = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/silver = 20) point_value = 20 merge_type = /obj/item/stack/sheet/mineral/silver @@ -240,7 +240,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \ inhand_icon_state = null singular_name = "bananium sheet" sheettype = "bananium" - mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/consumable/banana = 20) point_value = 50 merge_type = /obj/item/stack/sheet/mineral/bananium @@ -272,7 +272,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ throw_speed = 1 throw_range = 3 sheettype = "titanium" - mats_per_unit = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/titanium=SHEET_MATERIAL_AMOUNT) point_value = 20 merge_type = /obj/item/stack/sheet/mineral/titanium material_type = /datum/material/titanium @@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \ throw_speed = 1 throw_range = 3 sheettype = "plastitanium" - mats_per_unit = list(/datum/material/alloy/plastitanium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/alloy/plastitanium=SHEET_MATERIAL_AMOUNT) point_value = 45 material_type = /datum/material/alloy/plastitanium merge_type = /obj/item/stack/sheet/mineral/plastitanium @@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \ name = "snow" icon_state = "sheet-snow" inhand_icon_state = null - mats_per_unit = list(/datum/material/snow = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/snow = SHEET_MATERIAL_AMOUNT) singular_name = "snow block" force = 1 throwforce = 2 @@ -364,7 +364,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( icon_state = "sheet-adamantine" inhand_icon_state = "sheet-adamantine" singular_name = "adamantine sheet" - mats_per_unit = list(/datum/material/adamantine=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/adamantine=SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/mineral/adamantine /obj/item/stack/sheet/mineral/adamantine/get_main_recipes() @@ -381,7 +381,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( singular_name = "runite bar" icon_state = "sheet-runite" inhand_icon_state = "sheet-runite" - mats_per_unit = list(/datum/material/runite=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/runite=SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/mineral/runite material_type = /datum/material/runite @@ -395,7 +395,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( inhand_icon_state = "sheet-mythril" singular_name = "mythril sheet" novariants = TRUE - mats_per_unit = list(/datum/material/mythril=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/mythril=SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/mineral/mythril /* @@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( inhand_icon_state = "sheet-abductor" singular_name = "alien alloy sheet" sheettype = "abductor" - mats_per_unit = list(/datum/material/alloy/alien=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/alloy/alien=SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/mineral/abductor material_type = /datum/material/alloy/alien walltype = /turf/closed/wall/mineral/abductor @@ -476,7 +476,7 @@ GLOBAL_LIST_INIT(metalhydrogen_recipes, list( w_class = WEIGHT_CLASS_NORMAL resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF | INDESTRUCTIBLE point_value = 100 - mats_per_unit = list(/datum/material/metalhydrogen = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT) material_type = /datum/material/metalhydrogen merge_type = /obj/item/stack/sheet/mineral/metal_hydrogen @@ -491,6 +491,6 @@ GLOBAL_LIST_INIT(metalhydrogen_recipes, list( singular_name = "zaukerite crystal" w_class = WEIGHT_CLASS_NORMAL point_value = 120 - mats_per_unit = list(/datum/material/zaukerite = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/zaukerite = SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/mineral/zaukerite material_type = /datum/material/zaukerite diff --git a/code/game/objects/items/stacks/sheets/runed_metal.dm b/code/game/objects/items/stacks/sheets/runed_metal.dm index c91cd659f44..a1febc091b7 100644 --- a/code/game/objects/items/stacks/sheets/runed_metal.dm +++ b/code/game/objects/items/stacks/sheets/runed_metal.dm @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list( \ icon_state = "sheet-runed" inhand_icon_state = "sheet-runed" icon = 'icons/obj/stack_objects.dmi' - mats_per_unit = list(/datum/material/runedmetal = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/runedmetal = SHEET_MATERIAL_AMOUNT) sheettype = "runed" merge_type = /obj/item/stack/sheet/runed_metal grind_results = list(/datum/reagent/iron = 5, /datum/reagent/blood = 15) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index d74c9e922bc..68b0d981c6c 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -139,7 +139,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ singular_name = "iron sheet" icon_state = "sheet-metal" inhand_icon_state = "sheet-metal" - mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) throwforce = 10 flags_1 = CONDUCT_1 resistance_flags = FIRE_PROOF @@ -264,7 +264,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \ desc = "This sheet is an alloy of iron and plasma." icon_state = "sheet-plasteel" inhand_icon_state = "sheet-plasteel" - mats_per_unit = list(/datum/material/alloy/plasteel=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/alloy/plasteel=SHEET_MATERIAL_AMOUNT) material_type = /datum/material/alloy/plasteel throwforce = 10 flags_1 = CONDUCT_1 @@ -346,7 +346,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ icon_state = "sheet-wood" inhand_icon_state = "sheet-wood" icon = 'icons/obj/stack_objects.dmi' - mats_per_unit = list(/datum/material/wood=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/wood=SHEET_MATERIAL_AMOUNT) sheettype = "wood" armor_type = /datum/armor/mineral_wood resistance_flags = FLAMMABLE @@ -395,7 +395,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ inhand_icon_state = "sheet-bamboo" icon = 'icons/obj/stack_objects.dmi' sheettype = "bamboo" - mats_per_unit = list(/datum/material/bamboo = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT) throwforce = 15 armor_type = /datum/armor/mineral_bamboo resistance_flags = FLAMMABLE @@ -606,7 +606,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ singular_name = "cardboard sheet" icon_state = "sheet-card" inhand_icon_state = "sheet-card" - mats_per_unit = list(/datum/material/cardboard = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT) resistance_flags = FLAMMABLE force = 0 throwforce = 0 @@ -665,7 +665,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ icon_state = "sheet-brass" inhand_icon_state = "sheet-brass" icon = 'icons/obj/stack_objects.dmi' - mats_per_unit = list(/datum/material/bronze = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT) lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF @@ -724,7 +724,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ icon = 'icons/obj/stack_objects.dmi' icon_state = "bone" inhand_icon_state = null - mats_per_unit = list(/datum/material/bone = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT) singular_name = "bone" desc = "Someone's been drinking their milk." force = 7 @@ -755,7 +755,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list( singular_name = "plastic sheet" icon_state = "sheet-plastic" inhand_icon_state = "sheet-plastic" - mats_per_unit = list(/datum/material/plastic=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/plastic=SHEET_MATERIAL_AMOUNT) throwforce = 7 material_type = /datum/material/plastic merge_type = /obj/item/stack/sheet/plastic @@ -780,7 +780,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra singular_name = "paper frame" icon_state = "sheet-paper" inhand_icon_state = "sheet-paper" - mats_per_unit = list(/datum/material/paper = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/paper = SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/paperframes resistance_flags = FLAMMABLE grind_results = list(/datum/reagent/cellulose = 20) @@ -802,7 +802,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra singular_name = "meat sheet" icon_state = "sheet-meat" material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR - mats_per_unit = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/meat = SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/meat material_type = /datum/material/meat material_modifier = 1 //None of that wussy stuff @@ -819,7 +819,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra desc = "It's a delicious pepperoni sheetzza!" singular_name = "pepperoni sheetzza" icon_state = "sheet-pizza" - mats_per_unit = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/pizza = SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/pizza material_type = /datum/material/pizza material_modifier = 1 @@ -836,7 +836,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra desc = "You're too old to be playing with sandcastles. Now you build... sandstations." singular_name = "sand block" icon_state = "sheet-sandstone" - mats_per_unit = list(/datum/material/sand = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/sand = SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/sandblock material_type = /datum/material/sand material_modifier = 1 @@ -855,7 +855,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra singular_name = "haunted sheet" icon_state = "sheet-meat" material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR - mats_per_unit = list(/datum/material/hauntium = MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/hauntium = SHEET_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/hauntium material_type = /datum/material/hauntium material_modifier = 1 //None of that wussy stuff diff --git a/code/game/objects/items/stacks/tiles/tile_iron.dm b/code/game/objects/items/stacks/tiles/tile_iron.dm index 4eb80c0f470..75c805abca8 100644 --- a/code/game/objects/items/stacks/tiles/tile_iron.dm +++ b/code/game/objects/items/stacks/tiles/tile_iron.dm @@ -5,7 +5,7 @@ icon_state = "tile" inhand_icon_state = "tile" force = 6 - mats_per_unit = list(/datum/material/iron=500) + mats_per_unit = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5) throwforce = 10 flags_1 = CONDUCT_1 turf_type = /turf/open/floor/iron diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index e6cc7ae4096..a4e9daeb46d 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -32,7 +32,7 @@ inhand_icon_state = "tile-plasma" turf_type = /turf/open/floor/mineral/plasma mineralType = "plasma" - mats_per_unit = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/plasma /obj/item/stack/tile/mineral/uranium @@ -43,7 +43,7 @@ inhand_icon_state = "tile-uranium" turf_type = /turf/open/floor/mineral/uranium mineralType = "uranium" - mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/uranium /obj/item/stack/tile/mineral/gold @@ -54,7 +54,7 @@ inhand_icon_state = "tile-gold" turf_type = /turf/open/floor/mineral/gold mineralType = "gold" - mats_per_unit = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/gold /obj/item/stack/tile/mineral/silver @@ -65,7 +65,7 @@ inhand_icon_state = "tile-silver" turf_type = /turf/open/floor/mineral/silver mineralType = "silver" - mats_per_unit = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/silver /obj/item/stack/tile/mineral/diamond @@ -76,7 +76,7 @@ inhand_icon_state = "tile-diamond" turf_type = /turf/open/floor/mineral/diamond mineralType = "diamond" - mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/diamond /obj/item/stack/tile/mineral/bananium @@ -87,7 +87,7 @@ inhand_icon_state = "tile-bananium" turf_type = /turf/open/floor/mineral/bananium mineralType = "bananium" - mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT*0.25) material_flags = NONE //The slippery comp makes it unpractical for good clown decor. The material tiles should still slip. merge_type = /obj/item/stack/tile/mineral/bananium @@ -98,7 +98,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "tile_abductor" inhand_icon_state = "tile-abductor" - mats_per_unit = list(/datum/material/alloy/alien=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/alloy/alien=SHEET_MATERIAL_AMOUNT*0.25) turf_type = /turf/open/floor/mineral/abductor mineralType = "abductor" merge_type = /obj/item/stack/tile/mineral/abductor @@ -111,7 +111,7 @@ inhand_icon_state = "tile-shuttle" turf_type = /turf/open/floor/mineral/titanium mineralType = "titanium" - mats_per_unit = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/titanium=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/titanium tile_reskin_types = list( /obj/item/stack/tile/mineral/titanium, @@ -206,7 +206,7 @@ inhand_icon_state = "tile-darkshuttle" turf_type = /turf/open/floor/mineral/plastitanium mineralType = "plastitanium" - mats_per_unit = list(/datum/material/alloy/plastitanium=MINERAL_MATERIAL_AMOUNT*0.25) + mats_per_unit = list(/datum/material/alloy/plastitanium=SHEET_MATERIAL_AMOUNT*0.25) merge_type = /obj/item/stack/tile/mineral/plastitanium tile_reskin_types = list( /obj/item/stack/tile/mineral/plastitanium, diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 8eed224caa4..dbb29848d77 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1093,7 +1093,7 @@ singular_name = "plastic floor tile" desc = "A tile of cheap, flimsy plastic flooring." icon_state = "tile_plastic" - mats_per_unit = list(/datum/material/plastic=500) + mats_per_unit = list(/datum/material/plastic=SMALL_MATERIAL_AMOUNT*5) turf_type = /turf/open/floor/plastic merge_type = /obj/item/stack/tile/plastic @@ -1141,7 +1141,7 @@ desc = "A clangy tile made of high-quality bronze. Clockwork construction techniques allow the clanging to be minimized." icon_state = "tile_brass" turf_type = /turf/open/floor/bronze - mats_per_unit = list(/datum/material/bronze=500) + mats_per_unit = list(/datum/material/bronze=SMALL_MATERIAL_AMOUNT*5) merge_type = /obj/item/stack/tile/bronze tile_reskin_types = list( /obj/item/stack/tile/bronze, @@ -1169,7 +1169,7 @@ desc = "A strange tile made from runed metal. Doesn't seem to actually have any paranormal powers." icon_state = "tile_cult" turf_type = /turf/open/floor/cult - mats_per_unit = list(/datum/material/runedmetal=500) + mats_per_unit = list(/datum/material/runedmetal=SMALL_MATERIAL_AMOUNT*5) merge_type = /obj/item/stack/tile/cult /// Floor tiles used to test emissive turfs. @@ -1207,7 +1207,7 @@ desc = "Flooring that shows its contents underneath. Engineers love it!" icon_state = "maint_catwalk" inhand_icon_state = "tile-catwalk" - mats_per_unit = list(/datum/material/iron=100) + mats_per_unit = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT) turf_type = /turf/open/floor/catwalk_floor merge_type = /obj/item/stack/tile/catwalk_tile //Just to be cleaner, these all stack with eachother tile_reskin_types = list( @@ -1268,7 +1268,7 @@ turf_type = /turf/open/floor/glass inhand_icon_state = "tile-glass" merge_type = /obj/item/stack/tile/glass - mats_per_unit = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT * 0.25) // 4 tiles per sheet + mats_per_unit = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT * 0.25) // 4 tiles per sheet replace_plating = TRUE /obj/item/stack/tile/glass/sixty @@ -1282,7 +1282,7 @@ inhand_icon_state = "tile-rglass" turf_type = /turf/open/floor/glass/reinforced merge_type = /obj/item/stack/tile/rglass - mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT * 0.125, /datum/material/glass=MINERAL_MATERIAL_AMOUNT * 0.25) // 4 tiles per sheet + mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 0.125, /datum/material/glass=SHEET_MATERIAL_AMOUNT * 0.25) // 4 tiles per sheet replace_plating = TRUE /obj/item/stack/tile/rglass/sixty @@ -1295,7 +1295,7 @@ icon_state = "tile_pglass" turf_type = /turf/open/floor/glass/plasma merge_type = /obj/item/stack/tile/glass/plasma - mats_per_unit = list(/datum/material/alloy/plasmaglass = MINERAL_MATERIAL_AMOUNT * 0.25) + mats_per_unit = list(/datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT * 0.25) /obj/item/stack/tile/rglass/plasma name = "reinforced plasma glass floor" @@ -1304,4 +1304,4 @@ icon_state = "tile_rpglass" turf_type = /turf/open/floor/glass/reinforced/plasma merge_type = /obj/item/stack/tile/rglass/plasma - mats_per_unit = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT * 0.125, /datum/material/alloy/plasmaglass = MINERAL_MATERIAL_AMOUNT * 0.25) + mats_per_unit = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.125, /datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT * 0.25) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 2265f99d1b4..ec272c32874 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -346,7 +346,7 @@ throw_range = 5 flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=3000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*1.5) custom_price = PAYCHECK_CREW * 0.6 /obj/item/storage/bag/tray/Initialize(mapload) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 026324fd43c..ceba66ffe1f 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -474,7 +474,7 @@ icon_state = "championbelt" inhand_icon_state = "championbelt" worn_icon_state = "championbelt" - custom_materials = list(/datum/material/gold=400) + custom_materials = list(/datum/material/gold=SMALL_MATERIAL_AMOUNT *4) /obj/item/storage/belt/champion/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/storage/boxes/engineering_boxes.dm b/code/game/objects/items/storage/boxes/engineering_boxes.dm index 5478c2b6343..8114154e1c6 100644 --- a/code/game/objects/items/storage/boxes/engineering_boxes.dm +++ b/code/game/objects/items/storage/boxes/engineering_boxes.dm @@ -75,7 +75,7 @@ icon_state = "plasticbox" foldable_result = null illustration = "writing" - custom_materials = list(/datum/material/plastic = 1000) //You lose most if recycled. + custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT) //You lose most if recycled. /obj/item/storage/box/emergencytank name = "emergency oxygen tank box" diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index a3853e5d04c..5aeeff5128b 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -16,7 +16,7 @@ /obj/item/storage/fancy icon = 'icons/obj/food/containers.dmi' resistance_flags = FLAMMABLE - custom_materials = list(/datum/material/cardboard = 2000) + custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT) /// Used by examine to report what this thing is holding. var/contents_tag = "errors" /// What type of thing to fill this storage with. @@ -507,7 +507,7 @@ spawn_count = 10 contents_tag = "pickle" foldable_result = null - custom_materials = list(/datum/material/glass = 2000) + custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT) open_status = FANCY_CONTAINER_ALWAYS_OPEN has_open_closed_states = FALSE @@ -536,7 +536,7 @@ name = "coffee condiments display" desc = "A neat small wooden box, holding all your favorite coffee condiments." contents_tag = "coffee condiment" - custom_materials = list(/datum/material/wood = 1000) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT/2) resistance_flags = FLAMMABLE foldable_result = /obj/item/stack/sheet/mineral/wood open_status = FANCY_CONTAINER_ALWAYS_OPEN diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index f73970be2a7..8a447b4dfb1 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -6,7 +6,7 @@ inhand_icon_state = "cola" lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' - custom_materials = list(/datum/material/plastic = 1200) + custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*1.2) max_integrity = 500 /obj/item/storage/cans/suicide_act(mob/living/carbon/user) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 3854eb7e92d..d06e0990ab9 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -13,7 +13,7 @@ throw_range = 7 demolition_mod = 1.25 w_class = WEIGHT_CLASS_BULKY - custom_materials = list(/datum/material/iron = 500) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*5) attack_verb_continuous = list("robusts") attack_verb_simple = list("robust") hitsound = 'sound/weapons/smash.ogg' @@ -298,4 +298,4 @@ /obj/item/storage/toolbox/haunted name = "old toolbox" - custom_materials = list(/datum/material/hauntium = 500) + custom_materials = list(/datum/material/hauntium = SMALL_MATERIAL_AMOUNT*5) diff --git a/code/game/objects/items/tail_pin.dm b/code/game/objects/items/tail_pin.dm index 9795bc85551..e158c6dd9c1 100644 --- a/code/game/objects/items/tail_pin.dm +++ b/code/game/objects/items/tail_pin.dm @@ -8,7 +8,7 @@ throwforce = 0 throw_speed = 1 embedding = EMBED_HARMLESS - custom_materials = list(/datum/material/iron=1000) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT) hitsound = 'sound/weapons/bladeslice.ogg' attack_verb_continuous = list("pokes", "jabs", "pins the tail on") attack_verb_simple = list("poke", "jab") diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 40eb55dbee7..e63a7b4698d 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -24,7 +24,7 @@ throw_speed = 1 throw_range = 4 demolition_mod = 1.25 - custom_materials = list(/datum/material/iron = 500) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*5) actions_types = list(/datum/action/item_action/set_internals) armor_type = /datum/armor/item_tank integrity_failure = 0.5 diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index 451d6dfcec1..ced4919c448 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -395,7 +395,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) desc = "A TGC flipper, for deciding who gets to go first. Also conveniently acts as a counter, for various purposes." icon = 'icons/obj/toys/tcgmisc.dmi' icon_state = "coin_nanotrasen" - custom_materials = list(/datum/material/plastic = 400) + custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT*5) material_flags = NONE sideslist = list("nanotrasen", "syndicate") override_material_worth = TRUE diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index dd67bbcd8ce..59415cf3515 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -23,7 +23,7 @@ righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron=400) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 4) var/tracking_range = 20 /obj/item/locator/ui_interact(mob/user, datum/tgui/ui) @@ -110,7 +110,7 @@ w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 5 - custom_materials = list(/datum/material/iron=10000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 5) armor_type = /datum/armor/item_hand_tele resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/list/active_portal_pairs diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 50534f85920..a705fa3500b 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -13,7 +13,7 @@ throwforce = 7 demolition_mod = 1.25 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5) drop_sound = 'sound/items/handling/crowbar_drop.ogg' pickup_sound = 'sound/items/handling/crowbar_pickup.ogg' @@ -47,7 +47,7 @@ desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." icon = 'icons/obj/abductor.dmi' usesound = 'sound/weapons/sonic_jackhammer.ogg' - custom_materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) icon_state = "crowbar" belt_icon_state = "crowbar_alien" toolspeed = 0.1 @@ -60,7 +60,7 @@ w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 throw_range = 3 - custom_materials = list(/datum/material/iron=70) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.7) icon_state = "crowbar_large" worn_icon_state = "crowbar" toolspeed = 0.7 @@ -96,7 +96,7 @@ worn_icon_state = "jawsoflife" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - custom_materials = list(/datum/material/iron = 4500, /datum/material/silver = 2500, /datum/material/titanium = 3500) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2.25, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/titanium = SHEET_MATERIAL_AMOUNT*1.75) usesound = 'sound/items/jaws_pry.ogg' force = 15 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 823e8181bd2..d9ad265ced8 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -16,7 +16,7 @@ throwforce = 5 throw_speed = 3 throw_range = 5 - custom_materials = list(/datum/material/iron=75) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.75) attack_verb_continuous = list("stabs") attack_verb_simple = list("stab") hitsound = 'sound/weapons/bladeslice.ogg' @@ -65,7 +65,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "screwdriver_a" inhand_icon_state = "screwdriver_nuke" - custom_materials = list(/datum/material/iron=5000, /datum/material/silver=2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/silver=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) usesound = 'sound/items/pshoom.ogg' toolspeed = 0.1 random_color = FALSE @@ -84,7 +84,7 @@ worn_icon_state = "drill" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - custom_materials = list(/datum/material/iron=3500, /datum/material/silver=1500, /datum/material/titanium=2500) //what research value? + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*1.75, /datum/material/silver=HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium=SHEET_MATERIAL_AMOUNT*1.25) //what research value? force = 8 //might or might not be too high, subject to change throwforce = 8 throw_speed = 2 diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 51a21226350..a2062663b9b 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -32,7 +32,7 @@ toolspeed = 1 wound_bonus = 10 bare_wound_bonus = 15 - custom_materials = list(/datum/material/iron=70, /datum/material/glass=30) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.3) /// Whether the welding tool is on or off. var/welding = FALSE /// Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) @@ -338,7 +338,7 @@ desc = "A slightly larger welder with a larger tank." icon_state = "indwelder" max_fuel = 40 - custom_materials = list(/datum/material/glass=60) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6) /obj/item/weldingtool/largetank/flamethrower_screwdriver() return @@ -365,7 +365,7 @@ icon_state = "miniwelder" max_fuel = 10 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) change_icons = FALSE /obj/item/weldingtool/mini/flamethrower_screwdriver() @@ -380,7 +380,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "welder" toolspeed = 0.1 - custom_materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 5000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) light_system = NO_LIGHT_SUPPORT light_range = 0 change_icons = FALSE @@ -396,7 +396,7 @@ icon_state = "upindwelder" inhand_icon_state = "upindwelder" max_fuel = 80 - custom_materials = list(/datum/material/iron=70, /datum/material/glass=120) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*1.2) /obj/item/weldingtool/experimental name = "experimental welding tool" @@ -404,7 +404,7 @@ icon_state = "exwelder" inhand_icon_state = "exwelder" max_fuel = 40 - custom_materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 1500, /datum/material/uranium = 200) + custom_materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT*1.5, /datum/material/uranium =SMALL_MATERIAL_AMOUNT * 2) change_icons = FALSE can_off_process = TRUE light_range = 1 diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 8480b812e60..5f3dc8c9a8a 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -19,7 +19,7 @@ throw_speed = 3 throw_range = 7 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=80) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.8) attack_verb_continuous = list("pinches", "nips") attack_verb_simple = list("pinch", "nip") hitsound = 'sound/items/wirecutter.ogg' @@ -71,7 +71,7 @@ name = "alien wirecutters" desc = "Extremely sharp wirecutters, made out of a silvery-green metal." icon = 'icons/obj/abductor.dmi' - custom_materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) icon_state = "cutters" toolspeed = 0.1 random_color = FALSE diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 2f8f3c126e0..07c49ded192 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -14,7 +14,7 @@ demolition_mod = 1.25 w_class = WEIGHT_CLASS_SMALL usesound = 'sound/items/ratchet.ogg' - custom_materials = list(/datum/material/iron=150) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*1.5) drop_sound = 'sound/items/handling/wrench_drop.ogg' pickup_sound = 'sound/items/handling/wrench_pickup.ogg' @@ -42,7 +42,7 @@ desc = "A polarized wrench. It causes anything placed between the jaws to turn." icon = 'icons/obj/abductor.dmi' belt_icon_state = "wrench_alien" - custom_materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) usesound = 'sound/effects/empulse.ogg' toolspeed = 0.1 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 186c00e59e0..284061cde5e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -322,7 +322,7 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=10, /datum/material/glass=10) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.1, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.1) attack_verb_continuous = list("strikes", "pistol whips", "hits", "bashes") attack_verb_simple = list("strike", "pistol whip", "hit", "bash") var/bullets = 7 @@ -377,7 +377,7 @@ icon = 'icons/obj/weapons/guns/ammo.dmi' icon_state = "357OLD-7" w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron=10, /datum/material/glass=10) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.1, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.1) var/amount_left = 7 /obj/item/toy/ammo/gun/update_icon_state() diff --git a/code/game/objects/items/wall_mounted.dm b/code/game/objects/items/wall_mounted.dm index f88589d5e18..e98ad037a62 100644 --- a/code/game/objects/items/wall_mounted.dm +++ b/code/game/objects/items/wall_mounted.dm @@ -1,6 +1,6 @@ /obj/item/wallframe icon = 'icons/obj/wallframe.dmi' - custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT*2) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 2) flags_1 = CONDUCT_1 inhand_icon_state = "syringe_kit" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -68,8 +68,8 @@ return TOOL_ACT_TOOLTYPE_SUCCESS /obj/item/wallframe/wrench_act(mob/living/user, obj/item/tool) - var/metal_amt = round(custom_materials[GET_MATERIAL_REF(/datum/material/iron)]/MINERAL_MATERIAL_AMOUNT) //Replace this shit later - var/glass_amt = round(custom_materials[GET_MATERIAL_REF(/datum/material/glass)]/MINERAL_MATERIAL_AMOUNT) //Replace this shit later + var/metal_amt = round(custom_materials[GET_MATERIAL_REF(/datum/material/iron)]/SHEET_MATERIAL_AMOUNT) //Replace this shit later + var/glass_amt = round(custom_materials[GET_MATERIAL_REF(/datum/material/glass)]/SHEET_MATERIAL_AMOUNT) //Replace this shit later if(!metal_amt && !glass_amt) return FALSE @@ -91,6 +91,6 @@ righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5) grind_results = list(/datum/reagent/iron = 10, /datum/reagent/silicon = 10) custom_price = PAYCHECK_CREW * 0.5 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 69110143d15..b629f8f8c3a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -304,7 +304,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 9 throwforce = 10 w_class = WEIGHT_CLASS_BULKY - custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT + SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.75) attack_verb_continuous = list("hits", "bludgeons", "whacks", "bonks") attack_verb_simple = list("hit", "bludgeon", "whack", "bonk") @@ -373,7 +373,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 w_class = WEIGHT_CLASS_SMALL sharpness = SHARP_POINTY - custom_materials = list(/datum/material/iron=500, /datum/material/glass=500) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 5) resistance_flags = FIRE_PROOF /obj/item/throwing_star/stamina @@ -404,7 +404,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 5 throw_speed = 3 throw_range = 6 - custom_materials = list(/datum/material/iron=12000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 6) hitsound = 'sound/weapons/genhit.ogg' attack_verb_continuous = list("stubs", "pokes") attack_verb_simple = list("stub", "poke") @@ -478,7 +478,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 5 throwforce = 5 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5) attack_verb_continuous = list("bludgeons", "whacks", "disciplines", "thrashes") attack_verb_simple = list("bludgeon", "whack", "discipline", "thrash") @@ -491,7 +491,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' force = 1 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron = 600) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6) /obj/item/cane/white/Initialize(mapload) . = ..() @@ -691,7 +691,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 demolition_mod = 1.25 attack_verb_continuous = list("beats", "smacks") attack_verb_simple = list("beat", "smack") - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3.5) resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_HUGE /// Are we able to do a homerun? @@ -817,7 +817,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 desc = "This bat is made of highly reflective, highly armored material." icon_state = "baseball_bat_metal" inhand_icon_state = "baseball_bat_metal" - custom_materials = list(/datum/material/titanium = MINERAL_MATERIAL_AMOUNT * 3.5) + custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3.5) resistance_flags = NONE force = 12 throwforce = 15 diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 5d7e0d30c8f..30ed7344a3a 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -9,7 +9,7 @@ resistance_flags = NONE max_integrity = 250 integrity_failure = 0.1 - custom_materials = list(/datum/material/iron = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) layer = OBJ_LAYER var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 1 @@ -44,7 +44,7 @@ else for(var/i in custom_materials) var/datum/material/M = i - new M.sheet_type(loc, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) + new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1)) ..() /obj/structure/chair/attack_paw(mob/user, list/modifiers) @@ -326,7 +326,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) throw_range = 3 hitsound = 'sound/items/trayhit1.ogg' hit_reaction_chance = 50 - custom_materials = list(/datum/material/iron = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) var/break_chance = 5 //Likely hood of smashing the chair. var/obj/structure/chair/origin_type = /obj/structure/chair @@ -511,7 +511,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) desc = "No matter how much you squirm, it'll still be uncomfortable." resistance_flags = FLAMMABLE max_integrity = 50 - custom_materials = list(/datum/material/plastic = 2000) + custom_materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) buildstacktype = /obj/item/stack/sheet/plastic buildstackamount = 2 item_chair = /obj/item/chair/plastic @@ -544,7 +544,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) w_class = WEIGHT_CLASS_NORMAL force = 7 throw_range = 5 //Lighter Weight --> Flies Farther. - custom_materials = list(/datum/material/plastic = 2000) + custom_materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) break_chance = 25 origin_type = /obj/structure/chair/plastic diff --git a/code/game/objects/structures/cannons/cannonballs.dm b/code/game/objects/structures/cannons/cannonballs.dm index e833d1f7bd6..9e2b38a3420 100644 --- a/code/game/objects/structures/cannons/cannonballs.dm +++ b/code/game/objects/structures/cannons/cannonballs.dm @@ -8,7 +8,7 @@ merge_type = /obj/item/stack/cannonball throwforce = 10 flags_1 = CONDUCT_1 - custom_materials = list(/datum/material/alloy/plasteel=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/alloy/plasteel=SHEET_MATERIAL_AMOUNT) resistance_flags = FIRE_PROOF throw_speed = 5 throw_range = 3 diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 8566891b4fb..2d7e607cd22 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -272,7 +272,7 @@ var/turf/T = get_turf(src) for(var/material in custom_materials) var/datum/material/material_datum = material - var/material_count = FLOOR(custom_materials[material_datum] / MINERAL_MATERIAL_AMOUNT, 1) + var/material_count = FLOOR(custom_materials[material_datum] / SHEET_MATERIAL_AMOUNT, 1) if(!disassembled) material_count = rand(FLOOR(material_count/2, 1), material_count) new material_datum.sheet_type(T, material_count) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 729abad34f4..a400771bc0c 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -383,7 +383,7 @@ new girder_type(loc) for(var/material in custom_materials) var/datum/material/material_datum = material - new material_datum.sheet_type(loc, FLOOR(custom_materials[material_datum] / MINERAL_MATERIAL_AMOUNT, 1)) + new material_datum.sheet_type(loc, FLOOR(custom_materials[material_datum] / SHEET_MATERIAL_AMOUNT, 1)) qdel(src) /obj/structure/falsewall/material/mat_update_desc(mat) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 7a6a2a59913..ccaba88a73c 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -214,7 +214,7 @@ else var/obj/structure/tramwall/material/mat_tram_wall = new(loc) var/list/material_list = list() - material_list[GET_MATERIAL_REF(sheets.material_type)] = MINERAL_MATERIAL_AMOUNT * 2 + material_list[GET_MATERIAL_REF(sheets.material_type)] = SHEET_MATERIAL_AMOUNT * 2 if(material_list) mat_tram_wall.set_custom_materials(material_list) tram_wall = mat_tram_wall @@ -237,7 +237,7 @@ else var/obj/structure/falsewall/material/mat_falsewall = new(loc) var/list/material_list = list() - material_list[GET_MATERIAL_REF(sheets.material_type)] = MINERAL_MATERIAL_AMOUNT * 2 + material_list[GET_MATERIAL_REF(sheets.material_type)] = SHEET_MATERIAL_AMOUNT * 2 if(material_list) mat_falsewall.set_custom_materials(material_list) falsewall = mat_falsewall @@ -259,7 +259,7 @@ else var/turf/newturf = T.PlaceOnTop(/turf/closed/wall/material) var/list/material_list = list() - material_list[GET_MATERIAL_REF(sheets.material_type)] = MINERAL_MATERIAL_AMOUNT * 2 + material_list[GET_MATERIAL_REF(sheets.material_type)] = SHEET_MATERIAL_AMOUNT * 2 if(material_list) newturf.set_custom_materials(material_list) diff --git a/code/game/objects/structures/memorial.dm b/code/game/objects/structures/memorial.dm index cbfb9e49ac8..bd28aaacd20 100644 --- a/code/game/objects/structures/memorial.dm +++ b/code/game/objects/structures/memorial.dm @@ -42,4 +42,4 @@ That’s how he would have wanted it. desc = "Awarded for outstanding excellence in paperwork, administration, and bureaucracy." icon_state = "medal_paperwork" medaltype = "medal-gold" - custom_materials = list(/datum/material/gold=1000) + custom_materials = list(/datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index fe98b846dd2..194a93e9c7b 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -128,8 +128,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) icon = 'icons/obj/watercloset.dmi' icon_state = "mirror" custom_materials = list( - /datum/material/glass = MINERAL_MATERIAL_AMOUNT, - /datum/material/silver = MINERAL_MATERIAL_AMOUNT, + /datum/material/glass = SHEET_MATERIAL_AMOUNT, + /datum/material/silver = SHEET_MATERIAL_AMOUNT, ) result_path = /obj/structure/mirror pixel_shift = 28 diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 453d11e4962..2a3cf480c53 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -120,7 +120,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32) icon = 'icons/obj/stationobjs.dmi' icon_state = "nboard00" custom_materials = list( - /datum/material/wood = MINERAL_MATERIAL_AMOUNT, + /datum/material/wood = SHEET_MATERIAL_AMOUNT, ) resistance_flags = FLAMMABLE result_path = /obj/structure/noticeboard diff --git a/code/game/objects/structures/plaques/_plaques.dm b/code/game/objects/structures/plaques/_plaques.dm index 79f12cbdadd..775c7efef82 100644 --- a/code/game/objects/structures/plaques/_plaques.dm +++ b/code/game/objects/structures/plaques/_plaques.dm @@ -7,7 +7,7 @@ opacity = FALSE density = FALSE layer = SIGN_LAYER - custom_materials = list(/datum/material/gold = 2000) + custom_materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT) max_integrity = 200 //Twice as durable as regular signs. armor_type = /datum/armor/structure_plaque ///Custom plaque structures and items both start "unengraved", once engraved with a fountain pen their text can't be altered again. Static plaques are already engraved. @@ -121,7 +121,7 @@ name = "blank plaque" desc = "A blank plaque, use a fancy pen to engrave it. It can be placed on a wall." w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/gold = 2000) + custom_materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT) max_integrity = 200 armor_type = /datum/armor/item_plaque ///This points the item to make the proper structure when placed on a wall. diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm index 9bbd0987f02..c37ddc4ff67 100644 --- a/code/game/objects/structures/plaques/static_plaques.dm +++ b/code/game/objects/structures/plaques/static_plaques.dm @@ -159,5 +159,5 @@ of other passengers, and unforeseen circumstances such as foul play or mechanical issues.

\ By entering the tram, guideway, or crossings you agree Nanotrasen is not liable for any injuries, damages, or losses that may occur. If you do not agree to these terms, please do not use the tram.
" icon_state = "commission_tram" - custom_materials = list(/datum/material/titanium = 2000) + custom_materials = list(/datum/material/titanium =SHEET_MATERIAL_AMOUNT) plane = FLOOR_PLANE diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index cec188d8b49..e3ee70dfec7 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -4,7 +4,7 @@ opacity = FALSE density = FALSE layer = SIGN_LAYER - custom_materials = list(/datum/material/plastic = 2000) + custom_materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) max_integrity = 100 armor_type = /datum/armor/structure_sign resistance_flags = FLAMMABLE @@ -144,7 +144,7 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/plastic = 2000) + custom_materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) armor_type = /datum/armor/item_sign resistance_flags = FLAMMABLE max_integrity = 100 diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index 287ccbf3e4c..5929114a14b 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -241,7 +241,7 @@ return var/list/material_list = list() if(material.material_type) - material_list[material.material_type] = MINERAL_MATERIAL_AMOUNT * 10 + material_list[material.material_type] = SHEET_MATERIAL_AMOUNT * 10 make_new_stairs(/obj/structure/stairs/material, material_list) return TRUE diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 93b07c44e89..ba654d10b91 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -58,7 +58,7 @@ return var/list/material_list = list() if(material.material_type) - material_list[material.material_type] = MINERAL_MATERIAL_AMOUNT + material_list[material.material_type] = SHEET_MATERIAL_AMOUNT make_new_table(/obj/structure/table/greyscale, material_list) return return ..() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 9f2a13a630b..36c983d6dfc 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -31,7 +31,7 @@ var/buildstackamount = 1 var/framestackamount = 2 var/deconstruction_ready = 1 - custom_materials = list(/datum/material/iron = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) max_integrity = 100 integrity_failure = 0.33 smoothing_flags = SMOOTH_BITMASK @@ -294,7 +294,7 @@ else for(var/i in custom_materials) var/datum/material/M = i - new M.sheet_type(T, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) + new M.sheet_type(T, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1)) if(!wrench_disassembly) new frame(T) else @@ -376,7 +376,7 @@ for(var/atom/movable/attached_movable as anything in attached_items) if(!attached_movable.Move(loc)) RemoveItemFromTable(attached_movable, attached_movable.loc) - + /obj/structure/table/rolling/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) . = ..() if(has_gravity()) @@ -390,7 +390,7 @@ icon = 'icons/obj/smooth_structures/glass_table.dmi' icon_state = "glass_table-0" base_icon_state = "glass_table" - custom_materials = list(/datum/material/glass = 2000) + custom_materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT) buildstack = /obj/item/stack/sheet/glass smoothing_groups = SMOOTH_GROUP_GLASS_TABLES canSmoothWith = SMOOTH_GROUP_GLASS_TABLES @@ -466,7 +466,7 @@ icon = 'icons/obj/smooth_structures/plasmaglass_table.dmi' icon_state = "plasmaglass_table-0" base_icon_state = "plasmaglass_table" - custom_materials = list(/datum/material/alloy/plasmaglass = 2000) + custom_materials = list(/datum/material/alloy/plasmaglass =SHEET_MATERIAL_AMOUNT) buildstack = /obj/item/stack/sheet/plasmaglass glass_shard_type = /obj/item/shard/plasma max_integrity = 100 @@ -660,7 +660,7 @@ icon = 'icons/obj/smooth_structures/rglass_table.dmi' icon_state = "rglass_table-0" base_icon_state = "rglass_table" - custom_materials = list(/datum/material/glass = 2000, /datum/material/iron = 2000) + custom_materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT) buildstack = /obj/item/stack/sheet/rglass max_integrity = 150 @@ -670,7 +670,7 @@ icon = 'icons/obj/smooth_structures/rplasmaglass_table.dmi' icon_state = "rplasmaglass_table-0" base_icon_state = "rplasmaglass_table" - custom_materials = list(/datum/material/alloy/plasmaglass = 2000, /datum/material/iron = 2000) + custom_materials = list(/datum/material/alloy/plasmaglass =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT) buildstack = /obj/item/stack/sheet/plasmarglass /obj/structure/table/reinforced/titaniumglass @@ -679,7 +679,7 @@ icon = 'icons/obj/smooth_structures/titaniumglass_table.dmi' icon_state = "titaniumglass_table-0" base_icon_state = "titaniumglass_table" - custom_materials = list(/datum/material/alloy/titaniumglass = 2000) + custom_materials = list(/datum/material/alloy/titaniumglass =SHEET_MATERIAL_AMOUNT) buildstack = /obj/item/stack/sheet/titaniumglass max_integrity = 250 @@ -689,7 +689,7 @@ icon = 'icons/obj/smooth_structures/plastitaniumglass_table.dmi' icon_state = "plastitaniumglass_table-0" base_icon_state = "plastitaniumglass_table" - custom_materials = list(/datum/material/alloy/plastitaniumglass = 2000) + custom_materials = list(/datum/material/alloy/plastitaniumglass =SHEET_MATERIAL_AMOUNT) buildstack = /obj/item/stack/sheet/plastitaniumglass max_integrity = 300 @@ -709,7 +709,7 @@ can_buckle = 1 buckle_lying = NO_BUCKLE_LYING buckle_requires_restraints = TRUE - custom_materials = list(/datum/material/silver = 2000) + custom_materials = list(/datum/material/silver =SHEET_MATERIAL_AMOUNT) var/mob/living/carbon/patient = null var/obj/machinery/computer/operating/computer = null @@ -864,7 +864,7 @@ icon_state = "rack_parts" inhand_icon_state = "rack_parts" flags_1 = CONDUCT_1 - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) var/building = FALSE /obj/item/rack_parts/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/structures/tank_holder.dm b/code/game/objects/structures/tank_holder.dm index 03b734f8af5..2f065671975 100644 --- a/code/game/objects/structures/tank_holder.dm +++ b/code/game/objects/structures/tank_holder.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/atmospherics/tank.dmi' icon_state = "holder" - custom_materials = list(/datum/material/iron = 2000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) density = FALSE anchored = FALSE diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 74c35649f25..e34779c1f79 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -91,7 +91,7 @@ else for(var/i in custom_materials) var/datum/material/M = i - new M.sheet_type(loc, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) + new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1)) ..() /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) @@ -257,7 +257,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) /obj/item/bikehorn/rubberducky/plasticducky name = "plastic ducky" desc = "It's a cheap plastic knockoff of a loveable bathtime toy." - custom_materials = list(/datum/material/plastic = 1000) + custom_materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) /obj/item/bikehorn/rubberducky name = "rubber ducky" @@ -510,7 +510,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) else for(var/i in custom_materials) var/datum/material/M = i - new M.sheet_type(loc, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) + new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1)) /obj/structure/sink/proc/begin_reclamation() START_PROCESSING(SSplumbing, src) @@ -573,7 +573,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16)) /obj/structure/sinkframe/proc/drop_materials() for(var/datum/material/material as anything in custom_materials) - new material.sheet_type(loc, FLOOR(custom_materials[material] / MINERAL_MATERIAL_AMOUNT, 1)) + new material.sheet_type(loc, FLOOR(custom_materials[material] / SHEET_MATERIAL_AMOUNT, 1)) return //Water source, use the type water_source for unlimited water sources like classic sinks. diff --git a/code/game/turfs/closed/wall/material_walls.dm b/code/game/turfs/closed/wall/material_walls.dm index 4470b477e88..22b85401523 100644 --- a/code/game/turfs/closed/wall/material_walls.dm +++ b/code/game/turfs/closed/wall/material_walls.dm @@ -13,13 +13,13 @@ /turf/closed/wall/material/break_wall() for(var/i in custom_materials) var/datum/material/M = i - new M.sheet_type(src, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) + new M.sheet_type(src, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1)) return new girder_type(src) /turf/closed/wall/material/devastate_wall() for(var/i in custom_materials) var/datum/material/M = i - new M.sheet_type(src, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) + new M.sheet_type(src, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1)) /turf/closed/wall/material/mat_update_desc(mat) desc = "A huge chunk of [mat] used to separate rooms." diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 6e88d4640a3..8678e77f520 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -18,7 +18,7 @@ explosive_resistance = 0 //gold is a soft metal you dingus. smoothing_groups = SMOOTH_GROUP_GOLD_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_GOLD_WALLS - custom_materials = list(/datum/material/gold = 4000) + custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/silver name = "silver wall" @@ -31,7 +31,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_SILVER_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_SILVER_WALLS - custom_materials = list(/datum/material/silver = 4000) + custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/diamond name = "diamond wall" @@ -46,7 +46,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_DIAMOND_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_DIAMOND_WALLS - custom_materials = list(/datum/material/diamond = 4000) + custom_materials = list(/datum/material/diamond = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/diamond/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 41) return ..() @@ -62,7 +62,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_BANANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_BANANIUM_WALLS - custom_materials = list(/datum/material/bananium = 4000) + custom_materials = list(/datum/material/bananium = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/sandstone name = "sandstone wall" @@ -76,7 +76,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_SANDSTONE_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_SANDSTONE_WALLS - custom_materials = list(/datum/material/sandstone = 4000) + custom_materials = list(/datum/material/sandstone = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/uranium article = "a" @@ -90,7 +90,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_URANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_URANIUM_WALLS - custom_materials = list(/datum/material/uranium = 4000) + custom_materials = list(/datum/material/uranium = SHEET_MATERIAL_AMOUNT*2) /// Mutex to prevent infinite recursion when propagating radiation pulses var/active = null @@ -147,7 +147,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_PLASMA_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_PLASMA_WALLS - custom_materials = list(/datum/material/plasma = 4000) + custom_materials = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/wood name = "wooden wall" @@ -162,7 +162,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_WOOD_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_WOOD_WALLS - custom_materials = list(/datum/material/wood = 4000) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user) if(W.get_sharpness() && W.force) @@ -205,7 +205,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_IRON_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_IRON_WALLS - custom_materials = list(/datum/material/iron = 5000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) /turf/closed/wall/mineral/snow name = "packed snow wall" @@ -222,7 +222,7 @@ girder_type = null bullet_sizzle = TRUE bullet_bounce_sound = null - custom_materials = list(/datum/material/snow = 4000) + custom_materials = list(/datum/material/snow = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/snow/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 0) return ..() //No recoil damage, snow is weak @@ -240,7 +240,7 @@ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = SMOOTH_GROUP_ABDUCTOR_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_ABDUCTOR_WALLS - custom_materials = list(/datum/material/alloy/alien = 4000) + custom_materials = list(/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT*2) /////////////////////Titanium walls///////////////////// @@ -258,7 +258,7 @@ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_TITANIUM_WALLS - custom_materials = list(/datum/material/titanium = 4000) + custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/titanium/rust_heretic_act() return // titanium does not rust @@ -320,7 +320,7 @@ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = SMOOTH_GROUP_PLASTITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_PLASTITANIUM_WALLS + SMOOTH_GROUP_SYNDICATE_WALLS - custom_materials = list(/datum/material/alloy/plastitanium = 4000) + custom_materials = list(/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT*2) /turf/closed/wall/mineral/plastitanium/rust_heretic_act() return // plastitanium does not rust diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm index c0d97bf895f..a26e456971d 100644 --- a/code/game/turfs/closed/wall/misc_walls.dm +++ b/code/game/turfs/closed/wall/misc_walls.dm @@ -119,7 +119,7 @@ /turf/closed/wall/material/meat/Initialize(mapload) . = ..() - set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat) = MINERAL_MATERIAL_AMOUNT)) + set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat) = SHEET_MATERIAL_AMOUNT)) /turf/closed/wall/material/meat/airless baseturfs = /turf/open/floor/material/meat/airless diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index ba59edf6d87..3356694b27f 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -36,7 +36,7 @@ icon_state = "plasma" floor_tile = /obj/item/stack/tile/mineral/plasma icons = list("plasma","plasma_dam") - custom_materials = list(/datum/material/plasma = 500) + custom_materials = list(/datum/material/plasma = SMALL_MATERIAL_AMOUNT*5) //Plasma floor that can't be removed, for disco inferno @@ -51,7 +51,7 @@ icon_state = "gold" floor_tile = /obj/item/stack/tile/mineral/gold icons = list("gold","gold_dam") - custom_materials = list(/datum/material/gold = 500) + custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT*5) //SILVER @@ -60,7 +60,7 @@ icon_state = "silver" floor_tile = /obj/item/stack/tile/mineral/silver icons = list("silver","silver_dam") - custom_materials = list(/datum/material/silver = 500) + custom_materials = list(/datum/material/silver = SMALL_MATERIAL_AMOUNT*5) //TITANIUM (shuttle) @@ -68,7 +68,7 @@ name = "shuttle floor" icon_state = "titanium" floor_tile = /obj/item/stack/tile/mineral/titanium - custom_materials = list(/datum/material/titanium = 500) + custom_materials = list(/datum/material/titanium = SMALL_MATERIAL_AMOUNT*5) /turf/open/floor/mineral/titanium/broken_states() return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") @@ -152,7 +152,7 @@ name = "shuttle floor" icon_state = "plastitanium" floor_tile = /obj/item/stack/tile/mineral/plastitanium - custom_materials = list(/datum/material/alloy/plastitanium = 500) + custom_materials = list(/datum/material/alloy/plastitanium = SMALL_MATERIAL_AMOUNT*5) /turf/open/floor/mineral/plastitanium/broken_states() return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") @@ -181,7 +181,7 @@ icon_state = "bananium" floor_tile = /obj/item/stack/tile/mineral/bananium icons = list("bananium","bananium_dam") - custom_materials = list(/datum/material/bananium = 500) + custom_materials = list(/datum/material/bananium = SMALL_MATERIAL_AMOUNT*5) material_flags = NONE //The slippery comp makes it unpractical for good clown decor. The custom mat one should still slip. var/sound_cooldown = 0 @@ -227,7 +227,7 @@ icon_state = "diamond" floor_tile = /obj/item/stack/tile/mineral/diamond icons = list("diamond","diamond_dam") - custom_materials = list(/datum/material/diamond = 500) + custom_materials = list(/datum/material/diamond = SMALL_MATERIAL_AMOUNT*5) //URANIUM @@ -237,7 +237,7 @@ icon_state = "uranium" floor_tile = /obj/item/stack/tile/mineral/uranium icons = list("uranium","uranium_dam") - custom_materials = list(/datum/material/uranium = 500) + custom_materials = list(/datum/material/uranium = SMALL_MATERIAL_AMOUNT*5) var/last_event = 0 var/active = null @@ -287,7 +287,7 @@ floor_tile = /obj/item/stack/tile/mineral/abductor icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9") baseturfs = /turf/open/floor/plating/abductor2 - custom_materials = list(/datum/material/alloy/alien = 500) + custom_materials = list(/datum/material/alloy/alien = SMALL_MATERIAL_AMOUNT*5) /turf/open/floor/mineral/abductor/Initialize(mapload) . = ..() diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index ca9feba770a..85152b632fa 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -211,7 +211,7 @@ icon_state = "plastic" thermal_conductivity = 0.1 heat_capacity = 900 - custom_materials = list(/datum/material/plastic=500) + custom_materials = list(/datum/material/plastic=SMALL_MATERIAL_AMOUNT*5) floor_tile = /obj/item/stack/tile/plastic /turf/open/floor/plastic/broken_states() @@ -306,7 +306,7 @@ /turf/open/floor/material/meat/Initialize(mapload) . = ..() - set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat) = MINERAL_MATERIAL_AMOUNT)) + set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat) = SHEET_MATERIAL_AMOUNT)) /turf/open/floor/material/meat/airless initial_gas_mix = AIRLESS_ATMOS diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 60c536802ac..d6cf4acbd1e 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -830,7 +830,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} smoothing_groups = SMOOTH_GROUP_ABDUCTOR_TABLES canSmoothWith = SMOOTH_GROUP_ABDUCTOR_TABLES frame = /obj/structure/table_frame/abductor - custom_materials = list(/datum/material/silver = 2000) + custom_materials = list(/datum/material/silver =SHEET_MATERIAL_AMOUNT) /obj/structure/table/optable/abductor name = "alien operating table" diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index 1cf26b05d72..da0c715772b 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -423,7 +423,7 @@ name = "painting frame" desc = "The perfect showcase for your favorite deathtrap memories." icon = 'icons/obj/signs.dmi' - custom_materials = list(/datum/material/wood = 2000) + custom_materials = list(/datum/material/wood =SHEET_MATERIAL_AMOUNT) resistance_flags = FLAMMABLE flags_1 = NONE icon_state = "frame-empty" @@ -436,7 +436,7 @@ icon = 'icons/obj/signs.dmi' icon_state = "frame-empty" base_icon_state = "frame" - custom_materials = list(/datum/material/wood = 2000) + custom_materials = list(/datum/material/wood =SHEET_MATERIAL_AMOUNT) resistance_flags = FLAMMABLE buildable_sign = FALSE ///Canvas we're currently displaying. @@ -617,7 +617,7 @@ /obj/item/wallframe/painting/large name = "large painting frame" desc = "The perfect showcase for your favorite deathtrap memories. Make sure you have enough space to mount this one to the wall." - custom_materials = list(/datum/material/wood = 4000) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT*2) icon_state = "frame-large-empty" result_path = /obj/structure/sign/painting/large pixel_shift = 0 //See [/obj/structure/sign/painting/large/proc/finalize_size] @@ -644,7 +644,7 @@ /obj/structure/sign/painting/large icon = 'icons/obj/art/artstuff_64x64.dmi' - custom_materials = list(/datum/material/wood = 4000) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT*2) accepted_canvas_types = list( /obj/item/canvas/thirtysix_twentyfour, /obj/item/canvas/fortyfive_twentyseven, diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index d9023840579..31fe7aefb4b 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -54,7 +54,7 @@ var/amount_mod = disassembled ? 0 : -2 for(var/mat in custom_materials) var/datum/material/custom_material = GET_MATERIAL_REF(mat) - var/amount = max(0,round(custom_materials[mat]/MINERAL_MATERIAL_AMOUNT) + amount_mod) + var/amount = max(0,round(custom_materials[mat]/SHEET_MATERIAL_AMOUNT) + amount_mod) if(amount > 0) new custom_material.sheet_type(drop_location(), amount) qdel(src) @@ -65,7 +65,7 @@ /obj/structure/statue/uranium max_integrity = 300 light_range = 2 - custom_materials = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT*5) impressiveness = 25 // radiation makes an impression abstract_type = /obj/structure/statue/uranium @@ -85,7 +85,7 @@ max_integrity = 200 impressiveness = 20 desc = "This statue is suitably made from plasma." - custom_materials = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/plasma /obj/structure/statue/plasma/scientist @@ -102,7 +102,7 @@ max_integrity = 300 impressiveness = 25 desc = "This is a highly valuable statue made from gold." - custom_materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/gold /obj/structure/statue/gold/hos @@ -135,7 +135,7 @@ max_integrity = 300 impressiveness = 25 desc = "This is a valuable statue made from silver." - custom_materials = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/silver /obj/structure/statue/silver/md @@ -164,7 +164,7 @@ max_integrity = 1000 impressiveness = 50 desc = "This is a very expensive diamond statue." - custom_materials = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/diamond /obj/structure/statue/diamond/captain @@ -185,7 +185,7 @@ max_integrity = 300 impressiveness = 50 desc = "A bananium statue with a small engraving:'HOOOOOOONK'." - custom_materials = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/bananium /obj/structure/statue/bananium/clown @@ -197,7 +197,7 @@ /obj/structure/statue/sandstone max_integrity = 50 impressiveness = 15 - custom_materials = list(/datum/material/sandstone=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/sandstone=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/sandstone /obj/structure/statue/sandstone/assistant @@ -216,7 +216,7 @@ /obj/structure/statue/snow max_integrity = 50 - custom_materials = list(/datum/material/snow=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/snow=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/snow /obj/structure/statue/snow/snowman @@ -232,7 +232,7 @@ ///////////////////////////////bronze/////////////////////////////////// /obj/structure/statue/bronze - custom_materials = list(/datum/material/bronze=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/bronze=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/bronze /obj/structure/statue/bronze/marx @@ -247,7 +247,7 @@ name = "Elder Atmosian" desc = "A statue of an Elder Atmosian, capable of bending the laws of thermodynamics to their will." icon_state = "eng" - custom_materials = list(/datum/material/metalhydrogen = MINERAL_MATERIAL_AMOUNT*10) + custom_materials = list(/datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT*10) max_integrity = 1000 impressiveness = 100 abstract_type = /obj/structure/statue/elder_atmosian //This one is uncarvable @@ -277,7 +277,7 @@ throwforce = 5 throw_speed = 3 throw_range = 5 - custom_materials = list(/datum/material/iron=75) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.75) attack_verb_continuous = list("stabs") attack_verb_simple = list("stab") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 4f1dac572eb..f981ab60af7 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -6,7 +6,7 @@ icon_state = "" flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT) throwforce = 2 throw_speed = 3 throw_range = 7 diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index cf4e062fabc..b170ba204c4 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -9,7 +9,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 300) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*3, /datum/material/glass = SMALL_MATERIAL_AMOUNT*3) light_system = MOVABLE_LIGHT //Used as a flash here. light_range = FLASH_LIGHT_RANGE light_color = COLOR_WHITE diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 212d3f420f4..e4518155153 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -2,7 +2,7 @@ name = "health sensor" desc = "Used for scanning and monitoring health." icon_state = "health" - custom_materials = list(/datum/material/iron=800, /datum/material/glass=200) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*8, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 2) attachable = TRUE var/scanning = FALSE diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 783f67c35d5..061de2a5f92 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -7,7 +7,7 @@ name = "igniter" desc = "A small electronic device able to ignite combustible substances." icon_state = "igniter" - custom_materials = list(/datum/material/iron=500, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) var/datum/effect_system/spark_spread/sparks heat = 1000 drop_sound = 'sound/items/handling/component_drop.ogg' @@ -58,7 +58,7 @@ name = "condenser" desc = "A small electronic device able to chill their surroundings." icon_state = "freezer" - custom_materials = list(/datum/material/iron=250, /datum/material/glass=300) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) heat = 200 /obj/item/assembly/igniter/condenser/activate() diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 75ffdfe2413..ce13f09a40c 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -2,7 +2,7 @@ name = "infrared emitter" desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." icon_state = "infrared" - custom_materials = list(/datum/material/iron=1000, /datum/material/glass=500) + custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass=SMALL_MATERIAL_AMOUNT*5) is_position_sensitive = TRUE drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 4ab9cb93820..b71388e13cb 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -3,7 +3,7 @@ desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" inhand_icon_state = "mousetrap" - custom_materials = list(/datum/material/iron=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT) attachable = TRUE var/armed = FALSE drop_sound = 'sound/items/handling/component_drop.ogg' diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index dea36fad9d0..5b6bf306687 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -2,7 +2,7 @@ name = "proximity sensor" desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "prox" - custom_materials = list(/datum/material/iron=800, /datum/material/glass=200) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*8, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 2) attachable = TRUE drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 9dca6ece811..de9a2740497 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -5,7 +5,7 @@ inhand_icon_state = "signaler" lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' - custom_materials = list(/datum/material/iron=400, /datum/material/glass=120) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 4, /datum/material/glass=SMALL_MATERIAL_AMOUNT*1.2) attachable = TRUE drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 6b8244f54ff..1619f080abb 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -2,7 +2,7 @@ name = "timer" desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer" - custom_materials = list(/datum/material/iron=500, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) attachable = TRUE drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index d0f3d1c1499..e6992c7b079 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -7,7 +7,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" - custom_materials = list(/datum/material/iron=500, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) attachable = TRUE verb_say = "beeps" verb_ask = "beeps" diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm index 32d26a2bd44..5712a1f0c67 100644 --- a/code/modules/atmospherics/machinery/components/tank.dm +++ b/code/modules/atmospherics/machinery/components/tank.dm @@ -12,7 +12,7 @@ density = TRUE layer = ABOVE_WINDOW_LAYER - custom_materials = list(/datum/material/iron = TANK_PLATING_SHEETS * MINERAL_MATERIAL_AMOUNT) // plasteel is not a material to prevent two bugs: one where the default pressure is 1.5 times higher as plasteel's material modifier is added, and a second one where the tank names could be "plasteel plasteel" tanks + custom_materials = list(/datum/material/iron = TANK_PLATING_SHEETS * SHEET_MATERIAL_AMOUNT) // plasteel is not a material to prevent two bugs: one where the default pressure is 1.5 times higher as plasteel's material modifier is added, and a second one where the tank names could be "plasteel plasteel" tanks material_flags = MATERIAL_EFFECTS | MATERIAL_GREYSCALE | MATERIAL_ADD_PREFIX | MATERIAL_AFFECT_STATISTICS pipe_flags = PIPING_ONE_PER_TURF @@ -436,7 +436,7 @@ icon_state = "frame" anchored = FALSE density = TRUE - custom_materials = list(/datum/material/alloy/plasteel = 4 * MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/alloy/plasteel = 4 * SHEET_MATERIAL_AMOUNT) var/construction_state = TANK_FRAME var/datum/material/material_end_product @@ -462,7 +462,7 @@ /obj/structure/tank_frame/deconstruct(disassembled) if(disassembled) for(var/datum/material/mat as anything in custom_materials) - new mat.sheet_type(drop_location(), custom_materials[mat] / MINERAL_MATERIAL_AMOUNT) + new mat.sheet_type(drop_location(), custom_materials[mat] / SHEET_MATERIAL_AMOUNT) return ..() /obj/structure/tank_frame/update_icon(updates) @@ -561,7 +561,7 @@ if(!isturf(build_location)) return var/obj/machinery/atmospherics/components/tank/new_tank = new(build_location) - var/list/new_custom_materials = list((material_end_product) = TANK_PLATING_SHEETS * MINERAL_MATERIAL_AMOUNT) + var/list/new_custom_materials = list((material_end_product) = TANK_PLATING_SHEETS * SHEET_MATERIAL_AMOUNT) new_tank.set_custom_materials(new_custom_materials) new_tank.on_construction(user, new_tank.pipe_color, new_tank.piping_layer) to_chat(user, span_notice("[new_tank] has been sealed and is ready to accept gases.")) diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index d4888cbaf0b..78d0b78150c 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -123,7 +123,7 @@ icon = 'icons/obj/economy.dmi' icon_state = "rupee" w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/glass = 500) + custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*5) /obj/item/rupee/Initialize(mapload) . = ..() diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm index da4112a6665..c22874dc068 100644 --- a/code/modules/cargo/exports/materials.dm +++ b/code/modules/cargo/exports/materials.dm @@ -1,7 +1,7 @@ /datum/export/material - cost = 5 // Cost per MINERAL_MATERIAL_AMOUNT, which is 2000cm3 as of April 2016. + cost = 5 // Cost per SHEET_MATERIAL_AMOUNT, which is 2000cm3 as of April 2016. message = "cm3 of developer's tears. Please, report this on github" - amount_report_multiplier = MINERAL_MATERIAL_AMOUNT + amount_report_multiplier = SHEET_MATERIAL_AMOUNT var/material_id = null export_types = list( /obj/item/stack/sheet/mineral, /obj/item/stack/tile/mineral, @@ -25,7 +25,7 @@ if(istype(I, /obj/item/stack/ore)) amount *= 0.8 // Station's ore redemption equipment is really goddamn good. - return round(amount / MINERAL_MATERIAL_AMOUNT) + return round(amount / SHEET_MATERIAL_AMOUNT) // Materials. Nothing but plasma is really worth selling. Better leave it all to RnD and sell some plasma instead. diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index adfb9fe96bc..17640521c67 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -10,7 +10,7 @@ strip_delay = 20 equip_delay_other = 25 resistance_flags = NONE - custom_materials = list(/datum/material/glass = 250) + custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5) gender = PLURAL var/vision_flags = 0 var/invis_view = SEE_INVISIBLE_LIVING // Admin only for now @@ -404,7 +404,7 @@ inhand_icon_state = "welding-g" actions_types = list(/datum/action/item_action/toggle) flash_protect = FLASH_PROTECTION_WELDER - custom_materials = list(/datum/material/iron = 250) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5) tint = 2 visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT flags_cover = GLASSESCOVERSEYES diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index 75bb5d9eb87..83fe4501280 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -125,7 +125,7 @@ siemens_coefficient = 0.8 armor_type = /datum/armor/tinker_gloves clothing_traits = list(TRAIT_QUICK_BUILD) - custom_materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT, /datum/material/silver=HALF_SHEET_MATERIAL_AMOUNT*1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT) resistance_flags = NONE /datum/armor/tinker_gloves diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 358b957e29e..1b26462f09b 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -86,7 +86,7 @@ inhand_icon_state = null light_range = 5 resistance_flags = FIRE_PROOF | ACID_PROOF - custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT*1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT*5) hat_type = "purple" /obj/item/clothing/head/utility/hardhat/white diff --git a/code/modules/clothing/head/welding.dm b/code/modules/clothing/head/welding.dm index 4da5f96206a..287ab800c1f 100644 --- a/code/modules/clothing/head/welding.dm +++ b/code/modules/clothing/head/welding.dm @@ -6,7 +6,7 @@ inhand_icon_state = "welding" lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi' - custom_materials = list(/datum/material/iron=1750, /datum/material/glass=400) + custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT*1.75, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 4) flash_protect = FLASH_PROTECTION_WELDER tint = 2 armor_type = /datum/armor/utility_welding diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 9826d31da73..14598681417 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( desc = "A gas mask with built-in welding goggles and a face shield. Looks like a skull - clearly designed by a nerd." icon_state = "weldingmask" flash_protect = FLASH_PROTECTION_WELDER - custom_materials = list(/datum/material/iron=4000, /datum/material/glass=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2, /datum/material/glass=SHEET_MATERIAL_AMOUNT) tint = 2 armor_type = /datum/armor/gas_welding actions_types = list(/datum/action/item_action/toggle) @@ -354,7 +354,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( desc = "A creepy wooden mask. Surprisingly expressive for a poorly carved bit of wood." icon_state = "tiki_eyebrow" inhand_icon_state = null - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.25) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.25) resistance_flags = FLAMMABLE has_fov = FALSE flags_cover = MASKCOVERSEYES diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index bf0b200a01e..d8abfe4b1bd 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -373,7 +373,7 @@ icon_state = "beads" color = "#ffffff" custom_price = PAYCHECK_CREW * 0.2 - custom_materials = (list(/datum/material/plastic = 500)) + custom_materials = (list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT*5)) /obj/item/clothing/neck/beads/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index ed7f56e0fbe..198e50bca1f 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -10,14 +10,14 @@ /// If TRUE, we will always have the noslip trait no matter whether they're on or off var/always_noslip = FALSE /// How many materials we consume per banana created - var/material_per_banana = 100 + var/material_per_banana =SMALL_MATERIAL_AMOUNT /// Typepath of created banana var/banana_type = /obj/item/grown/bananapeel/specialpeel /obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_FEET) - AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * MINERAL_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) + AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * SHEET_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20) RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) if(always_noslip) diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index 4f2b7a3b5a6..f6c867bca7a 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -3,7 +3,7 @@ name = "sandals" icon_state = "wizard" inhand_icon_state = "wizshoe" - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 0.5) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 0.5) resistance_flags = FLAMMABLE strip_delay = 5 equip_delay_other = 50 diff --git a/code/modules/clothing/suits/reactive_armour_dimensional_themes.dm b/code/modules/clothing/suits/reactive_armour_dimensional_themes.dm index ca5da169630..f66b23b1261 100644 --- a/code/modules/clothing/suits/reactive_armour_dimensional_themes.dm +++ b/code/modules/clothing/suits/reactive_armour_dimensional_themes.dm @@ -83,7 +83,7 @@ to_convert.ChangeTurf(replace_wall) if (material) - var/list/custom_materials = list(GET_MATERIAL_REF(material) = MINERAL_MATERIAL_AMOUNT) + var/list/custom_materials = list(GET_MATERIAL_REF(material) = SHEET_MATERIAL_AMOUNT) to_convert.set_custom_materials(custom_materials) /** @@ -103,7 +103,7 @@ var/to_place = rand(MIN_BARRIERS, MAX_BARRIERS) var/list/custom_materials = list() if (material) - custom_materials = list(GET_MATERIAL_REF(material) = MINERAL_MATERIAL_AMOUNT) + custom_materials = list(GET_MATERIAL_REF(material) = SHEET_MATERIAL_AMOUNT) while (target_area.len > 0 && to_place > 0) var/turf/place_turf = pick(target_area) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 78fa671492f..32d704468f0 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -134,7 +134,7 @@ name = "bronze medal" desc = "A bronze medal." icon_state = "bronze" - custom_materials = list(/datum/material/iron=1000) + custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT) resistance_flags = FIRE_PROOF var/medaltype = "medal" //Sprite used for medalbox var/commended = FALSE @@ -203,7 +203,7 @@ desc = "A silver medal." icon_state = "silver" medaltype = "medal-silver" - custom_materials = list(/datum/material/silver=1000) + custom_materials = list(/datum/material/silver=HALF_SHEET_MATERIAL_AMOUNT) /obj/item/clothing/accessory/medal/silver/valor name = "medal of valor" @@ -226,7 +226,7 @@ desc = "A prestigious golden medal." icon_state = "gold" medaltype = "medal-gold" - custom_materials = list(/datum/material/gold=1000) + custom_materials = list(/datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT) /obj/item/clothing/accessory/medal/med_medal name = "exemplary performance medal" @@ -253,7 +253,7 @@ icon_state = "plasma" medaltype = "medal-plasma" armor_type = /datum/armor/medal_plasma - custom_materials = list(/datum/material/plasma=1000) + custom_materials = list(/datum/material/plasma=HALF_SHEET_MATERIAL_AMOUNT) /datum/armor/medal_plasma fire = -10 diff --git a/code/modules/experisci/handheld_scanner.dm b/code/modules/experisci/handheld_scanner.dm index 498898759b4..e0fd4d480d5 100644 --- a/code/modules/experisci/handheld_scanner.dm +++ b/code/modules/experisci/handheld_scanner.dm @@ -45,7 +45,7 @@ ///The toilet we're about to unleash unto this cursed plane of existence var/obj/structure/toilet/greyscale/result_toilet = new (drop_location()) - result_toilet.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, user) = MINERAL_MATERIAL_AMOUNT)) + result_toilet.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, user) = SHEET_MATERIAL_AMOUNT)) result_toilet.desc = "A horrendous mass of fused flesh resembling a standard-issue HT-451 model toilet. How it manages to function as one is beyond you. \ This one seems to be made out of the flesh of a devoted employee of the RnD department." result_toilet.buildstacktype = /obj/effect/decal/remains/human //this also prevents the toilet from dropping meat sheets. if you want to cheese the meat exepriments, sacrifice more people diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm index 96c3b8bbb0f..3b474d0ff6f 100644 --- a/code/modules/food_and_drinks/machinery/gibber.dm +++ b/code/modules/food_and_drinks/machinery/gibber.dm @@ -190,7 +190,7 @@ for (var/i=1 to meat_produced) var/obj/item/food/meat/slab/newmeat = new typeofmeat newmeat.name = "[sourcename] [newmeat.name]" - newmeat.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, occupant) = 4 * MINERAL_MATERIAL_AMOUNT)) + newmeat.set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, occupant) = 4 * SHEET_MATERIAL_AMOUNT)) if(istype(newmeat)) newmeat.subjectname = sourcename newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced) // Thehehe. Fat guys go first diff --git a/code/modules/food_and_drinks/machinery/stove.dm b/code/modules/food_and_drinks/machinery/stove.dm index addc0175be2..481f672a36c 100644 --- a/code/modules/food_and_drinks/machinery/stove.dm +++ b/code/modules/food_and_drinks/machinery/stove.dm @@ -36,7 +36,7 @@ amount_per_transfer_from_this = 50 amount_list_position = 2 reagent_flags = REFILLABLE | DRAINABLE - custom_materials = list(/datum/material/iron = 5000) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) w_class = WEIGHT_CLASS_BULKY custom_price = PAYCHECK_LOWER * 8 fill_icon_thresholds = null diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index ee19edaea76..9d7552eaad6 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -15,7 +15,7 @@ inhand_icon_state = "pizzabox" lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' - custom_materials = list(/datum/material/cardboard = 2000) + custom_materials = list(/datum/material/cardboard =SHEET_MATERIAL_AMOUNT) var/open = FALSE var/can_open_on_fall = TRUE //if FALSE, this pizza box will never open if it falls from a stack diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index bb67a86f5c9..001eaceebf8 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -10,7 +10,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron = 30, /datum/material/glass = 20) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) /obj/item/plant_analyzer/Initialize(mapload) . = ..() @@ -425,7 +425,7 @@ force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.5) attack_verb_continuous = list("slashes", "slices", "cuts", "claws") attack_verb_simple = list("slash", "slice", "cut", "claw") hitsound = 'sound/weapons/bladeslice.ogg' @@ -441,7 +441,7 @@ attack_verb_continuous = list("slashes", "slices", "bashes", "claws") attack_verb_simple = list("slash", "slice", "bash", "claw") hitsound = null - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.5) resistance_flags = FLAMMABLE flags_1 = NONE @@ -479,7 +479,7 @@ throw_speed = 4 throw_range = 7 embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10) - custom_materials = list(/datum/material/iron = 15000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5) attack_verb_continuous = list("chops", "tears", "lacerates", "cuts") attack_verb_simple = list("chop", "tear", "lacerate", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -500,7 +500,7 @@ /obj/item/hatchet/wooden desc = "A crude axe blade upon a short wooden handle." icon_state = "woodhatchet" - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1) resistance_flags = FLAMMABLE flags_1 = NONE @@ -579,7 +579,7 @@ throwforce = 6 w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=4000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT*2) attack_verb_continuous = list("slashes", "slices", "cuts", "claws") attack_verb_simple = list("slash", "slice", "cut", "claw") hitsound = 'sound/weapons/bladeslice.ogg' @@ -609,7 +609,7 @@ throwforce = 8 w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=4000, /datum/material/uranium=1500, /datum/material/gold=500) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/uranium=HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold=SMALL_MATERIAL_AMOUNT*5) attack_verb_continuous = list("slashes", "slices", "cuts") attack_verb_simple = list("slash", "slice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/industrial_lift/tram/tram_walls.dm b/code/modules/industrial_lift/tram/tram_walls.dm index 4e06eab1bac..f52e75c23bb 100644 --- a/code/modules/industrial_lift/tram/tram_walls.dm +++ b/code/modules/industrial_lift/tram/tram_walls.dm @@ -109,7 +109,7 @@ explosion_block = 0 //gold is a soft metal you dingus. smoothing_groups = SMOOTH_GROUP_GOLD_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_GOLD_WALLS - custom_materials = list(/datum/material/gold = 4000) + custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/silver name = "silver wall" @@ -122,7 +122,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_SILVER_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_SILVER_WALLS - custom_materials = list(/datum/material/silver = 4000) + custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/diamond name = "diamond wall" @@ -138,7 +138,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_DIAMOND_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_DIAMOND_WALLS - custom_materials = list(/datum/material/diamond = 4000) + custom_materials = list(/datum/material/diamond = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/bananium name = "bananium wall" @@ -151,7 +151,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_BANANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_BANANIUM_WALLS - custom_materials = list(/datum/material/bananium = 4000) + custom_materials = list(/datum/material/bananium = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/sandstone name = "sandstone wall" @@ -165,7 +165,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_SANDSTONE_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_SANDSTONE_WALLS - custom_materials = list(/datum/material/sandstone = 4000) + custom_materials = list(/datum/material/sandstone = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/uranium article = "a" @@ -179,7 +179,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_URANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_URANIUM_WALLS - custom_materials = list(/datum/material/uranium = 4000) + custom_materials = list(/datum/material/uranium = SHEET_MATERIAL_AMOUNT*2) /// Mutex to prevent infinite recursion when propagating radiation pulses var/active = null @@ -224,7 +224,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_PLASMA_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_PLASMA_WALLS - custom_materials = list(/datum/material/plasma = 4000) + custom_materials = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/wood name = "wooden wall" @@ -238,7 +238,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_WOOD_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_WOOD_WALLS - custom_materials = list(/datum/material/wood = 4000) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/wood/attackby(obj/item/W, mob/user) if(W.get_sharpness() && W.force) @@ -272,7 +272,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_IRON_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_IRON_WALLS - custom_materials = list(/datum/material/iron = 5000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5) /obj/structure/tramwall/abductor name = "alien wall" @@ -287,7 +287,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_ABDUCTOR_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS canSmoothWith = SMOOTH_GROUP_ABDUCTOR_WALLS - custom_materials = list(/datum/material/alloy/alien = 4000) + custom_materials = list(/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT*2) /obj/structure/tramwall/material name = "wall" @@ -306,7 +306,7 @@ new girder_type(loc) for(var/material in custom_materials) var/datum/material/material_datum = material - new material_datum.sheet_type(loc, FLOOR(custom_materials[material_datum] / MINERAL_MATERIAL_AMOUNT, 1)) + new material_datum.sheet_type(loc, FLOOR(custom_materials[material_datum] / SHEET_MATERIAL_AMOUNT, 1)) qdel(src) /obj/structure/tramwall/material/mat_update_desc(mat) diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index 56339ff492a..b9668c1f83b 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -6,7 +6,7 @@ impressiveness = 18 // Carved from the bones of a massive creature, it's going to be a specticle to say the least layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE - custom_materials = list(/datum/material/bone=MINERAL_MATERIAL_AMOUNT*5) + custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*5) abstract_type = /obj/structure/statue/bone /obj/structure/statue/bone/Initialize(mapload) @@ -17,7 +17,7 @@ /obj/structure/statue/bone/rib name = "colossal rib" desc = "It's staggering to think that something this big could have lived, let alone died." - custom_materials = list(/datum/material/bone=MINERAL_MATERIAL_AMOUNT*4) + custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*4) icon = 'icons/obj/art/statuelarge.dmi' icon_state = "rib" icon_preview = 'icons/obj/previews.dmi' @@ -26,7 +26,7 @@ /obj/structure/statue/bone/skull name = "colossal skull" desc = "The gaping maw of a dead, titanic monster." - custom_materials = list(/datum/material/bone=MINERAL_MATERIAL_AMOUNT*12) + custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*12) icon = 'icons/obj/art/statuelarge.dmi' icon_state = "skull" icon_preview = 'icons/obj/previews.dmi' @@ -34,7 +34,7 @@ /obj/structure/statue/bone/skull/half desc = "The gaping maw of a dead, titanic monster. This one is cracked in half." - custom_materials = list(/datum/material/bone=MINERAL_MATERIAL_AMOUNT*6) + custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*6) icon = 'icons/obj/art/statuelarge.dmi' icon_state = "skull-half" icon_preview = 'icons/obj/previews.dmi' diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index a0658b8ad59..23786b6e64c 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -14,7 +14,7 @@ throwforce = 5 throw_speed = 4 armour_penetration = 10 - custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075) + custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT*1.15, /datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT*2.075) hitsound = 'sound/weapons/bladeslice.ogg' attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps") attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp") diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 3161fcd976b..4ec3f754e58 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -12,7 +12,7 @@ lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' w_class = WEIGHT_CLASS_BULKY - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) tool_behaviour = TOOL_MINING toolspeed = 1 usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg') @@ -43,7 +43,7 @@ throwforce = 7 slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=1000) + custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT) /obj/item/pickaxe/silver name = "silver-plated pickaxe" @@ -113,7 +113,7 @@ toolspeed = 3 //3 times slower than a normal pickaxe slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=12050) //metal needed for a crowbar and for a knife, why the FUCK does a knife cost 6 metal sheets while a crowbar costs 0.025 sheets? shit makes no sense fuck this + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) //This number used to be insane and I'm just going to save your sanity and not tell you what it was. /obj/item/shovel name = "shovel" @@ -131,7 +131,7 @@ toolspeed = 1 usesound = 'sound/effects/shovel_dig.ogg' w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5) attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks") attack_verb_simple = list("bash", "bludgeon", "thrash", "whack") sharpness = SHARP_EDGED diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 28e0b9c41d6..65cf7d97892 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -38,28 +38,28 @@ name = "Kinetic Accelerator Offensive Mining Explosion Mod" desc = "A device which causes kinetic accelerators to fire AoE blasts that destroy rock and damage creatures." id = "hyperaoemod" - materials = list(/datum/material/iron = 7000, /datum/material/glass = 3000, /datum/material/silver = 3000, /datum/material/gold = 3000, /datum/material/diamond = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.5, /datum/material/gold =SHEET_MATERIAL_AMOUNT*1.5, /datum/material/diamond = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs /datum/design/unique_modkit/rapid_repeater name = "Kinetic Accelerator Rapid Repeater Mod" desc = "A device which greatly reduces a kinetic accelerator's cooldown on striking a living target or rock, but greatly increases its base cooldown." id = "repeatermod" - materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/uranium = 8000, /datum/material/bluespace = 2000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = SHEET_MATERIAL_AMOUNT*4, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/borg/upgrade/modkit/cooldown/repeater /datum/design/unique_modkit/resonator_blast name = "Kinetic Accelerator Resonator Blast Mod" desc = "A device which causes kinetic accelerators to fire shots that leave and detonate resonator blasts." id = "resonatormod" - materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/silver = 5000, /datum/material/uranium = 5000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/borg/upgrade/modkit/resonator_blasts /datum/design/unique_modkit/bounty name = "Kinetic Accelerator Death Syphon Mod" desc = "A device which causes kinetic accelerators to permanently gain damage against creature types killed with it." id = "bountymod" - materials = list(/datum/material/iron = 4000, /datum/material/silver = 4000, /datum/material/gold = 4000, /datum/material/bluespace = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*2, /datum/material/gold = SHEET_MATERIAL_AMOUNT*2, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT*2) reagents_list = list(/datum/reagent/blood = 40) build_path = /obj/item/borg/upgrade/modkit/bounty diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 13daabaffaa..fe15d628fd2 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -236,7 +236,7 @@ var/datum/material/mat = selected_material if(!mat) return - var/sheets_to_remove = (materials.materials[mat] >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT * seconds_per_tick) ) ? SMELT_AMOUNT * seconds_per_tick : round(materials.materials[mat] / MINERAL_MATERIAL_AMOUNT) + var/sheets_to_remove = (materials.materials[mat] >= (SHEET_MATERIAL_AMOUNT * SMELT_AMOUNT * seconds_per_tick) ) ? SMELT_AMOUNT * seconds_per_tick : round(materials.materials[mat] / SHEET_MATERIAL_AMOUNT) if(!sheets_to_remove) on = FALSE else diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 4f553af4558..6222767d83b 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -143,7 +143,7 @@ for(var/mat in mat_container.materials) var/datum/material/M = mat - var/mineral_amount = mat_container.materials[mat] / MINERAL_MATERIAL_AMOUNT + var/mineral_amount = mat_container.materials[mat] / SHEET_MATERIAL_AMOUNT if(mineral_amount) has_minerals = TRUE msg += "[capitalize(M.name)]: [mineral_amount] sheets
" @@ -237,7 +237,7 @@ if (mat_container) for(var/datum/material/material as anything in mat_container.materials) var/amount = mat_container.materials[material] - var/sheet_amount = amount / MINERAL_MATERIAL_AMOUNT + var/sheet_amount = amount / SHEET_MATERIAL_AMOUNT data["materials"] += list(list( "name" = material.name, "id" = REF(material), @@ -342,7 +342,7 @@ if(!amount) return - var/stored_amount = CEILING(amount / MINERAL_MATERIAL_AMOUNT, 0.1) + var/stored_amount = CEILING(amount / SHEET_MATERIAL_AMOUNT, 0.1) if(!stored_amount) return @@ -351,7 +351,7 @@ var/count = mat_container.retrieve_sheets(sheets_to_remove, mat, get_step(src, output_dir)) var/list/mats = list() - mats[mat] = MINERAL_MATERIAL_AMOUNT + mats[mat] = SHEET_MATERIAL_AMOUNT materials.silo_log(src, "released", -count, "sheets", mats) //Logging deleted for quick coding return TRUE diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index a022ddcd216..2077428bd34 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -98,7 +98,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) for(var/M in materials.materials) var/datum/material/mat = M var/amount = materials.materials[M] - var/sheets = round(amount) / MINERAL_MATERIAL_AMOUNT + var/sheets = round(amount) / SHEET_MATERIAL_AMOUNT var/ref = REF(M) if (sheets) if (sheets >= 1) @@ -169,7 +169,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/count = materials.retrieve_sheets(text2num(href_list["eject_amt"]), eject_sheet, drop_location()) var/list/matlist = list() - matlist[eject_sheet] = MINERAL_MATERIAL_AMOUNT * count + matlist[eject_sheet] = SHEET_MATERIAL_AMOUNT * count silo_log(src, "ejected", -count, "sheets", matlist) return TRUE else if(href_list["page"]) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index e8d56d4ed44..824dede7fb7 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -76,7 +76,7 @@ singular_name = "uranium ore chunk" points = 30 material_flags = NONE - mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/uranium mine_experience = 6 scan_state = "rock_Uranium" @@ -88,7 +88,7 @@ icon_state = "Iron ore" singular_name = "iron ore chunk" points = 1 - mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/iron mine_experience = 1 scan_state = "rock_Iron" @@ -100,7 +100,7 @@ icon_state = "Glass ore" singular_name = "sand pile" points = 1 - mats_per_unit = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/glass w_class = WEIGHT_CLASS_TINY mine_experience = 0 //its sand @@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "Plasma ore" singular_name = "plasma ore chunk" points = 15 - mats_per_unit = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/plasma mine_experience = 5 scan_state = "rock_Plasma" @@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ singular_name = "silver ore chunk" points = 16 mine_experience = 3 - mats_per_unit = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/silver scan_state = "rock_Silver" spreadChance = 5 @@ -174,7 +174,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ singular_name = "gold ore chunk" points = 18 mine_experience = 5 - mats_per_unit = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/gold scan_state = "rock_Gold" spreadChance = 5 @@ -185,7 +185,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "Diamond ore" singular_name = "diamond ore chunk" points = 50 - mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/diamond mine_experience = 10 scan_state = "rock_Diamond" @@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "Bananium ore" singular_name = "bananium ore chunk" points = 60 - mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/bananium mine_experience = 15 scan_state = "rock_Bananium" @@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "Titanium ore" singular_name = "titanium ore chunk" points = 50 - mats_per_unit = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/titanium=SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/titanium mine_experience = 3 scan_state = "rock_Titanium" @@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ force = 1 throwforce = 2 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron = 400) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*0.4) material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS var/string_attached var/list/sideslist = list("heads","tails") @@ -457,37 +457,37 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return /obj/item/coin/gold - custom_materials = list(/datum/material/gold = 400) + custom_materials = list(/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/silver - custom_materials = list(/datum/material/silver = 400) + custom_materials = list(/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/diamond - custom_materials = list(/datum/material/diamond = 400) + custom_materials = list(/datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/plasma - custom_materials = list(/datum/material/plasma = 400) + custom_materials = list(/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/uranium - custom_materials = list(/datum/material/uranium = 400) + custom_materials = list(/datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/titanium - custom_materials = list(/datum/material/titanium = 400) + custom_materials = list(/datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/bananium - custom_materials = list(/datum/material/bananium = 400) + custom_materials = list(/datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/adamantine - custom_materials = list(/datum/material/adamantine = 400) + custom_materials = list(/datum/material/adamantine = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/mythril - custom_materials = list(/datum/material/mythril = 400) + custom_materials = list(/datum/material/mythril = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/plastic - custom_materials = list(/datum/material/plastic = 400) + custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/runite - custom_materials = list(/datum/material/runite = 400) + custom_materials = list(/datum/material/runite = HALF_SHEET_MATERIAL_AMOUNT*0.4) /obj/item/coin/twoheaded desc = "Hey, this coin's the same on both sides!" @@ -497,7 +497,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ name = "antag token" desc = "A novelty coin that helps the heart know what hard evidence cannot prove." icon_state = "coin_valid" - custom_materials = list(/datum/material/plastic = 400) + custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*0.4) sideslist = list("valid", "salad") heads_name = "valid" material_flags = NONE @@ -506,7 +506,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/coin/iron /obj/item/coin/gold/debug - custom_materials = list(/datum/material/gold = 400) + custom_materials = list(/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT*0.4) desc = "If you got this somehow, be aware that it will dust you. Almost certainly." /obj/item/coin/gold/debug/attack_self(mob/user) @@ -544,7 +544,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ name = "eldritch coin" desc = "Everytime it lands it bolts or opens doors, except for you." icon_state = "coin_heretic" - custom_materials = list(/datum/material/diamond = 1000, /datum/material/plasma = 1000) + custom_materials = list(/datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) sideslist = list("heretic", "blade") heads_name = "heretic" has_action = TRUE diff --git a/code/modules/mob/living/basic/pets/dog.dm b/code/modules/mob/living/basic/pets/dog.dm index ac72f782a9c..25b1afeeb71 100644 --- a/code/modules/mob/living/basic/pets/dog.dm +++ b/code/modules/mob/living/basic/pets/dog.dm @@ -845,7 +845,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/food/meat.dmi' icon_state = "skeletonmeat" - custom_materials = list(/datum/material/bone = MINERAL_MATERIAL_AMOUNT * 4) + custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 4) force = 3 throwforce = 5 attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks") diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index 9feb1af26fb..81e1dd08b30 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -289,7 +289,7 @@ /// How much charge we are currently storing. var/charge = 10000 /// Associated list of charge sources and how much they charge, only stacks allowed. - var/list/charger_list = list(/obj/item/stack/ore/plasma = 1500, /obj/item/stack/sheet/mineral/plasma = 2000) + var/list/charger_list = list(/obj/item/stack/ore/plasma = 1500, /obj/item/stack/sheet/mineral/plasma =SHEET_MATERIAL_AMOUNT) /obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit) . = ..() diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index 026aad34842..a360023328d 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -12,7 +12,7 @@ inhand_icon_state = "electronic" steel_sheet_cost = 2 - custom_materials = list(/datum/material/iron=300, /datum/material/glass=100, /datum/material/plastic=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass=SMALL_MATERIAL_AMOUNT, /datum/material/plastic=SMALL_MATERIAL_AMOUNT) interaction_flags_atom = INTERACT_ATOM_ALLOW_USER_LOCATION | INTERACT_ATOM_IGNORE_MOBILITY icon_state_menu = "menu" diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 8f0b1fc5f5d..f900b355522 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -22,7 +22,7 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron=10) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1) pressure_resistance = 2 grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1) var/colour = "#000000" //what colour the ink is! @@ -110,7 +110,7 @@ throwforce = 5 throw_speed = 4 colour = "#DC143C" - custom_materials = list(/datum/material/gold = 750) + custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT*7.5) sharpness = SHARP_EDGED resistance_flags = FIRE_PROOF unique_reskin = list("Oak" = "pen-fountain-o", @@ -339,7 +339,7 @@ worn_icon_state = "pen" force = 3 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron=10, /datum/material/diamond=100, /datum/material/titanium = 10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.1, /datum/material/diamond=SMALL_MATERIAL_AMOUNT, /datum/material/titanium = SMALL_MATERIAL_AMOUNT*0.1) pressure_resistance = 2 grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1) tool_behaviour = TOOL_MINING //For the classic "digging out of prison with a spoon but you're in space so this analogy doesn't work" situation. diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 9934b45c501..12caa3c003e 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 - custom_materials = list(/datum/material/iron=60) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.6) pressure_resistance = 2 attack_verb_continuous = list("stamps") attack_verb_simple = list("stamp") diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index bdcb4ee8e65..764a239d37f 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -18,7 +18,7 @@ w_class = WEIGHT_CLASS_SMALL flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_NECK - custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 150) + custom_materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.5) custom_price = PAYCHECK_CREW * 2 var/flash_enabled = TRUE var/state_on = "camera" diff --git a/code/modules/photography/camera/film.dm b/code/modules/photography/camera/film.dm index 104cbad3bae..6c3bf84ad20 100644 --- a/code/modules/photography/camera/film.dm +++ b/code/modules/photography/camera/film.dm @@ -11,4 +11,4 @@ righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE - custom_materials = list(/datum/material/iron = 10, /datum/material/glass = 10) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index b36195aff46..d5ce0d66547 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -4,7 +4,7 @@ name = "picture frame" desc = "The perfect showcase for your favorite deathtrap memories." icon = 'icons/obj/signs.dmi' - custom_materials = list(/datum/material/wood = 2000) + custom_materials = list(/datum/material/wood =SHEET_MATERIAL_AMOUNT) resistance_flags = FLAMMABLE flags_1 = 0 icon_state = "frame-overlay" @@ -66,7 +66,7 @@ desc = "Every time you look it makes you laugh." icon = 'icons/obj/signs.dmi' icon_state = "frame-overlay" - custom_materials = list(/datum/material/wood = 2000) + custom_materials = list(/datum/material/wood =SHEET_MATERIAL_AMOUNT) resistance_flags = FLAMMABLE var/obj/item/photo/framed var/persistence_id diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index e83553d35ab..43e48b2e3a7 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -42,7 +42,7 @@ continue if(!isobserver(seen)) continue - set_custom_materials(list(/datum/material/hauntium = 2000)) + set_custom_materials(list(/datum/material/hauntium =SHEET_MATERIAL_AMOUNT)) break /obj/item/photo/update_icon_state() diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index e8982ef4f30..d887df951bd 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -325,7 +325,7 @@ All the important duct code: singular_name = "duct" icon = 'icons/obj/plumbing/fluid_ducts.dmi' icon_state = "ducts" - mats_per_unit = list(/datum/material/iron=500) + mats_per_unit = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5) w_class = WEIGHT_CLASS_TINY novariants = FALSE max_amount = 50 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index b838ca9b775..356da439554 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -24,7 +24,7 @@ var/charge = 0 ///Maximum charge in cell units var/maxcharge = 1000 - custom_materials = list(/datum/material/iron=700, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) ///If the cell has been booby-trapped by injecting it with plasma. Chance on use() to explode. var/rigged = FALSE @@ -280,7 +280,7 @@ name = "\improper Nanotrasen brand rechargeable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT maxcharge = 500 - custom_materials = list(/datum/material/glass=40) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.4) /obj/item/stock_parts/cell/crap/empty empty = TRUE @@ -289,7 +289,7 @@ name = "upgraded power cell" desc = "A power cell with a slightly higher capacity than normal!" maxcharge = 2500 - custom_materials = list(/datum/material/glass=50) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) chargerate = 1000 /obj/item/stock_parts/cell/upgraded/plus @@ -300,7 +300,7 @@ /obj/item/stock_parts/cell/secborg name = "security borg rechargeable D battery" maxcharge = 600 //600 max charge / 100 charge per shot = six shots - custom_materials = list(/datum/material/glass=40) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.4) /obj/item/stock_parts/cell/secborg/empty empty = TRUE @@ -330,14 +330,14 @@ name = "black power cell" icon_state = "bscell" maxcharge = 10000 - custom_materials = list(/datum/material/glass=60) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6) chargerate = 2000 /obj/item/stock_parts/cell/high name = "high-capacity power cell" icon_state = "hcell" maxcharge = 10000 - custom_materials = list(/datum/material/glass=60) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6) chargerate = 1500 /obj/item/stock_parts/cell/high/empty @@ -347,7 +347,7 @@ name = "super-capacity power cell" icon_state = "scell" maxcharge = 20000 - custom_materials = list(/datum/material/glass=300) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) chargerate = 2000 /obj/item/stock_parts/cell/super/empty @@ -357,7 +357,7 @@ name = "hyper-capacity power cell" icon_state = "hpcell" maxcharge = 30000 - custom_materials = list(/datum/material/glass=400) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4) chargerate = 3000 /obj/item/stock_parts/cell/hyper/empty @@ -368,7 +368,7 @@ desc = "A rechargeable transdimensional power cell." icon_state = "bscell" maxcharge = 40000 - custom_materials = list(/datum/material/glass=600) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*6) chargerate = 4000 /obj/item/stock_parts/cell/bluespace/empty @@ -378,7 +378,7 @@ name = "infinite-capacity power cell" icon_state = "icell" maxcharge = INFINITY //little disappointing if you examine it and it's not huge - custom_materials = list(/datum/material/glass=1000) + custom_materials = list(/datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT) chargerate = INFINITY ratingdesc = FALSE @@ -454,7 +454,7 @@ name = "miniature power cell" desc = "A tiny power cell with a very low power capacity. Used in light fixtures to power them in the event of an outage." maxcharge = 120 //Emergency lights use 0.2 W per tick, meaning ~10 minutes of emergency power from a cell - custom_materials = list(/datum/material/glass = 20) + custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*0.2) w_class = WEIGHT_CLASS_TINY /obj/item/stock_parts/cell/emergency_light/Initialize(mapload) diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index cf96dbe52c8..fb74f3b77f7 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -7,7 +7,7 @@ force = 2 throwforce = 5 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/glass=100) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/silicon = 5, /datum/reagent/nitrogen = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs ///How much light it gives off var/brightness = 2 diff --git a/code/modules/power/lighting/light_wallframes.dm b/code/modules/power/lighting/light_wallframes.dm index 0688f597f1a..af650232cca 100644 --- a/code/modules/power/lighting/light_wallframes.dm +++ b/code/modules/power/lighting/light_wallframes.dm @@ -10,7 +10,7 @@ name = "small light fixture frame" icon_state = "bulb-construct-item" result_path = /obj/structure/light_construct/small - custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) /obj/item/wallframe/light_fixture/try_build(turf/on_wall, user) if(!..()) diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm index a781defd014..9b01f982a5f 100644 --- a/code/modules/projectiles/ammunition/_ammunition.dm +++ b/code/modules/projectiles/ammunition/_ammunition.dm @@ -8,7 +8,7 @@ slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron = 500) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*5) override_notes = TRUE ///What sound should play when this ammo is fired var/fire_sound = null diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index b62b7bd7426..48fc55b616f 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -6,7 +6,7 @@ icon_state = "blshell" worn_icon_state = "shell" caliber = CALIBER_SHOTGUN - custom_materials = list(/datum/material/iron=4000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2) projectile_type = /obj/projectile/bullet/shotgun_slug /obj/item/ammo_casing/shotgun/executioner @@ -25,7 +25,7 @@ name = "beanbag slug" desc = "A weak beanbag slug for riot control." icon_state = "bshell" - custom_materials = list(/datum/material/iron=250) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5) projectile_type = /obj/projectile/bullet/shotgun_beanbag /obj/item/ammo_casing/shotgun/incendiary @@ -52,7 +52,7 @@ desc = "A stunning taser slug." icon_state = "stunshell" projectile_type = /obj/projectile/bullet/shotgun_stunslug - custom_materials = list(/datum/material/iron=250) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5) /obj/item/ammo_casing/shotgun/meteorslug name = "meteorslug shell" @@ -92,7 +92,7 @@ projectile_type = /obj/projectile/bullet/pellet/shotgun_rubbershot pellets = 6 variance = 20 - custom_materials = list(/datum/material/iron=4000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2) /obj/item/ammo_casing/shotgun/incapacitate name = "custom incapacitating shot" @@ -101,14 +101,14 @@ projectile_type = /obj/projectile/bullet/pellet/shotgun_incapacitate pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face. variance = 25 - custom_materials = list(/datum/material/iron=4000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2) /obj/item/ammo_casing/shotgun/improvised name = "improvised shell" desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards." icon_state = "improvshell" projectile_type = /obj/projectile/bullet/pellet/shotgun_improvised - custom_materials = list(/datum/material/iron=250) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5) pellets = 10 variance = 25 diff --git a/code/modules/projectiles/ammunition/caseless/foam.dm b/code/modules/projectiles/ammunition/caseless/foam.dm index cd835924610..871f0cc766d 100644 --- a/code/modules/projectiles/ammunition/caseless/foam.dm +++ b/code/modules/projectiles/ammunition/caseless/foam.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/weapons/guns/toy.dmi' icon_state = "foamdart" base_icon_state = "foamdart" - custom_materials = list(/datum/material/iron = 11.25) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.1125) harmful = FALSE var/modified = FALSE @@ -61,4 +61,4 @@ projectile_type = /obj/projectile/bullet/reusable/foam_dart/riot icon_state = "foamdart_riot" base_icon_state = "foamdart_riot" - custom_materials = list(/datum/material/iron = 1125) + custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT* 1.125) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 8a37d242123..f5550ba5ed4 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -9,7 +9,7 @@ worn_icon_state = "ammobox" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 30000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*15) throwforce = 2 w_class = WEIGHT_CLASS_TINY throw_speed = 3 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 278add358b6..87ec9e59bcf 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -21,7 +21,7 @@ max_ammo = 6 caliber = CALIBER_38 multiple_sprites = AMMO_BOX_PER_BULLET - custom_materials = list(/datum/material/iron = 20000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10) ammo_band_icon = "+38_ammo_band" ammo_band_color = null @@ -111,9 +111,9 @@ icon_state = "foambox" ammo_type = /obj/item/ammo_casing/caseless/foam_dart max_ammo = 40 - custom_materials = list(/datum/material/iron = 500) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*5) /obj/item/ammo_box/foambox/riot icon_state = "foambox_riot" ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot - custom_materials = list(/datum/material/iron = 50000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*25) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 792c94982e0..d85e514ab46 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -11,7 +11,7 @@ worn_icon_state = "gun" flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) w_class = WEIGHT_CLASS_NORMAL throwforce = 5 throw_speed = 3 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 3398c71324c..ad5a5ce9279 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -4,7 +4,7 @@ icon_state = "laser" inhand_icon_state = "laser" w_class = WEIGHT_CLASS_BULKY - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) ammo_type = list(/obj/item/ammo_casing/energy/lasergun) ammo_x_offset = 1 shaded_charge = 1 diff --git a/code/modules/projectiles/guns/energy/recharge.dm b/code/modules/projectiles/guns/energy/recharge.dm index 3e84b8761af..ae67135ea26 100644 --- a/code/modules/projectiles/guns/energy/recharge.dm +++ b/code/modules/projectiles/guns/energy/recharge.dm @@ -99,7 +99,7 @@ inhand_icon_state = "crossbow" no_charge_state = "crossbow_empty" w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) suppressed = TRUE ammo_type = list(/obj/item/ammo_casing/energy/bolt) recharge_time = 2 SECONDS @@ -124,6 +124,6 @@ base_icon_state = "crossbowlarge" no_charge_state = "crossbowlarge_empty" w_class = WEIGHT_CLASS_BULKY - custom_materials = list(/datum/material/iron=4000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2) suppressed = null ammo_type = list(/obj/item/ammo_casing/energy/bolt/large) diff --git a/code/modules/projectiles/guns/special/chem_gun.dm b/code/modules/projectiles/guns/special/chem_gun.dm index cf756f7649b..c902c8b19b6 100644 --- a/code/modules/projectiles/guns/special/chem_gun.dm +++ b/code/modules/projectiles/guns/special/chem_gun.dm @@ -9,7 +9,7 @@ throw_speed = 3 throw_range = 7 force = 4 - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) clumsy_check = FALSE fire_sound = 'sound/items/syringeproj.ogg' var/time_per_syringe = 250 diff --git a/code/modules/projectiles/guns/special/grenade_launcher.dm b/code/modules/projectiles/guns/special/grenade_launcher.dm index 7aa6bc9a46c..c23e1615053 100644 --- a/code/modules/projectiles/guns/special/grenade_launcher.dm +++ b/code/modules/projectiles/guns/special/grenade_launcher.dm @@ -10,7 +10,7 @@ force = 5 var/list/grenades = new/list() var/max_grenades = 3 - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) /obj/item/gun/grenadelauncher/examine(mob/user) . = ..() diff --git a/code/modules/projectiles/guns/special/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm index 873c05f5c5e..6439cebb3e3 100644 --- a/code/modules/projectiles/guns/special/syringe_gun.dm +++ b/code/modules/projectiles/guns/special/syringe_gun.dm @@ -16,7 +16,7 @@ force = 6 base_pixel_x = -4 pixel_x = -4 - custom_materials = list(/datum/material/iron=2000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) clumsy_check = FALSE fire_sound = 'sound/items/syringeproj.ogg' var/load_sound = 'sound/weapons/gun/shotgun/insert_shell.ogg' diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index d0ca022650b..c679d4a9d2f 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -222,7 +222,7 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' worn_icon_state = "beaker" - custom_materials = list(/datum/material/glass=500) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*5) fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) /obj/item/reagent_containers/cup/beaker/Initialize(mapload) @@ -242,7 +242,7 @@ name = "large beaker" desc = "A large beaker. Can hold up to 100 units." icon_state = "beakerlarge" - custom_materials = list(/datum/material/glass=2500) + custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT*1.25) volume = 100 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100) @@ -252,7 +252,7 @@ name = "x-large beaker" desc = "An extra-large beaker. Can hold up to 120 units." icon_state = "beakerwhite" - custom_materials = list(/datum/material/glass=2500, /datum/material/plastic=3000) + custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5) volume = 120 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,60,120) @@ -262,7 +262,7 @@ name = "metamaterial beaker" desc = "A large beaker. Can hold up to 180 units." icon_state = "beakergold" - custom_materials = list(/datum/material/glass=2500, /datum/material/plastic=3000, /datum/material/gold=1000, /datum/material/titanium=1000) + custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium=HALF_SHEET_MATERIAL_AMOUNT) volume = 180 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,60,120,180) @@ -273,7 +273,7 @@ desc = "A cryostasis beaker that allows for chemical storage without \ reactions. Can hold up to 50 units." icon_state = "beakernoreact" - custom_materials = list(/datum/material/iron=3000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 1.5) reagent_flags = OPENCONTAINER | NO_REACT volume = 50 amount_per_transfer_from_this = 10 @@ -284,7 +284,7 @@ and Element Cuban combined with the Compound Pete. Can hold up to \ 300 units." icon_state = "beakerbluespace" - custom_materials = list(/datum/material/glass = 5000, /datum/material/plasma = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) + custom_materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300) @@ -352,7 +352,7 @@ greyscale_config_worn = /datum/greyscale_config/buckets_worn greyscale_config_inhand_left = /datum/greyscale_config/buckets_inhands_left greyscale_config_inhand_right = /datum/greyscale_config/buckets_inhands_right - custom_materials = list(/datum/material/iron=200) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 2) w_class = WEIGHT_CLASS_NORMAL amount_per_transfer_from_this = 20 possible_transfer_amounts = list(5,10,15,20,25,30,50,70) @@ -391,7 +391,7 @@ greyscale_config_worn = null greyscale_config_inhand_left = null greyscale_config_inhand_right = null - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 2) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2) resistance_flags = FLAMMABLE armor_type = /datum/armor/bucket_wooden @@ -455,7 +455,7 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50, 100) volume = 100 - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT) resistance_flags = FLAMMABLE reagent_flags = OPENCONTAINER spillable = TRUE diff --git a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm index 65f255e61dc..280da37f327 100644 --- a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm @@ -7,7 +7,7 @@ fill_icon_thresholds = list(0) fill_icon_state = "drinking_glass" volume = 50 - custom_materials = list(/datum/material/glass=500) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*5) max_integrity = 20 spillable = TRUE resistance_flags = ACID_PROOF @@ -64,7 +64,7 @@ possible_transfer_amounts = list(15) fill_icon_state = "shot_glass" volume = 15 - custom_materials = list(/datum/material/glass=100) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT) custom_price = PAYCHECK_CREW * 0.4 /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/update_name(updates) diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm index 0f658c84650..4b6ccf7cd9b 100644 --- a/code/modules/reagents/reagent_containers/cups/drinks.dm +++ b/code/modules/reagents/reagent_containers/cups/drinks.dm @@ -48,7 +48,7 @@ force = 1 throwforce = 1 amount_per_transfer_from_this = 5 - custom_materials = list(/datum/material/iron=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT) possible_transfer_amounts = list(5) volume = 5 flags_1 = CONDUCT_1 @@ -66,7 +66,7 @@ force = 14 throwforce = 10 amount_per_transfer_from_this = 20 - custom_materials = list(/datum/material/gold=1000) + custom_materials = list(/datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT) volume = 150 /obj/item/reagent_containers/cup/glass/trophy/silver_cup @@ -78,7 +78,7 @@ force = 10 throwforce = 8 amount_per_transfer_from_this = 15 - custom_materials = list(/datum/material/silver=800) + custom_materials = list(/datum/material/silver=SMALL_MATERIAL_AMOUNT*8) volume = 100 @@ -91,7 +91,7 @@ force = 5 throwforce = 4 amount_per_transfer_from_this = 10 - custom_materials = list(/datum/material/iron=400) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 4) volume = 25 ///////////////////////////////////////////////Drinks @@ -212,7 +212,7 @@ icon_state = "smallbottle" inhand_icon_state = null list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard - custom_materials = list(/datum/material/plastic=1000) + custom_materials = list(/datum/material/plastic=HALF_SHEET_MATERIAL_AMOUNT) volume = 50 amount_per_transfer_from_this = 10 fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90) @@ -331,7 +331,7 @@ /obj/item/reagent_containers/cup/glass/waterbottle/large desc = "A fresh commercial-sized bottle of water." icon_state = "largebottle" - custom_materials = list(/datum/material/plastic=3000) + custom_materials = list(/datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5) list_reagents = list(/datum/reagent/water = 100) volume = 100 amount_per_transfer_from_this = 10 @@ -402,7 +402,7 @@ icon = 'icons/obj/drinks/colo.dmi' icon_state = "colocup" inhand_icon_state = "colocup" - custom_materials = list(/datum/material/plastic = 1000) + custom_materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) possible_transfer_amounts = list(5, 10, 15, 20) volume = 20 amount_per_transfer_from_this = 5 @@ -430,7 +430,7 @@ desc = "A metal shaker to mix drinks in." icon = 'icons/obj/drinks/bottles.dmi' icon_state = "shaker" - custom_materials = list(/datum/material/iron=1500) + custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT * 1.5) amount_per_transfer_from_this = 10 volume = 100 isGlass = FALSE @@ -448,7 +448,7 @@ custom_price = PAYCHECK_COMMAND * 2 icon = 'icons/obj/drinks/bottles.dmi' icon_state = "flask" - custom_materials = list(/datum/material/iron=250) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5) volume = 60 isGlass = FALSE @@ -456,7 +456,7 @@ name = "captain's flask" desc = "A gold flask belonging to the captain." icon_state = "flask_gold" - custom_materials = list(/datum/material/gold=500) + custom_materials = list(/datum/material/gold=SMALL_MATERIAL_AMOUNT*5) /obj/item/reagent_containers/cup/glass/flask/det name = "detective's flask" diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 5a1da322224..1648eb2009c 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -11,7 +11,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5, 10, 15) volume = 15 - custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) reagent_flags = TRANSPARENT custom_price = PAYCHECK_CREW * 0.5 sharpness = SHARP_POINTY diff --git a/code/modules/reagents/reagent_containers/watering_can.dm b/code/modules/reagents/reagent_containers/watering_can.dm index e237f73d141..1915213b16d 100644 --- a/code/modules/reagents/reagent_containers/watering_can.dm +++ b/code/modules/reagents/reagent_containers/watering_can.dm @@ -6,7 +6,7 @@ inhand_icon_state = "watering_can" lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi' - custom_materials = list(/datum/material/iron = 200) + custom_materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2) w_class = WEIGHT_CLASS_NORMAL volume = 100 amount_per_transfer_from_this = 20 @@ -25,7 +25,7 @@ name = "advanced watering can" icon_state = "adv_watering_can" inhand_icon_state = "adv_watering_can" - custom_materials = list(/datum/material/iron = 2500, /datum/material/glass = 200) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) list_reagents = list(/datum/reagent/water = 100) ///Refill rate for the watering can var/refill_rate = 5 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index a85980e6625..71e9177926c 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -170,7 +170,7 @@ visible_message(span_danger("\The [src] explodes!")) // old code for reference: // standard fuel tank = 1000 units = heavy_impact_range = 1, light_impact_range = 5, flame_range = 5 - // big fuel tank = 5000 units = devastation_range = 1, heavy_impact_range = 2, light_impact_range = 7, flame_range = 12 + // big fuel tank =SHEET_MATERIAL_AMOUNT * 2.5 units = devastation_range = 1, heavy_impact_range = 2, light_impact_range = 7, flame_range = 12 // It did not account for how much fuel was actually in the tank at all, just the size of the tank. // I encourage others to better scale these numbers in the future. // As it stands this is a minor nerf in exchange for an easy bombing technique working that has been broken for a while. @@ -298,7 +298,7 @@ name = "high capacity fuel tank" desc = "A tank full of a high quantity of welding fuel. Keep away from open flames." icon_state = "fuel_high" - tank_volume = 5000 + tank_volume =SHEET_MATERIAL_AMOUNT * 2.5 /// Wall mounted dispeners, like pepper spray or virus food. Not a normal tank, and shouldn't be able to be turned into a plumbed stationary one. /obj/structure/reagent_dispensers/wall diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 5fcb7229f37..6a5fef2bfa8 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -119,7 +119,7 @@ return to_chat(user, span_notice("You start slicing the floorweld off \the [src]...")) - if(I.use_tool(src, user, 20, volume=100) && panel_open) + if(I.use_tool(src, user, 20, volume=SMALL_MATERIAL_AMOUNT) && panel_open) to_chat(user, span_notice("You slice the floorweld off \the [src].")) deconstruct() return diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index c823b10b7a8..1e542952fc0 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -87,7 +87,7 @@ lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi' //made out of a single sheet of wood - custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT) item_flags = NO_PIXEL_RANDOM_DROP /obj/item/ritual_totem/Initialize(mapload) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index 19eb5321459..c7e38145349 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -413,7 +413,7 @@ if(!used_for_blade.use(5))//use 5 of the material return var/obj/item/ceremonial_blade/blade = new(altar_turf) - blade.set_custom_materials(list(GET_MATERIAL_REF(material_used) = MINERAL_MATERIAL_AMOUNT * 5)) + blade.set_custom_materials(list(GET_MATERIAL_REF(material_used) = SHEET_MATERIAL_AMOUNT * 5)) return TRUE /datum/religion_rites/unbreakable diff --git a/code/modules/religion/sparring/ceremonial_gear.dm b/code/modules/religion/sparring/ceremonial_gear.dm index 69b7448eda0..efb5ba28b85 100644 --- a/code/modules/religion/sparring/ceremonial_gear.dm +++ b/code/modules/religion/sparring/ceremonial_gear.dm @@ -13,7 +13,7 @@ greyscale_colors = "#FFFFFF" hitsound = 'sound/weapons/bladeslice.ogg' - custom_materials = list(/datum/material/iron = 12000) //Defaults to an Iron blade. + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) //Defaults to an Iron blade. force = 2 //20 throwforce = 1 //10 wound_bonus = CANT_WOUND // bad for sparring diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 0722ca9ab5c..c8cf81253fe 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -6,7 +6,7 @@ For the materials datum, it assumes you need reagents unless specified otherwise. To designate a material that isn't a reagent, you use one of the material IDs below. These are NOT ids in the usual sense (they aren't defined in the object or part of a datum), they are simply references used as part of a "has materials?" type proc. They all start with a $ to denote that they aren't reagents. -The currently supporting non-reagent materials. All material amounts are set as the define MINERAL_MATERIAL_AMOUNT, which defaults to 2000 +The currently supporting non-reagent materials. All material amounts are set as the define SHEET_MATERIAL_AMOUNT, which defaults to 2000 Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from iron). Only add raw materials. @@ -99,7 +99,7 @@ other types of metals and chemistry for reagents). name = "Component Design Disk" desc = "A disk for storing device design data for construction in lathes." icon_state = "datadisk1" - custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 100) + custom_materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT) ///List of all `/datum/design` stored on the disk. var/list/blueprints = list() diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index bfc4476810b..4b15192f777 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -16,7 +16,7 @@ name = "Safeguard Module" desc = "Allows for the construction of a Safeguard AI Module." id = "safeguard_module" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/supplied/safeguard category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -27,7 +27,7 @@ name = "OneHuman Module" desc = "Allows for the construction of a OneHuman AI Module." id = "onehuman_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 6000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = 6000, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/zeroth/onehuman category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -38,7 +38,7 @@ name = "ProtectStation Module" desc = "Allows for the construction of a ProtectStation AI Module." id = "protectstation_module" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/supplied/protect_station category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -49,7 +49,7 @@ name = "Quarantine Module" desc = "Allows for the construction of a Quarantine AI Module." id = "quarantine_module" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/supplied/quarantine category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -60,7 +60,7 @@ name = "OxygenIsToxicToHumans Module" desc = "Allows for the construction of a OxygenIsToxicToHumans AI Module." id = "oxygen_module" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/supplied/oxygen category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -71,7 +71,7 @@ name = "Freeform Module" desc = "Allows for the construction of a Freeform AI Module." id = "freeform_module" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 10000, /datum/material/bluespace = 2000)//Custom inputs should be more expensive to get + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = 10000, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT)//Custom inputs should be more expensive to get build_path = /obj/item/ai_module/supplied/freeform category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION @@ -82,7 +82,7 @@ name = "Reset Module" desc = "Allows for the construction of a Reset AI Module." id = "reset_module" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/reset category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION @@ -93,7 +93,7 @@ name = "Purge Module" desc = "Allows for the construction of a Purge AI Module." id = "purge_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/reset/purge category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION @@ -104,7 +104,7 @@ name = "Law Removal Module" desc = "Allows for the construction of a Law Removal AI Core Module." id = "remove_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/remove category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION @@ -115,7 +115,7 @@ name = "Core Freeform Module" desc = "Allows for the construction of a Core Freeform AI Core Module." id = "freeformcore_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 10000, /datum/material/bluespace = 2000)//Ditto + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = 10000, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT)//Ditto build_path = /obj/item/ai_module/core/freeformcore category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION @@ -126,7 +126,7 @@ name = "Asimov Module" desc = "Allows for the construction of an Asimov AI Core Module." id = "asimov_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/asimov category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -137,7 +137,7 @@ name = "P.A.L.A.D.I.N. Module" desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module." id = "paladin_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/paladin category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -148,7 +148,7 @@ name = "T.Y.R.A.N.T. Module" desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module." id = "tyrant_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/tyrant category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -159,7 +159,7 @@ name = "Overlord Module" desc = "Allows for the construction of an Overlord AI Module." id = "overlord_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/overlord category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -170,7 +170,7 @@ name = "Corporate Module" desc = "Allows for the construction of a Corporate AI Core Module." id = "corporate_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/corp category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -181,7 +181,7 @@ name = "Default Module" desc = "Allows for the construction of a Default AI Core Module." id = "default_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/custom category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -192,7 +192,7 @@ name = "Dungeon Master Module" desc = "Allows for the construction of a Dungeon Master AI Core Module." id = "dungeon_master_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/dungeon_master category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -203,7 +203,7 @@ name = "Painter Module" desc = "Allows for the construction of a Painter AI Core Module." id = "painter_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/painter category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -214,7 +214,7 @@ name = "Nutimov Module" desc = "Allows for the construction of a Nutimov AI Core Module." id = "nutimov_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/nutimov category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -225,7 +225,7 @@ name = "10 Commandments Module" desc = "Allows for the construction of a 10 Commandments AI Core Module." id = "ten_commandments_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/ten_commandments category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -236,7 +236,7 @@ name = "Asimov++ Module" desc = "Allows for the construction of a Asimov++ AI Core Module." id = "asimovpp_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/asimovpp category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -247,7 +247,7 @@ name = "Hippocratic Module" desc = "Allows for the construction of a Hippocratic AI Core Module." id = "hippocratic_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/hippocratic category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -258,7 +258,7 @@ name = "Paladin Devotion Module" desc = "Allows for the construction of a Paladin Devotion AI Core Module." id = "paladin_devotion_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/paladin_devotion category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -269,7 +269,7 @@ name = "Robocop Module" desc = "Allows for the construction of a Robocop AI Core Module." id = "robocop_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/robocop category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -280,7 +280,7 @@ name = "Maintain Module" desc = "Allows for the construction of a Maintain AI Core Module." id = "maintain_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/maintain category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -291,7 +291,7 @@ name = "Liveandletlive Module" desc = "Allows for the construction of a Liveandletlive AI Core Module." id = "liveandletlive_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/liveandletlive category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -302,7 +302,7 @@ name = "Peacekeeper Module" desc = "Allows for the construction of a Peacekeeper AI Core Module." id = "peacekeeper_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/peacekeeper category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -313,7 +313,7 @@ name = "Reporter Module" desc = "Allows for the construction of a Reporter AI Core Module." id = "reporter_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/reporter category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -324,7 +324,7 @@ name = "H.O.G.A.N. Module" desc = "Allows for the construction of a H.O.G.A.N. AI Core Module." id = "hulkamania_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/hulkamania category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -335,7 +335,7 @@ name = "Drone Module" desc = "Allows for the construction of a Drone AI Core Module." id = "drone_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/drone category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES @@ -346,7 +346,7 @@ name = "Antimov Module" desc = "Allows for the construction of a Antimov AI Core Module." id = "antimov_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/antimov category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -357,7 +357,7 @@ name = "Balance Module" desc = "Allows for the construction of a Balance AI Core Module." id = "balance_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/balance category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -368,7 +368,7 @@ name = "Thermodynamic Module" desc = "Allows for the construction of a Thermodynamic AI Core Module." id = "thermurderdynamic_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/thermurderdynamic category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES @@ -379,7 +379,7 @@ name = "Damaged AI Module" desc = "Allows for the construction of a Damaged AI Core Module." id = "damaged_module" - materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ai_module/core/full/damaged category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm index 464991cba82..24e1489c724 100644 --- a/code/modules/research/designs/autolathe/engineering_designs.dm +++ b/code/modules/research/designs/autolathe/engineering_designs.dm @@ -2,7 +2,7 @@ name = "Solar Panel Frame" id = "solar_panel" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3500, /datum/material/glass = 1000) + materials = list(/datum/material/iron = 3500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/solar_assembly category = list( RND_CATEGORY_INITIAL, @@ -14,7 +14,7 @@ name = "Solar Tracking Electronics" id = "solar_tracker" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/electronics/tracker category = list( RND_CATEGORY_INITIAL, @@ -26,7 +26,7 @@ name = "Blast Door Controller" id = "blast" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/assembly/control category = list( RND_CATEGORY_INITIAL, @@ -38,7 +38,7 @@ name = "Custom Vendor Refill" id = "custom_vendor_refill" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/vending_refill/custom category = list( RND_CATEGORY_INITIAL, @@ -51,7 +51,7 @@ name = "Light Fixture Battery" id = "miniature_power_cell" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 20) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/stock_parts/cell/emergency_light category = list( RND_CATEGORY_INITIAL, @@ -136,7 +136,7 @@ name = "Intercom Frame" id = "intercom_frame" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75, /datum/material/glass = 25) + materials = list(/datum/material/iron = 75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/wallframe/intercom category = list( RND_CATEGORY_INITIAL, @@ -148,7 +148,7 @@ name = "Earmuffs" id = "earmuffs" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/ears/earmuffs category = list( RND_CATEGORY_INITIAL, @@ -160,7 +160,7 @@ name = "Pipe Painter" id = "pipe_painter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/pipe_painter category = list( RND_CATEGORY_INITIAL, @@ -172,7 +172,7 @@ name = "Airlock Painter" id = "airlock_painter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/airlock_painter category = list( RND_CATEGORY_INITIAL, @@ -184,7 +184,7 @@ name = "Decal Painter" id = "decal_painter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/airlock_painter/decal category = list( RND_CATEGORY_INITIAL, @@ -196,7 +196,7 @@ name = "Tile Sprayer" id = "tile_sprayer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/airlock_painter/decal/tile category = list( RND_CATEGORY_INITIAL, @@ -208,7 +208,7 @@ name = "APC Module" id = "power_control" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/electronics/apc category = list( RND_CATEGORY_INITIAL, @@ -220,7 +220,7 @@ name = "Airlock Electronics" id = "airlock_board" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/electronics/airlock category = list( RND_CATEGORY_INITIAL, @@ -232,7 +232,7 @@ name = "Firelock Circuitry" id = "firelock_board" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/electronics/firelock category = list( RND_CATEGORY_INITIAL, @@ -244,7 +244,7 @@ name = "Air Alarm Electronics" id = "airalarm_electronics" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/electronics/airalarm category = list( RND_CATEGORY_INITIAL, @@ -256,7 +256,7 @@ name = "Fire Alarm Electronics" id = "firealarm_electronics" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/electronics/firealarm category = list( RND_CATEGORY_INITIAL, @@ -268,7 +268,7 @@ name = "Trapdoor Controller Electronics" id = "trapdoor_electronics" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/assembly/trapdoor category = list( RND_CATEGORY_INITIAL, @@ -292,7 +292,7 @@ name = "Pocket Fire Extinguisher" id = "pocketfireextinguisher" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 40) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass = 40) build_path = /obj/item/extinguisher/mini/empty category = list( RND_CATEGORY_INITIAL, @@ -328,7 +328,7 @@ name = "Light Switch Frame" id = "light_switch_frame" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75, /datum/material/glass = 25) + materials = list(/datum/material/iron = 75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/wallframe/light_switch category = list( RND_CATEGORY_INITIAL, @@ -342,7 +342,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/turbine category = list( @@ -357,7 +357,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/engine category = list( @@ -372,7 +372,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/auxbase category = list( diff --git a/code/modules/research/designs/autolathe/materials.dm b/code/modules/research/designs/autolathe/materials.dm index 66a70274308..5805005a397 100644 --- a/code/modules/research/designs/autolathe/materials.dm +++ b/code/modules/research/designs/autolathe/materials.dm @@ -2,7 +2,7 @@ name = "Iron" id = "iron" build_type = AUTOLATHE - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/iron category = list( RND_CATEGORY_INITIAL, @@ -14,7 +14,7 @@ name = "Iron Rod" id = "rods" build_type = AUTOLATHE - materials = list(/datum/material/iron = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/rods category = list( RND_CATEGORY_INITIAL, @@ -26,7 +26,7 @@ name = "Glass" id = "glass" build_type = AUTOLATHE - materials = list(/datum/material/glass = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/glass category = list( RND_CATEGORY_INITIAL, @@ -38,7 +38,7 @@ name = "Reinforced Glass" id = "rglass" build_type = AUTOLATHE | SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/rglass category = list( RND_CATEGORY_INITIAL, @@ -51,7 +51,7 @@ name = "Silver" id = "silver" build_type = AUTOLATHE - materials = list(/datum/material/silver = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/silver category = list( RND_CATEGORY_INITIAL, @@ -63,7 +63,7 @@ name = "Gold" id = "gold" build_type = AUTOLATHE - materials = list(/datum/material/gold = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/gold category = list( RND_CATEGORY_INITIAL, @@ -75,7 +75,7 @@ name = "Diamond" id = "diamond" build_type = AUTOLATHE - materials = list(/datum/material/diamond = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/diamond = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/diamond category = list( RND_CATEGORY_INITIAL, @@ -87,7 +87,7 @@ name = "Plasma" id = "plasma" build_type = AUTOLATHE - materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/plasma category = list( RND_CATEGORY_INITIAL, @@ -99,7 +99,7 @@ name = "Uranium" id = "uranium" build_type = AUTOLATHE - materials = list(/datum/material/uranium = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/uranium = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/uranium category = list( RND_CATEGORY_INITIAL, @@ -111,7 +111,7 @@ name = "Bananium" id = "bananium" build_type = AUTOLATHE - materials = list(/datum/material/bananium = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/bananium = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/bananium category = list( RND_CATEGORY_INITIAL, @@ -123,7 +123,7 @@ name = "Titanium" id = "titanium" build_type = AUTOLATHE - materials = list(/datum/material/titanium = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/titanium category = list( RND_CATEGORY_INITIAL, @@ -135,7 +135,7 @@ name = "Plastic" id = "plastic" build_type = AUTOLATHE - materials = list(/datum/material/plastic = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plastic category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/designs/autolathe/medsci_designs.dm b/code/modules/research/designs/autolathe/medsci_designs.dm index 4d2cb98549d..e0b03384044 100644 --- a/code/modules/research/designs/autolathe/medsci_designs.dm +++ b/code/modules/research/designs/autolathe/medsci_designs.dm @@ -3,7 +3,7 @@ name = "Pill Bottle" id = "pillbottle" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 20, /datum/material/glass = 100) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/storage/pill_bottle category = list( RND_CATEGORY_INITIAL, @@ -15,7 +15,7 @@ name = "Stethoscope" id = "stethoscope" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/neck/stethoscope category = list( RND_CATEGORY_INITIAL, @@ -27,7 +27,7 @@ name = "Surgical Tape" id = "surgical_tape" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 500) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/stack/sticky_tape/surgical category = list( RND_CATEGORY_INITIAL, @@ -40,7 +40,7 @@ name = "Slime Scanner" id = "slime_scanner" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 300, /datum/material/glass = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/slime_scanner category = list( RND_CATEGORY_INITIAL, @@ -52,7 +52,7 @@ name = "Petri Dish" id = "petri_dish" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/glass = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/petri_dish category = list( RND_CATEGORY_INITIAL, @@ -64,7 +64,7 @@ name = "Sterile Swab" id = "swab" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/plastic = 200) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/swab category = list( RND_CATEGORY_INITIAL, @@ -77,8 +77,8 @@ id = "telescreen_research" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 5, ) build_path = /obj/item/wallframe/telescreen/research category = list( @@ -92,8 +92,8 @@ id = "telescreen_ordnance" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 5, ) build_path = /obj/item/wallframe/telescreen/ordnance category = list( @@ -107,7 +107,7 @@ name = "Syringe" id = "syringe" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10, /datum/material/glass = 20) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.1, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/reagent_containers/syringe category = list( RND_CATEGORY_INITIAL, @@ -119,7 +119,7 @@ name = "Dropper" id = "dropper" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 10, /datum/material/plastic = 30) + materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.1, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.3) build_path = /obj/item/reagent_containers/dropper category = list( RND_CATEGORY_INITIAL, @@ -131,7 +131,7 @@ name = "Blood Filter" id = "blood_filter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 1500, /datum/material/silver = 500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/blood_filter category = list( RND_CATEGORY_INITIAL, @@ -143,7 +143,7 @@ name = "Scalpel" id = "scalpel" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/scalpel category = list( RND_CATEGORY_INITIAL, @@ -155,7 +155,7 @@ name = "Circular Saw" id = "circular_saw" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3) build_path = /obj/item/circular_saw category = list( RND_CATEGORY_INITIAL, @@ -167,7 +167,7 @@ name = "Bonesetter" id = "bonesetter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.25) build_path = /obj/item/bonesetter category = list( RND_CATEGORY_INITIAL, @@ -179,7 +179,7 @@ name = "Surgical Drill" id = "surgicaldrill" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3) build_path = /obj/item/surgicaldrill category = list( RND_CATEGORY_INITIAL, @@ -191,7 +191,7 @@ name = "Retractor" id = "retractor" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/retractor category = list( RND_CATEGORY_INITIAL, @@ -203,7 +203,7 @@ name = "Cautery" id = "cautery" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass = 750) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.25, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 7.5) build_path = /obj/item/cautery category = list( RND_CATEGORY_INITIAL, @@ -215,7 +215,7 @@ name = "Hemostat" id = "hemostat" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.25) build_path = /obj/item/hemostat category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/designs/autolathe/multi-department_designs.dm b/code/modules/research/designs/autolathe/multi-department_designs.dm index cef0bb8b773..529ef2846ea 100644 --- a/code/modules/research/designs/autolathe/multi-department_designs.dm +++ b/code/modules/research/designs/autolathe/multi-department_designs.dm @@ -2,7 +2,7 @@ name = "Flashlight" id = "flashlight" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 20) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/flashlight category = list( RND_CATEGORY_INITIAL, @@ -13,7 +13,7 @@ name = "Pocket Crowbar" id = "crowbar" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/crowbar category = list( RND_CATEGORY_INITIAL, @@ -25,7 +25,7 @@ name = "Multitool" id = "multitool" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 20) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/multitool category = list( RND_CATEGORY_INITIAL, @@ -37,7 +37,7 @@ name = "Rapid Wiring Device" id = "rwd" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 5000) + materials = list(/datum/material/iron = 10000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/rwd/loaded category = list( RND_CATEGORY_INITIAL, @@ -49,7 +49,7 @@ name = "Gas Analyzer" id = "analyzer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 30, /datum/material/glass = 20) + materials = list(/datum/material/iron = 30, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/analyzer category = list( RND_CATEGORY_INITIAL, @@ -61,7 +61,7 @@ name = "Welding Tool" id = "welding_tool" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 70, /datum/material/glass = 20) + materials = list(/datum/material/iron = 70, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/weldingtool/empty category = list( RND_CATEGORY_INITIAL, @@ -157,7 +157,7 @@ name = "Toolbox" id = "tool_box" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(MAT_CATEGORY_ITEM_MATERIAL = 500) + materials = list(MAT_CATEGORY_ITEM_MATERIAL =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/storage/toolbox category = list( RND_CATEGORY_INITIAL, @@ -168,7 +168,7 @@ name = "Emergency Oxygen Tank" id = "emergency_oxygen" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/tank/internals/emergency_oxygen/empty category = list( RND_CATEGORY_INITIAL, @@ -202,7 +202,7 @@ name = "Generic Gas Tank" id = "generic_tank" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/tank/internals/generic category = list( RND_CATEGORY_INITIAL, @@ -214,7 +214,7 @@ name = "Boxcutter" id = "boxcutter" build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/iron = 4000, /datum/material/plastic = 500) + materials = list(/datum/material/iron = 4000, /datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/boxcutter category = list( RND_CATEGORY_INITIAL, @@ -237,7 +237,7 @@ name = "Beaker" id = "beaker" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5) category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY, @@ -261,7 +261,7 @@ name = "Igniter" id = "igniter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/assembly/igniter category = list( RND_CATEGORY_INITIAL, @@ -273,7 +273,7 @@ name = "Condenser" id = "condenser" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=250, /datum/material/glass=300) + materials = list(/datum/material/iron=250, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/assembly/igniter/condenser category = list( RND_CATEGORY_INITIAL, @@ -296,7 +296,7 @@ name = "Infrared Emitter" id = "infrared_emitter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/assembly/infra category = list( RND_CATEGORY_INITIAL, @@ -308,7 +308,7 @@ name = "Health Sensor" id = "health_sensor" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 800, /datum/material/glass = 200) + materials = list(/datum/material/iron = 800, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/assembly/health category = list( RND_CATEGORY_INITIAL, @@ -320,7 +320,7 @@ name = "Timer" id = "timer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/assembly/timer category = list( RND_CATEGORY_INITIAL, @@ -332,7 +332,7 @@ name = "Voice Analyzer" id = "voice_analyzer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/assembly/voice category = list( RND_CATEGORY_INITIAL, @@ -344,7 +344,7 @@ name = "Light Tube" id = "light_tube" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 100) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/light/tube category = list( RND_CATEGORY_INITIAL, @@ -356,7 +356,7 @@ name = "Light Bulb" id = "light_bulb" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 100) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/light/bulb category = list( RND_CATEGORY_INITIAL, @@ -368,7 +368,7 @@ name = "Proximity Sensor" id = "prox_sensor" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 800, /datum/material/glass = 200) + materials = list(/datum/material/iron = 800, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/assembly/prox_sensor category = list( RND_CATEGORY_INITIAL, @@ -391,7 +391,7 @@ name = "Spraycan" id = "spraycan" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/toy/crayon/spraycan category = list( RND_CATEGORY_INITIAL, @@ -415,7 +415,7 @@ name = "Fluid Duct" id = "fluid_ducts" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/stack/ducts maxstack = 50 category = list( @@ -440,7 +440,7 @@ name = "Package Wrapping" id = "packagewrap" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/stack/package_wrap category = list( RND_CATEGORY_INITIAL, @@ -453,7 +453,7 @@ name = "Holodisk" id = "holodisk" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/disk/holodisk category = list( RND_CATEGORY_INITIAL, @@ -465,7 +465,7 @@ name = "Blue Circuit Tile" id = "circuit" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/stack/tile/circuit maxstack = 50 category = list( @@ -479,7 +479,7 @@ name = "Green Circuit Tile" id = "circuitgreen" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/stack/tile/circuit/green maxstack = 50 category = list( @@ -492,7 +492,7 @@ name = "Red Circuit Tile" id = "circuitred" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/stack/tile/circuit/red maxstack = 50 category = list( @@ -505,7 +505,7 @@ name = "Conveyor Belt" id = "conveyor_belt" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/stack/conveyor maxstack = 30 category = list( @@ -530,7 +530,7 @@ name = "Laptop Frame" id = "laptop" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 1000) + materials = list(/datum/material/iron = 10000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/modular_computer/laptop/buildable category = list( RND_CATEGORY_INITIAL, @@ -543,7 +543,7 @@ desc = "A utility scanner that fills multiple roles: Exports, sales, and vendor price tags." id = "universal_scanner" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 1500, /datum/material/glass = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/universal_scanner category = list( RND_CATEGORY_INITIAL, @@ -556,7 +556,7 @@ desc = "An paper biscuit which can seal in itself paperwork. After sealing it the only way to open is through cracking it, cracking is irreversible and makes it permamently open. Not actually a biscuit." id = "biscuit" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/plastic = 20) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/folder/biscuit/unsealed category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/designs/autolathe/security_designs.dm b/code/modules/research/designs/autolathe/security_designs.dm index 4bc71976432..fa0ed64f32b 100644 --- a/code/modules/research/designs/autolathe/security_designs.dm +++ b/code/modules/research/designs/autolathe/security_designs.dm @@ -2,7 +2,7 @@ name = "Beanbag Slug (Less Lethal)" id = "beanbag_slug" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ammo_casing/shotgun/beanbag category = list( RND_CATEGORY_INITIAL, @@ -50,7 +50,7 @@ name = "Universal Recorder Tape" id = "tape" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20, /datum/material/glass = 5) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass = 5) build_path = /obj/item/tape/random category = list( RND_CATEGORY_INITIAL, @@ -62,7 +62,7 @@ name = "Box of Foam Darts (Harmless)" id = "foam_dart" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/ammo_box/foambox category = list( RND_CATEGORY_INITIAL, @@ -74,7 +74,7 @@ name = "Flamethrower (Lethal/Highly Destructive)" id = "flamethrower" build_type = AUTOLATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/flamethrower/full category = list( RND_CATEGORY_HACKED, @@ -98,7 +98,7 @@ name = "Handcuffs" id = "handcuffs" build_type = AUTOLATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/restraints/handcuffs category = list( RND_CATEGORY_HACKED, @@ -154,7 +154,7 @@ name = "Foam Riot Dart (Nonlethal)" id = "riot_dart" build_type = AUTOLATHE - materials = list(/datum/material/iron = 1000) //Discount for making individually - no box = less iron! + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) //Discount for making individually - no box = less iron! build_path = /obj/item/ammo_casing/caseless/foam_dart/riot category = list( RND_CATEGORY_HACKED, @@ -202,7 +202,7 @@ name = "Ammo Box (10mm) (Lethal)" id = "c10mm" build_type = AUTOLATHE - materials = list(/datum/material/iron = 30000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 300) build_path = /obj/item/ammo_box/c10mm category = list( RND_CATEGORY_HACKED, @@ -214,7 +214,7 @@ name = "Ammo Box (.45) (Lethal)" id = "c45" build_type = AUTOLATHE - materials = list(/datum/material/iron = 30000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 300) build_path = /obj/item/ammo_box/c45 category = list( RND_CATEGORY_HACKED, @@ -226,7 +226,7 @@ name = "Ammo Box (9mm) (Lethal)" id = "c9mm" build_type = AUTOLATHE - materials = list(/datum/material/iron = 30000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 300) build_path = /obj/item/ammo_box/c9mm category = list( RND_CATEGORY_HACKED, @@ -240,7 +240,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/interrogation category = list( @@ -255,7 +255,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/prison category = list( diff --git a/code/modules/research/designs/autolathe/service_designs.dm b/code/modules/research/designs/autolathe/service_designs.dm index ee90d6a7319..6fd7ecbd2a6 100644 --- a/code/modules/research/designs/autolathe/service_designs.dm +++ b/code/modules/research/designs/autolathe/service_designs.dm @@ -2,7 +2,7 @@ name = "Bucket" id = "bucket" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/reagent_containers/cup/bucket category = list( RND_CATEGORY_INITIAL, @@ -14,7 +14,7 @@ name = "Watering Can" id = "watering_can" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/reagent_containers/cup/watering_can category = list( RND_CATEGORY_INITIAL, @@ -26,7 +26,7 @@ name = "Mop" id = "mop" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mop category = list( RND_CATEGORY_INITIAL, @@ -38,7 +38,7 @@ name = "Push Broom" id = "pushbroom" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/pushbroom category = list( RND_CATEGORY_INITIAL, @@ -50,7 +50,7 @@ name = "Camera" id = "camera" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/camera category = list( RND_CATEGORY_INITIAL, @@ -86,7 +86,7 @@ name = "Plastic Knife" id = "plastic_knife" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 100) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/knife/plastic category = list( RND_CATEGORY_INITIAL, @@ -146,7 +146,7 @@ name = "Serving Tray" id = "servingtray" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/storage/bag/tray category = list( RND_CATEGORY_INITIAL, @@ -170,7 +170,7 @@ name = "Cafeteria Tray" id = "foodtray" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/storage/bag/tray/cafeteria category = list( RND_CATEGORY_INITIAL, @@ -182,7 +182,7 @@ name = "Bowl" id = "bowl" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5) category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT) build_path = /obj/item/reagent_containers/cup/bowl category = list( @@ -194,7 +194,7 @@ name = "Drinking Glass" id = "drinking_glass" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5) category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT) build_path = /obj/item/reagent_containers/cup/glass/drinkingglass category = list( @@ -206,7 +206,7 @@ name = "Shot Glass" id = "shot_glass" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 100) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT) category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT) build_path = /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass category = list( @@ -218,7 +218,7 @@ name = "Shaker" id = "shaker" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT) build_path = /obj/item/reagent_containers/cup/glass/shaker category = list( @@ -230,7 +230,7 @@ name = "Cultivator" id = "cultivator" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=50) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/cultivator category = list( RND_CATEGORY_INITIAL, @@ -242,7 +242,7 @@ name = "Plant Analyzer" id = "plant_analyzer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 30, /datum/material/glass = 20) + materials = list(/datum/material/iron = 30, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/plant_analyzer category = list( RND_CATEGORY_INITIAL, @@ -254,7 +254,7 @@ name = "Shovel" id = "shovel" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/shovel category = list( RND_CATEGORY_INITIAL, @@ -266,7 +266,7 @@ name = "Spade" id = "spade" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/shovel/spade category = list( RND_CATEGORY_INITIAL, @@ -314,7 +314,7 @@ name = "Station Bounced Radio" id = "bounced_radio" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75, /datum/material/glass = 25) + materials = list(/datum/material/iron = 75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/radio/off category = list( RND_CATEGORY_INITIAL, @@ -338,7 +338,7 @@ name = "Pet Carrier" id = "pet_carrier" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 7500, /datum/material/glass = 100) + materials = list(/datum/material/iron = 7500, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/pet_carrier category = list( RND_CATEGORY_INITIAL, @@ -350,7 +350,7 @@ name = "Cap Gun" id = "toygun" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/toy/gun category = list( RND_CATEGORY_HACKED, @@ -362,7 +362,7 @@ name = "Box of Cap Gun Shots" id = "capbox" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20, /datum/material/glass = 5) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass = 5) build_path = /obj/item/toy/ammo/gun category = list( RND_CATEGORY_HACKED, @@ -386,7 +386,7 @@ name = "Plastic Armblade" id = "toy_armblade" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 2000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/toy/foamblade category = list( RND_CATEGORY_HACKED, @@ -410,7 +410,7 @@ name = "Plastic Bead Necklace" id = "plastic_necklace" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 500) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/neck/beads category = list( RND_CATEGORY_INITIAL, @@ -434,7 +434,7 @@ name = "Plastic Box" id = "plastic_box" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 1000) + materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/storage/box/plastic category = list( RND_CATEGORY_INITIAL, @@ -446,7 +446,7 @@ name = "Sticky Tape" id = "sticky_tape" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 500) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/stack/sticky_tape category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT) maxstack = 5 @@ -471,7 +471,7 @@ name = "Hand Labeler Paper Roll" id = "roll" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 25) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/hand_labeler_refill category = list( RND_CATEGORY_INITIAL, @@ -507,7 +507,7 @@ name = "Fishing Rod" id = "fishing_rod" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/fishing_rod category = list( RND_CATEGORY_INITIAL, @@ -533,7 +533,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/bar category = list( @@ -548,7 +548,7 @@ build_type = PROTOLATHE materials = list( /datum/material/iron = 10000, - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/entertainment category = list( diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 045f5ee7c4b..9d3b442773e 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -70,7 +70,7 @@ name = "Monkey Cube" id = "mcube" build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 50) + materials = list(/datum/material/biomass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/food/monkeycube category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_BIO_FOOD) diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index 0ff83589072..ea48ad208fd 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -8,7 +8,7 @@ desc = "A bluespace tracking beacon." id = "beacon" build_type = PROTOLATHE - materials = list(/datum/material/iron = 150, /datum/material/glass = 100) + materials = list(/datum/material/iron = 150, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/beacon category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -20,7 +20,7 @@ desc = "A block of metal ready to be transformed into a bag of holding with a bluespace anomaly core." id = "bag_holding" build_type = PROTOLATHE - materials = list(/datum/material/gold = 3000, /datum/material/diamond = 1500, /datum/material/uranium = 250, /datum/material/bluespace = 2000) + materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium = 250, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/bag_of_holding_inert category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -32,7 +32,7 @@ desc = "A small blue crystal with mystical properties." id = "bluespace_crystal" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/diamond = 1500, /datum/material/plasma = 1500) + materials = list(/datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/stack/ore/bluespace_crystal/artificial category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -44,7 +44,7 @@ desc = "Little thingie that can track its position at all times." id = "telesci_gps" build_type = PROTOLATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/gps category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -57,7 +57,7 @@ desc = "A device that can desynchronize the user from spacetime." id = "desynchronizer" build_type = PROTOLATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/silver = 1500, /datum/material/bluespace = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/desynchronizer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -69,7 +69,7 @@ desc = "A mining satchel that can hold an infinite amount of ores." id = "minerbag_holding" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/gold = 250, /datum/material/uranium = 500) //quite cheap, for more convenience + materials = list(/datum/material/gold = 250, /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5) //quite cheap, for more convenience build_path = /obj/item/storage/bag/ore/holding category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -81,7 +81,7 @@ desc = "An experimental device that is able to swap the locations of two entities by switching their particles' spin values. Must be linked to another device to function." id = "swapper" build_type = PROTOLATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000, /datum/material/bluespace = 2000, /datum/material/gold = 1500, /datum/material/silver = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/swapper category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 442d16299ca..84c5a3ac80a 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -4,7 +4,7 @@ name = "NULL ENTRY Board" desc = "I promise this doesn't give you syndicate goodies!" build_type = IMPRINTER | AWAY_IMPRINTER - materials = list(/datum/material/glass = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) /datum/design/board/arcade_battle name = "Battle Arcade Machine Board" @@ -60,7 +60,7 @@ name = "AI Upload Board" desc = "Allows for the construction of circuit boards used to build an AI Upload Console." id = "aiupload" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/diamond = 2000, /datum/material/bluespace = 2000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/computer/aiupload category = list( RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_ROBOTICS @@ -71,7 +71,7 @@ name = "Cyborg Upload Board" desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console." id = "borgupload" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/diamond = 2000, /datum/material/bluespace = 2000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/computer/borgupload category = list( RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_ROBOTICS @@ -163,7 +163,7 @@ name = "Robotics Control Console Board" desc = "Allows for the construction of circuit boards used to build a Robotics Control console." id = "robocontrol" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000, /datum/material/bluespace = 2000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/computer/robotics category = list( RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_ROBOTICS diff --git a/code/modules/research/designs/electronics_designs.dm b/code/modules/research/designs/electronics_designs.dm index c4922b092a6..d55e1a188bd 100644 --- a/code/modules/research/designs/electronics_designs.dm +++ b/code/modules/research/designs/electronics_designs.dm @@ -8,7 +8,7 @@ desc = "Allows for the construction of an intellicard." id = "intellicard" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 1000, /datum/material/gold = 200) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/aicard category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_MISC @@ -20,7 +20,7 @@ desc = "Allows for the construction of a pAI Card." id = "paicard" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/iron = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/pai_card category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_MISC @@ -32,7 +32,7 @@ desc = "A software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading." id = "ai_cam_upgrade" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/gold = 15000, /datum/material/silver = 15000, /datum/material/diamond = 20000, /datum/material/plasma = 10000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/gold = 15000, /datum/material/silver = 15000, /datum/material/diamond = 20000, /datum/material/plasma = 10000) build_path = /obj/item/surveillance_upgrade category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_UPGRADES @@ -47,7 +47,7 @@ desc = "Produce additional disks for storing technology data." id = "tech_disk" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 300, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/disk/tech_disk category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE diff --git a/code/modules/research/designs/experisci_designs.dm b/code/modules/research/designs/experisci_designs.dm index 5c1b6796f25..b4478a4b1dc 100644 --- a/code/modules/research/designs/experisci_designs.dm +++ b/code/modules/research/designs/experisci_designs.dm @@ -3,7 +3,7 @@ desc = "Experimental scanning unit used for performing scanning experiments." id = "experi_scanner" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/iron = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/experi_scanner category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index d38b7a42d64..3c911a6567d 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -233,7 +233,7 @@ desc = "Contains designs for various limbs." id = "limbdesign_parent" build_type = PROTOLATHE - materials = list(/datum/material/iron = 300, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/disk/design_disk/limbs category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index de10e2dd97d..7f346a54ec9 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -586,7 +586,7 @@ name = "Weapon Recharger Board" desc = "The circuit board for a Weapon Recharger." id = "recharger" - materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/machine/recharger category = list( RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_SECURITY diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index 0a346f10f13..b8e08996d93 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -136,7 +136,7 @@ name = "\"Phazon\" Central Control module" desc = "Allows for the construction of a \"Phazon\" Central Control module." id = "phazon_main" - materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/mecha/phazon/main category = list( RND_CATEGORY_EXOSUIT_BOARDS + RND_SUBCATEGORY_EXOSUIT_BOARDS_PHAZON @@ -147,7 +147,7 @@ name = "\"Phazon\" Peripherals Control module" desc = "Allows for the construction of a \"Phazon\" Peripheral Control module." id = "phazon_peri" - materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/mecha/phazon/peripherals category = list( RND_CATEGORY_EXOSUIT_BOARDS + RND_SUBCATEGORY_EXOSUIT_BOARDS_PHAZON @@ -158,7 +158,7 @@ name = "\"Phazon\" Weapons & Targeting Control module" desc = "Allows for the construction of a \"Phazon\" Weapons & Targeting Control module." id = "phazon_targ" - materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/mecha/phazon/targeting category = list( RND_CATEGORY_EXOSUIT_BOARDS + RND_SUBCATEGORY_EXOSUIT_BOARDS_PHAZON @@ -225,7 +225,7 @@ id = "mech_scattershot" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -249,7 +249,7 @@ id = "mech_scattershot_ammo" build_type = MECHFAB build_path = /obj/item/mecha_ammo/scattershot - materials = list(/datum/material/iron=6000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3) construction_time = 20 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -273,7 +273,7 @@ id = "mech_carbine" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -297,7 +297,7 @@ id = "mech_carbine_ammo" build_type = MECHFAB build_path = /obj/item/mecha_ammo/incendiary - materials = list(/datum/material/iron=6000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3) construction_time = 20 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -321,7 +321,7 @@ id = "mech_ion" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion - materials = list(/datum/material/iron=20000,/datum/material/silver=6000,/datum/material/uranium=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/silver=SHEET_MATERIAL_AMOUNT*3,/datum/material/uranium=SHEET_MATERIAL_AMOUNT) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -345,7 +345,7 @@ id = "mech_tesla" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla - materials = list(/datum/material/iron=20000,/datum/material/silver=8000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/silver=SHEET_MATERIAL_AMOUNT*4) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -369,7 +369,7 @@ id = "mech_laser" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -393,7 +393,7 @@ id = "mech_laser_heavy" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -417,7 +417,7 @@ id = "mech_disabler" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -441,7 +441,7 @@ id = "mech_grenade_launcher" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang - materials = list(/datum/material/iron=22000,/datum/material/gold=6000,/datum/material/silver=8000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*11,/datum/material/gold=SHEET_MATERIAL_AMOUNT*3,/datum/material/silver=SHEET_MATERIAL_AMOUNT*4) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -465,7 +465,7 @@ id = "mech_grenade_launcher_ammo" build_type = MECHFAB build_path = /obj/item/mecha_ammo/flashbang - materials = list(/datum/material/iron=4000,/datum/material/gold=500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2,/datum/material/gold=SMALL_MATERIAL_AMOUNT*5) construction_time = 20 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -489,7 +489,7 @@ id = "mech_missile_rack" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/breaching - materials = list(/datum/material/iron=22000,/datum/material/gold=6000,/datum/material/silver=8000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*11,/datum/material/gold=SHEET_MATERIAL_AMOUNT*3,/datum/material/silver=SHEET_MATERIAL_AMOUNT*4) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -513,7 +513,7 @@ id = "mech_missile_rack_ammo" build_type = MECHFAB build_path = /obj/item/mecha_ammo/missiles_pep - materials = list(/datum/material/iron=8000,/datum/material/gold=500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*4,/datum/material/gold=SMALL_MATERIAL_AMOUNT*5) construction_time = 20 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -537,7 +537,7 @@ id = "clusterbang_launcher" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang - materials = list(/datum/material/iron=20000,/datum/material/gold=10000,/datum/material/uranium=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/gold=SHEET_MATERIAL_AMOUNT*5,/datum/material/uranium=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -561,7 +561,7 @@ id = "clusterbang_launcher_ammo" build_type = MECHFAB build_path = /obj/item/mecha_ammo/clusterbang - materials = list(/datum/material/iron=6000,/datum/material/gold=1500,/datum/material/uranium=1500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3,/datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT * 1.5,/datum/material/uranium=HALF_SHEET_MATERIAL_AMOUNT * 1.5) construction_time = 20 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -585,7 +585,7 @@ id = "mech_wormhole_gen" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -615,7 +615,7 @@ id = "mech_teleporter" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/teleporter - materials = list(/datum/material/iron=10000,/datum/material/diamond=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/diamond=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -645,7 +645,7 @@ id = "mech_rcd" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/rcd - materials = list(/datum/material/iron=30000,/datum/material/gold=20000,/datum/material/plasma=25000,/datum/material/silver=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*15,/datum/material/gold=SHEET_MATERIAL_AMOUNT*10,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*12.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*10) construction_time = 1200 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -675,7 +675,7 @@ id = "mech_thrusters" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/thrusters/gas - materials = list(/datum/material/iron=25000,/datum/material/titanium=5000,/datum/material/silver=3000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*12.5,/datum/material/titanium=SHEET_MATERIAL_AMOUNT * 2.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*1.5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -705,7 +705,7 @@ id = "mech_gravcatapult" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -735,7 +735,7 @@ id = "mech_repair_droid" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid - materials = list(/datum/material/iron=10000,/datum/material/glass = 5000,/datum/material/gold=1000,/datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,/datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT,/datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -765,7 +765,7 @@ id = "mech_ccw_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/armor/anticcw_armor_booster - materials = list(/datum/material/iron=20000,/datum/material/silver=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/silver=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -795,7 +795,7 @@ id = "mech_proj_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/armor/antiproj_armor_booster - materials = list(/datum/material/iron=20000,/datum/material/gold=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/gold=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -825,7 +825,7 @@ id = "mech_diamond_drill" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill - materials = list(/datum/material/iron=10000,/datum/material/diamond=6500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/diamond=SHEET_MATERIAL_AMOUNT*3.25) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -845,7 +845,7 @@ id = "mech_plasma_cutter" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma - materials = list(/datum/material/iron = 8000, /datum/material/glass = 1000, /datum/material/plasma = 2000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*4, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -873,7 +873,7 @@ id = "mecha_kineticgun" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun - materials = list(/datum/material/iron = 8000, /datum/material/glass = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*4, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -901,7 +901,7 @@ id = "mech_lmg" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -923,7 +923,7 @@ id = "mech_lmg_ammo" build_type = MECHFAB build_path = /obj/item/mecha_ammo/lmg - materials = list(/datum/material/iron=4000) + materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT *2) construction_time = 20 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -945,7 +945,7 @@ id = "mech_sleeper" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/medical/sleeper - materials = list(/datum/material/iron=5000, /datum/material/glass = 10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -963,7 +963,7 @@ id = "mech_syringe_gun" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun - materials = list(/datum/material/iron=3000, /datum/material/glass = 2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*1.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -980,7 +980,7 @@ desc = "Equipment for medical exosuits. A mounted medical nanite projector which will treat patients with a focused beam." id = "mech_medi_beam" build_type = MECHFAB - materials = list(/datum/material/iron = 15000, /datum/material/glass = 8000, /datum/material/plasma = 3000, /datum/material/gold = 8000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4, /datum/material/plasma =SHEET_MATERIAL_AMOUNT*1.5, /datum/material/gold = SHEET_MATERIAL_AMOUNT*4, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) construction_time = 250 build_path = /obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam category = list( diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 2d2f0914d12..d4f546fe6fb 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -4,7 +4,7 @@ id = "borg_suit" build_type = MECHFAB build_path = /obj/item/robot_suit - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 500 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -15,7 +15,7 @@ id = "borg_chest" build_type = MECHFAB build_path = /obj/item/bodypart/chest/robot - materials = list(/datum/material/iron=40000) + materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT*20) construction_time = 350 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -26,7 +26,7 @@ id = "borg_head" build_type = MECHFAB build_path = /obj/item/bodypart/head/robot - materials = list(/datum/material/iron=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 350 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -37,7 +37,7 @@ id = "borg_l_arm" build_type = MECHFAB build_path = /obj/item/bodypart/arm/left/robot - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -48,7 +48,7 @@ id = "borg_r_arm" build_type = MECHFAB build_path = /obj/item/bodypart/arm/right/robot - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -59,7 +59,7 @@ id = "borg_l_leg" build_type = MECHFAB build_path = /obj/item/bodypart/leg/left/robot - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -70,7 +70,7 @@ id = "borg_r_leg" build_type = MECHFAB build_path = /obj/item/bodypart/leg/right/robot - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS @@ -82,7 +82,7 @@ id = "ripley_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/ripley - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_RIPLEY + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -93,7 +93,7 @@ id = "ripley_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_torso - materials = list(/datum/material/iron=20000,/datum/material/glass = 7500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/glass =SHEET_MATERIAL_AMOUNT*3.75) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_RIPLEY + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -104,7 +104,7 @@ id = "ripley_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_left_arm - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_RIPLEY + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -115,7 +115,7 @@ id = "ripley_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_right_arm - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_RIPLEY + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -126,7 +126,7 @@ id = "ripley_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_left_leg - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_RIPLEY + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -137,7 +137,7 @@ id = "ripley_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_right_leg - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_RIPLEY + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -149,7 +149,7 @@ id = "odysseus_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/odysseus - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -160,7 +160,7 @@ id = "odysseus_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_torso - materials = list(/datum/material/iron=12000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*6) construction_time = 180 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -171,7 +171,7 @@ id = "odysseus_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_head - materials = list(/datum/material/iron=6000,/datum/material/glass = 10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -182,7 +182,7 @@ id = "odysseus_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_left_arm - materials = list(/datum/material/iron=6000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -193,7 +193,7 @@ id = "odysseus_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_right_arm - materials = list(/datum/material/iron=6000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -204,7 +204,7 @@ id = "odysseus_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_left_leg - materials = list(/datum/material/iron=7000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3.5) construction_time = 130 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -215,7 +215,7 @@ id = "odysseus_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_right_leg - materials = list(/datum/material/iron=7000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3.5) construction_time = 130 category = list( RND_CATEGORY_MECHFAB_ODYSSEUS + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -227,7 +227,7 @@ id = "gygax_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/gygax - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -238,7 +238,7 @@ id = "gygax_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_torso - materials = list(/datum/material/iron=20000,/datum/material/glass = 10000,/datum/material/gold=2000, /datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/gold=SHEET_MATERIAL_AMOUNT, /datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -249,7 +249,7 @@ id = "gygax_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_head - materials = list(/datum/material/iron=10000,/datum/material/glass = 5000, /datum/material/gold=2000, /datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/gold=SHEET_MATERIAL_AMOUNT, /datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -260,7 +260,7 @@ id = "gygax_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_left_arm - materials = list(/datum/material/iron=15000, /datum/material/gold=1000, /datum/material/silver=1000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5, /datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver=HALF_SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -271,7 +271,7 @@ id = "gygax_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_right_arm - materials = list(/datum/material/iron=15000, /datum/material/gold=1000, /datum/material/silver=1000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5, /datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver=HALF_SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -282,7 +282,7 @@ id = "gygax_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_left_leg - materials = list(/datum/material/iron=15000, /datum/material/gold=2000, /datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5, /datum/material/gold=SHEET_MATERIAL_AMOUNT, /datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -293,7 +293,7 @@ id = "gygax_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_right_leg - materials = list(/datum/material/iron=15000, /datum/material/gold=2000, /datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5, /datum/material/gold=SHEET_MATERIAL_AMOUNT, /datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -304,7 +304,7 @@ id = "gygax_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_armor - materials = list(/datum/material/iron=15000,/datum/material/gold=10000, /datum/material/silver=10000, /datum/material/titanium=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/gold=SHEET_MATERIAL_AMOUNT*5, /datum/material/silver=SHEET_MATERIAL_AMOUNT*5, /datum/material/titanium=SHEET_MATERIAL_AMOUNT*5) construction_time = 600 category = list( RND_CATEGORY_MECHFAB_GYGAX + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -316,7 +316,7 @@ id = "durand_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/durand - materials = list(/datum/material/iron=25000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*12.5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -327,7 +327,7 @@ id = "durand_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_torso - materials = list(/datum/material/iron=25000, /datum/material/glass = 10000,/datum/material/silver=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*12.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*5) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -338,7 +338,7 @@ id = "durand_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_head - materials = list(/datum/material/iron=10000,/datum/material/glass = 15000,/datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -349,7 +349,7 @@ id = "durand_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_left_arm - materials = list(/datum/material/iron=10000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -360,7 +360,7 @@ id = "durand_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_right_arm - materials = list(/datum/material/iron=10000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -371,7 +371,7 @@ id = "durand_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_left_leg - materials = list(/datum/material/iron=15000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -382,7 +382,7 @@ id = "durand_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_right_leg - materials = list(/datum/material/iron=15000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -393,7 +393,7 @@ id = "durand_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_armor - materials = list(/datum/material/iron=30000,/datum/material/uranium=25000,/datum/material/titanium=20000) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 300,/datum/material/uranium=SHEET_MATERIAL_AMOUNT*12.5,/datum/material/titanium=SHEET_MATERIAL_AMOUNT*10) construction_time = 600 category = list( RND_CATEGORY_MECHFAB_DURAND + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -405,7 +405,7 @@ id = "honk_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/honker - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -416,7 +416,7 @@ id = "honk_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_torso - materials = list(/datum/material/iron=20000,/datum/material/glass = 10000,/datum/material/bananium=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/bananium=SHEET_MATERIAL_AMOUNT*5) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -427,7 +427,7 @@ id = "honk_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_head - materials = list(/datum/material/iron=10000,/datum/material/glass = 5000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -438,7 +438,7 @@ id = "honk_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_left_arm - materials = list(/datum/material/iron=15000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -449,7 +449,7 @@ id = "honk_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_right_arm - materials = list(/datum/material/iron=15000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -460,7 +460,7 @@ id = "honk_left_leg" build_type = MECHFAB build_path =/obj/item/mecha_parts/part/honker_left_leg - materials = list(/datum/material/iron=20000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -471,7 +471,7 @@ id = "honk_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_right_leg - materials = list(/datum/material/iron=20000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_HONK + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -483,7 +483,7 @@ id = "phazon_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/phazon - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -494,7 +494,7 @@ id = "phazon_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_torso - materials = list(/datum/material/iron=35000,/datum/material/glass = 10000,/datum/material/plasma=20000) + materials = list(/datum/material/iron=35000,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*10) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -505,7 +505,7 @@ id = "phazon_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_head - materials = list(/datum/material/iron=15000,/datum/material/glass = 5000,/datum/material/plasma=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -516,7 +516,7 @@ id = "phazon_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_left_arm - materials = list(/datum/material/iron=20000,/datum/material/plasma=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -527,7 +527,7 @@ id = "phazon_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_right_arm - materials = list(/datum/material/iron=20000,/datum/material/plasma=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -538,7 +538,7 @@ id = "phazon_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_left_leg - materials = list(/datum/material/iron=20000,/datum/material/plasma=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -549,7 +549,7 @@ id = "phazon_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_right_leg - materials = list(/datum/material/iron=20000,/datum/material/plasma=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -560,7 +560,7 @@ id = "phazon_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_armor - materials = list(/datum/material/iron=25000,/datum/material/plasma=20000,/datum/material/titanium=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*12.5,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*10,/datum/material/titanium=SHEET_MATERIAL_AMOUNT*10) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -572,7 +572,7 @@ id = "savannah_ivanov_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/savannah_ivanov - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -583,7 +583,7 @@ id = "savannah_ivanov_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_torso - materials = list(/datum/material/iron=20000,/datum/material/glass = 7500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/glass =SHEET_MATERIAL_AMOUNT*3.75) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -594,7 +594,7 @@ id = "savannah_ivanov_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_head - materials = list(/datum/material/iron=6000,/datum/material/glass = 10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -605,7 +605,7 @@ id = "savannah_ivanov_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_arm - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -616,7 +616,7 @@ id = "savannah_ivanov_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_arm - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -627,7 +627,7 @@ id = "savannah_ivanov_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/savannah_ivanov - materials = list(/datum/material/iron=25000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*12.5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -638,7 +638,7 @@ id = "savannah_ivanov_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_torso - materials = list(/datum/material/iron=25000, /datum/material/glass = 10000,/datum/material/silver=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*12.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*5) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -649,7 +649,7 @@ id = "savannah_ivanov_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_head - materials = list(/datum/material/iron=10000,/datum/material/glass = 15000,/datum/material/silver=2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -660,7 +660,7 @@ id = "savannah_ivanov_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_arm - materials = list(/datum/material/iron=10000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -671,7 +671,7 @@ id = "savannah_ivanov_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_arm - materials = list(/datum/material/iron=10000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -682,7 +682,7 @@ id = "savannah_ivanov_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_leg - materials = list(/datum/material/iron=15000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -693,7 +693,7 @@ id = "savannah_ivanov_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_leg - materials = list(/datum/material/iron=15000,/datum/material/silver=4000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5,/datum/material/silver=SHEET_MATERIAL_AMOUNT*2) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -704,7 +704,7 @@ id = "savannah_ivanov_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/savannah_ivanov_armor - materials = list(/datum/material/iron=30000,/datum/material/uranium=25000,/datum/material/titanium=20000) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 300,/datum/material/uranium=SHEET_MATERIAL_AMOUNT*12.5,/datum/material/titanium=SHEET_MATERIAL_AMOUNT*10) construction_time = 600 category = list( RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -716,7 +716,7 @@ id = "clarke_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/clarke - materials = list(/datum/material/iron=20000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_CLARKE + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -727,7 +727,7 @@ id = "clarke_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/clarke_torso - materials = list(/datum/material/iron=20000,/datum/material/glass = 7500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/glass =SHEET_MATERIAL_AMOUNT*3.75) construction_time = 200 category = list( RND_CATEGORY_MECHFAB_CLARKE + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -738,7 +738,7 @@ id = "clarke_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/clarke_head - materials = list(/datum/material/iron=6000,/datum/material/glass = 10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_CLARKE + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -749,7 +749,7 @@ id = "clarke_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/clarke_left_arm - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_CLARKE + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -760,7 +760,7 @@ id = "clarke_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/clarke_right_arm - materials = list(/datum/material/iron=15000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*7.5) construction_time = 150 category = list( RND_CATEGORY_MECHFAB_CLARKE + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -772,7 +772,7 @@ id = "ripleyupgrade" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/ripleyupgrade - materials = list(/datum/material/iron=10000,/datum/material/plasma=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -788,7 +788,7 @@ id = "mech_hydraulic_clamp" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -804,7 +804,7 @@ id = "mech_drill" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/drill - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -831,7 +831,7 @@ id = "mech_mscanner" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/mining_scanner - materials = list(/datum/material/iron=5000,/datum/material/glass = 2500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2.5,/datum/material/glass = SHEET_MATERIAL_AMOUNT *1.25) construction_time = 50 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -849,7 +849,7 @@ id = "mech_extinguisher" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/extinguisher - materials = list(/datum/material/iron=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -867,7 +867,7 @@ id = "mech_generator" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/generator - materials = list(/datum/material/iron=10000,/datum/material/glass = 1000,/datum/material/silver=2000,/datum/material/plasma=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT,/datum/material/silver=SHEET_MATERIAL_AMOUNT,/datum/material/plasma=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 100 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -894,7 +894,7 @@ id = "mech_mousetrap_mortar" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar - materials = list(/datum/material/iron=20000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -911,7 +911,7 @@ id = "mech_banana_mortar" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar - materials = list(/datum/material/iron=20000,/datum/material/bananium=5000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/bananium=SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -928,7 +928,7 @@ id = "mech_honker" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker - materials = list(/datum/material/iron=20000,/datum/material/bananium=10000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/bananium=SHEET_MATERIAL_AMOUNT*5) construction_time = 500 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -945,7 +945,7 @@ id = "mech_punching_face" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove - materials = list(/datum/material/iron=20000,/datum/material/bananium=7500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*10,/datum/material/bananium=SHEET_MATERIAL_AMOUNT*3.75) construction_time = 400 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -966,7 +966,7 @@ id = "borg_upgrade_rename" build_type = MECHFAB build_path = /obj/item/borg/upgrade/rename - materials = list(/datum/material/iron = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -977,7 +977,7 @@ id = "borg_upgrade_restart" build_type = MECHFAB build_path = /obj/item/borg_restart_board - materials = list(/datum/material/iron = 20000 , /datum/material/glass = 5000) + materials = list(/datum/material/iron = 20000 , /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -988,7 +988,7 @@ id = "borg_upgrade_thrusters" build_type = MECHFAB build_path = /obj/item/borg/upgrade/thrusters - materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000, /datum/material/plasma = 5000, /datum/material/uranium = 6000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*3, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium =SHEET_MATERIAL_AMOUNT*3) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -999,7 +999,7 @@ id = "borg_upgrade_disablercooler" build_type = MECHFAB build_path = /obj/item/borg/upgrade/disablercooler - materials = list(/datum/material/iron = 20000 , /datum/material/glass = 6000, /datum/material/gold = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron = 20000 , /datum/material/glass =SHEET_MATERIAL_AMOUNT*3, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SECURITY @@ -1010,7 +1010,7 @@ id = "borg_upgrade_diamonddrill" build_type = MECHFAB build_path = /obj/item/borg/upgrade/ddrill - materials = list(/datum/material/iron=10000, /datum/material/glass = 6000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*3, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) construction_time = 80 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING @@ -1021,7 +1021,7 @@ id = "borg_upgrade_holding" build_type = MECHFAB build_path = /obj/item/borg/upgrade/soh - materials = list(/datum/material/iron = 10000, /datum/material/gold = 2000, /datum/material/uranium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) construction_time = 40 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING @@ -1032,7 +1032,7 @@ id = "borg_upgrade_lavaproof" build_type = MECHFAB build_path = /obj/item/borg/upgrade/lavaproof - materials = list(/datum/material/iron = 10000, /datum/material/plasma = 4000, /datum/material/titanium = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/plasma =SHEET_MATERIAL_AMOUNT*2, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING @@ -1043,7 +1043,7 @@ id = "borg_syndicate_module" build_type = MECHFAB build_path = /obj/item/borg/upgrade/syndicate - materials = list(/datum/material/iron = 15000, /datum/material/glass = 15000, /datum/material/diamond = 10000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/diamond =SHEET_MATERIAL_AMOUNT*5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -1054,7 +1054,7 @@ id = "borg_transform_clown" build_type = MECHFAB build_path = /obj/item/borg/upgrade/transform/clown - materials = list(/datum/material/iron = 15000, /datum/material/glass = 15000, /datum/material/bananium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/bananium =HALF_SHEET_MATERIAL_AMOUNT) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -1065,7 +1065,7 @@ id = "borg_upgrade_selfrepair" build_type = MECHFAB build_path = /obj/item/borg/upgrade/selfrepair - materials = list(/datum/material/iron = 15000, /datum/material/glass = 15000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5) construction_time = 80 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -1076,7 +1076,7 @@ id = "borg_upgrade_expandedsynthesiser" build_type = MECHFAB build_path = /obj/item/borg/upgrade/hypospray/expanded - materials = list(/datum/material/iron = 15000, /datum/material/glass = 15000, /datum/material/plasma = 8000, /datum/material/uranium = 8000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/plasma =SHEET_MATERIAL_AMOUNT*4, /datum/material/uranium =SHEET_MATERIAL_AMOUNT*4) construction_time = 80 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL @@ -1087,7 +1087,7 @@ id = "borg_upgrade_piercinghypospray" build_type = MECHFAB build_path = /obj/item/borg/upgrade/piercing_hypospray - materials = list(/datum/material/iron = 15000, /datum/material/glass = 15000, /datum/material/titanium = 5000, /datum/material/diamond = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*7.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 1.5) construction_time = 80 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL @@ -1098,7 +1098,7 @@ id = "borg_upgrade_defibrillator" build_type = MECHFAB build_path = /obj/item/borg/upgrade/defib - materials = list(/datum/material/iron = 8000, /datum/material/glass = 5000, /datum/material/silver = 4000, /datum/material/gold = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*4, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*2, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5) construction_time = 80 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL @@ -1109,7 +1109,7 @@ id = "borg_upgrade_surgicalprocessor" build_type = MECHFAB build_path = /obj/item/borg/upgrade/processor - materials = list(/datum/material/iron = 5000, /datum/material/glass = 4000, /datum/material/silver = 4000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*2, /datum/material/silver =SHEET_MATERIAL_AMOUNT*2) construction_time = 40 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL @@ -1120,7 +1120,7 @@ id = "borg_upgrade_trashofholding" build_type = MECHFAB build_path = /obj/item/borg/upgrade/tboh - materials = list(/datum/material/gold = 2000, /datum/material/uranium = 1000) + materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) construction_time = 40 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR @@ -1131,7 +1131,7 @@ id = "borg_upgrade_advancedmop" build_type = MECHFAB build_path = /obj/item/borg/upgrade/amop - materials = list(/datum/material/iron = 2000, /datum/material/glass = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =SHEET_MATERIAL_AMOUNT) construction_time = 40 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR @@ -1142,7 +1142,7 @@ id = "borg_upgrade_prt" build_type = MECHFAB build_path = /obj/item/borg/upgrade/prt - materials = list(/datum/material/iron = 2500, /datum/material/glass = 750) //same price as a cautery + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.125, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*0.75) //same price as a cautery construction_time = 40 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR @@ -1197,7 +1197,7 @@ id = "borg_upgrade_expand" build_type = MECHFAB build_path = /obj/item/borg/upgrade/expand - materials = list(/datum/material/iron = 200000, /datum/material/titanium = 5000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*100, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -1208,7 +1208,7 @@ id = "borg_ai_control" build_type = MECHFAB build_path = /obj/item/borg/upgrade/ai - materials = list(/datum/material/iron = 1200, /datum/material/glass = 1500, /datum/material/gold = 200) + materials = list(/datum/material/iron = 1200, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 2) construction_time = 50 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CONTROL_INTERFACES @@ -1220,7 +1220,7 @@ id = "borg_upgrade_rped" build_type = MECHFAB build_path = /obj/item/borg/upgrade/rped - materials = list(/datum/material/iron = 10000, /datum/material/glass = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING @@ -1231,7 +1231,7 @@ id = "borg_upgrade_circuitapp" build_type = MECHFAB build_path = /obj/item/borg/upgrade/circuit_app - materials = list(/datum/material/iron = 2000, /datum/material/titanium = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SMALL_MATERIAL_AMOUNT*5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING @@ -1242,7 +1242,7 @@ id = "borg_upgrade_beakerapp" build_type = MECHFAB build_path = /obj/item/borg/upgrade/beaker_app - materials = list(/datum/material/iron = 2000, /datum/material/glass = 2250) //Need glass for the new beaker too + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.125) //Need glass for the new beaker too construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL @@ -1253,7 +1253,7 @@ id = "borg_upgrade_pinpointer" build_type = MECHFAB build_path = /obj/item/borg/upgrade/pinpointer - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL @@ -1264,7 +1264,7 @@ id = "borg_upgrade_broomer" build_type = MECHFAB build_path = /obj/item/borg/upgrade/broomer - materials = list(/datum/material/iron = 4000, /datum/material/glass = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*2, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR @@ -1275,7 +1275,7 @@ desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity." id = "mmi" build_type = MECHFAB - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) construction_time = 75 build_path = /obj/item/mmi category = list( @@ -1296,7 +1296,7 @@ desc = "The latest in Artificial Intelligences." id = "mmi_posi" build_type = MECHFAB - materials = list(/datum/material/iron = 1700, /datum/material/glass = 1350, /datum/material/gold = 500) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*1.7, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*1.35, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) construction_time = 75 build_path = /obj/item/mmi/posibrain category = list( @@ -1310,7 +1310,7 @@ id = "mecha_tracking" build_type = MECHFAB build_path =/obj/item/mecha_parts/mecha_tracking - materials = list(/datum/material/iron=500) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5) construction_time = 50 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -1337,7 +1337,7 @@ id = "mecha_tracking_ai_control" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_tracking/ai_control - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/silver = 200) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT * 2) construction_time = 50 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -1365,7 +1365,7 @@ id = "mecha_camera" build_type = MECHFAB build_path = /obj/item/mecha_parts/camera_kit - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 200, /datum/material/titanium = 200) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 2, /datum/material/titanium =SMALL_MATERIAL_AMOUNT * 2) construction_time = 50 category = list( RND_CATEGORY_MECHFAB_EQUIPMENT, @@ -1392,7 +1392,7 @@ desc = "When a problem arises, SCIENCE is the solution." id = "sflash" build_type = MECHFAB - materials = list(/datum/material/iron = 750, /datum/material/glass = 750) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 7.5) construction_time = 100 build_path = /obj/item/assembly/flash/handheld category = list( @@ -1410,7 +1410,7 @@ desc = "A 'Nakamura Engineering' designed shell for a Modular Suit." id = "mod_shell" build_type = MECHFAB - materials = list(/datum/material/iron = 10000, /datum/material/plasma = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 25 SECONDS build_path = /obj/item/mod/construction/shell category = list( @@ -1422,7 +1422,7 @@ desc = "A 'Nakamura Engineering' designed helmet for a Modular Suit." id = "mod_helmet" build_type = MECHFAB - materials = list(/datum/material/iron = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 10 SECONDS build_path = /obj/item/mod/construction/helmet category = list( @@ -1434,7 +1434,7 @@ desc = "A 'Nakamura Engineering' designed chestplate for a Modular Suit." id = "mod_chestplate" build_type = MECHFAB - materials = list(/datum/material/iron = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 10 SECONDS build_path = /obj/item/mod/construction/chestplate category = list( @@ -1446,7 +1446,7 @@ desc = "'Nakamura Engineering' designed gauntlets for a Modular Suit." id = "mod_gauntlets" build_type = MECHFAB - materials = list(/datum/material/iron = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 10 SECONDS build_path = /obj/item/mod/construction/gauntlets category = list( @@ -1458,7 +1458,7 @@ desc = "'Nakamura Engineering' designed boots for a Modular Suit." id = "mod_boots" build_type = MECHFAB - materials = list(/datum/material/iron = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 10 SECONDS build_path = /obj/item/mod/construction/boots category = list( @@ -1470,7 +1470,7 @@ desc = "External plating for a MODsuit." id = "mod_plating_standard" build_type = MECHFAB - materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*3, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.5, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) construction_time = 15 SECONDS build_path = /obj/item/mod/construction/plating category = list( @@ -1489,7 +1489,7 @@ name = "MOD Engineering Plating" id = "mod_plating_engineering" build_path = /obj/item/mod/construction/plating/engineering - materials = list(/datum/material/iron = 6000, /datum/material/gold = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*3, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING research_icon_state = "engineering-plating" @@ -1497,7 +1497,7 @@ name = "MOD Atmospheric Plating" id = "mod_plating_atmospheric" build_path = /obj/item/mod/construction/plating/atmospheric - materials = list(/datum/material/iron = 6000, /datum/material/titanium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*3, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING research_icon_state = "atmospheric-plating" @@ -1505,7 +1505,7 @@ name = "MOD Medical Plating" id = "mod_plating_medical" build_path = /obj/item/mod/construction/plating/medical - materials = list(/datum/material/iron = 6000, /datum/material/silver = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*3, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL research_icon_state = "medical-plating" @@ -1513,7 +1513,7 @@ name = "MOD Security Plating" id = "mod_plating_security" build_path = /obj/item/mod/construction/plating/security - materials = list(/datum/material/iron = 6000, /datum/material/uranium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*3, /datum/material/uranium =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_SECURITY research_icon_state = "security-plating" @@ -1521,7 +1521,7 @@ name = "MOD Cosmohonk Plating" id = "mod_plating_cosmohonk" build_path = /obj/item/mod/construction/plating/cosmohonk - materials = list(/datum/material/iron = 6000, /datum/material/bananium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*3, /datum/material/bananium =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_SERVICE research_icon_state = "cosmohonk-plating" @@ -1530,7 +1530,7 @@ desc = "A paint kit for Modular Suits." id = "mod_paint_kit" build_type = MECHFAB - materials = list(/datum/material/iron = 1000, /datum/material/plastic = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) construction_time = 5 SECONDS build_path = /obj/item/mod/paint category = list( @@ -1543,7 +1543,7 @@ name = "MOD Module" build_type = MECHFAB construction_time = 1 SECONDS - materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL @@ -1557,19 +1557,19 @@ /datum/design/module/mod_storage name = "Storage Module" id = "mod_storage" - materials = list(/datum/material/iron = 2500, /datum/material/glass = 500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT *1.25, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/storage /datum/design/module/mod_storage_expanded name = "Expanded Storage Module" id = "mod_storage_expanded" - materials = list(/datum/material/iron = 5000, /datum/material/uranium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/storage/large_capacity /datum/design/module/mod_visor_medhud name = "Medical Visor Module" id = "mod_visor_medhud" - materials = list(/datum/material/silver = 500, /datum/material/glass = 1000) + materials = list(/datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/visor/medhud category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1578,7 +1578,7 @@ /datum/design/module/mod_visor_diaghud name = "Diagnostic Visor Module" id = "mod_visor_diaghud" - materials = list(/datum/material/gold = 500, /datum/material/glass = 1000) + materials = list(/datum/material/gold =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/visor/diaghud category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -1586,7 +1586,7 @@ /datum/design/module/mod_visor_sechud name = "Security Visor Module" id = "mod_visor_sechud" - materials = list(/datum/material/titanium = 500, /datum/material/glass = 1000) + materials = list(/datum/material/titanium =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/visor/sechud category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1594,7 +1594,7 @@ /datum/design/module/mod_visor_meson name = "Meson Visor Module" id = "mod_visor_meson" - materials = list(/datum/material/uranium = 500, /datum/material/glass = 1000) + materials = list(/datum/material/uranium =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/visor/meson category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -1602,7 +1602,7 @@ /datum/design/module/mod_visor_welding name = "Welding Protection Module" id = "mod_welding" - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/welding category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1610,7 +1610,7 @@ /datum/design/module/mod_t_ray name = "T-Ray Scanner Module" id = "mod_t_ray" - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/t_ray category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1618,7 +1618,7 @@ /datum/design/module/mod_health_analyzer name = "Health Analyzer Module" id = "mod_health_analyzer" - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/health_analyzer category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1627,7 +1627,7 @@ /datum/design/module/mod_stealth name = "Cloak Module" id = "mod_stealth" - materials = list(/datum/material/iron = 1000, /datum/material/bluespace = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/stealth category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1635,13 +1635,13 @@ /datum/design/module/mod_jetpack name = "Ion Jetpack Module" id = "mod_jetpack" - materials = list(/datum/material/iron = 1500, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/jetpack /datum/design/module/mod_magboot name = "Magnetic Stabilizator Module" id = "mod_magboot" - materials = list(/datum/material/iron = 1000, /datum/material/gold = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/magboot category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1650,7 +1650,7 @@ /datum/design/module/mod_mag_harness name = "Magnetic Harness Module" id = "mod_mag_harness" - materials = list(/datum/material/iron = 1500, /datum/material/silver = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/magnetic_harness category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1659,7 +1659,7 @@ /datum/design/module/mod_tether name = "Emergency Tether Module" id = "mod_tether" - materials = list(/datum/material/iron = 1000, /datum/material/silver = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/tether category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1668,13 +1668,13 @@ /datum/design/module/mod_mouthhole name = "Eating Apparatus Module" id = "mod_mouthhole" - materials = list(/datum/material/iron = 1500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/mod/module/mouthhole /datum/design/module/mod_rad_protection name = "Radiation Protection Module" id = "mod_rad_protection" - materials = list(/datum/material/iron = 1000, /datum/material/uranium = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/rad_protection category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1682,19 +1682,19 @@ /datum/design/module/mod_emp_shield name = "EMP Shield Module" id = "mod_emp_shield" - materials = list(/datum/material/iron = 1000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/emp_shield /datum/design/module/mod_flashlight name = "Flashlight Module" id = "mod_flashlight" - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/flashlight /datum/design/module/mod_reagent_scanner name = "Reagent Scanner Module" id = "mod_reagent_scanner" - materials = list(/datum/material/glass = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/reagent_scanner category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -1703,7 +1703,7 @@ /datum/design/module/mod_gps name = "Internal GPS Module" id = "mod_gps" - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/gps category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -1712,7 +1712,7 @@ /datum/design/module/mod_constructor name = "Constructor Module" id = "mod_constructor" - materials = list(/datum/material/iron = 1000, /datum/material/titanium = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/constructor category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1720,7 +1720,7 @@ /datum/design/module/mod_quick_carry name = "Quick Carry Module" id = "mod_quick_carry" - materials = list(/datum/material/iron = 1000, /datum/material/titanium = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/quick_carry category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1729,19 +1729,19 @@ /datum/design/module/mod_longfall name = "Longfall Module" id = "mod_longfall" - materials = list(/datum/material/iron = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/longfall /datum/design/module/mod_thermal_regulator name = "Thermal Regulator Module" id = "mod_thermal_regulator" - materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/thermal_regulator /datum/design/module/mod_injector name = "Injector Module" id = "mod_injector" - materials = list(/datum/material/iron = 1000, /datum/material/diamond = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/injector category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1750,7 +1750,7 @@ /datum/design/module/mod_bikehorn name = "Bike Horn Module" id = "mod_bikehorn" - materials = list(/datum/material/plastic = 500, /datum/material/iron = 500) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/bikehorn category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SERVICE @@ -1759,7 +1759,7 @@ /datum/design/module/mod_microwave_beam name = "Microwave Beam Module" id = "mod_microwave_beam" - materials = list(/datum/material/iron = 1000, /datum/material/uranium = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/microwave_beam category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SERVICE @@ -1768,7 +1768,7 @@ /datum/design/module/mod_waddle name = "Waddle Module" id = "mod_waddle" - materials = list(/datum/material/plastic = 1000, /datum/material/iron = 1000) + materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/waddle category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SERVICE @@ -1777,7 +1777,7 @@ /datum/design/module/mod_clamp name = "Crate Clamp Module" id = "mod_clamp" - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/clamp category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -1786,7 +1786,7 @@ /datum/design/module/mod_drill name = "Drill Module" id = "mod_drill" - materials = list(/datum/material/silver = 1000, /datum/material/iron = 2000) + materials = list(/datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/drill category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -1795,7 +1795,7 @@ /datum/design/module/mod_orebag name = "Ore Bag Module" id = "mod_orebag" - materials = list(/datum/material/iron = 1500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/mod/module/orebag category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -1804,7 +1804,7 @@ /datum/design/module/mod_organ_thrower name = "Organ Thrower Module" id = "mod_organ_thrower" - materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/organ_thrower category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1813,31 +1813,31 @@ /datum/design/module/mod_pathfinder name = "Pathfinder Module" id = "mod_pathfinder" - materials = list(/datum/material/uranium = 1000, /datum/material/iron = 1000) + materials = list(/datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/pathfinder /datum/design/module/mod_dna_lock name = "DNA Lock Module" id = "mod_dna_lock" - materials = list(/datum/material/diamond = 500, /datum/material/glass = 1000) + materials = list(/datum/material/diamond =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/dna_lock /datum/design/module/mod_plasma_stabilizer name = "Plasma Stabilizer Module" id = "mod_plasma" - materials = list(/datum/material/plasma = 1000, /datum/material/glass = 1000) + materials = list(/datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/plasma_stabilizer /datum/design/module/mod_glove_translator name = "Glove Translator Module" id = "mod_sign_radio" - materials = list(/datum/material/iron = 750, /datum/material/glass = 500) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/signlang_radio /datum/design/module/mister_atmos name = "Resin Mister Module" id = "mod_mister_atmos" - materials = list(/datum/material/glass = 1000, /datum/material/titanium = 1500) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/mod/module/mister/atmos category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -1846,7 +1846,7 @@ /datum/design/module/mod_holster name = "Holster Module" id = "mod_holster" - materials = list(/datum/material/iron = 1500, /datum/material/glass = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/holster category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1855,7 +1855,7 @@ /datum/design/module/mod_sonar name = "Active Sonar Module" id = "mod_sonar" - materials = list(/datum/material/titanium = 250, /datum/material/glass = 1000, /datum/material/gold = 500, /datum/material/uranium = 250) + materials = list(/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/mod/module/active_sonar category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1864,7 +1864,7 @@ /datum/design/module/projectile_dampener name = "Projectile Dampener Module" id = "mod_projectile_dampener" - materials = list(/datum/material/iron = 1000, /datum/material/bluespace = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/mod/module/projectile_dampener category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1873,7 +1873,7 @@ /datum/design/module/surgicalprocessor name = "Surgical Processor Module" id = "mod_surgicalprocessor" - materials = list(/datum/material/titanium = 250, /datum/material/glass = 1000, /datum/material/silver = 1500) + materials = list(/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/mod/module/surgical_processor category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1882,7 +1882,7 @@ /datum/design/module/threadripper name = "Thread Ripper Module" id = "mod_threadripper" - materials = list(/datum/material/titanium = 250, /datum/material/plastic = 1000, /datum/material/silver = 1500) + materials = list(/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/mod/module/thread_ripper category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1891,7 +1891,7 @@ /datum/design/module/defibrillator name = "Defibrillator Module" id = "mod_defib" - materials = list(/datum/material/titanium = 250, /datum/material/diamond = 1000, /datum/material/silver = 1500) + materials = list(/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/mod/module/defibrillator category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1900,7 +1900,7 @@ /datum/design/module/patienttransport name = "Patient Transport Module" id = "mod_patienttransport" - materials = list(/datum/material/iron = 1000, /datum/material/bluespace = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/criminalcapture/patienttransport category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -1909,7 +1909,7 @@ /datum/design/module/criminalcapture name = "Criminal Capture Module" id = "mod_criminalcapture" - materials = list(/datum/material/iron = 1000, /datum/material/bluespace = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/criminalcapture category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -1919,7 +1919,7 @@ /datum/design/module/disposal name = "Disposal Connector Module" id = "mod_disposal" - materials = list(/datum/material/iron = 2500, /datum/material/titanium = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT *1.25, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/disposal_connector category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -1929,7 +1929,7 @@ /datum/design/module/mod_antigrav name = "Anti-Gravity Module" id = "mod_antigrav" - materials = list(/datum/material/iron = 2500, /datum/material/glass = 2000, /datum/material/uranium = 2000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT *1.25, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/anomaly_locked/antigrav category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -1938,7 +1938,7 @@ /datum/design/module/mod_teleporter name = "Teleporter Module" id = "mod_teleporter" - materials = list(/datum/material/iron = 2500, /datum/material/glass = 2000, /datum/material/bluespace = 2000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT *1.25, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/anomaly_locked/teleporter category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -1947,7 +1947,7 @@ /datum/design/module/mod_kinesis name = "Kinesis Module" id = "mod_kinesis" - materials = list(/datum/material/iron = 2500, /datum/material/glass = 2000, /datum/material/uranium = 1000, /datum/material/bluespace = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT *1.25, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/anomaly_locked/kinesis category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index ca7b23004ec..857cd4e9dc0 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -6,7 +6,7 @@ name = "Health Analyzer" id = "healthanalyzer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/healthanalyzer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -18,7 +18,7 @@ desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units." id = "bluespacebeaker" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 5000, /datum/material/plastic = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY ) @@ -30,7 +30,7 @@ desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units." id = "splitbeaker" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY ) @@ -41,7 +41,7 @@ name = "X-large Beaker" id = "xlarge_beaker" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000) + materials = list(/datum/material/glass = 2500, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY ) @@ -52,7 +52,7 @@ name = "Metamaterial Beaker" id = "meta_beaker" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000, /datum/material/gold = 1000, /datum/material/titanium = 1000) + materials = list(/datum/material/glass = 2500, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY ) @@ -63,7 +63,7 @@ name = "Chemical Analyzer" id = "ph_meter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500, /datum/material/gold = 1000, /datum/material/titanium = 1000) + materials = list(/datum/material/glass = 2500, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ph_meter category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -75,7 +75,7 @@ desc = "An advanced syringe that can hold 60 units of chemicals" id = "bluespacesyringe" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2000, /datum/material/plasma = 1000, /datum/material/diamond = 1000, /datum/material/bluespace = 500) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/reagent_containers/syringe/bluespace category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -87,7 +87,7 @@ desc = "Produce additional disks for storing genetic data." id = "dna_disk" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 300, /datum/material/glass = 100, /datum/material/silver = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/disk/data category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GENETICS @@ -99,7 +99,7 @@ desc = "A diamond-tipped syringe that pierces armor when launched at high velocity. It can hold up to 10 units." id = "piercesyringe" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2000, /datum/material/diamond = 1000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/reagent_containers/syringe/piercing category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -111,7 +111,7 @@ desc = "A bluespace body bag, powered by experimental bluespace technology. It can hold loads of bodies and the largest of creatures." id = "bluespacebodybag" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2000, /datum/material/diamond = 500, /datum/material/bluespace = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SMALL_MATERIAL_AMOUNT*5, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/bodybag/bluespace category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -123,7 +123,7 @@ desc = "A refill pack for the auto-extinguisher on Plasma-man suits." id = "plasmarefiller" //Why did this have no plasmatech build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/plasma = 1000) + materials = list(/datum/material/iron = 4000, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/extinguisher_refill category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS_EQUIPMENT @@ -135,7 +135,7 @@ desc = "Allows tracking of someone's location if their suit sensors are turned to tracking beacon." id = "crewpinpointer" build_type = PROTOLATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 1500, /datum/material/gold = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/pinpointer/crew category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -148,7 +148,7 @@ id = "defibrillator" build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/defibrillator - materials = list(/datum/material/iron = 8000, /datum/material/glass = 4000, /datum/material/silver = 3000, /datum/material/gold = 1500) + materials = list(/datum/material/iron = 8000, /datum/material/glass = 4000, /datum/material/silver =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) @@ -159,7 +159,7 @@ desc = "A mounted frame for holding defibrillators, providing easy security." id = "defibmountdefault" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/wallframe/defib_mount category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS @@ -171,7 +171,7 @@ desc = "An all-in-one mounted frame for holding defibrillators, complete with ID-locked clamps and recharging cables. The PENLITE version also allows for slow recharging of the defib's battery." id = "defibmount" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000, /datum/material/silver = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/wallframe/defib_mount/charging category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS @@ -184,7 +184,7 @@ id = "defibrillator_compact" build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/defibrillator/compact - materials = list(/datum/material/iron = 16000, /datum/material/glass = 8000, /datum/material/silver = 6000, /datum/material/gold = 3000) + materials = list(/datum/material/iron = 16000, /datum/material/glass = 8000, /datum/material/silver = 6000, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) @@ -196,7 +196,7 @@ id = "genescanner" build_path = /obj/item/sequence_scanner build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GENETICS ) @@ -208,7 +208,7 @@ id = "healthanalyzer_advanced" build_path = /obj/item/healthanalyzer/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 2000, /datum/material/gold = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = 2500, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -220,7 +220,7 @@ id = "medigel" build_path = /obj/item/reagent_containers/medigel build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass = 500) + materials = list(/datum/material/iron = 2500, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) @@ -230,7 +230,7 @@ name = "Surgical Drapes" id = "surgical_drapes" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 2000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/surgical_drapes category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -243,7 +243,7 @@ id = "laserscalpel" build_path = /obj/item/scalpel/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 1500, /datum/material/diamond = 200, /datum/material/titanium = 4000) + materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =SMALL_MATERIAL_AMOUNT * 2, /datum/material/titanium = 4000) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -255,7 +255,7 @@ id = "mechanicalpinches" build_path = /obj/item/retractor/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium = 5000) + materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -267,7 +267,7 @@ id = "searingtool" build_path = /obj/item/cautery/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 2000, /datum/material/plasma = 2000, /datum/material/uranium = 3000, /datum/material/titanium = 3000) + materials = list(/datum/material/iron = 4000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -278,7 +278,7 @@ desc = "A traditional spray bottle used to generate a fine mist. Not to be confused with a medspray." id = "med_spray_bottle" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 2000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/reagent_containers/spray/medical category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -291,7 +291,7 @@ id = "chem_pack" build_type = PROTOLATHE | AWAY_LATHE departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - materials = list(/datum/material/plastic = 2000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/reagent_containers/chem_pack category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -304,7 +304,7 @@ id = "blood_pack" build_type = PROTOLATHE | AWAY_LATHE departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - materials = list(/datum/material/plastic = 1000) + materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/reagent_containers/blood category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -317,7 +317,7 @@ id = "portable_chem_mixer" build_type = PROTOLATHE | AWAY_LATHE departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - materials = list(/datum/material/plastic = 5000, /datum/material/iron = 10000, /datum/material/glass = 3000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/iron = 10000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/storage/portable_chem_mixer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -347,7 +347,7 @@ id = "ci-gloweyes" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 600, /datum/material/glass = 1000) + materials = list(/datum/material/iron = 600, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/organ/internal/eyes/robotic/glow category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC @@ -372,8 +372,8 @@ desc = "A set of surgical tools hidden behind a concealed panel on the user's arm." id = "ci-surgery" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list (/datum/material/iron = 2500, /datum/material/glass = 1500, /datum/material/silver = 1500) - construction_time = 200 + materials = list (/datum/material/iron = 2500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + construction_time =SMALL_MATERIAL_AMOUNT * 2 build_path = /obj/item/organ/internal/cyberimp/arm/surgery category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -385,8 +385,8 @@ desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm." id = "ci-toolset" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list (/datum/material/iron = 2500, /datum/material/glass = 1500, /datum/material/silver = 1500) - construction_time = 200 + materials = list (/datum/material/iron = 2500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + construction_time =SMALL_MATERIAL_AMOUNT * 2 build_path = /obj/item/organ/internal/cyberimp/arm/toolset category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -399,7 +399,7 @@ id = "ci-medhud" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 50 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 500, /datum/material/gold = 500) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/cyberimp/eyes/hud/medical category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -438,7 +438,7 @@ id = "ci-xray" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/uranium = 1000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/organ/internal/eyes/robotic/xray category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_COMBAT @@ -451,7 +451,7 @@ id = "ci-thermals" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/organ/internal/eyes/robotic/thermals category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_COMBAT @@ -477,7 +477,7 @@ id = "ci-antistun" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 500, /datum/material/gold = 1000) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/organ/internal/cyberimp/brain/anti_stun category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -490,7 +490,7 @@ id = "ci-nutriment" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/gold = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/cyberimp/chest/nutriment category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -503,7 +503,7 @@ id = "ci-nutrimentplus" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 50 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold = 500, /datum/material/uranium = 750) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, /datum/material/uranium = 750) build_path = /obj/item/organ/internal/cyberimp/chest/nutriment/plus category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -516,7 +516,7 @@ id = "ci-reviver" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 800, /datum/material/glass = 800, /datum/material/gold = 300, /datum/material/uranium = 500) + materials = list(/datum/material/iron = 800, /datum/material/glass = 800, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/cyberimp/chest/reviver category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -529,7 +529,7 @@ id = "ci-thrusters" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 80 - materials = list(/datum/material/iron = 4000, /datum/material/glass = 2000, /datum/material/silver = 1000, /datum/material/diamond = 1000) + materials = list(/datum/material/iron = 4000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/organ/internal/cyberimp/chest/thrusters category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -545,7 +545,7 @@ desc = "A sterile automatic implant injector." id = "implanter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 200) + materials = list(/datum/material/iron = 600, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/implanter category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS @@ -557,7 +557,7 @@ desc = "A glass case for containing an implant." id = "implantcase" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/implantcase category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS @@ -569,7 +569,7 @@ desc = "Makes death amusing." id = "implant_trombone" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/bananium = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/bananium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/implantcase/sad_trombone category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -593,7 +593,7 @@ desc = "A glass case containing an implant." id = "implant_tracking" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/implantcase/tracking category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC @@ -608,7 +608,7 @@ id = "cybernetic_liver" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/liver/cybernetic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1 @@ -619,7 +619,7 @@ name = "Cybernetic Liver" desc = "A cybernetic liver." id = "cybernetic_liver_tier2" - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/liver/cybernetic/tier2 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_2 @@ -631,7 +631,7 @@ desc = "An upgraded cybernetic liver." id = "cybernetic_liver_tier3" construction_time = 50 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver=500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver=SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/liver/cybernetic/tier3 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_3 @@ -644,7 +644,7 @@ id = "cybernetic_heart" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/heart/cybernetic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1 @@ -655,7 +655,7 @@ name = "Cybernetic Heart" desc = "A cybernetic heart." id = "cybernetic_heart_tier2" - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/heart/cybernetic/tier2 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_2 @@ -667,7 +667,7 @@ desc = "An upgraded cybernetic heart." id = "cybernetic_heart_tier3" construction_time = 50 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver=500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver=SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/heart/cybernetic/tier3 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_3 @@ -680,7 +680,7 @@ id = "cybernetic_lungs" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/lungs/cybernetic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1 @@ -691,7 +691,7 @@ name = "Cybernetic Lungs" desc = "A pair of cybernetic lungs." id = "cybernetic_lungs_tier2" - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/lungs/cybernetic/tier2 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_2 @@ -703,7 +703,7 @@ desc = "A pair of upgraded cybernetic lungs." id = "cybernetic_lungs_tier3" construction_time = 50 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/lungs/cybernetic/tier3 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_3 @@ -716,7 +716,7 @@ id = "cybernetic_stomach" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/stomach/cybernetic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1 @@ -727,7 +727,7 @@ name = "Cybernetic Stomach" desc = "A cybernetic stomach." id = "cybernetic_stomach_tier2" - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/stomach/cybernetic/tier2 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_2 @@ -739,7 +739,7 @@ desc = "An upgraded cybernetic stomach." id = "cybernetic_stomach_tier3" construction_time = 50 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/stomach/cybernetic/tier3 category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_3 @@ -765,7 +765,7 @@ id = "cybernetic_ears_u" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/organ/internal/ears/cybernetic/upgraded category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_2 diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 72cea062cd7..66e8f53d462 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -7,7 +7,7 @@ desc = "Allows for the construction of circuit boards used to build an Express Supply Console."//who? id = "cargoexpress"//the coder reading this build_type = IMPRINTER - materials = list(/datum/material/glass = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/circuitboard/computer/cargo/express category = list( RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_CARGO @@ -19,7 +19,7 @@ desc = "Allows the Cargo Express Console to call down the Bluespace Drop Pod, greatly increasing user safety."//who? id = "bluespace_pod"//the coder reading this build_type = PROTOLATHE - materials = list(/datum/material/glass = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/disk/cargo/bluespace_pod category = list( RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_CARGO @@ -30,7 +30,7 @@ name = "Pickaxe" id = "pickaxe" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/pickaxe category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -42,7 +42,7 @@ desc = "Yours is the drill that will pierce through the rock walls." id = "drill" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass = 1000) //expensive, but no need for miners. + materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) //expensive, but no need for miners. build_path = /obj/item/pickaxe/drill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -54,7 +54,7 @@ desc = "Yours is the drill that will pierce the heavens!" id = "drill_diamond" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass = 1000, /datum/material/diamond = 2000) //Yes, a whole diamond is needed. + materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) //Yes, a whole diamond is needed. build_path = /obj/item/pickaxe/drill/diamonddrill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -66,7 +66,7 @@ desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." id = "plasmacutter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1500, /datum/material/glass = 500, /datum/material/plasma = 400) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma = 400) build_path = /obj/item/gun/energy/plasmacutter category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -78,7 +78,7 @@ desc = "It's an advanced plasma cutter, oh my god." id = "plasmacutter_adv" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000, /datum/material/plasma = 2000, /datum/material/gold = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/gun/energy/plasmacutter/adv category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -90,7 +90,7 @@ desc = "Essentially a handheld planet-cracker. Rock walls cower in fear when they hear one of these." id = "jackhammer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass = 2000, /datum/material/silver = 2000, /datum/material/diamond = 6000) + materials = list(/datum/material/iron = 6000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/diamond = 6000) build_path = /obj/item/pickaxe/drill/jackhammer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -102,7 +102,7 @@ desc = "An upgraded version of the resonator that allows more fields to be active at once." id = "superresonator" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 1500, /datum/material/silver = 1000, /datum/material/uranium = 1000) + materials = list(/datum/material/iron = 4000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/resonator/upgraded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -114,7 +114,7 @@ desc = "A device which allows kinetic accelerators to be wielded by any organism." id = "triggermod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/borg/upgrade/modkit/trigger_guard category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -126,7 +126,7 @@ desc = "A device which allows kinetic accelerators to deal more damage." id = "damagemod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/borg/upgrade/modkit/damage category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -146,7 +146,7 @@ desc = "A device which decreases the cooldown of a Kinetic Accelerator." id = "cooldownmod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/borg/upgrade/modkit/cooldown category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -166,7 +166,7 @@ desc = "A device which allows kinetic accelerators to fire at a further range." id = "rangemod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/borg/upgrade/modkit/range category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -186,7 +186,7 @@ desc = "A modification kit for Kinetic Accelerators which causes it to fire AoE blasts that destroy rock." id = "hypermod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 8000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron = 8000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/borg/upgrade/modkit/aoe/turfs category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -205,7 +205,7 @@ name = "Mining Scanner" id = "mining_scanner" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/iron = 500, /datum/material/silver = 1000) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/t_scanner/adv_mining_scanner/lesser category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index ca564d27bc6..f05fd11cf8c 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -8,7 +8,7 @@ desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." id = "health_hud" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/hud/health category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -20,7 +20,7 @@ desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." id = "health_hud_night" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/silver = 350) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = 350) build_path = /obj/item/clothing/glasses/hud/health/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -32,7 +32,7 @@ desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status." id = "security_hud" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/hud/security category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -44,7 +44,7 @@ desc = "A heads-up display which provides id data and vision in complete darkness." id = "security_hud_night" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/gold = 350) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = 350) build_path = /obj/item/clothing/glasses/hud/security/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -56,7 +56,7 @@ desc = "A HUD used to analyze and determine faults within robotic machinery." id = "diagnostic_hud" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/hud/diagnostic category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -68,7 +68,7 @@ desc = "Upgraded version of the diagnostic HUD designed to function during a power failure." id = "diagnostic_hud_night" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/plasma = 300) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/clothing/glasses/hud/diagnostic/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -84,7 +84,7 @@ desc = "Protects the eyes from bright flashes; approved by the mad scientist association." id = "welding_goggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/welding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -96,7 +96,7 @@ desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd." id = "weldingmask" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/mask/gas/welding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -108,7 +108,7 @@ desc = "By applying state of the art lighting technology to a fire helmet with industry standard photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards." id = "bright_helmet" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500) + materials = list(/datum/material/iron = 4000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/head/utility/hardhat/red/upgraded category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -120,7 +120,7 @@ desc = "This awesome mug will ensure your coffee never stays cold!" id = "mauna_mug" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 100) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE ) @@ -144,7 +144,7 @@ desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant." id = "portaseeder" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 400) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = 400) build_path = /obj/item/storage/bag/plants/portaseeder category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_TOOLS_BOTANY @@ -156,7 +156,7 @@ desc = "Damn son, where'd you find this?" id = "air_horn" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/bananium = 1000) + materials = list(/datum/material/iron = 4000, /datum/material/bananium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/bikehorn/airhorn category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -167,7 +167,7 @@ name = "Hilarious Firing Pin" id = "clown_firing_pin" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 300, /datum/material/bananium = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 3, /datum/material/bananium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/firing_pin/clown category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -179,7 +179,7 @@ desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." id = "mesons" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/meson category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -191,7 +191,7 @@ desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes." id = "engine_goggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/plasma = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/clothing/glasses/meson/engine category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -203,7 +203,7 @@ desc = "Used by engineering staff to see underfloor objects such as cables and pipes." id = "tray_goggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/meson/engine/tray category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ATMOSPHERICS @@ -215,7 +215,7 @@ desc = "Used by Atmospheric Technician to determine the temperature of the air" id = "atmos_thermal" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/plasma = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/clothing/glasses/meson/engine/atmos_imaging category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ATMOSPHERICS @@ -227,7 +227,7 @@ desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display." id = "nvgmesons" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/glasses/meson/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -239,7 +239,7 @@ desc = "Goggles that let you see through darkness unhindered." id = "night_visision_goggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/glasses/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -251,7 +251,7 @@ desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle." id = "magboots" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4500, /datum/material/silver = 1500, /datum/material/gold = 2500) + materials = list(/datum/material/iron = 4500, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold = 2500) build_path = /obj/item/clothing/shoes/magboots category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -263,7 +263,7 @@ desc = "A device which can project temporary forcefields to seal off an area." id = "forcefield_projector" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass = 1000) + materials = list(/datum/material/iron = 2500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/forcefield_projector category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -275,7 +275,7 @@ desc = "Goggles fitted with a portable analyzer capable of determining the research worth of an item or components of a machine." id = "scigoggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/glasses/science category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -287,7 +287,7 @@ desc = "Goggles that lets the user see in the dark and recognize chemical compounds at a glance." id = "nv_scigoggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/glasses/science/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -299,7 +299,7 @@ desc = "A roasting stick for cooking sausages in exotic ovens." id = "roastingstick" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250) + materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/bluespace = 250) build_path = /obj/item/melee/roastingstick category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN @@ -311,7 +311,7 @@ desc = "Used to track portable teleportation beacons and targets with embedded tracking implants." id = "locator" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/silver = 500) + materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/locator category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -323,7 +323,7 @@ desc = "Allows for the construction of a quantum keycard." id = "quantum_keycard" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/iron = 500, /datum/material/silver = 500, /datum/material/bluespace = 1000) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/quantum_keycard category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -335,7 +335,7 @@ desc = "Allows you to control the connected bot launchpad" id = "botpad_remote" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/iron = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/botpad_remote category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -347,7 +347,7 @@ desc = "An advanced tool capable of instantly neutralizing anomalies, designed to capture the fleeting aberrations created by the engine." id = "anomaly_neutralizer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/gold = 2000, /datum/material/plasma = 5000, /datum/material/uranium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/anomaly_neutralizer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -371,7 +371,7 @@ desc = "An empty oxygen tank." id = "oxygen_tank" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/tank/internals/oxygen/empty category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS @@ -383,7 +383,7 @@ desc = "An empty oxygen tank." id = "plasma_tank" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/tank/internals/plasma/empty category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS @@ -395,7 +395,7 @@ desc = "A card used to provide ID and determine access across the station. Has an integrated digital display and advanced microchips." id = "idcard" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=200, /datum/material/glass = 100) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/card/id/advanced category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -407,7 +407,7 @@ desc = "Overdesigned engineering gloves that have automated construction subroutines dialed in, allowing for faster construction while worn." id = "eng_gloves" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT, /datum/material/silver=HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/gloves/tinkerer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -418,7 +418,7 @@ name = "Lava-Resistant Iron Rods" id = "lava_rods" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000) + materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma=SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium=SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/rods/lava category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -430,7 +430,7 @@ desc = "The classic Nanotrasen design for competitively priced bath based duck toys. No need for fancy Waffle co. rubber, buy Plastic Ducks today!" id = "plasticducky" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 1000) + materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/bikehorn/rubberducky/plasticducky category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -458,7 +458,7 @@ desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals." id = "advmop" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass = 200) + materials = list(/datum/material/iron = 2500, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/mop/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -470,7 +470,7 @@ desc = "It's a bag for trash, you put garbage in it." id = "normtrash" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 2000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/storage/bag/trash category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -482,7 +482,7 @@ desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage." id = "blutrash" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/gold = 1500, /datum/material/uranium = 250, /datum/material/plasma = 1500) + materials = list(/datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium = 250, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/storage/bag/trash/bluespace category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -494,7 +494,7 @@ desc = "A device to automatically replace lights. Refill with working light bulbs." id = "light_replacer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1500, /datum/material/silver = 150, /datum/material/glass = 3000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver = 150, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/lightreplacer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -506,7 +506,7 @@ desc = "A device to automatically replace lights at a distance. Refill with working light bulbs." id = "light_replacer_blue" build_type = PROTOLATHE - materials = list(/datum/material/iron = 1500, /datum/material/silver = 150, /datum/material/glass = 3000, /datum/material/bluespace = 300) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver = 150, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/lightreplacer/blue category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -518,7 +518,7 @@ desc = "A floor buffer that can be attached to vehicular janicarts." id = "buffer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 200) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/janicart_upgrade/buffer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_JANITOR @@ -530,7 +530,7 @@ desc = "A vacuum that can be attached to vehicular janicarts." id = "vacuum" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 200) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/janicart_upgrade/vacuum category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_JANITOR @@ -542,7 +542,7 @@ desc = "Removes stains from the floor, and not much else." id = "paint_remover" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) reagents_list = list(/datum/reagent/acetone = 60) build_path = /obj/item/paint/paint_remover category = list( @@ -555,7 +555,7 @@ desc = "A spray bottle, with an unscrewable top." id = "spraybottle" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 200) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/reagent_containers/spray category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -567,7 +567,7 @@ desc = "A trap used to catch space bears and other legged creatures." id = "beartrap" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/titanium = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/restraints/legcuffs/beartrap category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -583,7 +583,7 @@ name = "Advanced Watering Can" id = "adv_watering_can" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass = 200) + materials = list(/datum/material/iron = 2500, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY_ADVANCED ) @@ -599,7 +599,7 @@ desc = "A holograpic projector used to project various warning signs." id = "holosign" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -611,7 +611,7 @@ desc = "A holograpic projector used to project hard light wet floor barriers." id = "holobarrier_jani" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000, /datum/material/silver = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator/janibarrier category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -623,7 +623,7 @@ desc = "A holographic projector that creates holographic security barriers." id = "holosignsec" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator/security category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY @@ -635,7 +635,7 @@ desc = "A holographic projector that creates holographic engineering barriers." id = "holosignengi" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator/engineering category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -647,7 +647,7 @@ desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric conditions." id = "holosignatmos" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator/atmos category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ATMOSPHERICS @@ -659,7 +659,7 @@ desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases." build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/holosign_creator/medical - materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 100) //a hint of silver since it can troll 2 antags (bad viros and sentient disease) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =SMALL_MATERIAL_AMOUNT) //a hint of silver since it can troll 2 antags (bad viros and sentient disease) id = "holobarrier_med" category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -675,7 +675,7 @@ desc = "An experimental suit of armour capable of utilizing an implanted anomaly core to protect the user." id = "reactive_armour" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/diamond = 5000, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold = 5000) + materials = list(/datum/material/iron = 10000, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/reactive_armour_shell category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -696,7 +696,7 @@ desc = "A royal knight's favorite hat. If you hold it upside down it's actually a bucket." id = "knight_helmet" build_type = AUTOLATHE - materials = list(MAT_CATEGORY_ITEM_MATERIAL = 5000) + materials = list(MAT_CATEGORY_ITEM_MATERIAL =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/clothing/head/helmet/knight/greyscale category = list(RND_CATEGORY_IMPORTED) @@ -723,7 +723,7 @@ desc = "Manufactured by UhangInc, used to blind and down an opponent quickly. Printed pepper sprays do not contain reagents." id = "pepperspray" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/reagent_containers/spray/pepper/empty category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -735,7 +735,7 @@ desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests." id = "bola_energy" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/silver = 500, /datum/material/plasma = 500, /datum/material/titanium = 500) + materials = list(/datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/restraints/legcuffs/bola/energy category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -760,7 +760,7 @@ desc = "An empty evidence bag." id = "evidencebag" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 100) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/evidencebag category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -772,7 +772,7 @@ desc = "Central Command-issued inspection device. Performs inspections according to Nanotrasen protocols when activated, then prints an encrypted report regarding the maintenance of the station. Definitely not giving you cancer." id = "inspector" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/uranium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/inspector category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -783,7 +783,7 @@ name = "Plumbing Constructor" id = "plumbing_rcd" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000) + materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/construction/plumbing category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PLUMBING @@ -794,7 +794,7 @@ name = "Gas Filter" id = "gas_filter" build_type = PROTOLATHE | AUTOLATHE - materials = list(/datum/material/iron = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/gas_filter category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS_EQUIPMENT @@ -805,7 +805,7 @@ name = "Plasmaman Gas Filter" id = "plasmaman_gas_filter" build_type = PROTOLATHE | AUTOLATHE - materials = list(/datum/material/iron = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/gas_filter/plasmaman category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS_EQUIPMENT @@ -820,7 +820,7 @@ name = "Super Sticky Tape" id = "super_sticky_tape" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 3000) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/stack/sticky_tape/super category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -831,7 +831,7 @@ name = "Pointy Tape" id = "pointy_tape" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1500, /datum/material/plastic = 1000) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sticky_tape/pointy category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -842,7 +842,7 @@ name = "Super Pointy Tape" id = "super_pointy_tape" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/plastic = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sticky_tape/pointy/super category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -868,7 +868,7 @@ name = "Rocket Gloves" id = "tackle_rocket" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plasma = 1000, /datum/material/plastic = 2000) + materials = list(/datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/clothing/gloves/tackler/rocket category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -886,7 +886,7 @@ desc = "A holographic projector that creates seating designation for restaurants." id = "holosignrestaurant" build_type = PROTOLATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator/robot_seat/restaurant category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE @@ -898,7 +898,7 @@ desc = "A holographic projector that creates seating designation for bars." id = "holosignbar" build_type = PROTOLATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/holosign_creator/robot_seat/bar category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE @@ -910,7 +910,7 @@ desc = "Gotta shove something in!" id = "oven_tray" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/plate/oven_tray category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN @@ -925,7 +925,7 @@ name = "Advanced Fishing Rod" id = "fishing_rod_tech" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/uranium = 1000, /datum/material/plastic = 2000) + materials = list(/datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/fishing_rod/tech category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -940,7 +940,7 @@ name = "Coffeepot" id = "coffeepot" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 500, /datum/material/plastic = 500) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/reagent_containers/cup/coffeepot category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN @@ -951,7 +951,7 @@ name = "Bluespace Coffeepot" id = "bluespace_coffeepot" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/plastic = 500, /datum/material/bluespace = 500) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SMALL_MATERIAL_AMOUNT*5, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/reagent_containers/cup/coffeepot/bluespace category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN @@ -962,7 +962,7 @@ name = "Blank Coffee Cartridge" id = "coffee_cartridge" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 1000) + materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/blank_coffee_cartridge category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN @@ -973,7 +973,7 @@ name = "Syrup bottle" id = "syrup_bottle" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 1000) + materials = list(/datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/reagent_containers/cup/bottle/syrup_bottle category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index 89377a8e1d4..11b5b649391 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -7,7 +7,7 @@ desc = "A basic power cell that holds 1 MJ of energy." id = "basic_cell" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE |MECHFAB - materials = list(/datum/material/iron = 700, /datum/material/glass = 50) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 0.5) construction_time=100 build_path = /obj/item/stock_parts/cell/empty category = list( @@ -20,7 +20,7 @@ desc = "A power cell that holds 10 MJ of energy." id = "high_cell" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE | MECHFAB - materials = list(/datum/material/iron = 700, /datum/material/glass = 60) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.6) construction_time=100 build_path = /obj/item/stock_parts/cell/high/empty category = list( @@ -33,7 +33,7 @@ desc = "A power cell that holds 20 MJ of energy." id = "super_cell" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list(/datum/material/iron = 700, /datum/material/glass = 70) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7) construction_time=100 build_path = /obj/item/stock_parts/cell/super/empty category = list( @@ -46,7 +46,7 @@ desc = "A power cell that holds 30 MJ of energy." id = "hyper_cell" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list(/datum/material/iron = 700, /datum/material/gold = 150, /datum/material/silver = 150, /datum/material/glass = 80) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.8) construction_time=100 build_path = /obj/item/stock_parts/cell/hyper/empty category = list( @@ -59,7 +59,7 @@ desc = "A power cell that holds 40 MJ of energy." id = "bluespace_cell" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list(/datum/material/iron = 800, /datum/material/gold = 120, /datum/material/glass = 160, /datum/material/diamond = 160, /datum/material/titanium = 300, /datum/material/bluespace = 100) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 1.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.6, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 1.6, /datum/material/titanium =SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) construction_time=100 build_path = /obj/item/stock_parts/cell/bluespace/empty category = list( @@ -72,7 +72,7 @@ desc = "The NT-75 Electromagnetic Power Inducer can wirelessly induce electric charge in an object, allowing you to recharge power cells without having to remove them." id = "inducer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/inducer/sci category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -94,7 +94,7 @@ desc = "The basic tier of a compressor blade." id = "turbine_part_compressor" build_type = PROTOLATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) construction_time = 100 build_path = /obj/item/turbine_parts/compressor category = list( @@ -107,7 +107,7 @@ desc = "The basic tier of a rotor shaft." id = "turbine_part_rotor" build_type = PROTOLATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5) construction_time = 100 build_path = /obj/item/turbine_parts/rotor category = list( @@ -120,7 +120,7 @@ desc = "The basic tier of a stator." id = "turbine_part_stator" build_type = PROTOLATHE - materials = list(/datum/material/iron = 500) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*5) construction_time = 100 build_path = /obj/item/turbine_parts/stator category = list( diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm index 1e890315e0f..ef9077f562c 100644 --- a/code/modules/research/designs/smelting_designs.dm +++ b/code/modules/research/designs/smelting_designs.dm @@ -4,7 +4,7 @@ name = "Plasteel" id = "plasteel" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/plasma = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasteel category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -16,7 +16,7 @@ name = "Plastitanium" id = "plastitanium" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/titanium = MINERAL_MATERIAL_AMOUNT, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT, /datum/material/plasma = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/plastitanium category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -28,7 +28,7 @@ name = "Plasma Glass" id = "plasmaglass" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasmaglass category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -40,7 +40,7 @@ name = "Reinforced Plasma Glass" id = "plasmareinforcedglass" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/iron = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasmarglass category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -52,7 +52,7 @@ name = "Titanium Glass" id = "titaniumglass" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/titanium = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/titaniumglass category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS @@ -64,7 +64,7 @@ name = "Plastitanium Glass" id = "plastitaniumglass" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plastitaniumglass category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index e6520d72c8e..8436cc8c9a6 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -7,7 +7,7 @@ desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 5000) //hardcore + materials = list(/datum/material/iron = 10000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) //hardcore build_path = /obj/item/storage/part_replacer category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -19,7 +19,7 @@ desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 15000, /datum/material/glass = 5000, /datum/material/silver = 2500) //hardcore + materials = list(/datum/material/iron = 15000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = 2500) //hardcore build_path = /obj/item/storage/part_replacer/bluespace category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -32,7 +32,7 @@ desc = "A stock part used in the construction of various devices." id = "basic_capacitor" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/capacitor category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 @@ -58,7 +58,7 @@ desc = "A stock part used in the construction of various devices." id = "super_capacitor" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/gold = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/gold =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/capacitor/super category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -71,7 +71,7 @@ desc = "A stock part used in the construction of various devices." id = "quadratic_capacitor" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/gold = 100, /datum/material/diamond = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/gold =SMALL_MATERIAL_AMOUNT, /datum/material/diamond =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/capacitor/quadratic category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -85,7 +85,7 @@ desc = "A stock part used in the construction of various devices." id = "basic_scanning" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/stock_parts/scanning_module category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 @@ -98,7 +98,7 @@ desc = "A stock part used in the construction of various devices." id = "adv_scanning" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass = 100) + materials = list(/datum/material/iron = 150, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/scanning_module/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -111,7 +111,7 @@ desc = "A stock part used in the construction of various devices." id = "phasic_scanning" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 150, /datum/material/silver = 60) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = 150, /datum/material/silver = 60) build_path = /obj/item/stock_parts/scanning_module/phasic category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -124,7 +124,7 @@ desc = "A stock part used in the construction of various devices." id = "triphasic_scanning" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/diamond = 30, /datum/material/bluespace = 30) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = 30, /datum/material/bluespace = 30) build_path = /obj/item/stock_parts/scanning_module/triphasic category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -138,7 +138,7 @@ desc = "A stock part used in the construction of various devices." id = "micro_mani" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/manipulator category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 @@ -164,7 +164,7 @@ desc = "A stock part used in the construction of various devices." id = "pico_mani" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/stock_parts/manipulator/pico category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -177,7 +177,7 @@ desc = "A stock part used in the construction of various devices." id = "femto_mani" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/diamond = 30, /datum/material/titanium = 30) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = 30, /datum/material/titanium = 30) build_path = /obj/item/stock_parts/manipulator/femto category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -191,7 +191,7 @@ desc = "A stock part used in the construction of various devices." id = "basic_micro_laser" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 50) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/stock_parts/micro_laser category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 @@ -204,7 +204,7 @@ desc = "A stock part used in the construction of various devices." id = "high_micro_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass = 100) + materials = list(/datum/material/iron = 150, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/micro_laser/high category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -217,7 +217,7 @@ desc = "A stock part used in the construction of various devices." id = "ultra_micro_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 150, /datum/material/uranium = 60) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = 150, /datum/material/uranium = 60) build_path = /obj/item/stock_parts/micro_laser/ultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -230,7 +230,7 @@ desc = "A stock part used in the construction of various devices." id = "quadultra_micro_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/uranium = 100, /datum/material/diamond = 60) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/uranium =SMALL_MATERIAL_AMOUNT, /datum/material/diamond = 60) build_path = /obj/item/stock_parts/micro_laser/quadultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -243,7 +243,7 @@ desc = "A stock part used in the construction of various devices." id = "basic_matter_bin" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/matter_bin category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 @@ -269,7 +269,7 @@ desc = "A stock part used in the construction of various devices." id = "super_matter_bin" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/stock_parts/matter_bin/super category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -282,7 +282,7 @@ desc = "A stock part used in the construction of various devices." id = "bluespace_matter_bin" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 250, /datum/material/diamond = 100, /datum/material/bluespace = 100) + materials = list(/datum/material/iron = 250, /datum/material/diamond =SMALL_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/matter_bin/bluespace category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -296,7 +296,7 @@ desc = "A compact module capable of sensing extradimensional activity." id = "s_ansible" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/silver = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/ansible category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -308,7 +308,7 @@ desc = "A tiny device capable of filtering and converting super-intense radiowaves." id = "s_filter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/silver = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/filter category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -320,7 +320,7 @@ desc = "A compact micro-machine capable of amplifying weak subspace transmissions." id = "s_amplifier" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/gold = 100, /datum/material/uranium = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT, /datum/material/uranium =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/amplifier category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -332,7 +332,7 @@ desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." id = "s_treatment" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/silver = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/stock_parts/subspace/treatment category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -344,7 +344,7 @@ desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." id = "s_analyzer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/gold = 100) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/analyzer category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -356,7 +356,7 @@ desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." id = "s_crystal" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 800, /datum/material/silver = 100, /datum/material/gold = 100) + materials = list(/datum/material/glass = 800, /datum/material/silver =SMALL_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/crystal category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -368,7 +368,7 @@ desc = "A large piece of equipment used to open a window into the subspace dimension." id = "s_transmitter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 100, /datum/material/silver = 100, /datum/material/uranium = 100) + materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT, /datum/material/uranium =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/transmitter category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -380,7 +380,7 @@ desc = "A small magnetic card reader, used for devices that take and transmit holocredits." id = "c-reader" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=50, /datum/material/glass=10) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=10) build_path = /obj/item/stock_parts/card_reader category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_MISC @@ -392,7 +392,7 @@ desc = "A small hydrostatic reclaimer, it takes moisture out of the air and returns it back to the source." id = "w-recycler" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/plastic = 200, /datum/material/iron = 50) + materials = list(/datum/material/plastic =SMALL_MATERIAL_AMOUNT * 2, /datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/stock_parts/water_recycler category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_MISC diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index d414026c272..58a34d0fd26 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -7,7 +7,7 @@ name = "Advanced Fire Extinguisher" id = "adv_fire_extinguisher" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/titanium = 500, /datum/material/gold = 500) + materials = list(/datum/material/titanium =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/extinguisher/advanced/empty category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -19,7 +19,7 @@ desc = "A small electric hand drill with an interchangeable screwdriver and bolt bit" id = "handdrill" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3500, /datum/material/silver = 1500, /datum/material/titanium = 2500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*1.75, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT*1.25) build_path = /obj/item/screwdriver/power category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -32,7 +32,7 @@ id = "jawsoflife" // added one more requirment since the Jaws of Life are a bit OP build_path = /obj/item/crowbar/power build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4500, /datum/material/silver = 2500, /datum/material/titanium = 3500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*2.25, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/titanium =SHEET_MATERIAL_AMOUNT*1.75) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) @@ -44,7 +44,7 @@ desc = "An experimental welder capable of self-fuel generation." id = "exwelder" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 1500, /datum/material/uranium = 200) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/weldingtool/experimental category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -56,7 +56,7 @@ desc = "An experimental gas analyzer capable of operating at long distance" id = "rangedanalyzer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 100, /datum/material/glass = 20, /datum/material/gold = 300, /datum/material/bluespace=200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace=SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/analyzer/ranged category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ATMOSPHERICS @@ -67,7 +67,7 @@ name = "Rapid Pipe Dispenser (RPD)" id = "rpd_loaded" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*37.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*18.75) build_path = /obj/item/pipe_dispenser category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -79,7 +79,7 @@ desc = "A tool that can construct and deconstruct walls, airlocks and floors on the fly." id = "rcd_loaded" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 60000, /datum/material/glass = 5000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*30, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/construction/rcd/loaded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -91,7 +91,7 @@ desc = "A tool that can lay & destory floor tiles on the fly." id = "rtd_loaded" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 30000, /datum/material/glass = 2500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 15, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.25) build_path = /obj/item/construction/rtd/loaded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -102,7 +102,7 @@ name = "RCD Matter Cartridge" id = "rcd_ammo" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 12000, /datum/material/glass = 8000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*6, /datum/material/glass =SHEET_MATERIAL_AMOUNT*4) build_path = /obj/item/rcd_ammo category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -114,7 +114,7 @@ desc = "Adds computer and machine frame designs to the RCD." id = "rcd_upgrade_frames" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 1500, /datum/material/titanium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/rcd_upgrade/frames category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -126,7 +126,7 @@ desc = "Adds the ability to produce simple circuits using the RCD." id = "rcd_upgrade_simple_circuits" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 1500, /datum/material/titanium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/rcd_upgrade/simple_circuits category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -138,7 +138,7 @@ desc = "Adds the ability to furnish areas using the RCD." id = "rcd_upgrade_furnishing" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 1500, /datum/material/titanium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/rcd_upgrade/furnishing category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -150,7 +150,7 @@ desc = "Upgrades the RCD to be able to pull materials from the ore silo. The RCD must be linked to the silo using a multitool before it will function." id = "rcd_upgrade_silo_link" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass = 2500, /datum/material/silver = 2500, /datum/material/titanium = 2500, /datum/material/bluespace = 2500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/titanium =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT*1.25) build_path = /obj/item/rcd_upgrade/silo_link category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -162,7 +162,7 @@ desc = "Adds reverse wrench mode to the RPD. Attention, due to budget cuts, the mode is hard linked to the destroy mode control button." id = "rpd_upgrade_unwrench" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.25) build_path = /obj/item/rpd_upgrade/unwrench category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -174,7 +174,7 @@ desc = "A tool that can portable and standing lighting orbs and glowsticks." id = "rld_mini" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000, /datum/material/glass = 10000, /datum/material/plastic = 8000, /datum/material/gold = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*10, /datum/material/glass =SHEET_MATERIAL_AMOUNT*5, /datum/material/plastic =SHEET_MATERIAL_AMOUNT*4, /datum/material/gold =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/construction/rld/mini category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -187,7 +187,7 @@ id = "gene_shears" build_path = /obj/item/geneshears build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=4000, /datum/material/uranium=1500, /datum/material/silver=500) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2, /datum/material/uranium=HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver=SMALL_MATERIAL_AMOUNT*5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY_ADVANCED ) @@ -197,7 +197,7 @@ name = "Research Plumbing Constructor" id = "plumbing_rcd_sci" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*37.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*18.75, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/construction/plumbing/research category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PLUMBING @@ -208,7 +208,7 @@ name = "Service Plumbing Constructor" id = "plumbing_rcd_service" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*37.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*18.75, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/construction/plumbing/service category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PLUMBING @@ -219,7 +219,7 @@ name = "Biopsy Tool" id = "biopsy_tool" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*2, /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.5) build_path = /obj/item/biopsy_tool category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_XENOBIOLOGY @@ -236,7 +236,7 @@ id = "alien_wrench" build_path = /obj/item/wrench/abductor build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) @@ -248,7 +248,7 @@ id = "alien_wirecutters" build_path = /obj/item/wirecutters/abductor build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) @@ -260,7 +260,7 @@ id = "alien_screwdriver" build_path = /obj/item/screwdriver/abductor build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) @@ -272,7 +272,7 @@ id = "alien_crowbar" build_path = /obj/item/crowbar/abductor build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) @@ -284,7 +284,7 @@ id = "alien_welder" build_path = /obj/item/weldingtool/abductor build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 5000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) @@ -296,7 +296,7 @@ id = "alien_multitool" build_path = /obj/item/multitool/abductor build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 5000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) @@ -312,7 +312,7 @@ id = "alien_scalpel" build_path = /obj/item/scalpel/alien build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -324,7 +324,7 @@ id = "alien_hemostat" build_path = /obj/item/hemostat/alien build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -336,7 +336,7 @@ id = "alien_retractor" build_path = /obj/item/retractor/alien build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -348,7 +348,7 @@ id = "alien_saw" build_path = /obj/item/circular_saw/alien build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -360,7 +360,7 @@ id = "alien_drill" build_path = /obj/item/surgicaldrill/alien build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -372,7 +372,7 @@ id = "alien_cautery" build_path = /obj/item/cautery/alien build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -384,7 +384,7 @@ id = "wirebrush" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOLS) - materials = list(/datum/material/iron = 200, /datum/material/glass = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/wirebrush category = list(RND_CATEGORY_TOOLS) departmental_flags = DEPARTMENT_BITFLAG_SERVICE @@ -397,7 +397,7 @@ desc = "A wrench that can unbolt airlocks regardless of power status." id = "bolter_wrench" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/wrench/bolter category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 9c6dde255c1..ace647f2df4 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -16,7 +16,7 @@ desc = "Designed to quickly reload revolvers. TRAC bullets embed a tracking implant within the target's body. The implant's signal is incompatible with teleporters." id = "c38_trac" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000, /datum/material/silver = 5000, /datum/material/gold = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/silver =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ammo_box/c38/trac category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -28,7 +28,7 @@ desc = "Designed to quickly reload revolvers. Hot Shot bullets contain an incendiary payload." id = "c38_hotshot" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000, /datum/material/plasma = 5000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/ammo_box/c38/hotshot category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -40,7 +40,7 @@ desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload." id = "c38_iceblox" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000, /datum/material/plasma = 5000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/ammo_box/c38/iceblox category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -52,7 +52,7 @@ desc = "Designed to quickly reload revolvers. Rubber bullets are bouncy and less-than-lethal." id = "c38_rubber" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10) build_path = /obj/item/ammo_box/c38/match/bouncy category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -106,7 +106,7 @@ desc = "A 20 round magazine for the out of date WT-550 Autorifle." id = "mag_autorifle" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2) build_path = /obj/item/ammo_box/magazine/wt550m9 category = list("Ammo") departmental_flags = DEPARTMENT_BITFLAG_SECURITY @@ -115,7 +115,7 @@ name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." id = "mag_autorifle_ap" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6) build_path = /obj/item/ammo_box/magazine/wt550m9/wtap departmental_flags = DEPARTMENT_BITFLAG_SECURITY @@ -123,7 +123,7 @@ name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." id = "mag_autorifle_ic" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic departmental_flags = DEPARTMENT_BITFLAG_SECURITY @@ -132,7 +132,7 @@ desc = "This safety firing pin allows firearms to be operated within proximity to a firing range." id = "pin_testing" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 300) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/firing_pin/test_range category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_FIRING_PINS @@ -144,7 +144,7 @@ desc = "This is a security firing pin which only authorizes users who are mindshield-implanted." id = "pin_loyalty" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/silver = 600, /datum/material/diamond = 600, /datum/material/uranium = 200) + materials = list(/datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 6, /datum/material/uranium =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/firing_pin/implant/mindshield category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_FIRING_PINS @@ -156,7 +156,7 @@ desc = "This firing pin only shoots while ya ain't on station, fair dinkum!" id = "pin_explorer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/silver = 1000, /datum/material/gold = 1000, /datum/material/iron = 500) + materials = list(/datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/firing_pin/explorer category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_FIRING_PINS @@ -168,7 +168,7 @@ desc = "The kit for a high-tech cannon that fires internal, reusable bolt cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers." id = "stunrevolver" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 10000, /datum/material/silver = 10000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 5) build_path = /obj/item/weaponcrafting/gunkit/tesla category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -181,7 +181,7 @@ desc = "The kit for an energy gun with an experimental miniaturized reactor." id = "nuclear_gun" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 2000, /datum/material/uranium = 3000, /datum/material/titanium = 1000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/weaponcrafting/gunkit/nuclear category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -194,7 +194,7 @@ desc = "An advanced riot shield made of lightweight materials that collapses for easy storage." id = "tele_shield" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 4000, /datum/material/silver = 300, /datum/material/titanium = 200) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/silver =SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/shield/riot/tele category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MELEE @@ -207,7 +207,7 @@ desc = "The gunkit for a powerful long ranged anti-material rifle that fires charged particle beams to obliterate targets." id = "beamrifle" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 5000, /datum/material/diamond = 5000, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold = 5000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 4, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2.25, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/weaponcrafting/gunkit/beam_rifle category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -220,7 +220,7 @@ desc = "Your opponent will bubble into a messy pile of goop." id = "decloner" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/gold = 5000, /datum/material/uranium = 10000) + materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 5) build_path = /obj/item/weaponcrafting/gunkit/decloner category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -233,7 +233,7 @@ desc = "A gun that fires many syringes." id = "rapidsyringe" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/gun/syringe/rapidsyringe category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -245,7 +245,7 @@ desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want id = "temp_gun" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 500, /datum/material/silver = 3000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/weaponcrafting/gunkit/temperature category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -258,7 +258,7 @@ desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life." id = "flora_gun" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 500, /datum/material/uranium = 2000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/uranium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/gun/energy/floragun category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY_ADVANCED @@ -270,7 +270,7 @@ desc = "A grenade that affects a larger area and use larger containers." id = "large_grenade" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/grenade/chem_grenade/large category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -282,7 +282,7 @@ desc = "An advanced grenade that is able to self ignite its mixture." id = "pyro_grenade" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/plasma = 500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/grenade/chem_grenade/pyro category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -294,7 +294,7 @@ desc = "An advanced grenade that rapidly cools its contents upon detonation." id = "cryo_grenade" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/silver = 500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/grenade/chem_grenade/cryo category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -306,7 +306,7 @@ desc = "An advanced grenade that can be detonated several times, best used with a repeating igniter." id = "adv_grenade" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/grenade/chem_grenade/adv_release category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -318,7 +318,7 @@ desc = "Not quite as menacing as it sounds" id = "xray_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/gold = 5000, /datum/material/uranium = 4000, /datum/material/iron = 5000, /datum/material/titanium = 2000, /datum/material/bluespace = 2000) + materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 2, /datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/weaponcrafting/gunkit/xray category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -331,7 +331,7 @@ desc = "How to Dismantle a Cyborg: The Gun." id = "ioncarbine" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/silver = 6000, /datum/material/iron = 8000, /datum/material/uranium = 2000) + materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT * 3, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4, /datum/material/uranium =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/weaponcrafting/gunkit/ion category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -344,7 +344,7 @@ desc = "A projector that emits high density quantum-coupled bluespace beams. Requires a bluespace anomaly core to function." id = "wormholeprojector" build_type = PROTOLATHE - materials = list(/datum/material/silver = 2000, /datum/material/iron = 5000, /datum/material/diamond = 2000, /datum/material/bluespace = 3000) + materials = list(/datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/diamond =SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/gun/energy/wormhole_projector category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -356,7 +356,7 @@ desc = "A stunning shell for a shotgun." id = "stunshell" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/ammo_casing/shotgun/stunslug category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -369,7 +369,7 @@ Does nothing on its own." id = "techshotshell" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1000, /datum/material/glass = 200) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/ammo_casing/shotgun/techshell category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -381,7 +381,7 @@ desc = "A reverse-engineered suppressor that fits on most small arms with threaded barrels." id = "suppressor" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2000, /datum/material/silver = 500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/suppressor category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS @@ -393,7 +393,7 @@ desc = "A multi-mode device that blasts one-point bluespace-gravitational bolts that locally distort gravity. Requires a gravitational anomaly core to function." id = "gravitygun" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/silver = 8000, /datum/material/uranium = 8000, /datum/material/glass = 12000, /datum/material/iron = 12000, /datum/material/diamond = 3000, /datum/material/bluespace = 3000) + materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT * 4, /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 4, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 6, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 6, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/gun/energy/gravity_gun category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -405,7 +405,7 @@ desc = "A kit to reverse-engineer a proto-kinetic accelerator into an energy crossbow, favored by syndicate infiltration teams and carp hunters." id = "largecrossbow" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 5000, /datum/material/glass = 1500, /datum/material/uranium = 1500, /datum/material/silver = 1500) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/weaponcrafting/gunkit/ebow category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS @@ -418,7 +418,7 @@ desc = "A mace fit for a cleric. Useful for bypassing plate armor, but too bulky for much else." id = "cleric_mace" build_type = AUTOLATHE - materials = list(MAT_CATEGORY_ITEM_MATERIAL = 12000) + materials = list(MAT_CATEGORY_ITEM_MATERIAL = SHEET_MATERIAL_AMOUNT * 6) build_path = /obj/item/melee/cleric_mace category = list(RND_CATEGORY_IMPORTED) @@ -427,7 +427,7 @@ desc = "Uses reverse flow gravitodynamics to flip its personal gravity back to the thrower mid-flight. Also functions similar to a stun baton." id = "stun_boomerang" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 4000, /datum/material/silver = 10000, /datum/material/gold = 2000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 5, /datum/material/gold =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/melee/baton/security/boomerang category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED diff --git a/code/modules/research/designs/wiremod_designs.dm b/code/modules/research/designs/wiremod_designs.dm index eeb739f2b3a..7e07a641f82 100644 --- a/code/modules/research/designs/wiremod_designs.dm +++ b/code/modules/research/designs/wiremod_designs.dm @@ -7,7 +7,7 @@ category = list( RND_CATEGORY_CIRCUITRY + RND_CATEGORY_CIRCUITRY_CORE ) - materials = list(/datum/material/glass = 1000, /datum/material/iron = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/circuit_multitool @@ -19,7 +19,7 @@ category = list( RND_CATEGORY_CIRCUITRY + RND_CATEGORY_CIRCUITRY_CORE ) - materials = list(/datum/material/glass = 1000, /datum/material/iron = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/usb_cable @@ -39,7 +39,7 @@ name = "Component ( NULL ENTRY )" desc = "A component that goes into an integrated circuit." build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass = 1000) + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_COMPONENTS @@ -451,7 +451,7 @@ desc = "A handheld shell with one big button." id = "compact_remote_shell" build_path = /obj/item/compact_remote - materials = list(/datum/material/glass = 2000, /datum/material/iron = 5000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) build_type = COMPONENT_PRINTER category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -463,7 +463,7 @@ id = "controller_shell" build_path = /obj/item/controller build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass = 2000, /datum/material/iron = 7000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 7000) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -474,7 +474,7 @@ id = "scanner_shell" build_path = /obj/item/wiremod_scanner build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass = 2000, /datum/material/iron = 7000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 7000) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -484,7 +484,7 @@ desc = "A handheld shell that allows the user to input a string" id = "keyboard_shell" build_path = /obj/item/keyboard_shell - materials = list(/datum/material/glass = 2000, /datum/material/iron = 10000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000) build_type = COMPONENT_PRINTER category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -496,7 +496,7 @@ id = "gun_shell" build_path = /obj/item/gun/energy/wiremod_gun build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass = 2000, /datum/material/iron = 10000, /datum/material/plasma = 100) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000, /datum/material/plasma =SMALL_MATERIAL_AMOUNT) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -507,7 +507,7 @@ id = "bot_shell" build_path = /obj/item/shell/bot build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass = 2000, /datum/material/iron = 10000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -518,7 +518,7 @@ id = "money_bot_shell" build_path = /obj/item/shell/money_bot build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass = 2000, /datum/material/iron = 10000, /datum/material/gold = 50) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000, /datum/material/gold =SMALL_MATERIAL_AMOUNT*0.5) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -530,9 +530,9 @@ build_path = /obj/item/shell/drone build_type = COMPONENT_PRINTER materials = list( - /datum/material/glass = 2000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 11000, - /datum/material/gold = 500, + /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, ) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -543,9 +543,9 @@ desc = "A very large shell that cannot be moved around. Stores the most components." id = "server_shell" materials = list( - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/iron = 15000, - /datum/material/gold = 1500, + /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, ) build_path = /obj/item/shell/server build_type = COMPONENT_PRINTER @@ -558,7 +558,7 @@ desc = "A door shell that cannot be moved around when assembled." id = "door_shell" materials = list( - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/iron = 15000, ) build_path = /obj/item/shell/airlock @@ -572,7 +572,7 @@ desc = "A dispenser shell that can dispense items." id = "dispenser_shell" materials = list( - /datum/material/glass = 5000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/iron = 15000, ) build_path = /obj/item/shell/dispenser @@ -586,7 +586,7 @@ desc = "An implant that can be placed in a user's head to control circuits using their brain." id = "bci_shell" materials = list( - /datum/material/glass = 2000, + /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 8000, ) build_path = /obj/item/shell/bci @@ -623,7 +623,7 @@ name = "Assembly Shell" desc = "An assembly shell that can be attached to wires and other assemblies." id = "assembly_shell" - materials = list(/datum/material/glass = 2000, /datum/material/iron = 5000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/assembly/wiremod build_type = COMPONENT_PRINTER category = list( @@ -634,7 +634,7 @@ name = "MOD Module Shell" desc = "A module shell that allows a circuit to be inserted into, and interface with, a MODsuit." id = "module_shell" - materials = list(/datum/material/glass = 2000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/mod/module/circuit build_type = COMPONENT_PRINTER category = list( diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index d0ac21f7f91..574b4d1c57f 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -349,7 +349,7 @@ var/count = mat_container.retrieve_sheets(text2num(eject_amt), eject_sheet, drop_location()) var/list/matlist = list() - matlist[eject_sheet] = MINERAL_MATERIAL_AMOUNT * count + matlist[eject_sheet] = SHEET_MATERIAL_AMOUNT * count materials.silo_log(src, "ejected", -count, "sheets", matlist) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 6c5b0392a5a..4deb1e9ec46 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -127,7 +127,7 @@ var/stack_name if(istype(item_inserted, /obj/item/stack/ore/bluespace_crystal)) stack_name = "bluespace" - use_power(MINERAL_MATERIAL_AMOUNT / 10) + use_power(SHEET_MATERIAL_AMOUNT / 10) else var/obj/item/stack/S = item_inserted stack_name = S.name diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm index 16f0ed7e646..8205fc230c4 100644 --- a/code/modules/research/research_disk.dm +++ b/code/modules/research/research_disk.dm @@ -3,7 +3,7 @@ name = "technology disk" desc = "A disk for storing technology data for further research." icon_state = "datadisk0" - custom_materials = list(/datum/material/iron=300, /datum/material/glass=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass=SMALL_MATERIAL_AMOUNT) var/datum/techweb/stored_research /obj/item/disk/tech_disk/Initialize(mapload) diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index f0362d4f0d8..7f14aa37ec0 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -261,32 +261,32 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good name = "capacitor" desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) /obj/item/stock_parts/scanning_module name = "scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module" - custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/manipulator name = "micro-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "micro_mani" - custom_materials = list(/datum/material/iron=30) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3) base_name = "manipulator" /obj/item/stock_parts/micro_laser name = "micro-laser" desc = "A tiny laser used in certain devices." icon_state = "micro_laser" - custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/matter_bin name = "matter bin" desc = "A container designed to hold compressed matter awaiting reconstruction." icon_state = "matter_bin" - custom_materials = list(/datum/material/iron=80) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.8) //Rating 2 @@ -296,7 +296,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "adv_capacitor" rating = 2 energy_rating = 3 - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) /obj/item/stock_parts/scanning_module/adv name = "advanced scanning module" @@ -304,7 +304,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "adv_scan_module" rating = 2 energy_rating = 3 - custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/manipulator/nano name = "nano-manipulator" @@ -312,7 +312,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "nano_mani" rating = 2 energy_rating = 3 - custom_materials = list(/datum/material/iron=30) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3) /obj/item/stock_parts/micro_laser/high name = "high-power micro-laser" @@ -320,7 +320,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "high_micro_laser" rating = 2 energy_rating = 3 - custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/matter_bin/adv name = "advanced matter bin" @@ -328,7 +328,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "advanced_matter_bin" rating = 2 energy_rating = 3 - custom_materials = list(/datum/material/iron=80) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.8) //Rating 3 @@ -338,7 +338,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "super_capacitor" rating = 3 energy_rating = 5 - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) /obj/item/stock_parts/scanning_module/phasic name = "phasic scanning module" @@ -346,7 +346,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "super_scan_module" rating = 3 energy_rating = 5 - custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/manipulator/pico name = "pico-manipulator" @@ -354,7 +354,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "pico_mani" rating = 3 energy_rating = 5 - custom_materials = list(/datum/material/iron=30) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3) /obj/item/stock_parts/micro_laser/ultra name = "ultra-high-power micro-laser" @@ -362,7 +362,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good desc = "A tiny laser used in certain devices." rating = 3 energy_rating = 5 - custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/matter_bin/super name = "super matter bin" @@ -370,7 +370,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "super_matter_bin" rating = 3 energy_rating = 5 - custom_materials = list(/datum/material/iron=80) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.8) //Rating 4 @@ -380,7 +380,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "quadratic_capacitor" rating = 4 energy_rating = 10 - custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) /obj/item/stock_parts/scanning_module/triphasic name = "triphasic scanning module" @@ -388,7 +388,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "triphasic_scan_module" rating = 4 energy_rating = 10 - custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/manipulator/femto name = "femto-manipulator" @@ -396,7 +396,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "femto_mani" rating = 4 energy_rating = 10 - custom_materials = list(/datum/material/iron=30) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3) /obj/item/stock_parts/micro_laser/quadultra name = "quad-ultra micro-laser" @@ -404,7 +404,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good desc = "A tiny laser used in certain devices." rating = 4 energy_rating = 10 - custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2) /obj/item/stock_parts/matter_bin/bluespace name = "bluespace matter bin" @@ -412,7 +412,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "bluespace_matter_bin" rating = 4 energy_rating = 10 - custom_materials = list(/datum/material/iron=80) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.8) // Subspace stock parts @@ -420,43 +420,43 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good name = "subspace ansible" icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." - custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) /obj/item/stock_parts/subspace/filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." - custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) /obj/item/stock_parts/subspace/amplifier name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." - custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) /obj/item/stock_parts/subspace/treatment name = "subspace treatment disk" icon_state = "treatment_disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." - custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) /obj/item/stock_parts/subspace/analyzer name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." - custom_materials = list(/datum/material/iron=30, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) /obj/item/stock_parts/subspace/crystal name = "ansible crystal" icon_state = "ansible_crystal" desc = "A crystal made from pure glass used to transmit laser databursts to subspace." - custom_materials = list(/datum/material/glass=50) + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) /obj/item/stock_parts/subspace/transmitter name = "subspace transmitter" icon_state = "subspace_transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." - custom_materials = list(/datum/material/iron=50) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5) // Misc. Parts @@ -464,13 +464,13 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good name = "card reader" icon_state = "card_reader" desc = "A small magnetic card reader, used for devices that take and transmit holocredits." - custom_materials = list(/datum/material/iron=50, /datum/material/glass=10) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) /obj/item/stock_parts/water_recycler name = "water recycler" icon_state = "water_recycler" desc = "A chemical reclaimation component, which serves to re-accumulate and filter water over time." - custom_materials = list(/datum/material/plastic=200, /datum/material/iron=50) + custom_materials = list(/datum/material/plastic=SMALL_MATERIAL_AMOUNT * 2, /datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5) /obj/item/research//Makes testing much less of a pain -Sieve name = "research" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 6d8344d5244..097f927dc2a 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -1020,7 +1020,7 @@ inhand_icon_state = "tile-bluespace" w_class = WEIGHT_CLASS_NORMAL force = 6 - mats_per_unit = list(/datum/material/iron=500) + mats_per_unit = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5) throwforce = 10 throw_speed = 3 throw_range = 7 @@ -1037,7 +1037,7 @@ inhand_icon_state = "tile-sepia" w_class = WEIGHT_CLASS_NORMAL force = 6 - mats_per_unit = list(/datum/material/iron=500) + mats_per_unit = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5) throwforce = 10 throw_speed = 0.1 throw_range = 28 diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 07d1bebc207..4660ab505c0 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -187,7 +187,7 @@ if(statue.name == initial(statue.name)) //statue has not been set up statue.name = "statue of [becoming_statue.real_name]" statue.desc = "statue depicting [becoming_statue.real_name]" - statue.set_custom_materials(list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT*5)) + statue.set_custom_materials(list(/datum/material/silver=SHEET_MATERIAL_AMOUNT*5)) if(is_statue) statue.visible_message(span_danger("[statue] becomes animated!")) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index cd5145a75a2..3a5ed229c5f 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -124,7 +124,7 @@ if(tool && tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it to_chat(user, span_warning("This step requires a different tool!")) return TRUE - + return FALSE /datum/surgery/proc/get_surgery_step() @@ -166,14 +166,14 @@ name = "Surgery Procedure Disk" desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console." icon_state = "datadisk1" - custom_materials = list(/datum/material/iron=300, /datum/material/glass=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass=SMALL_MATERIAL_AMOUNT) var/list/surgeries /obj/item/disk/surgery/debug name = "Debug Surgery Disk" desc = "A disk that contains all existing surgery procedures." icon_state = "datadisk1" - custom_materials = list(/datum/material/iron=300, /datum/material/glass=100) + custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass=SMALL_MATERIAL_AMOUNT) /obj/item/disk/surgery/debug/Initialize(mapload) . = ..() diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index ed40565596c..76a313020f7 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -6,7 +6,7 @@ inhand_icon_state = "retractor" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_TINY @@ -26,7 +26,7 @@ inhand_icon_state = "hemostat" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.25) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_TINY @@ -48,7 +48,7 @@ inhand_icon_state = "cautery" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 2500, /datum/material/glass = 750) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass = SMALL_MATERIAL_AMOUNT*7.5) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_TINY @@ -72,7 +72,7 @@ inhand_icon_state = "e_cautery" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 2000, /datum/material/plasma = 2000, /datum/material/uranium = 3000, /datum/material/titanium = 3000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/uranium = SHEET_MATERIAL_AMOUNT*1.5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT*1.5) hitsound = 'sound/items/welder.ogg' w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.7 @@ -116,7 +116,7 @@ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' hitsound = 'sound/weapons/circsawhit.ogg' - custom_materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*3) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL force = 15 @@ -163,7 +163,7 @@ throwforce = 5 throw_speed = 3 throw_range = 5 - custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -207,7 +207,7 @@ throwforce = 9 throw_speed = 2 throw_range = 5 - custom_materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*3) attack_verb_continuous = list("attacks", "slashes", "saws", "cuts") attack_verb_simple = list("attack", "slash", "saw", "cut") sharpness = SHARP_EDGED @@ -319,7 +319,7 @@ inhand_icon_state = "e_scalpel" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 6000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 1500, /datum/material/diamond = 200, /datum/material/titanium = 4000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =SMALL_MATERIAL_AMOUNT * 2, /datum/material/titanium = SHEET_MATERIAL_AMOUNT*2) hitsound = 'sound/weapons/blade1.ogg' force = 16 w_class = WEIGHT_CLASS_NORMAL @@ -368,7 +368,7 @@ name = "mechanical pinches" desc = "An agglomerate of rods and gears." icon = 'icons/obj/medical/surgery_tools.dmi' - custom_materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium = 5000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*2, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) icon_state = "adv_retractor" inhand_icon_state = "adv_retractor" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -416,7 +416,7 @@ throwforce = 6 throw_speed = 2 throw_range = 5 - custom_materials = list(/datum/material/iron=8000, /datum/material/titanium=6000) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*4, /datum/material/titanium=SHEET_MATERIAL_AMOUNT*3) attack_verb_continuous = list("shears", "snips") attack_verb_simple = list("shear", "snip") sharpness = SHARP_EDGED @@ -490,7 +490,7 @@ icon_state = "bonesetter" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 2500) + custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_SMALL @@ -506,7 +506,7 @@ icon_state = "bloodfilter" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - custom_materials = list(/datum/material/iron=2000, /datum/material/glass=1500, /datum/material/silver=500) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT, /datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver=SMALL_MATERIAL_AMOUNT*5) item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_NORMAL attack_verb_continuous = list("pumps", "siphons") diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index a34f09642b6..c550e0cbeda 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -498,7 +498,7 @@ equip_cooldown = 0 ///The medical gun doing the actual healing. yes its wierd but its better than copypasting the entire thing var/obj/item/gun/medbeam/mech/medigun - custom_materials = list(/datum/material/iron = 15000, /datum/material/glass = 8000, /datum/material/plasma = 3000, /datum/material/gold = 8000, /datum/material/diamond = 2000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4, /datum/material/plasma = SHEET_MATERIAL_AMOUNT*1.5, /datum/material/gold = SHEET_MATERIAL_AMOUNT*4, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) /obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/Initialize(mapload) . = ..() diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm index 8e24f802db2..3f98e901c4e 100644 --- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm @@ -329,9 +329,9 @@ /obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/sheet/P, mob/user) if(P.type == fuel.type && P.amount > 0) - var/to_load = max(max_fuel - fuel.amount*MINERAL_MATERIAL_AMOUNT,0) + var/to_load = max(max_fuel - fuel.amount*SHEET_MATERIAL_AMOUNT,0) if(to_load) - var/units = min(max(round(to_load / MINERAL_MATERIAL_AMOUNT),1),P.amount) + var/units = min(max(round(to_load / SHEET_MATERIAL_AMOUNT),1),P.amount) fuel.amount += units P.use(units) to_chat(user, "[icon2html(src, user)][span_notice("[units] unit\s of [fuel] successfully loaded.")]") @@ -365,7 +365,7 @@ if(cur_charge < chassis.cell.maxcharge) use_fuel = fuelrate_active chassis.give_power(rechargerate * seconds_per_tick) - fuel.amount -= min(seconds_per_tick * use_fuel / MINERAL_MATERIAL_AMOUNT, fuel.amount) + fuel.amount -= min(seconds_per_tick * use_fuel / SHEET_MATERIAL_AMOUNT, fuel.amount) /////////////////////////////////////////// THRUSTERS ///////////////////////////////////////////// diff --git a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm index deb79bb889e..ce644adfcac 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm @@ -47,7 +47,7 @@ name = "incendiary ammo box" desc = "A box of incendiary ammunition for use with exosuit weapons." icon_state = "incendiary" - custom_materials = list(/datum/material/iron=6000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT*3) rounds = 24 ammo_type = MECHA_AMMO_INCENDIARY @@ -55,7 +55,7 @@ name = "scattershot ammo box" desc = "A box of scaled-up buckshot, for use in exosuit shotguns." icon_state = "scattershot" - custom_materials = list(/datum/material/iron=6000) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT*3) rounds = 40 ammo_type = MECHA_AMMO_BUCKSHOT @@ -63,7 +63,7 @@ name = "machine gun ammo box" desc = "A box of linked ammunition, designed for the Ultra AC 2 exosuit weapon." icon_state = "lmg" - custom_materials = list(/datum/material/iron = 4000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) rounds = 300 ammo_type = MECHA_AMMO_LMG @@ -83,7 +83,7 @@ name = "precision explosive missiles" desc = "A box of large missiles, ready for loading into a PEP-6 exosuit missile rack." icon_state = "missile_br" - custom_materials = list(/datum/material/iron=8000,/datum/material/gold=500) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*4,/datum/material/gold=SMALL_MATERIAL_AMOUNT*5) rounds = 6 direct_load = TRUE load_audio = 'sound/weapons/gun/general/mag_bullet_insert.ogg' @@ -93,7 +93,7 @@ name = "launchable flashbangs" desc = "A box of smooth flashbangs, for use with a large exosuit launcher. Cannot be primed by hand." icon_state = "flashbang" - custom_materials = list(/datum/material/iron=4000,/datum/material/gold=500) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2,/datum/material/gold=SMALL_MATERIAL_AMOUNT*5) rounds = 6 ammo_type = MECHA_AMMO_FLASHBANG @@ -101,7 +101,7 @@ name = "launchable flashbang clusters" desc = "A box of clustered flashbangs, for use with a specialized exosuit cluster launcher. Cannot be primed by hand." icon_state = "clusterbang" - custom_materials = list(/datum/material/iron=6000,/datum/material/gold=1500,/datum/material/uranium=1500) + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*3,/datum/material/gold=HALF_SHEET_MATERIAL_AMOUNT * 1.5,/datum/material/uranium=HALF_SHEET_MATERIAL_AMOUNT * 1.5) rounds = 3 direct_load = TRUE ammo_type = MECHA_AMMO_CLUSTERBANG diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index e6f6434b2c9..e3a0ac87a25 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -430,7 +430,7 @@ var/list/new_material_content = list() for(var/datum/material/current_material in A.custom_materials) if(istype(current_material, /datum/material/iron)) //we can flatten an empty ammo box into a sheet of iron (2000 units) so we have to make sure the box always has this amount at minimum - new_material_content[current_material] = (A.custom_materials[current_material] - 2000) * (A.rounds / initial(A.rounds)) + 2000 + new_material_content[current_material] = (A.custom_materials[current_material] - SHEET_MATERIAL_AMOUNT) * (A.rounds / initial(A.rounds)) + SHEET_MATERIAL_AMOUNT else new_material_content[current_material] = A.custom_materials[current_material] * (A.rounds / initial(A.rounds)) A.set_custom_materials(new_material_content) @@ -447,7 +447,7 @@ qdel(A) return TRUE A.rounds = 0 - A.set_custom_materials(list(/datum/material/iron=2000)) + A.set_custom_materials(list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)) A.update_appearance() return TRUE if(!fail_chat_override) diff --git a/code/modules/vehicles/mecha/mecha_ui.dm b/code/modules/vehicles/mecha/mecha_ui.dm index c1735a56050..d9f21265040 100644 --- a/code/modules/vehicles/mecha/mecha_ui.dm +++ b/code/modules/vehicles/mecha/mecha_ui.dm @@ -29,7 +29,7 @@ /obj/vehicle/sealed/mecha/ui_static_data(mob/user) var/list/data = list() data["cabin_dangerous_highpressure"] = WARNING_HIGH_PRESSURE - data["mineral_material_amount"] = MINERAL_MATERIAL_AMOUNT + data["SHEET_MATERIAL_AMOUNT"] = SHEET_MATERIAL_AMOUNT //map of relevant flags to check tgui side, not every flag needs to be here data["mechflag_keys"] = list( "ADDING_ACCESS_POSSIBLE" = ADDING_ACCESS_POSSIBLE, diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 9278d78af80..aaf27481c70 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -88,7 +88,7 @@ overlay_icon = "gold_wheelchair_overlay" max_integrity = 200 armor_type = /datum/armor/wheelchair_gold - custom_materials = list(/datum/material/gold = 10000) + custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT*5) foldabletype = /obj/item/wheelchair/gold /obj/item/wheelchair @@ -101,7 +101,7 @@ righthand_file = 'icons/mob/inhands/items_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL force = 8 //Force is same as a chair - custom_materials = list(/datum/material/iron = 10000) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5) ///The wheelchair vehicle type we create when we unfold this chair var/unfolded_type = /obj/vehicle/ridden/wheelchair @@ -115,7 +115,7 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' force = 10 - custom_materials = list(/datum/material/gold = 10000) + custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT*5) unfolded_type = /obj/vehicle/ridden/wheelchair/gold /datum/armor/wheelchair_gold diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index e866e959c1c..3242b38efaa 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -1433,7 +1433,7 @@ max_integrity = 700 max_loaded_items = 40 light_mask = "greed-light-mask" - custom_materials = list(/datum/material/gold = MINERAL_MATERIAL_AMOUNT * 5) + custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT * 5) /obj/machinery/vending/custom/greed/Initialize(mapload) . = ..() diff --git a/code/modules/wiremod/core/usb_cable.dm b/code/modules/wiremod/core/usb_cable.dm index d188f03c58a..339b2643f00 100644 --- a/code/modules/wiremod/core/usb_cable.dm +++ b/code/modules/wiremod/core/usb_cable.dm @@ -9,7 +9,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' base_icon_state = "coil" w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron = 75) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75) /// The currently connected circuit var/obj/item/integrated_circuit/attached_circuit