From e9d23225655a1a46829fa0f441e94c1f00c97b0b Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Fri, 10 Jul 2026 00:24:13 +0200 Subject: [PATCH] Makes material costs use sheets amount define (#19584) * Material defines * Move these * Food sytnhetizer --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/__defines/materials.dm | 11 +- code/__defines/research.dm | 3 - code/defines/obj/weapon.dm | 76 +++--- code/game/gamemodes/nuclear/pinpointer.dm | 2 +- code/game/machinery/camera/camera_assembly.dm | 2 +- .../machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/floor_light.dm | 2 +- code/game/mecha/equipment/tools/tools.dm | 2 +- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/game/mecha/mecha_parts.dm | 14 +- code/game/objects/items.dm | 2 +- code/game/objects/items/apc_frame.dm | 2 +- code/game/objects/items/bells.dm | 2 +- .../objects/items/devices/advnifrepair.dm | 2 +- code/game/objects/items/devices/binoculars.dm | 2 +- .../objects/items/devices/body_snatcher_vr.dm | 2 +- .../devices/communicator/communicator.dm | 2 +- code/game/objects/items/devices/debugger.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 4 +- code/game/objects/items/devices/gps.dm | 2 +- .../objects/items/devices/laserpointer.dm | 2 +- .../objects/items/devices/lightreplacer.dm | 2 +- code/game/objects/items/devices/multitool.dm | 2 +- code/game/objects/items/devices/powersink.dm | 2 +- .../items/devices/radio/electropack.dm | 2 +- .../objects/items/devices/radio/headset.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 2 +- .../objects/items/devices/scanners/gas.dm | 2 +- .../objects/items/devices/scanners/health.dm | 2 +- .../devices/scanners/mass_spectrometer.dm | 2 +- .../items/devices/scanners/motion_tracker.dm | 2 +- .../items/devices/scanners/reagents.dm | 2 +- .../items/devices/scanners/sleevemate.dm | 2 +- .../objects/items/devices/scanners/slime.dm | 2 +- .../objects/items/devices/suit_cooling.dm | 2 +- code/game/objects/items/devices/t_scanner.dm | 6 +- .../objects/items/devices/taperecorder.dm | 4 +- code/game/objects/items/ghost_hunting/ammo.dm | 4 +- code/game/objects/items/glassjar.dm | 4 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/weapons/AI_modules.dm | 2 +- code/game/objects/items/weapons/RCD.dm | 4 +- code/game/objects/items/weapons/RPD_vr.dm | 2 +- code/game/objects/items/weapons/canes.dm | 2 +- .../circuitboards/computer/camera_monitor.dm | 2 +- .../circuitboards/machinery/engineering.dm | 2 +- code/game/objects/items/weapons/ecigs.dm | 2 +- .../objects/items/weapons/extinguisher.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 2 +- .../items/weapons/implants/implanter.dm | 2 +- .../objects/items/weapons/material/knives.dm | 2 +- code/game/objects/items/weapons/paint.dm | 2 +- code/game/objects/items/weapons/shields.dm | 2 +- .../objects/items/weapons/surgery_tools.dm | 14 +- .../objects/items/weapons/teleportation.dm | 4 +- .../game/objects/items/weapons/tools/brass.dm | 2 +- .../objects/items/weapons/tools/crowbar.dm | 4 +- .../items/weapons/tools/screwdriver.dm | 2 +- .../items/weapons/tools/transforming.dm | 4 +- .../items/weapons/tools/weldingtool.dm | 10 +- .../items/weapons/tools/wirecutters.dm | 2 +- .../objects/items/weapons/tools/wrench.dm | 2 +- code/game/objects/items/weapons/traps.dm | 2 +- code/game/objects/items/weapons/trays.dm | 2 +- code/game/turfs/simulated/floor_types_eris.dm | 20 +- code/modules/anomalies/anomaly.dm | 2 +- code/modules/assembly/assembly.dm | 2 +- code/modules/assembly/igniter.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/assembly/timer.dm | 2 +- code/modules/assembly/voice.dm | 2 +- .../clothing/accessories/accessory_vr.dm | 2 +- code/modules/clothing/accessories/hands.dm | 2 +- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/head/misc_special.dm | 2 +- .../spacesuits/rig/modules/modules.dm | 2 +- code/modules/detectivework/tools/uvlight.dm | 2 +- code/modules/economy/coins.dm | 32 +-- .../food/drinkingglass/drinkingglass.dm | 2 +- .../modules/food/drinkingglass/glass_types.dm | 16 +- code/modules/food/drinkingglass/metaglass.dm | 2 +- .../food/drinkingglass/serving_glasses.dm | 4 +- code/modules/food/drinkingglass/shaker.dm | 2 +- .../modules/food/food/drinks/drinkingglass.dm | 6 +- .../cooking_machines/foodsynthesizer.dm | 4 +- code/modules/mining/drilling/scanner.dm | 4 +- code/modules/mining/mine_items.dm | 16 +- .../mob/living/silicon/robot/analyzer.dm | 2 +- .../mob/living/silicon/robot/component.dm | 2 +- code/modules/organs/subtypes/nano.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/paperwork/photography.dm | 2 +- code/modules/paperwork/stamps.dm | 2 +- code/modules/power/antimatter/shielding.dm | 2 +- code/modules/power/cable.dm | 4 +- code/modules/power/cell.dm | 2 +- code/modules/power/cells/device_cells.dm | 14 +- code/modules/power/cells/esoteric_cells.dm | 2 +- code/modules/power/cells/power_cells.dm | 26 +- code/modules/power/fusion_coil.dm | 2 +- code/modules/power/lighting.dm | 8 +- code/modules/projectiles/ammunition.dm | 2 +- .../projectiles/ammunition/ammo_boxes.dm | 98 +++---- .../projectiles/ammunition/magazines.dm | 96 +++---- .../projectiles/ammunition/magnetic.dm | 2 +- code/modules/projectiles/ammunition/rounds.dm | 104 ++++---- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/energy/altevian_vr.dm | 6 +- code/modules/projectiles/guns/energy/laser.dm | 8 +- code/modules/projectiles/guns/energy/stun.dm | 4 +- code/modules/projectiles/guns/lasertag.dm | 2 +- .../guns/launcher/grenade_launcher.dm | 2 +- .../projectiles/guns/launcher/syringe_gun.dm | 4 +- code/modules/projectiles/guns/projectile.dm | 2 +- .../guns/projectile/altevian_vr.dm | 4 +- .../guns/projectile/automatic_vr.dm | 2 +- .../guns/projectile/revolver_vr.dm | 2 +- .../projectiles/guns/projectile/smartgun.dm | 4 +- code/modules/projectiles/guns/toy.dm | 14 +- .../reagents/reagent_containers/glass.dm | 20 +- .../reagents/reagent_containers/spray.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- .../modules/research/tg/designs/ai_designs.dm | 14 +- .../research/tg/designs/ammunition_designs.dm | 244 +++++++++--------- .../research/tg/designs/boards/telecomms.dm | 14 +- .../research/tg/designs/circuitry_designs.dm | 24 +- .../tg/designs/construction_designs.dm | 12 +- .../research/tg/designs/equipment_designs.dm | 62 ++--- .../research/tg/designs/experisci_designs.dm | 2 +- .../research/tg/designs/firework_designs.dm | 26 +- .../research/tg/designs/illegal_designs.dm | 10 +- .../research/tg/designs/implant_designs.dm | 34 +-- .../research/tg/designs/mecha_designs.dm | 6 +- .../research/tg/designs/mechfab_designs.dm | 206 +++++++-------- .../tg/designs/mechfab_equipment_designs.dm | 116 ++++----- .../research/tg/designs/medical_designs.dm | 76 +++--- .../research/tg/designs/mining_designs.dm | 2 +- .../research/tg/designs/misc_designs.dm | 50 ++-- .../research/tg/designs/modsuit_designs.dm | 100 +++---- .../tg/designs/modular_computer_designs.dm | 50 ++-- .../tg/designs/multi-department_designs.dm | 6 +- .../research/tg/designs/prosfab_designs.dm | 144 +++++------ .../research/tg/designs/service_designs.dm | 42 +-- .../research/tg/designs/stock_part_designs.dm | 110 ++++---- .../research/tg/designs/tool_designs.dm | 210 +++++++-------- .../research/tg/designs/weapon_designs.dm | 184 ++++++------- code/modules/research/tg/disks.dm | 4 +- code/modules/resleeving/implant.dm | 2 +- code/modules/resleeving/machines.dm | 2 +- code/modules/resleeving/sleevecard.dm | 2 +- .../vore/fluffstuff/custom_items_vr.dm | 2 +- code/modules/xenoarcheaology/tools/tools.dm | 10 +- 157 files changed, 1315 insertions(+), 1311 deletions(-) diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm index afd26e95100..126c59322a0 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -146,5 +146,12 @@ #define OPTIMAL_COST(cost)(max(1, round(cost))) /// Default circuitboard material list -#define DEFAULT_CIRCUIT_MATERIALS list(MAT_GLASS = 2000) -#define RECYCLE_CIRCUIT_MATERIALS list(MAT_GLASS = 40) +#define DEFAULT_CIRCUIT_MATERIALS list(MAT_GLASS = MATERIAL_COST(1)) +#define RECYCLE_CIRCUIT_MATERIALS list(MAT_GLASS = MATERIAL_COST(0.02)) + +#define MATERIAL_COST(x) (SHEET_MATERIAL_AMOUNT * x) + +/// Amount of material in one sheet +#define SHEET_MATERIAL_AMOUNT 2000 +/// Max size of sheet stacks +#define MAX_STACK_SIZE 50 diff --git a/code/__defines/research.dm b/code/__defines/research.dm index e93efc648b8..07b110b731c 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -1,6 +1,3 @@ -#define SHEET_MATERIAL_AMOUNT 2000 -#define MAX_STACK_SIZE 50 - #define IMPRINTER 0x0001 //For circuits. Uses glass/chemicals. #define PROTOLATHE 0x0002 //New stuff. Uses glass/metal/chemicals #define MECHFAB 0x0004 //Mechfab diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index cb6c853fc5a..71b7b4a4c8d 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -129,7 +129,7 @@ item_state = "radio" throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 100)*/ + matter = list(MAT_STEEL = MATERIAL_COST(0.05))*/ /obj/item/SWF_uplink name = "station-bounced radio" @@ -147,7 +147,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' @@ -324,13 +324,13 @@ name = "console screen" desc = "Used in the construction of computers and other devices with a interactive console." icon_state = "screen" - matter = list(MAT_GLASS = 200) + matter = list(MAT_GLASS = MATERIAL_COST(0.1)) /obj/item/stock_parts/capacitor name = "capacitor" desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" - matter = list(MAT_STEEL = 50,MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025)) var/charge = 0 var/max_charge = 1000 @@ -354,25 +354,25 @@ name = "scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module" - matter = list(MAT_STEEL = 50,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01)) /obj/item/stock_parts/manipulator name = "micro-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "micro_mani" - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) /obj/item/stock_parts/micro_laser name = "micro-laser" desc = "A tiny laser used in certain devices." icon_state = "micro_laser" - matter = list(MAT_STEEL = 10,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.005),MAT_GLASS = MATERIAL_COST(0.01)) /obj/item/stock_parts/matter_bin name = "matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "matter_bin" - matter = list(MAT_STEEL = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.04)) //Rank 2 @@ -381,35 +381,35 @@ desc = "An advanced capacitor used in the construction of a variety of devices." icon_state = "capacitor_adv" rating = 2 - matter = list(MAT_STEEL = 50,MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025)) /obj/item/stock_parts/scanning_module/adv name = "advanced scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module_adv" rating = 2 - matter = list(MAT_STEEL = 50,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01)) /obj/item/stock_parts/manipulator/nano name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "nano_mani" rating = 2 - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) /obj/item/stock_parts/micro_laser/high name = "high-power micro-laser" desc = "A tiny laser used in certain devices." icon_state = "high_micro_laser" rating = 2 - matter = list(MAT_STEEL = 10,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.005),MAT_GLASS = MATERIAL_COST(0.01)) /obj/item/stock_parts/matter_bin/adv name = "advanced matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "advanced_matter_bin" rating = 2 - matter = list(MAT_STEEL = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.04)) //Rating 3 @@ -418,35 +418,35 @@ desc = "A super-high capacity capacitor used in the construction of a variety of devices." icon_state = "capacitor_super" rating = 3 - matter = list(MAT_STEEL = 50,MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025)) /obj/item/stock_parts/scanning_module/phasic name = "phasic scanning module" desc = "A compact, high resolution phasic scanning module used in the construction of certain devices." icon_state = "scan_module_phasic" rating = 3 - matter = list(MAT_STEEL = 50,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01)) /obj/item/stock_parts/manipulator/pico name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "pico_mani" rating = 3 - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) /obj/item/stock_parts/micro_laser/ultra name = "ultra-high-power micro-laser" icon_state = "ultra_high_micro_laser" desc = "A tiny laser used in certain devices." rating = 3 - matter = list(MAT_STEEL = 10,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.005),MAT_GLASS = MATERIAL_COST(0.01)) /obj/item/stock_parts/matter_bin/super name = "super matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "super_matter_bin" rating = 3 - matter = list(MAT_STEEL = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.04)) // Rating 4 - Anomaly @@ -455,35 +455,35 @@ desc = "A hyper-capacity capacitor used in the construction of a variety of devices." icon_state = "capacitor_hyper" rating = 4 - matter = list(MAT_STEEL = 80, MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.04), MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/stock_parts/scanning_module/hyper name = "quantum scanning module" desc = "A compact, near-perfect resolution quantum scanning module used in the construction of certain devices." icon_state = "scan_module_hyper" rating = 4 - matter = list(MAT_STEEL = 100,MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.05),MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/stock_parts/manipulator/hyper name = "planck-manipulator" desc = "A miniscule manipulator used in the construction of certain devices." icon_state = "hyper_mani" rating = 4 - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) /obj/item/stock_parts/micro_laser/hyper name = "hyper-power micro-laser" icon_state = "hyper_micro_laser" desc = "A tiny laser used in certain devices." rating = 4 - matter = list(MAT_STEEL = 30, MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/stock_parts/matter_bin/hyper name = "hyper matter bin" desc = "A container for holding compressed matter awaiting re-construction." icon_state = "hyper_matter_bin" rating = 4 - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) // Rating 5 - Precursor @@ -492,35 +492,35 @@ desc = "A capacitor of immense capacity used in the construction of a variety of devices." icon_state = "capacitor_omni" rating = 5 - matter = list(MAT_STEEL = 80, MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.04), MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/stock_parts/scanning_module/omni name = "omni-scanning module" desc = "A compact, perfect resolution temporospatial scanning module used in the construction of certain devices." icon_state = "scan_module_omni" rating = 5 - matter = list(MAT_STEEL = 100,MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.05),MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/stock_parts/manipulator/omni name = "omni-manipulator" desc = "A strange, infinitesimal manipulator used in the construction of certain devices." icon_state = "omni_mani" rating = 5 - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) /obj/item/stock_parts/micro_laser/omni name = "omni-power micro-laser" icon_state = "omni_micro_laser" desc = "A strange laser used in certain devices." rating = 5 - matter = list(MAT_STEEL = 30, MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/stock_parts/matter_bin/omni name = "omni-matter bin" desc = "A strange container for holding compressed matter awaiting re-construction." icon_state = "omni_matter_bin" rating = 5 - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) // Subspace stock parts @@ -529,43 +529,43 @@ name = "subspace ansible" icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." - matter = list(MAT_STEEL = 30,MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005)) /obj/item/stock_parts/subspace/sub_filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." - matter = list(MAT_STEEL = 30,MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005)) /obj/item/stock_parts/subspace/amplifier name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." - matter = list(MAT_STEEL = 30,MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005)) /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." - matter = list(MAT_STEEL = 30,MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005)) /obj/item/stock_parts/subspace/analyzer name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." - matter = list(MAT_STEEL = 30,MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005)) /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." - matter = list(MAT_GLASS = 50) + matter = list(MAT_GLASS = MATERIAL_COST(0.025)) /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." - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) /obj/item/ectoplasm name = "ectoplasm" @@ -581,21 +581,21 @@ desc = "A gear used for construction." icon = 'icons/obj/stock_parts.dmi' icon_state = "gear" - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) /obj/item/stock_parts/motor name = "motor" desc = "A motor used for construction." icon = 'icons/obj/stock_parts.dmi' icon_state = "motor" - matter = list(MAT_STEEL = 60, MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.03), MAT_GLASS = MATERIAL_COST(0.005)) /obj/item/stock_parts/spring name = "spring" desc = "A spring used for construction." icon = 'icons/obj/stock_parts.dmi' icon_state = "spring" - matter = list(MAT_STEEL = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.02)) /obj/effect/spawner/parts name = "nondescript parts bundle that shouldn't exist" diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index fa9f9a1d951..c4137a89fda 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -7,7 +7,7 @@ item_state = "electronic" throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) preserve_item = 1 var/obj/item/disk/nuclear/the_disk = null var/active = 0 diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 83bb1b5c1ce..5089a4c780d 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -6,7 +6,7 @@ w_class = ITEMSIZE_SMALL anchored = FALSE - matter = list(MAT_STEEL = 700,MAT_GLASS = 300) + matter = list(MAT_STEEL = MATERIAL_COST(0.35),MAT_GLASS = MATERIAL_COST(0.15)) // Motion, EMP-Proof, X-Ray var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/stock_parts/scanning_module) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index e02de8432ae..c6f83ab6033 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -4,7 +4,7 @@ icon_state = "door_electronics" w_class = ITEMSIZE_SMALL //It should be tiny! -Agouri - matter = list(MAT_STEEL = 50,MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025)) req_one_access = list(ACCESS_ENGINE, ACCESS_TALON_ENGINEER) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon var/list/apply_any_access = list(ACCESS_ENGINE) // Can apply any access, not just their own diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index 5c7b6ca9dc8..04df533991c 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(floor_light_cache) desc = "A backlit floor panel, ready for installation!" icon = 'icons/obj/machines/floor_light.dmi' icon_state = "item" - matter = list(MAT_STEEL = 2500, MAT_GLASS = 2750) + matter = list(MAT_STEEL = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(1.375)) /obj/item/floor_light/attack_self(mob/user) . = ..(user) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 337f5cebebc..fe314ba4df4 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1,3 +1,3 @@ /obj/item/mecha_parts/mecha_equipment/tool - matter = list(MAT_STEEL = 5000, MAT_GLASS = 3000) + matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.5)) equip_type = EQUIP_UTILITY diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 7e92c5d74a6..fd10fc85900 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -1,7 +1,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon name = "mecha weapon" range = RANGED - matter = list(MAT_STEEL = 6000, MAT_GLASS = 3000) + matter = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(1.5)) var/projectile //Type of projectile fired. var/projectiles = 1 //Amount of projectiles loaded. var/projectiles_per_shot = 1 //Amount of projectiles fired per single shot. diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 4f6ae169954..b73e74fa0b7 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -188,37 +188,37 @@ name="Phazon Torso" icon_state = "phazon_harness" //construction_time = 300 - //construction_cost = list(MAT_STEEL=35000,MAT_GLASS=10000,MAT_PHORON=20000) + //construction_cost = list(MAT_STEEL = MATERIAL_COST(17.5),MAT_GLASS = MATERIAL_COST(5),MAT_PHORON = MATERIAL_COST(10)) /obj/item/mecha_parts/part/phazon_head name="Phazon Head" icon_state = "phazon_head" //construction_time = 200 - //construction_cost = list(MAT_STEEL=15000,MAT_GLASS=5000,MAT_PHORON=10000) + //construction_cost = list(MAT_STEEL = MATERIAL_COST(7.5),MAT_GLASS = MATERIAL_COST(2.5),MAT_PHORON = MATERIAL_COST(5)) /obj/item/mecha_parts/part/phazon_left_arm name="Phazon Left Arm" icon_state = "phazon_l_arm" //construction_time = 200 - //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) + //construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5)) /obj/item/mecha_parts/part/phazon_right_arm name="Phazon Right Arm" icon_state = "phazon_r_arm" //construction_time = 200 - //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) + //construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5)) /obj/item/mecha_parts/part/phazon_left_leg name="Phazon Left Leg" icon_state = "phazon_l_leg" //construction_time = 200 - //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) + //construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5)) /obj/item/mecha_parts/part/phazon_right_leg name="Phazon Right Leg" icon_state = "phazon_r_leg" //construction_time = 200 - //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) + //construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5)) ///////// Odysseus @@ -263,7 +263,7 @@ name="Odysseus Carapace" icon_state = "odysseus_armour" construction_time = 200 - construction_cost = list(MAT_STEEL=15000)*/ + construction_cost = list(MAT_STEEL = MATERIAL_COST(7.5))*/ ////////// Janus diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b48e109bea0..cfa8b21e3ba 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -4,7 +4,7 @@ w_class = ITEMSIZE_NORMAL blocks_emissive = EMISSIVE_BLOCK_GENERIC - //matter = list(MAT_STEEL = 1) + //matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite var/randpixel = 6 diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index e7ffb5fef4f..7ad28007417 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -7,7 +7,7 @@ icon_state = "apc_frame" refund_amt = 2 build_wall_only = TRUE - matter = list(MAT_STEEL = 100, MAT_GLASS = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.015)) /obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob) if (get_dist(on_wall, user)>1) diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm index 66647cc52f7..b0568e032bc 100644 --- a/code/game/objects/items/bells.dm +++ b/code/game/objects/items/bells.dm @@ -6,7 +6,7 @@ force = 2 throwforce = 2 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) var/broken attack_verb = list("annoyed") var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine") diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm index 35e449f3aab..f45d87aa431 100644 --- a/code/game/objects/items/devices/advnifrepair.dm +++ b/code/game/objects/items/devices/advnifrepair.dm @@ -10,7 +10,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 5 throw_range = 10 - matter = list(MAT_STEEL = 4000, MAT_GLASS = 6000) + matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(3)) var/datum/reagents/supply var/efficiency = 15 //How many units reagent per 1 unit nanopaste pickup_sound = 'sound/items/pickup/device.ogg' diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index 071630f2cba..c710c678d13 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -11,7 +11,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' - //matter = list(MAT_STEEL = 50, MAT_GLASS = 50) + //matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) /obj/item/binoculars/attack_self(mob/user) . = ..(user) diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm index e86c62ad6e4..f01ca63eb64 100644 --- a/code/game/objects/items/devices/body_snatcher_vr.dm +++ b/code/game/objects/items/devices/body_snatcher_vr.dm @@ -7,7 +7,7 @@ item_state = "healthanalyzer" slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 136b99e4c6e..8aad5a971e7 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -23,7 +23,7 @@ slot_flags = SLOT_ID | SLOT_BELT show_messages = 1 - matter = list(MAT_STEEL = 30,MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005)) var/video_range = 3 var/obj/machinery/camera/communicator/video_source // Their camera diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index ec5c71583d5..512d31a1c20 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -18,7 +18,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' - matter = list(MAT_STEEL = 50,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01)) var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage /obj/item/debugger/is_used_on(obj/O, mob/user) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 1eea2155309..a8bbe29fe87 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -19,7 +19,7 @@ icon_state = "flashlight" w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT - matter = list(MAT_STEEL = 50,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01)) actions_types = list(/datum/action/item_action/toggle_flashlight) light_system = MOVABLE_LIGHT_DIRECTIONAL @@ -345,7 +345,7 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL attack_verb = list ("smacked", "thwacked", "thunked") - matter = list(MAT_STEEL = 200,MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.1),MAT_GLASS = MATERIAL_COST(0.025)) hitsound = "swing_hit" /obj/item/flashlight/drone diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index cd48b6d2240..6268283077d 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(GPS_list) icon_state = "gps-gen" w_class = ITEMSIZE_TINY slot_flags = SLOT_BELT - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) var/gps_tag = "GEN0" var/emped = FALSE diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 566b0285819..63e4fa8979e 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -6,7 +6,7 @@ item_state = "pen" var/pointer_icon_state slot_flags = SLOT_BELT - matter = list(MAT_GLASS = 500, MAT_STEEL = 500) + matter = list(MAT_GLASS = MATERIAL_COST(0.25), MAT_STEEL = MATERIAL_COST(0.25)) w_class = ITEMSIZE_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter. var/turf/pointer_loc var/energy = 8 diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index b0e894eadb5..c9545a93322 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -237,7 +237,7 @@ color = "#bbbbff" slot_flags = SLOT_BELT - matter = list(MAT_STEEL = 5000,MAT_GLASS = 1500) + matter = list(MAT_STEEL = MATERIAL_COST(2.5),MAT_GLASS = MATERIAL_COST(0.75)) var/static/dcolor = "#e0eff0" var/static/dnightcolor = "#efcc86" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 4bae812da87..56c3c7c5650 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -18,7 +18,7 @@ drop_sound = 'sound/items/drop/multitool.ogg' pickup_sound = 'sound/items/pickup/multitool.ogg' - matter = list(MAT_STEEL = 50,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01)) var/mode_index = 1 var/toolmode = MULTITOOL_MODE_STANDARD diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index cb2cbf8cb4d..7bcb0f70ada 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -10,7 +10,7 @@ throw_speed = 1 throw_range = 2 - matter = list(MAT_STEEL = 750) + matter = list(MAT_STEEL = MATERIAL_COST(0.375)) var/drain_rate = 1500000 // amount of power to drain per tick var/apc_drain_rate = 5000 // Max. amount drained from single APC. In Watts. diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index eec4a83b9f1..e164219fb5a 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -11,7 +11,7 @@ slot_flags = SLOT_BACK w_class = ITEMSIZE_HUGE - matter = list(MAT_STEEL = 10000,MAT_GLASS = 2500) + matter = list(MAT_STEEL = MATERIAL_COST(5),MAT_GLASS = MATERIAL_COST(1.25)) var/code = 2 electric_pack = TRUE diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 1549ed64927..9f3be420fff 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -4,7 +4,7 @@ var/radio_desc = "" icon_state = "headset" item_state = null //To remove the radio's state - matter = list(MAT_STEEL = 75) + matter = list(MAT_STEEL = MATERIAL_COST(0.0375)) subspace_transmission = TRUE canhear_range = 0 // can't hear headsets from very far away slot_flags = SLOT_EARS diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index abd0d65c680..783db311fdc 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -36,7 +36,7 @@ var/bs_tx_preload_id var/bs_rx_preload_id - matter = list(MAT_GLASS = 25,MAT_STEEL = 75) + matter = list(MAT_GLASS = MATERIAL_COST(0.0125),MAT_STEEL = MATERIAL_COST(0.0375)) var/const/FREQ_LISTENING = 1 var/list/internal_channels diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/game/objects/items/devices/scanners/gas.dm index f1921974f33..dc27c860b63 100644 --- a/code/game/objects/items/devices/scanners/gas.dm +++ b/code/game/objects/items/devices/scanners/gas.dm @@ -10,7 +10,7 @@ throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01)) pickup_sound = 'sound/items/pickup/device.ogg' diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index 0b4217d8d8c..8056715c980 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -11,7 +11,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 5 throw_range = 10 - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) var/mode = 1; var/advscan = SCANNABLE_BENEFICIAL var/showadvscan = 1 diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm index 54263f49397..bcc71b2d947 100644 --- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm +++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm @@ -10,7 +10,7 @@ throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01)) var/details = 0 var/recent_fail = 0 diff --git a/code/game/objects/items/devices/scanners/motion_tracker.dm b/code/game/objects/items/devices/scanners/motion_tracker.dm index e2fb6e1359e..815ca38379c 100644 --- a/code/game/objects/items/devices/scanners/motion_tracker.dm +++ b/code/game/objects/items/devices/scanners/motion_tracker.dm @@ -10,7 +10,7 @@ throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01)) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/scanners/reagents.dm b/code/game/objects/items/devices/scanners/reagents.dm index 919d74cd591..7114f530cad 100644 --- a/code/game/objects/items/devices/scanners/reagents.dm +++ b/code/game/objects/items/devices/scanners/reagents.dm @@ -9,7 +9,7 @@ throwforce = 5 throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01)) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/scanners/sleevemate.dm b/code/game/objects/items/devices/scanners/sleevemate.dm index 039efe4af82..468fa20391e 100644 --- a/code/game/objects/items/devices/scanners/sleevemate.dm +++ b/code/game/objects/items/devices/scanners/sleevemate.dm @@ -12,7 +12,7 @@ GLOBAL_DATUM(sleevemate_mob, /mob/living/carbon/human/dummy/mannequin) w_class = ITEMSIZE_SMALL throw_speed = 5 throw_range = 10 - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) var/datum/mind/stored_mind diff --git a/code/game/objects/items/devices/scanners/slime.dm b/code/game/objects/items/devices/scanners/slime.dm index 7478a9c790c..bb6a8528b30 100644 --- a/code/game/objects/items/devices/scanners/slime.dm +++ b/code/game/objects/items/devices/scanners/slime.dm @@ -7,7 +7,7 @@ throwforce = 0 throw_speed = 3 throw_range = 7 - matter = list(MAT_STEEL = 30,MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01)) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index b51e1012b18..85596388a3b 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -14,7 +14,7 @@ throw_range = 4 actions_types = list(/datum/action/item_action/toggle_heatsink) - matter = list(MAT_STEEL = 15000, MAT_GLASS = 3500) + matter = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(1.75)) var/on = 0 //is it turned on? var/cover_open = 0 //is the cover open? diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 5803894588e..956921d19a6 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -8,7 +8,7 @@ item_state = "t-ray" slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 150) + matter = list(MAT_STEEL = MATERIAL_COST(0.075)) var/scan_range = 1 @@ -142,13 +142,13 @@ /obj/item/t_scanner/upgraded name = "Upgraded T-ray Scanner" desc = "An upgraded version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." - matter = list(MAT_STEEL = 500, PHORON = 150) + matter = list(MAT_STEEL = MATERIAL_COST(0.25), PHORON = 150) scan_range = 3 /obj/item/t_scanner/advanced name = "Advanced T-ray Scanner" desc = "An advanced version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." - matter = list(MAT_STEEL = 1500, PHORON = 200, SILVER = 250) + matter = list(MAT_STEEL = MATERIAL_COST(0.75), PHORON = 200, SILVER = 250) scan_range = 7 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 7007b90ea32..421aec52086 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -6,7 +6,7 @@ item_state = "analyzer" w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 60,MAT_GLASS = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.03),MAT_GLASS = MATERIAL_COST(0.015)) var/emagged = 0.0 var/recording = 0.0 @@ -370,7 +370,7 @@ icon_state = "tape_white" item_state = "analyzer" w_class = ITEMSIZE_TINY - matter = list(MAT_STEEL=20, MAT_GLASS=5) + matter = list(MAT_STEEL = MATERIAL_COST(0.01), MAT_GLASS = MATERIAL_COST(0.0025)) force = 1 throwforce = 0 var/max_capacity = 1800 diff --git a/code/game/objects/items/ghost_hunting/ammo.dm b/code/game/objects/items/ghost_hunting/ammo.dm index 0ae542eb80a..0d8f43a121b 100644 --- a/code/game/objects/items/ghost_hunting/ammo.dm +++ b/code/game/objects/items/ghost_hunting/ammo.dm @@ -24,7 +24,7 @@ caliber = ".357" icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/spectral/strong - matter = list(MAT_STEEL = 210) + matter = list(MAT_STEEL = MATERIAL_COST(0.105)) //38 /obj/item/ammo_magazine/s38/spectral @@ -60,7 +60,7 @@ caliber = ".44" icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/spectral/strong - matter = list(MAT_STEEL = 210) + matter = list(MAT_STEEL = MATERIAL_COST(0.105)) //The actual spectral bullet. /obj/item/projectile/bullet/spectral diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 435b4f0515a..8542142868e 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/items.dmi' icon_state = "jar" w_class = ITEMSIZE_SMALL - matter = list(MAT_GLASS = 200) + matter = list(MAT_GLASS = MATERIAL_COST(0.1)) flags = NOBLUDGEON var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly) var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling @@ -200,7 +200,7 @@ /obj/item/glass_jar/fish/plastic name = "plastic tank" desc = "A large plastic tank." - matter = list(MAT_PLASTIC = 4000) + matter = list(MAT_PLASTIC = MATERIAL_COST(2)) #undef JAR_NOTHING #undef JAR_MONEY diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 405de40ed5d..86ff54977b1 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -8,7 +8,7 @@ desc = "This is rubbish." drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) var/age = 0 /obj/item/trash/Initialize(mapload, _age) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index b13ee81ff02..238bc106772 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -17,7 +17,7 @@ AI MODULES throw_speed = 3 throw_range = 15 preserve_item = 1 - matter = list(MAT_STEEL = 30, MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005)) var/datum/ai_laws/laws = null /obj/item/aiModule/examine(mob/user) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 3374b08018a..086dcfad934 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -308,11 +308,11 @@ icon_state = "rcd" item_state = "rcdammo" w_class = ITEMSIZE_SMALL - matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = 15000) + matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = MATERIAL_COST(7.5)) var/remaining = RCD_MAX_CAPACITY / 3 /obj/item/rcd_ammo/large name = "high-capacity matter cartridge" desc = "Do not ingest." - matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = 22500) + matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = MATERIAL_COST(11.25)) remaining = RCD_MAX_CAPACITY diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index 036b5795fc3..3acc82bad6e 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -23,7 +23,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 50000, MAT_GLASS = 25000) + matter = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(12.5)) var/datum/effect/effect/system/spark_spread/spark_system var/p_dir = NORTH // Next pipe will be built with this dir var/p_flipped = FALSE // If the next pipe should be built flipped diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index b2d1db24cb8..70b1caab80b 100644 --- a/code/game/objects/items/weapons/canes.dm +++ b/code/game/objects/items/weapons/canes.dm @@ -10,7 +10,7 @@ force = 5.0 throwforce = 7.0 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") /obj/item/cane/crutch diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm index e81cdc8fd67..7ef63415499 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -38,7 +38,7 @@ name = T_BOARD("entertainment camera monitor") build_path = /obj/machinery/computer/security/telescreen/entertainment board_type = new /datum/frame/frame_types/display - matter = list(MAT_STEEL = 50, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) /obj/item/circuitboard/security/telescreen/entertainment/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm b/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm index d8fc8f3e433..65c42ff195f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm @@ -6,7 +6,7 @@ name = T_BOARD("pipe layer") build_path = /obj/machinery/pipelayer board_type = new /datum/frame/frame_types/machine - matter = list(MAT_STEEL = 50, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) req_components = list( /obj/item/stock_parts/motor = 1, /obj/item/stock_parts/gear = 1, diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index 8098f392584..fbfeb239f12 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -153,7 +153,7 @@ w_class = ITEMSIZE_TINY icon = 'icons/obj/ecig.dmi' icon_state = "ecartridge" - matter = list(MAT_STEEL = 50, MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.005)) volume = 20 flags = OPENCONTAINER max_transfer_amount = null diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 81df859e472..ebf29fdb471 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -10,7 +10,7 @@ throw_speed = 2 throw_range = 10 force = 10 - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") drop_sound = 'sound/items/drop/gascan.ogg' pickup_sound = 'sound/items/pickup/gascan.ogg' diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index bb317ca2c9b..9c98c5d03f7 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -16,7 +16,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) var/status = FALSE var/throw_amount = THROWER_MIN var/lit = FALSE //on or off diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index d51c149de1d..c007104a960 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -9,7 +9,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 2 throw_range = 5 - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' var/elastic diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 2d4a6ee4d5a..b5769baa590 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -6,7 +6,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 1000, MAT_GLASS = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5)) var/obj/item/implant/imp = null var/active = 1 ///Var for attack_self chain diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index a54ef88e469..124a0a723af 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -71,7 +71,7 @@ sharp = TRUE edge = TRUE force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) - matter = list(MAT_STEEL = 12000) + matter = list(MAT_STEEL = MATERIAL_COST(6)) attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") drop_sound = 'sound/items/drop/knife.ogg' diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 25dab1b5931..32c9f7f0673 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/items.dmi' icon_state = "paint_neutral" item_state = "paintcan" - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) w_class = ITEMSIZE_NORMAL amount_per_transfer_from_this = 10 max_transfer_amount = 60 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index f36688400e5..76f52cdf835 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -67,7 +67,7 @@ throw_speed = 1 throw_range = 4 w_class = ITEMSIZE_LARGE - matter = list(MAT_GLASS = 7500, MAT_STEEL = 1000) + matter = list(MAT_GLASS = MATERIAL_COST(3.75), MAT_STEEL = MATERIAL_COST(0.5)) attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 9dd6f43c0cf..0ab9a680973 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -44,7 +44,7 @@ name = "retractor" desc = "Retracts stuff." icon_state = "retractor" - matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000) + matter = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5)) drop_sound = 'sound/items/drop/scrap.ogg' /* @@ -54,7 +54,7 @@ name = "hemostat" desc = "You think you have seen this before." icon_state = "hemostat" - matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500) + matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25)) attack_verb = list("attacked", "pinched") hitsound = 'sound/items/wirecutter.ogg' drop_sound = 'sound/items/drop/scrap.ogg' @@ -66,7 +66,7 @@ name = "cautery" desc = "This stops bleeding." icon_state = "cautery" - matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500) + matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25)) attack_verb = list("burnt") drop_sound = 'sound/items/drop/scrap.ogg' @@ -78,7 +78,7 @@ desc = "You can drill using this item. You dig?" icon_state = "drill" hitsound = 'sound/weapons/circsawhit.ogg' - matter = list(MAT_STEEL = 15000, MAT_GLASS = 10000) + matter = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(5)) force = 15.0 w_class = ITEMSIZE_NORMAL attack_verb = list("drilled") @@ -99,7 +99,7 @@ throwforce = 5.0 throw_speed = 3 throw_range = 5 - matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000) + matter = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5)) attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' drop_sound = 'sound/items/drop/knife.ogg' @@ -163,7 +163,7 @@ throwforce = 9.0 throw_speed = 3 throw_range = 5 - matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000) + matter = list(MAT_STEEL = MATERIAL_COST(10),MAT_GLASS = MATERIAL_COST(5)) attack_verb = list("attacked", "slashed", "sawed", "cut") sharp = TRUE edge = TRUE @@ -176,7 +176,7 @@ hitsound = 'sound/weapons/emitter2.ogg' damtype = SEARING w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 25000,MAT_GLASS = 20000) + matter = list(MAT_STEEL = MATERIAL_COST(12.5),MAT_GLASS = MATERIAL_COST(10)) attack_verb = list("attacked", "slashed", "seared", "cut") toolspeed = 0.75 diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index ddebd6a3688..9fdc9baf67c 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -20,7 +20,7 @@ item_state = "electronic" throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 400) + matter = list(MAT_STEEL = MATERIAL_COST(0.2)) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' @@ -130,7 +130,7 @@ Frequency: w_class = ITEMSIZE_SMALL throw_speed = 3 throw_range = 5 - matter = list(MAT_STEEL = 10000) + matter = list(MAT_STEEL = MATERIAL_COST(5)) preserve_item = 1 /obj/item/hand_tele/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/tools/brass.dm b/code/game/objects/items/weapons/tools/brass.dm index 8688b4a275f..922a23f2a71 100644 --- a/code/game/objects/items/weapons/tools/brass.dm +++ b/code/game/objects/items/weapons/tools/brass.dm @@ -28,4 +28,4 @@ desc = "A welder made from brass fittings." icon_state = "brasswelder" max_fuel = 20 - matter = list(MAT_STEEL = 70, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.03)) diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 87106eb1ee4..6f384fe3ba4 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -12,7 +12,7 @@ pry = 1 item_state = "crowbar" w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/crowbar.ogg' drop_sound = 'sound/items/drop/crowbar.ogg' @@ -83,7 +83,7 @@ throwforce = 5 pry = 1 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) attack_verb = list("whapped", "smacked", "swatted", "thwacked", "hit") usesound = 'sound/items/crowbar.ogg' toolspeed = 1 diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 3ff6999c4e3..9eb46941794 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -19,7 +19,7 @@ usesound = 'sound/items/screwdriver.ogg' drop_sound = 'sound/items/drop/screwdriver.ogg' pickup_sound = 'sound/items/pickup/screwdriver.ogg' - matter = list(MAT_STEEL = 75) + matter = list(MAT_STEEL = MATERIAL_COST(0.0375)) attack_verb = list("stabbed") sharp = TRUE toolspeed = 1 diff --git a/code/game/objects/items/weapons/tools/transforming.dm b/code/game/objects/items/weapons/tools/transforming.dm index f4c1c70b1da..f6884c8cce7 100644 --- a/code/game/objects/items/weapons/tools/transforming.dm +++ b/code/game/objects/items/weapons/tools/transforming.dm @@ -42,7 +42,7 @@ icon = 'icons/obj/tools.dmi' icon_state = "jaws_pry" item_state = "jawsoflife" - matter = list(MAT_METAL=150, MAT_SILVER=50) + matter = list(MAT_METAL=150, MAT_SILVER = MATERIAL_COST(0.025)) usesound = 'sound/items/jaws_pry.ogg' force = 15 toolspeed = 0.25 @@ -78,7 +78,7 @@ icon = 'icons/obj/tools.dmi' icon_state = "drill_bolt" item_state = "drill" - matter = list(MAT_STEEL = 150, MAT_SILVER = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.075), MAT_SILVER = MATERIAL_COST(0.025)) hitsound = 'sound/items/drill_hit.ogg' usesound = 'sound/items/drill_use.ogg' force = 8 diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 2c74d280dee..213383741d8 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -17,7 +17,7 @@ w_class = ITEMSIZE_SMALL //Cost to make in the autolathe - matter = list(MAT_STEEL = 70, MAT_GLASS = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.015)) //R&D tech level @@ -363,7 +363,7 @@ desc = "A slightly larger welder with a larger tank." icon_state = "indwelder" max_fuel = 40 - matter = list(MAT_STEEL = 70, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/weldingtool/hugetank name = "upgraded welding tool" @@ -371,7 +371,7 @@ icon_state = "upindwelder" max_fuel = 80 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 70, MAT_GLASS = 120) + matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06)) /obj/item/weldingtool/mini name = "emergency welding tool" @@ -379,7 +379,7 @@ icon_state = "miniwelder" max_fuel = 10 w_class = ITEMSIZE_SMALL - matter = list(MAT_METAL = 30, MAT_GLASS = 10) + matter = list(MAT_METAL = 30, MAT_GLASS = MATERIAL_COST(0.005)) change_icons = 0 toolspeed = 2 eye_safety_modifier = 1 // Safer on eyes. @@ -434,7 +434,7 @@ icon_state = "exwelder" max_fuel = 40 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 70, MAT_GLASS = 120) + matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06)) toolspeed = 0.5 change_icons = 0 flame_intensity = 3 diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index 1dd6dffc344..7134c41666f 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -15,7 +15,7 @@ throw_speed = 2 throw_range = 9 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.04)) attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' usesound = 'sound/items/wirecutter.ogg' diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index c44d96af19f..96d1173127e 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -10,7 +10,7 @@ force = 6 throwforce = 7 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 150) + matter = list(MAT_STEEL = MATERIAL_COST(0.075)) attack_verb = list("bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/ratchet.ogg' toolspeed = 1 diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 438012bca5e..2b796590001 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -17,7 +17,7 @@ center_of_mass_y = 0 throwforce = 0 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 18750) + matter = list(MAT_STEEL = MATERIAL_COST(9.375)) var/deployed = 0 var/camo_net = FALSE var/stun_length = 0.25 SECONDS diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 5f6b3351373..d612fbd3ae2 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -11,7 +11,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 3000) + matter = list(MAT_STEEL = MATERIAL_COST(1.5)) var/list/carrying = list() // List of things on the tray. - Doohl var/max_carry = 10 var/min_bonus_damage = 3 diff --git a/code/game/turfs/simulated/floor_types_eris.dm b/code/game/turfs/simulated/floor_types_eris.dm index 4db49117714..411e3047b83 100644 --- a/code/game/turfs/simulated/floor_types_eris.dm +++ b/code/game/turfs/simulated/floor_types_eris.dm @@ -349,46 +349,46 @@ singular_name = "cafe floor tile" desc = "A chekered pattern, an ancient style for a familiar feeling." icon_state = "tile_cafe" - matter = list(MAT_PLASTIC = 1) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.0005)) // Circuit /obj/item/stack/tile/floor/eris/bcircuit name = "circuit floor tile" singular_name = "circuit floor tile" icon_state = "tile_techmaint" // No sprite for this... - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) // Derelict /obj/item/stack/tile/floor/eris/derelict1 name = "derelict floor tile" singular_name = "derelict floor tile" icon_state = "tile_techmaint" // No sprite for this... - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/derelict2 name = "derelict floor tile" singular_name = "derelict floor tile" icon_state = "tile_techmaint" // No sprite for this... - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/derelict3 name = "derelict floor tile" singular_name = "derelict floor tile" icon_state = "tile_techmaint" // No sprite for this... - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/derelict4 name = "derelict floor tile" singular_name = "derelict floor tile" icon_state = "tile_techmaint" // No sprite for this... - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) // Techmaint /obj/item/stack/tile/floor/eris/techmaint name = "maint floor tile" singular_name = "maint floor tile" icon_state = "tile_techmaint" - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/techmaint/perforated name = "perforated maint floor tile" @@ -412,7 +412,7 @@ name = "steel floor tile" singular_name = "steel floor tile" icon_state = "tile_steel" - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/steel/panels name = "steel panel tile" @@ -512,7 +512,7 @@ singular_name = "white floor tile" desc = "Appears to be made out of a lighter mat." icon_state = "tile_white" - matter = list(MAT_PLASTIC = 1) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/white/panels name = "white panel tile" @@ -596,7 +596,7 @@ name = "dark floor tile" singular_name = "dark floor tile" icon_state = "tile_dark" - matter = list(MAT_STEEL = 1) + matter = list(MAT_STEEL = MATERIAL_COST(0.0005)) /obj/item/stack/tile/floor/eris/dark/panels name = "dark panel tile" diff --git a/code/modules/anomalies/anomaly.dm b/code/modules/anomalies/anomaly.dm index fd51e582b36..f8765dc9bcc 100644 --- a/code/modules/anomalies/anomaly.dm +++ b/code/modules/anomalies/anomaly.dm @@ -74,7 +74,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 5 throw_range = 10 - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 45fc35a6300..8243066ab8a 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "" w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) throwforce = 2 throw_speed = 3 throw_range = 10 diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 3ffb771d090..f133e9ab90b 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -2,7 +2,7 @@ name = "igniter" desc = "A small electronic device able to ignite combustable substances." icon_state = "igniter" - matter = list(MAT_STEEL = 500, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.025)) secured = 1 wires = WIRE_RECEIVE diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index b0e00e8dba3..b56a9d0bac9 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -4,7 +4,7 @@ name = "infrared emitter" desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." icon_state = "infrared" - matter = list(MAT_STEEL = 1000, MAT_GLASS = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25)) wires = WIRE_PULSE diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 5b557463cb8..2289fae189a 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -2,7 +2,7 @@ name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) var/armed = 0 special_handling = TRUE diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 4c69aa55fa9..8194a0b9ca0 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" - matter = list(MAT_STEEL = 800, MAT_GLASS = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.4), MAT_GLASS = MATERIAL_COST(0.1)) wires = WIRE_PULSE secured = 0 diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 3459e1cf0a8..3d08373be03 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -3,7 +3,7 @@ desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration." icon_state = "signaller" item_state = "signaler" - matter = list(MAT_STEEL = 1000, MAT_GLASS = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.1)) wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE secured = TRUE diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index de1ccb76f49..9d0fc089ee8 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" - matter = list(MAT_STEEL = 500, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.025)) wires = WIRE_PULSE diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 795d689d6f7..1cc4b37f7b3 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -2,7 +2,7 @@ name = "voice analyzer" desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" - matter = list(MAT_STEEL = 500, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.025)) var/listening = 0 var/recorded //the activation message special_handling = TRUE diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm index c296abd99bc..9cfa1ad901e 100644 --- a/code/modules/clothing/accessories/accessory_vr.dm +++ b/code/modules/clothing/accessories/accessory_vr.dm @@ -260,7 +260,7 @@ icon_state = "collar_holo" item_state = "collar_holo" overlay_state = "collar_holo" - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) /obj/item/clothing/accessory/collar/holo/indigestible desc = "A special variety of the holo-collar that seems to be made of a very durable fabric that fits around the neck." diff --git a/code/modules/clothing/accessories/hands.dm b/code/modules/clothing/accessories/hands.dm index 04cac8e0ace..c1a2a748365 100644 --- a/code/modules/clothing/accessories/hands.dm +++ b/code/modules/clothing/accessories/hands.dm @@ -4,7 +4,7 @@ icon_state = "knuckledusters" slot = ACCESSORY_SLOT_RING slot_flags = SLOT_GLOVES - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) attack_verb = list("punched", "beaten", "struck") siemens_coefficient = 1 force = 10 //base punch strength is 5 diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2fa562d98e4..10211ea737f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -385,7 +385,7 @@ BLIND // can't see anything icon_state = "welding-g" item_state_slots = list(slot_r_hand_str = "welding-g", slot_l_hand_str = "welding-g") actions_types = list(/datum/action/item_action/flip_welding_goggles) - matter = list(MAT_STEEL = 1500, MAT_GLASS = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(0.5)) item_flags = AIRTIGHT var/up = 0 flash_protection = FLASH_PROTECTION_MAJOR diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 0a44df9b681..d2928a0d26c 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -52,7 +52,7 @@ name = "magnetic 'pin'" addblends = null desc = "Finally, a hair pin even a Morpheus chassis can use." - matter = list(MAT_STEEL = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.005)) /obj/item/clothing/head/pin/flower name = "red flower pin" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index b0bec3ca3e6..12d324410ef 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -18,7 +18,7 @@ desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" item_state_slots = list(slot_r_hand_str = "welding", slot_l_hand_str = "welding") - matter = list(MAT_STEEL = 3000, MAT_GLASS = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5)) var/up = 0 armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 22d0617fb9a..d44deeebd2e 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -13,7 +13,7 @@ desc = "It looks pretty sciency." icon = 'icons/obj/rig_modules.dmi' icon_state = "module" - matter = list(MAT_STEEL = 20000, MAT_PLASTIC = 30000, MAT_GLASS = 5000) + matter = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTIC = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(2.5)) var/damage = 0 var/obj/item/rig/holder diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm index 6e0fdd528ca..f532c81d2d3 100644 --- a/code/modules/detectivework/tools/uvlight.dm +++ b/code/modules/detectivework/tools/uvlight.dm @@ -7,7 +7,7 @@ w_class = ITEMSIZE_SMALL item_state = "electronic" actions_types = list(/datum/action/item_action/toggle_uv_light) - matter = list(MAT_STEEL = 150) + matter = list(MAT_STEEL = MATERIAL_COST(0.075)) var/list/scanned = list() var/list/stored_alpha = list() diff --git a/code/modules/economy/coins.dm b/code/modules/economy/coins.dm index 1becc2a2320..13b9120c515 100644 --- a/code/modules/economy/coins.dm +++ b/code/modules/economy/coins.dm @@ -23,25 +23,25 @@ name = MAT_GOLD + " coin" desc = "A shiny " + MAT_GOLD + " coin. Just like in the old movies with pirates!" icon_state = "coin_gold" - matter = list(MAT_GOLD = 250) + matter = list(MAT_GOLD = MATERIAL_COST(0.125)) /obj/item/coin/silver name = MAT_SILVER + " coin" desc = "A shiny " + MAT_SILVER + " coin. You can almost see your reflection in it. Unless you're a vampire." icon_state = "coin_silver" - matter = list(MAT_SILVER = 250) + matter = list(MAT_SILVER = MATERIAL_COST(0.125)) /obj/item/coin/copper name = MAT_COPPER + " coin" desc = "A sturdy " + MAT_COPPER + " coin. The preferred tender of people who like to make other people count a lot." icon_state = "coin_copper" - matter = list(MAT_COPPER = 250) + matter = list(MAT_COPPER = MATERIAL_COST(0.125)) /obj/item/coin/diamond name = MAT_DIAMOND + " coin" desc = "A coin made of solid " + MAT_DIAMOND + ". Carbon, really, but who's counting?" // me, I'm counting icon_state = "coin_diamond" - matter = list(MAT_DIAMOND = 250) + matter = list(MAT_DIAMOND = MATERIAL_COST(0.125)) /obj/item/coin/graphite name = MAT_GRAPHITE + " coin" @@ -53,49 +53,49 @@ name = MAT_IRON + " coin" desc = "A dull " + MAT_IRON + " coin. Not that it's boring, it's just a bit plain." icon_state = "coin_iron" - matter = list(MAT_IRON = 250) + matter = list(MAT_IRON = MATERIAL_COST(0.125)) /obj/item/coin/steel name = MAT_STEEL + " coin" desc = "A plain " + MAT_STEEL + " coin. You'd think they'd make more coins out of this, considering how plentiful it is." icon_state = "coin_steel" - matter = list(MAT_STEEL = 250) + matter = list(MAT_STEEL = MATERIAL_COST(0.125)) /obj/item/coin/durasteel name = MAT_DURASTEEL + " coin" desc = "A shiny " + MAT_DURASTEEL + " coin. Keep it in your breast pocket, maybe it'll stop a bullet someday." icon_state = "coin_durasteel" - matter = list(MAT_DURASTEEL = 250) + matter = list(MAT_DURASTEEL = MATERIAL_COST(0.125)) /obj/item/coin/plasteel name = MAT_PLASTEEL + " coin" desc = "Someone made a coin out of " + MAT_PLASTEEL + ". Now why would they do that?" icon_state = "coin_plasteel" - matter = list(MAT_PLASTEEL = 250) + matter = list(MAT_PLASTEEL = MATERIAL_COST(0.125)) /obj/item/coin/titanium name = MAT_TITANIUM + " coin" desc = "A shiny " + MAT_TITANIUM + " coin with some commemorative markings." icon_state = "coin_titanium" - matter = list(MAT_TITANIUM = 250) + matter = list(MAT_TITANIUM = MATERIAL_COST(0.125)) /obj/item/coin/lead name = MAT_LEAD + " coin" desc = "A heavy coin indeed. Shame it's worthless as anything other than a paperweight." icon_state = "coin_lead" - matter = list(MAT_LEAD = 250) + matter = list(MAT_LEAD = MATERIAL_COST(0.125)) /obj/item/coin/phoron name = "solid " + MAT_PHORON + " coin" desc = "Solid " + MAT_PHORON + ", pressed into a coin and laminated for safety. Go ahead, lick it." icon_state = "coin_phoron" - matter = list(MAT_PHORON = 250) + matter = list(MAT_PHORON = MATERIAL_COST(0.125)) /obj/item/coin/uranium name = MAT_URANIUM + " coin" desc = "A " + MAT_URANIUM + " coin. You probably don't want to store this in your pants pocket..." icon_state = "coin_uranium" - matter = list(MAT_URANIUM = 250) + matter = list(MAT_URANIUM = MATERIAL_COST(0.125)) var/last_event = 0 var/active = 0 @@ -133,25 +133,25 @@ name = MAT_PLATINUM + " coin" desc = "A shiny " + MAT_PLATINUM + " coin. Truth is, the game was rigged from the start." icon_state = "coin_platinum" - matter = list(MAT_GOLD = 250) + matter = list(MAT_GOLD = MATERIAL_COST(0.125)) /obj/item/coin/morphium name = MAT_MORPHIUM + " coin" desc = "Solid " + MAT_MORPHIUM + ", made into a coin. Extravagant is putting it lightly." icon_state = "coin_morphium" - matter = list(MAT_MORPHIUM = 250) + matter = list(MAT_MORPHIUM = MATERIAL_COST(0.125)) /obj/item/coin/aluminium name = MAT_ALUMINIUM + " coin" desc = "Someone decided to make a coin out of" + MAT_ALUMINIUM + ". Now your wallet can be lighter than ever." icon_state = "coin_aluminium" - matter = list(MAT_ALUMINIUM = 250) + matter = list(MAT_ALUMINIUM = MATERIAL_COST(0.125)) /obj/item/coin/verdantium name = MAT_VERDANTIUM + " coin" desc = "Shiny green " + MAT_VERDANTIUM + ", pressed into a coin. It almost seems to glimmer under starlight." icon_state = "coin_verdantium" - matter = list(MAT_VERDANTIUM = 250) + matter = list(MAT_VERDANTIUM = MATERIAL_COST(0.125)) /obj/item/coin/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/cable_coil)) diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index f6403a164b2..bbefa3eaffe 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -21,7 +21,7 @@ min_transfer_amount = 1 flags = OPENCONTAINER - matter = list(MAT_GLASS = 60) + matter = list(MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/reagent_containers/food/drinks/glass2/examine(mob/M as mob) . = ..() diff --git a/code/modules/food/drinkingglass/glass_types.dm b/code/modules/food/drinkingglass/glass_types.dm index 9d238ed1a49..95c17029368 100644 --- a/code/modules/food/drinkingglass/glass_types.dm +++ b/code/modules/food/drinkingglass/glass_types.dm @@ -8,7 +8,7 @@ volume = 30 max_transfer_amount = 30 rim_pos = list(23,13,20) // y, x0, x1 - matter = list(MAT_GLASS = 60) + matter = list(MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/reagent_containers/food/drinks/glass2/rocks name = "rocks glass" @@ -19,7 +19,7 @@ volume = 20 max_transfer_amount = 20 rim_pos = list(21, 10, 23) - matter = list(MAT_GLASS = 40) + matter = list(MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/reagent_containers/food/drinks/glass2/shake name = "milkshake glass" @@ -30,7 +30,7 @@ volume = 30 max_transfer_amount = 30 rim_pos = list(25, 13, 21) - matter = list(MAT_GLASS = 30) + matter = list(MAT_GLASS = MATERIAL_COST(0.015)) /obj/item/reagent_containers/food/drinks/glass2/cocktail name = "cocktail glass" @@ -41,7 +41,7 @@ volume = 15 max_transfer_amount = 15 rim_pos = list(22, 13, 21) - matter = list(MAT_GLASS = 30) + matter = list(MAT_GLASS = MATERIAL_COST(0.015)) /obj/item/reagent_containers/food/drinks/glass2/shot name = "shot glass" @@ -52,7 +52,7 @@ volume = 5 max_transfer_amount = 5 rim_pos = list(17, 13, 21) - matter = list(MAT_GLASS = 10) + matter = list(MAT_GLASS = MATERIAL_COST(0.005)) /obj/item/reagent_containers/food/drinks/glass2/pint name = "pint glass" @@ -63,7 +63,7 @@ volume = 60 max_transfer_amount = 60 rim_pos = list(25, 12, 21) - matter = list(MAT_GLASS = 120) + matter = list(MAT_GLASS = MATERIAL_COST(0.06)) /obj/item/reagent_containers/food/drinks/glass2/mug name = "glass mug" @@ -74,7 +74,7 @@ volume = 40 max_transfer_amount = 40 rim_pos = list(22, 12, 20) - matter = list(MAT_GLASS = 80) + matter = list(MAT_GLASS = MATERIAL_COST(0.04)) /obj/item/reagent_containers/food/drinks/glass2/wine name = "wine glass" @@ -85,4 +85,4 @@ volume = 25 max_transfer_amount = 25 rim_pos = list(25, 12, 21) - matter = list(MAT_GLASS = 50) + matter = list(MAT_GLASS = MATERIAL_COST(0.025)) diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index f6f507419c5..4bc12c6a6fc 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -7,7 +7,7 @@ unacidable = TRUE //glass center_of_mass_x = 16 center_of_mass_y = 10 - matter = list(MAT_GLASS = 500) + matter = list(MAT_GLASS = MATERIAL_COST(0.25)) icon = 'icons/obj/drinks.dmi' /obj/item/reagent_containers/food/drinks/metaglass/metapint diff --git a/code/modules/food/drinkingglass/serving_glasses.dm b/code/modules/food/drinkingglass/serving_glasses.dm index 5b1e79fe81b..0115d886da3 100644 --- a/code/modules/food/drinkingglass/serving_glasses.dm +++ b/code/modules/food/drinkingglass/serving_glasses.dm @@ -7,7 +7,7 @@ filling_states = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100) volume = 120 max_transfer_amount = 60 - matter = list(MAT_GLASS = 50) + matter = list(MAT_GLASS = MATERIAL_COST(0.025)) /obj/item/reagent_containers/food/drinks/glass2/pitcher name = "plastic pitcher" @@ -18,4 +18,4 @@ filling_states = list(15, 30, 50, 70, 85, 100) volume = 120 max_transfer_amount = 60 - matter = list(MAT_PLASTIC = 50) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.025)) diff --git a/code/modules/food/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm index 8a7c7e612d8..741d1af756e 100644 --- a/code/modules/food/drinkingglass/shaker.dm +++ b/code/modules/food/drinkingglass/shaker.dm @@ -5,7 +5,7 @@ icon_state = "fitness-cup_black" base_icon = "fitness-cup" volume = 100 - matter = list(MAT_PLASTIC = 2000) + matter = list(MAT_PLASTIC = MATERIAL_COST(1)) filling_states = list(10,20,30,40,50,60,70,80) max_transfer_amount = 50 rim_pos = null // no fruit slices diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index 1dcae9a0863..32ebc70c6d6 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -11,7 +11,7 @@ unacidable = TRUE //glass center_of_mass_x = 16 center_of_mass_y = 10 - matter = list(MAT_GLASS = 500) + matter = list(MAT_GLASS = MATERIAL_COST(0.25)) /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change() if (!length(reagents?.reagent_list)) @@ -116,7 +116,7 @@ icon_state = "shotglass" amount_per_transfer_from_this = 10 volume = 10 - matter = list(MAT_GLASS = 175) + matter = list(MAT_GLASS = MATERIAL_COST(0.0875)) /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change() cut_overlays() @@ -140,7 +140,7 @@ desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits." icon_state = "fitness-cup_black" volume = 100 - matter = list(MAT_PLASTIC = 2000) + matter = list(MAT_PLASTIC = MATERIAL_COST(1)) /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/Initialize(mapload) . = ..() diff --git a/code/modules/food/kitchen/cooking_machines/foodsynthesizer.dm b/code/modules/food/kitchen/cooking_machines/foodsynthesizer.dm index 92dd0e48797..34b3102f3b2 100644 --- a/code/modules/food/kitchen/cooking_machines/foodsynthesizer.dm +++ b/code/modules/food/kitchen/cooking_machines/foodsynthesizer.dm @@ -699,7 +699,7 @@ desc = "The circuitboard for a Food Synthesizer." build_path = /obj/machinery/synthesizer board_type = new /datum/frame/frame_types/foodsynthesizer - matter = list(MAT_STEEL = 50, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/scanning_module = 1) @@ -709,7 +709,7 @@ desc = "The circuitboard for a compact food synthesizer." build_path = /obj/machinery/synthesizer/mini board_type = new /datum/frame/frame_types/foodsynthesizer/mini - matter = list(MAT_STEEL = 50, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/scanning_module = 1) diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index d75368fc469..e1254ee01f0 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "deep_scan_device" item_state = "electronic" - matter = list(MAT_STEEL = 150) + matter = list(MAT_STEEL = MATERIAL_COST(0.075)) var/scan_time = 2 SECONDS var/range = 2 var/exact = FALSE @@ -107,7 +107,7 @@ name = "advanced ore detector" desc = "An advanced device used to locate ore deep underground." description_info = "This scanner has variable range, you can use the Set Scanner Range verb, or alt+click the device. Drills dig in 5x5." - matter = list(MAT_STEEL = 150) + matter = list(MAT_STEEL = MATERIAL_COST(0.075)) scan_time = 0.5 SECONDS exact = TRUE diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index af2bcecd41f..a1428e7923c 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -19,7 +19,7 @@ icon_state = "pickaxe" item_state = "pickaxe" w_class = ITEMSIZE_LARGE - matter = list(MAT_STEEL = 2500) + matter = list(MAT_STEEL = MATERIAL_COST(1.25)) var/digspeed = 36 //moving the delay to an item var so R&D can make improved picks. --NEO var/sand_dig = FALSE // does this thing dig sand? attack_verb = list("hit", "pierced", "sliced", "attacked") @@ -63,7 +63,7 @@ item_state = "jackhammer" digspeed = 30 //Only slighty better than a pickaxe sand_dig = TRUE - matter = list(MAT_STEEL = 3750) + matter = list(MAT_STEEL = MATERIAL_COST(1.875)) desc = "The most basic of mining drills, for short excavations and small mineral extractions." drill_verb = "drilling" @@ -73,7 +73,7 @@ item_state = "jackhammer" digspeed = 27 sand_dig = TRUE - matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 2500) + matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_PLASTEEL = MATERIAL_COST(1.25)) desc = "Yours is the drill that will pierce through the rock walls." drill_verb = "drilling" @@ -83,7 +83,7 @@ item_state = "jackhammer" digspeed = 4 //Digs through walls, girders, and can dig up sand sand_dig = TRUE - matter = list(MAT_STEEL = 4500, MAT_PLASTEEL = 3000, MAT_DIAMONDS = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(2.25), MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_DIAMONDS = 1000) desc = "Yours is the drill that will pierce the heavens!" drill_verb = "drilling" @@ -114,7 +114,7 @@ w_class = ITEMSIZE_NORMAL //it is smaller than the pickaxe damtype = BURN digspeed = 18 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/light thermite on fire - matter = list(MAT_STEEL = 3000, MAT_PLASTEEL = 1500, MAT_DIAMONDS = 500, MAT_PHORON = 500) + matter = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_PLASTEEL = MATERIAL_COST(0.75), MAT_DIAMONDS = 500, MAT_PHORON = MATERIAL_COST(0.25)) drill_verb = "cutting" drill_sound = 'sound/items/Welder.ogg' sharp = TRUE @@ -136,7 +136,7 @@ force = 8.0 throwforce = 4.0 w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") sharp = FALSE edge = TRUE @@ -186,7 +186,7 @@ slot_flags = SLOT_BELT item_state = "woodshovel" w_class = ITEMSIZE_NORMAL - matter = list(MAT_WOOD = 50) + matter = list(MAT_WOOD = MATERIAL_COST(0.025)) sharp = 0 edge = 1 @@ -198,7 +198,7 @@ desc = "A sharp tool for climbers and hikers to break up ice and keep themselves from slipping on a steep slope." icon_state = "icepick" item_state = "icepick" - matter = list(MAT_STEEL = 12000) //Same as a knife + matter = list(MAT_STEEL = MATERIAL_COST(6)) //Same as a knife force = 15 //increasing force for icepick/axe, cause it's a freaking iceaxe. throwforce = 0 diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index ebd2f224da5..a2850e13134 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -13,7 +13,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 5 throw_range = 10 - matter = list(MAT_STEEL = 500, MAT_GLASS = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.1)) var/mode = 1; pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 3ababa9e305..d997b6eff0c 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -237,7 +237,7 @@ name = "broken component" icon = 'icons/obj/robot_component.dmi' icon_state = "broken" - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) /obj/item/broken_device/random var/list/possible_icons = list("binradio_broken", diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index 7a798f63b26..dc54173afd9 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -112,7 +112,7 @@ organ_tag = O_FACT parent_organ = BP_TORSO - var/list/materials = list(MAT_STEEL = 0) + var/list/materials = list(MAT_STEEL = MATERIAL_COST(0)) var/max_storage = 10000 organ_verbs = list( /mob/living/carbon/human/proc/reagent_purge diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 77fd692d7d3..64c4b465072 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -26,7 +26,7 @@ w_class = ITEMSIZE_TINY throw_speed = 7 throw_range = 15 - matter = list(MAT_STEEL = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.005)) var/colour = "black" //what colour the ink is! pressure_resistance = 2 drop_sound = 'sound/items/drop/accessory.ogg' diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index f345f137b33..e358b116267 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -132,7 +132,7 @@ GLOBAL_VAR_INIT(photo_count, 0) item_state = "camera" w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) var/pictures_max = 10 var/pictures_left = 10 var/on = 1 diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 9ff7e75494a..82e1cafb687 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -9,7 +9,7 @@ slot_flags = SLOT_HOLSTER throw_speed = 7 throw_range = 15 - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) pressure_resistance = 2 attack_verb = list("stamped") drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 666928fe74b..7c797387908 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -197,7 +197,7 @@ throwforce = 5 throw_speed = 1 throw_range = 2 - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) /obj/item/am_shielding_container/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/multitool) && istype(src.loc,/turf)) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index a703185d30a..b01d172a8bd 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -516,7 +516,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list( w_class = ITEMSIZE_SMALL throw_speed = 2 throw_range = 5 - matter = list(MAT_STEEL = 50, MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01)) slot_flags = SLOT_BELT item_state = "coil" attack_verb = list("whipped", "lashed", "disciplined", "flogged") @@ -945,7 +945,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list( w_class = ITEMSIZE_SMALL throw_speed = 2 throw_range = 5 - matter = list(MAT_STEEL = 50, MAT_GLASS = 20) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01)) slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") stacktype = null diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 769e2acdec4..41cb550554e 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -26,7 +26,7 @@ var/charge_delay = 0 // How long it takes for the cell to start recharging after last use var/robot_durability = 50 - matter = list(MAT_STEEL = 700, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.025)) drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm index f9aab5cb243..81a364786e0 100644 --- a/code/modules/power/cells/device_cells.dm +++ b/code/modules/power/cells/device_cells.dm @@ -13,7 +13,7 @@ charge = 480 maxcharge = 480 charge_amount = 5 - matter = list(MAT_STEEL = 350, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.175), MAT_GLASS = MATERIAL_COST(0.025)) preserve_item = 1 /obj/item/cell/device/empty @@ -29,7 +29,7 @@ icon_state = "device_crap" charge = 240 maxcharge = 240 - matter = list(MAT_STEEL = 350, MAT_GLASS = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.175), MAT_GLASS = MATERIAL_COST(0.015)) /obj/item/cell/device/crap/update_icon() //No visible charge indicator return @@ -47,7 +47,7 @@ charge = 4800 maxcharge = 4800 charge_amount = 20 - matter = list(MAT_STEEL = 400, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.2), MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/cell/device/hyper/empty charge = 0 @@ -59,7 +59,7 @@ name = "shielded device power cell" desc = "A small power cell designed to power handheld devices. Shielded from EMPs." icon_state = "s_st" - matter = list(MAT_STEEL = 400, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.2), MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/cell/device/empproof/Initialize(mapload) AddElement(/datum/element/empprotection, EMP_PROTECT_SELF) @@ -89,7 +89,7 @@ name = "shielded weapon power cell" desc = "A small power cell designed to power handheld weaponry. Shielded from EMPs." icon_state = "s_hi" - matter = list(MAT_STEEL = 400, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.2), MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/cell/device/weapon/empproof/Initialize(mapload) AddElement(/datum/element/empprotection, EMP_PROTECT_SELF) @@ -105,7 +105,7 @@ name = "self-charging weapon power cell" desc = "A small power cell designed to power handheld weaponry. This one recharges itself." icon_state = "meb_m_nu" - matter = list(MAT_STEEL = 400, MAT_GLASS = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.2), MAT_GLASS = MATERIAL_COST(0.04)) self_recharge = TRUE charge_amount = 120 charge_delay = 75 @@ -115,7 +115,7 @@ */ /obj/item/cell/device/weapon/recharge/captain icon_state = "infinite_m" - matter = list(MAT_STEEL = 400, MAT_GLASS = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.2), MAT_GLASS = MATERIAL_COST(0.05)) charge_amount = 160 //Recharges a lot more quickly... charge_delay = 100 //... but it takes a while to get started diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm index 68cff0ec2e3..4685e37bf31 100644 --- a/code/modules/power/cells/esoteric_cells.dm +++ b/code/modules/power/cells/esoteric_cells.dm @@ -5,7 +5,7 @@ icon_state = "modded" charge = 10000 maxcharge = 10000 - matter = list(MAT_STEEL = 1000, MAT_GLASS = 80, MAT_SILVER = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.04), MAT_SILVER = MATERIAL_COST(0.05)) self_recharge = TRUE charge_amount = 150 diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm index 4a45edc490b..6eb9fc3b5be 100644 --- a/code/modules/power/cells/power_cells.dm +++ b/code/modules/power/cells/power_cells.dm @@ -14,7 +14,7 @@ icon_state = "crap" charge = 500 maxcharge = 500 - matter = list(MAT_STEEL = 700, MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.02)) robot_durability = 20 /obj/item/cell/crap/update_icon() //No visible charge indicator @@ -31,7 +31,7 @@ icon_state = "apc" charge = 5000 maxcharge = 5000 - matter = list(MAT_STEEL = 700, MAT_GLASS = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.025)) /* * Robot @@ -49,7 +49,7 @@ icon_state = "b_hi" charge = 10000 maxcharge = 10000 - matter = list(MAT_STEEL = 700, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.03)) robot_durability = 55 /obj/item/cell/high/empty @@ -63,7 +63,7 @@ icon_state = "b_sup" charge = 20000 maxcharge = 20000 - matter = list(MAT_STEEL = 700, MAT_GLASS = 70) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.035)) robot_durability = 60 /obj/item/cell/super/empty @@ -88,7 +88,7 @@ icon_state = "b_hy" charge = 30000 maxcharge = 30000 - matter = list(MAT_STEEL = 700, MAT_GLASS = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.04)) robot_durability = 70 /obj/item/cell/hyper/empty @@ -103,7 +103,7 @@ connector_type = "mech" charge = 15000 maxcharge = 15000 - matter = list(MAT_STEEL = 800, MAT_GLASS = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.4), MAT_GLASS = MATERIAL_COST(0.03)) /obj/item/cell/mech/lead name = "lead acid battery" @@ -111,7 +111,7 @@ icon_state = "lead" charge = 8000 maxcharge = 8000 - matter = list(MAT_STEEL = 300, MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.15), MAT_GLASS = MATERIAL_COST(0.005)) /obj/item/cell/mech/lead/update_icon() //No visible charge indicator return @@ -121,14 +121,14 @@ icon_state = "exs_m" charge = 20000 maxcharge = 20000 - matter = list(MAT_STEEL = 800, MAT_GLASS = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.4), MAT_GLASS = MATERIAL_COST(0.04)) /obj/item/cell/mech/super name = "super-capacity mecha power cell" icon_state = "exs_l" charge = 25000 maxcharge = 25000 - matter = list(MAT_STEEL = 800, MAT_GLASS = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.4), MAT_GLASS = MATERIAL_COST(0.05)) /* * Infinite @@ -138,7 +138,7 @@ icon_state = "infinite_b" charge = 30000 maxcharge = 30000 //determines how badly mobs get shocked - matter = list(MAT_STEEL = 700, MAT_GLASS = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.04)) robot_durability = 200 /obj/item/cell/infinite/Initialize(mapload) @@ -188,7 +188,7 @@ desc = "A tiny power cell with a very low power capacity. Used in light fixtures to power them in the event of an outage." charge = 720 maxcharge = 720 //Emergency lights use 0.2 W per tick, meaning ~60 minutes of emergency power from a cell - matter = list(MAT_GLASS = 20) + matter = list(MAT_GLASS = MATERIAL_COST(0.01)) icon_state = "em_light" connector_type = "emergency" w_class = ITEMSIZE_TINY @@ -290,7 +290,7 @@ icon_state = "secborg" charge = 2400 maxcharge = 2400 - matter = list(MAT_STEEL = 700, MAT_GLASS = 40) + matter = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.02)) /obj/item/cell/secborg/empty charge = 0 @@ -303,7 +303,7 @@ icon_state = "meb_b_hi" charge = 40000 maxcharge = 40000 - matter = list(MAT_STEEL = 1000, MAT_GLASS = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.05)) /obj/item/cell/giga/empty charge = 0 diff --git a/code/modules/power/fusion_coil.dm b/code/modules/power/fusion_coil.dm index 4fd6ac8278f..92a82d43fa9 100644 --- a/code/modules/power/fusion_coil.dm +++ b/code/modules/power/fusion_coil.dm @@ -19,7 +19,7 @@ var/coil_charged = TRUE //have we been discharged into something yet? var/coil_damaged = FALSE //have we been damaged? one hit is fine, but two direct hits will explode us if we're charged var/coil_charge = 4800000 //how much power do we dump into the SMES on use? restores the main (if unupgraded) by 20%, or engine by 80% - matter = list(MAT_STEEL = 6000, MAT_COPPER = 4000, MAT_PLASTIC = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(3), MAT_COPPER = MATERIAL_COST(2), MAT_PLASTIC = MATERIAL_COST(1)) /obj/item/fusion_coil/Initialize(mapload) . = ..() diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 1c4ea232257..197303ff591 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -949,7 +949,7 @@ GLOBAL_LIST_EMPTY(light_type_cache) force = 2 throwforce = 5 w_class = ITEMSIZE_TINY - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) ///LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN var/status = LIGHT_OK @@ -991,7 +991,7 @@ GLOBAL_LIST_EMPTY(light_type_cache) icon_state = "ltube" base_state = "ltube" item_state = "c_tube" - matter = list(MAT_GLASS = 100) + matter = list(MAT_GLASS = MATERIAL_COST(0.05)) brightness_range = 7 brightness_power = 2 init_brightness_range = 7 @@ -1019,7 +1019,7 @@ GLOBAL_LIST_EMPTY(light_type_cache) icon_state = "lbulb" base_state = "lbulb" item_state = "contvapour" - matter = list(MAT_GLASS = 100) + matter = list(MAT_GLASS = MATERIAL_COST(0.05)) brightness_range = 5 brightness_power = 1 brightness_color = LIGHT_COLOR_INCANDESCENT_BULB @@ -1070,7 +1070,7 @@ GLOBAL_LIST_EMPTY(light_type_cache) icon_state = "fbulb" base_state = "fbulb" item_state = "egg4" - matter = list(MAT_GLASS = 100) + matter = list(MAT_GLASS = MATERIAL_COST(0.05)) // update the icon state and description of the light /obj/item/light/update_icon() diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 426eef1f8d6..8bf7a8506a7 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -101,7 +101,7 @@ icon = 'icons/obj/ammo.dmi' slot_flags = SLOT_BELT item_state = "syringe_kit" - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) throwforce = 5 w_class = ITEMSIZE_SMALL throw_speed = 4 diff --git a/code/modules/projectiles/ammunition/ammo_boxes.dm b/code/modules/projectiles/ammunition/ammo_boxes.dm index e9ee86a7d33..27d8d3779bf 100644 --- a/code/modules/projectiles/ammunition/ammo_boxes.dm +++ b/code/modules/projectiles/ammunition/ammo_boxes.dm @@ -32,7 +32,7 @@ icon_state = "foambox" caliber = "foam" ammo_type = /obj/item/ammo_casing/afoam_dart - matter = list(MAT_PLASTIC = 1800) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.9)) max_ammo = 30 multiple_sprites = null @@ -41,7 +41,7 @@ desc = "Contains Donk-Soft riot darts. It's Donk or Don't! Ages 18 and up." icon_state = "foambox_riot" ammo_type = /obj/item/ammo_casing/afoam_dart/riot - matter = list(MAT_STEEL = 5040, MAT_PLASTIC = 1800) + matter = list(MAT_STEEL = MATERIAL_COST(2.52), MAT_PLASTIC = MATERIAL_COST(0.9)) /* * Cap @@ -54,7 +54,7 @@ icon_state = "capbox" caliber = "caps" ammo_type = /obj/item/ammo_casing/cap - matter = list(MAT_STEEL = 2040) + matter = list(MAT_STEEL = MATERIAL_COST(1.02)) max_ammo = 24 multiple_sprites = null @@ -68,7 +68,7 @@ icon_state = "magnum" caliber = ".357" ammo_type = /obj/item/ammo_casing/a357 - matter = list(MAT_STEEL = 5040) + matter = list(MAT_STEEL = MATERIAL_COST(2.52)) max_ammo = 24 multiple_sprites = 1 @@ -78,7 +78,7 @@ icon_state = "magnum_r" caliber = ".357" ammo_type = /obj/item/ammo_casing/a357/rubber - matter = list(MAT_STEEL = 5040) + matter = list(MAT_STEEL = MATERIAL_COST(2.52)) max_ammo = 24 multiple_sprites = 1 @@ -92,7 +92,7 @@ icon_state = "pistol" caliber = ".38" ammo_type = /obj/item/ammo_casing/a38 - matter = list(MAT_STEEL = 1440) + matter = list(MAT_STEEL = MATERIAL_COST(0.72)) max_ammo = 24 multiple_sprites = 1 @@ -102,7 +102,7 @@ icon_state = "pistol_p" caliber = ".38" ammo_type = /obj/item/ammo_casing/a38/rubber - matter = list(MAT_STEEL = 1440) + matter = list(MAT_STEEL = MATERIAL_COST(0.72)) max_ammo = 24 multiple_sprites = 1 @@ -116,7 +116,7 @@ icon_state = "box10mm" caliber = "10mm" ammo_type = /obj/item/ammo_casing/a10mm - matter = list(MAT_STEEL = 3000) + matter = list(MAT_STEEL = MATERIAL_COST(1.5)) max_ammo = 40 multiple_sprites = 1 @@ -126,7 +126,7 @@ icon_state = "box10mm-practice" caliber = "10mm" ammo_type = /obj/item/ammo_casing/a10mm/practice - matter = list(MAT_STEEL = 2400) + matter = list(MAT_STEEL = MATERIAL_COST(1.2)) max_ammo = 40 multiple_sprites = 1 @@ -136,7 +136,7 @@ icon_state = "box10mm-rubber" caliber = "10mm" ammo_type = /obj/item/ammo_casing/a10mm/rubber - matter = list(MAT_STEEL = 2400) + matter = list(MAT_STEEL = MATERIAL_COST(1.2)) max_ammo = 40 multiple_sprites = 1 @@ -146,7 +146,7 @@ icon_state = "box10mm-hw" caliber = "10mm" ammo_type = /obj/item/ammo_casing/a10mm/emp - matter = list(MAT_STEEL = 5200, MAT_URANIUM = 4000) + matter = list(MAT_STEEL = MATERIAL_COST(2.6), MAT_URANIUM = MATERIAL_COST(2)) max_ammo = 40 multiple_sprites = 1 @@ -160,7 +160,7 @@ icon_state = "box44" caliber = ".44" ammo_type = /obj/item/ammo_casing/a44 - matter = list(MAT_STEEL = 5040) + matter = list(MAT_STEEL = MATERIAL_COST(2.52)) max_ammo = 24 multiple_sprites = 1 @@ -170,7 +170,7 @@ icon_state = "box44-rubber" caliber = ".44" ammo_type = /obj/item/ammo_casing/a44/rubber - matter = list(MAT_STEEL = 1440) + matter = list(MAT_STEEL = MATERIAL_COST(0.72)) max_ammo = 24 multiple_sprites = 1 @@ -184,7 +184,7 @@ icon_state = "pistol_s" caliber = ".45" ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 1800) + matter = list(MAT_STEEL = MATERIAL_COST(0.9)) max_ammo = 24 multiple_sprites = 1 @@ -194,7 +194,7 @@ icon_state = "pistol_p" caliber = ".45" ammo_type = /obj/item/ammo_casing/a45/practice - matter = list(MAT_STEEL = 1440) + matter = list(MAT_STEEL = MATERIAL_COST(0.72)) max_ammo = 24 multiple_sprites = 1 @@ -204,7 +204,7 @@ icon_state = "pistol_ap" caliber = ".45" ammo_type = /obj/item/ammo_casing/a45/ap - matter = list(MAT_STEEL = 1200, MAT_PLASTEEL = 600) + matter = list(MAT_STEEL = MATERIAL_COST(0.6), MAT_PLASTEEL = MATERIAL_COST(0.3)) max_ammo = 24 multiple_sprites = 1 @@ -214,7 +214,7 @@ icon_state = "pistol_hp" caliber = ".45" ammo_type = /obj/item/ammo_casing/a45/hp - matter = list(MAT_STEEL = 1440, MAT_PLASTIC = 360) + matter = list(MAT_STEEL = MATERIAL_COST(0.72), MAT_PLASTIC = MATERIAL_COST(0.18)) max_ammo = 24 multiple_sprites = 1 @@ -224,7 +224,7 @@ icon_state = "pistol_r" caliber = ".45" ammo_type = /obj/item/ammo_casing/a45/rubber - matter = list(MAT_STEEL = 1440) + matter = list(MAT_STEEL = MATERIAL_COST(0.72)) max_ammo = 24 multiple_sprites = 1 @@ -234,7 +234,7 @@ icon_state = "pistol_hw" caliber = ".45" ammo_type = /obj/item/ammo_casing/a45/emp - matter = list(MAT_STEEL = 3120, MAT_URANIUM = 2400) + matter = list(MAT_STEEL = MATERIAL_COST(1.56), MAT_URANIUM = MATERIAL_COST(1.2)) max_ammo = 24 multiple_sprites = 1 @@ -248,7 +248,7 @@ icon_state = "slug" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g - matter = list(MAT_STEEL = 2880) + matter = list(MAT_STEEL = MATERIAL_COST(1.44)) max_ammo = 8 multiple_sprites = 1 @@ -258,7 +258,7 @@ icon_state = "buckshot" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/pellet - matter = list(MAT_STEEL = 2880) + matter = list(MAT_STEEL = MATERIAL_COST(1.44)) max_ammo = 8 multiple_sprites = 1 @@ -268,7 +268,7 @@ icon_state = "bean" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/beanbag - matter = list(MAT_STEEL = 1440) + matter = list(MAT_STEEL = MATERIAL_COST(0.72)) max_ammo = 8 multiple_sprites = 1 @@ -278,7 +278,7 @@ icon_state = "stunslug" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/stunshell - matter = list(MAT_STEEL = 2880, MAT_GLASS = 5760) + matter = list(MAT_STEEL = MATERIAL_COST(1.44), MAT_GLASS = MATERIAL_COST(2.88)) max_ammo = 8 multiple_sprites = 1 @@ -288,7 +288,7 @@ icon_state = "emp" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/emp - matter = list(MAT_STEEL = 2880, MAT_URANIUM = 1920) + matter = list(MAT_STEEL = MATERIAL_COST(1.44), MAT_URANIUM = MATERIAL_COST(0.96)) max_ammo = 8 multiple_sprites = 1 @@ -298,7 +298,7 @@ icon_state = "bean" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/flechette - matter = list(MAT_STEEL = 2880, MAT_PLASTEEL = 800) + matter = list(MAT_STEEL = MATERIAL_COST(1.44), MAT_PLASTEEL = MATERIAL_COST(0.4)) max_ammo = 8 multiple_sprites = 1 @@ -308,7 +308,7 @@ icon_state = "practice" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/practice - matter = list(MAT_STEEL = 480) + matter = list(MAT_STEEL = MATERIAL_COST(0.24)) max_ammo = 8 multiple_sprites = 1 @@ -318,7 +318,7 @@ icon_state = "blank" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/blank - matter = list(MAT_STEEL = 720) + matter = list(MAT_STEEL = MATERIAL_COST(0.36)) max_ammo = 8 multiple_sprites = 1 @@ -328,7 +328,7 @@ icon_state = "flash" caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g/flash - matter = list(MAT_STEEL = 720, MAT_GLASS = 720) + matter = list(MAT_STEEL = MATERIAL_COST(0.36), MAT_GLASS = MATERIAL_COST(0.36)) max_ammo = 8 multiple_sprites = 1 @@ -342,7 +342,7 @@ icon_state = "sniper" caliber = "14.5mm" ammo_type = /obj/item/ammo_casing/a145 - matter = list(MAT_STEEL = 8750) + matter = list(MAT_STEEL = MATERIAL_COST(4.375)) max_ammo = 7 multiple_sprites = 1 @@ -352,7 +352,7 @@ icon_state = "sniper" caliber = "14.5mm" ammo_type = /obj/item/ammo_casing/a145 - matter = list(MAT_STEEL = 8750) + matter = list(MAT_STEEL = MATERIAL_COST(4.375)) max_ammo = 7 multiple_sprites = 1 @@ -366,7 +366,7 @@ icon_state = "rifle" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762 - matter = list(MAT_STEEL = 6000) + matter = list(MAT_STEEL = MATERIAL_COST(3)) max_ammo = 30 multiple_sprites = 1 @@ -376,7 +376,7 @@ icon_state = "rifle_hp" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/hp - matter = list(MAT_STEEL = 9000) + matter = list(MAT_STEEL = MATERIAL_COST(4.5)) max_ammo = 30 multiple_sprites = 1 @@ -386,7 +386,7 @@ icon_state = "rifle_ap" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/ap - matter = list(MAT_STEEL = 9000) + matter = list(MAT_STEEL = MATERIAL_COST(4.5)) max_ammo = 30 multiple_sprites = 1 @@ -396,7 +396,7 @@ icon_state = "rifle_p" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/practice - matter = list(MAT_STEEL = 2700) + matter = list(MAT_STEEL = MATERIAL_COST(1.35)) max_ammo = 30 multiple_sprites = 1 @@ -406,7 +406,7 @@ icon_state = "rifle_hunter" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/hunter - matter = list(MAT_STEEL = 6000) + matter = list(MAT_STEEL = MATERIAL_COST(3)) max_ammo = 30 multiple_sprites = 1 @@ -416,7 +416,7 @@ icon_state = "paper_wrap" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762 - matter = list(MAT_STEEL = 1600) + matter = list(MAT_STEEL = MATERIAL_COST(0.8)) max_ammo = 8 multiple_sprites = 1 @@ -426,7 +426,7 @@ icon_state = "paper_wrap" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/blank - matter = list(MAT_STEEL = 720) + matter = list(MAT_STEEL = MATERIAL_COST(0.36)) max_ammo = 8 multiple_sprites = 1 @@ -436,7 +436,7 @@ icon_state = "paper_wrap" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/hunter - matter = list(MAT_STEEL = 1600) + matter = list(MAT_STEEL = MATERIAL_COST(0.8)) max_ammo = 8 multiple_sprites = 1 @@ -450,7 +450,7 @@ icon_state = "hrifle" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545 - matter = list(MAT_STEEL = 5400) + matter = list(MAT_STEEL = MATERIAL_COST(2.7)) max_ammo = 30 multiple_sprites = 1 @@ -460,7 +460,7 @@ icon_state = "hrifle-ap" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/ap - matter = list(MAT_STEEL = 8100) + matter = list(MAT_STEEL = MATERIAL_COST(4.05)) max_ammo = 30 multiple_sprites = 1 @@ -470,7 +470,7 @@ icon_state = "hrifle-hp" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/hp - matter = list(MAT_STEEL = 5400) + matter = list(MAT_STEEL = MATERIAL_COST(2.7)) max_ammo = 30 multiple_sprites = 1 @@ -480,7 +480,7 @@ icon_state = "hrifle-blank" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/practice - matter = list(MAT_STEEL = 2700) + matter = list(MAT_STEEL = MATERIAL_COST(1.35)) max_ammo = 30 multiple_sprites = 1 @@ -490,7 +490,7 @@ icon_state = "hrifle-hunter" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/hunter - matter = list(MAT_STEEL = 5400) + matter = list(MAT_STEEL = MATERIAL_COST(2.7)) max_ammo = 30 multiple_sprites = 1 @@ -500,7 +500,7 @@ icon_state = "hrifle-blank" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/blank - matter = list(MAT_STEEL = 2700) + matter = list(MAT_STEEL = MATERIAL_COST(1.35)) max_ammo = 30 multiple_sprites = 1 @@ -510,7 +510,7 @@ icon_state = "boxhrifle" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545 - matter = list(MAT_STEEL = 18000) + matter = list(MAT_STEEL = MATERIAL_COST(9)) max_ammo = 100 multiple_sprites = 1 @@ -520,7 +520,7 @@ icon_state = "boxhrifle-ap" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/ap - matter = list(MAT_STEEL = 27000) + matter = list(MAT_STEEL = MATERIAL_COST(13.5)) max_ammo = 100 multiple_sprites = 1 @@ -530,7 +530,7 @@ icon_state = "boxhrifle-hp" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/hp - matter = list(MAT_STEEL = 18000) + matter = list(MAT_STEEL = MATERIAL_COST(9)) max_ammo = 100 multiple_sprites = 1 @@ -540,7 +540,7 @@ icon_state = "boxhrifle-practice" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/practice - matter = list(MAT_STEEL = 9000) + matter = list(MAT_STEEL = MATERIAL_COST(4.5)) max_ammo = 100 multiple_sprites = 1 @@ -550,6 +550,6 @@ icon_state = "boxhrifle-hunter" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545/hunter - matter = list(MAT_STEEL = 18000) + matter = list(MAT_STEEL = MATERIAL_COST(9)) max_ammo = 100 multiple_sprites = 1 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index cce08a09331..78571330ed5 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -30,7 +30,7 @@ icon_state = "toy" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/afoam_dart - matter = list(MAT_PLASTIC = 250) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.125)) caliber = "foam" max_ammo = 9 multiple_sprites = 1 @@ -48,7 +48,7 @@ icon_state = "toysmg" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/afoam_dart - matter = list(MAT_PLASTIC = 250) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.125)) caliber = "foam" max_ammo = 20 multiple_sprites = 1 @@ -58,7 +58,7 @@ /obj/item/ammo_magazine/mfoam_dart/smg/riot ammo_type = /obj/item/ammo_casing/afoam_dart/riot - matter = list(MAT_PLASTIC = 1260, MAT_PLASTIC = 250) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.63), MAT_PLASTIC = MATERIAL_COST(0.125)) ///////// .357 ///////// @@ -68,7 +68,7 @@ icon_state = "38" caliber = ".357" ammo_type = /obj/item/ammo_casing/a357 - matter = list(MAT_STEEL = 1260) + matter = list(MAT_STEEL = MATERIAL_COST(0.63)) max_ammo = 6 multiple_sprites = 1 @@ -94,7 +94,7 @@ desc = "A speedloader for .38 revolvers." icon_state = "38" caliber = ".38" - matter = list(MAT_STEEL = 360) + matter = list(MAT_STEEL = MATERIAL_COST(0.18)) ammo_type = /obj/item/ammo_casing/a38 max_ammo = 6 multiple_sprites = 1 @@ -113,7 +113,7 @@ name = "makarov magazine (.38)" icon_state = "45" mag_type = MAGAZINE - matter = list(MAT_STEEL = 480) + matter = list(MAT_STEEL = MATERIAL_COST(0.24)) caliber = ".38" ammo_type = /obj/item/ammo_casing/a38 max_ammo = 8 @@ -128,7 +128,7 @@ name = "magazine (.38)" icon_state = "m91" mag_type = MAGAZINE - matter = list(MAT_STEEL = 540) + matter = list(MAT_STEEL = MATERIAL_COST(0.27)) caliber = ".38" ammo_type = /obj/item/ammo_casing/a38 max_ammo = 10 @@ -145,7 +145,7 @@ icon_state = "45" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.2625)) //metal costs are very roughly based around 1 .45 casing = 75 metal caliber = ".45" max_ammo = 7 multiple_sprites = 1 @@ -183,7 +183,7 @@ icon_state = "uzi45" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 1200) + matter = list(MAT_STEEL = MATERIAL_COST(0.6)) caliber = ".45" max_ammo = 16 multiple_sprites = 1 @@ -197,7 +197,7 @@ icon_state = "tomstick" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 1500) + matter = list(MAT_STEEL = MATERIAL_COST(0.75)) caliber = ".45" max_ammo = 20 multiple_sprites = 1 @@ -215,7 +215,7 @@ w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets! mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 3750) + matter = list(MAT_STEEL = MATERIAL_COST(1.875)) caliber = ".45" max_ammo = 50 multiple_sprites = 1 @@ -234,7 +234,7 @@ desc = "A stripper clip for reloading .45 rounds into magazines." caliber = ".45" ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 675) // metal costs very roughly based around one .45 casing = 75 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.3375)) // metal costs very roughly based around one .45 casing = 75 metal max_ammo = 9 multiple_sprites = 1 @@ -255,7 +255,7 @@ name = "speedloader (.45)" icon_state = "45s" ammo_type = /obj/item/ammo_casing/a45 - matter = list(MAT_STEEL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.2625)) //metal costs are very roughly based around 1 .45 casing = 75 metal caliber = ".45" max_ammo = 6 multiple_sprites = 1 @@ -303,7 +303,7 @@ name = "magazine (9mm)" icon_state = "m91" mag_type = MAGAZINE - matter = list(MAT_STEEL = 600) + matter = list(MAT_STEEL = MATERIAL_COST(0.3)) caliber = "9mm" ammo_type = /obj/item/ammo_casing/a9mm max_ammo = 10 @@ -330,7 +330,7 @@ desc = "\"FOR LAW ENFORCEMENT/MILITARY USE ONLY\" is clearly etched on the magazine. This is probably illegal for you to have." // Remember, Security is not Law Enforcement, so it's illegal for Security to use as well. icon_state = "m93" mag_type = MAGAZINE - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) caliber = "9mm" ammo_type = /obj/item/ammo_casing/a9mm max_ammo = 17 @@ -351,7 +351,7 @@ name = "compact magazine (9mm)" icon_state = "m92" mag_type = MAGAZINE - matter = list(MAT_STEEL = 480) + matter = list(MAT_STEEL = MATERIAL_COST(0.24)) caliber = "9mm" ammo_type = /obj/item/ammo_casing/a9mm max_ammo = 8 @@ -377,7 +377,7 @@ name = "\improper \"Mäuse\" magazine (9mm)" icon_state = "9x19p" mag_type = MAGAZINE - matter = list(MAT_STEEL = 480) + matter = list(MAT_STEEL = MATERIAL_COST(0.24)) caliber = "9mm" ammo_type = /obj/item/ammo_casing/a9mm max_ammo = 8 @@ -396,7 +396,7 @@ icon_state = "9mmt" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a9mm - matter = list(MAT_STEEL = 1200) + matter = list(MAT_STEEL = MATERIAL_COST(0.6)) caliber = "9mm" max_ammo = 20 multiple_sprites = 1 @@ -419,7 +419,7 @@ /obj/item/ammo_magazine/m9mmt/ap name = "top mounted magazine (9mm armor piercing)" ammo_type = /obj/item/ammo_casing/a9mm/ap - matter = list(MAT_STEEL = 1000, MAT_PLASTEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_PLASTEEL = MATERIAL_COST(1)) // P90 /obj/item/ammo_magazine/m9mmp90 @@ -427,7 +427,7 @@ icon_state = "p90" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a9mm/ap - matter = list(MAT_STEEL = 3000) + matter = list(MAT_STEEL = MATERIAL_COST(1.5)) caliber = "9mm" max_ammo = 50 multiple_sprites = 1 @@ -442,7 +442,7 @@ desc = "A stripper clip for reloading 9mm rounds into magazines." caliber = "9mm" ammo_type = /obj/item/ammo_casing/a9mm - matter = list(MAT_STEEL = 540) // metal costs are very roughly based around one 9mm casing = 60 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.27)) // metal costs are very roughly based around one 9mm casing = 60 metal max_ammo = 9 multiple_sprites = 1 @@ -464,7 +464,7 @@ icon_state = "S9mm" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a9mm - matter = list(MAT_STEEL = 1200) + matter = list(MAT_STEEL = MATERIAL_COST(0.6)) caliber = "9mm" max_ammo = 21 multiple_sprites = 1 @@ -473,7 +473,7 @@ desc = "A high capacity double stack magazine made specially for the Advanced SMG. Filled with 21 9mm armor piercing bullets." icon_state = "S9mm" ammo_type = /obj/item/ammo_casing/a9mm/ap - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) /obj/item/ammo_magazine/m9mmAdvanced/empty initial_ammo = 0 @@ -485,7 +485,7 @@ icon_state = "10mm" mag_type = MAGAZINE caliber = "10mm" - matter = list(MAT_STEEL = 1500) + matter = list(MAT_STEEL = MATERIAL_COST(0.75)) ammo_type = /obj/item/ammo_casing/a10mm max_ammo = 20 multiple_sprites = 1 @@ -495,38 +495,38 @@ /obj/item/ammo_magazine/m10mm/practice name = "magazine (10mm practice)" - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) ammo_type = /obj/item/ammo_casing/a10mm/practice /obj/item/ammo_magazine/m10mm/rubber name = "magazine (10mm rubber)" - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) ammo_type = /obj/item/ammo_casing/a10mm/rubber /obj/item/ammo_magazine/m10mm/emp name = "magazine (10mm haywire)" - matter = list(MAT_STEEL = 1500, MAT_URANIUM = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(1)) ammo_type = /obj/item/ammo_casing/a10mm/emp // Pistol /obj/item/ammo_magazine/m10mm/pistol icon_state = "m91" - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) max_ammo = 12 /obj/item/ammo_magazine/m10mm/pistol/practice name = "magazine (10mm practice)" - matter = list(MAT_STEEL = 800) + matter = list(MAT_STEEL = MATERIAL_COST(0.4)) ammo_type = /obj/item/ammo_casing/a10mm/practice /obj/item/ammo_magazine/m10mm/pistol/rubber name = "magazine (10mm rubber)" - matter = list(MAT_STEEL = 800) + matter = list(MAT_STEEL = MATERIAL_COST(0.4)) ammo_type = /obj/item/ammo_casing/a10mm/rubber /obj/item/ammo_magazine/m10mm/pistol/emp name = "magazine (10mm haywire)" - matter = list(MAT_STEEL = 1000, MAT_URANIUM = 1500) + matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.75)) ammo_type = /obj/item/ammo_casing/a10mm/emp /obj/item/ammo_magazine/m10mm/pistol/empty @@ -539,7 +539,7 @@ icon_state = "m545" mag_type = MAGAZINE caliber = "5.45mm" - matter = list(MAT_STEEL = 1800) + matter = list(MAT_STEEL = MATERIAL_COST(0.9)) ammo_type = /obj/item/ammo_casing/a545 max_ammo = 20 multiple_sprites = 1 @@ -562,7 +562,7 @@ // Extended /obj/item/ammo_magazine/m545/ext name = "extended magazine (5.45mm)" - matter = list(MAT_STEEL = 2700) + matter = list(MAT_STEEL = MATERIAL_COST(1.35)) max_ammo = 30 /obj/item/ammo_magazine/m545/ext/empty @@ -584,7 +584,7 @@ /obj/item/ammo_magazine/m545/small name = "reduced magazine (5.45mm)" icon_state = "m545-small" - matter = list(MAT_STEEL = 900) + matter = list(MAT_STEEL = MATERIAL_COST(0.45)) max_ammo = 10 /obj/item/ammo_magazine/m545/small/empty @@ -608,7 +608,7 @@ icon_state = "clip_rifle" caliber = "5.45mm" ammo_type = /obj/item/ammo_casing/a545 - matter = list(MAT_STEEL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.225)) // metal costs are very roughly based around one 10mm casing = 180 metal max_ammo = 5 multiple_sprites = 1 @@ -630,7 +630,7 @@ icon_state = "a545" mag_type = MAGAZINE caliber = "5.45mm" - matter = list(MAT_STEEL = 10000) + matter = list(MAT_STEEL = MATERIAL_COST(5)) ammo_type = /obj/item/ammo_casing/a545 w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!! max_ammo = 50 @@ -654,7 +654,7 @@ icon_state = "m44" mag_type = MAGAZINE caliber = ".44" - matter = list(MAT_STEEL = 1260) + matter = list(MAT_STEEL = MATERIAL_COST(0.63)) ammo_type = /obj/item/ammo_casing/a44 max_ammo = 7 multiple_sprites = 1 @@ -673,7 +673,7 @@ desc = "A stripper clip for reloading .44 rounds into magazines." caliber = ".44" ammo_type = /obj/item/ammo_casing/a44 - matter = list(MAT_STEEL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.81)) // metal costs are very roughly based around one .50 casing = 180 metal max_ammo = 9 multiple_sprites = 1 @@ -682,7 +682,7 @@ name = "speedloader (.44)" icon_state = "44" ammo_type = /obj/item/ammo_casing/a44 - matter = list(MAT_STEEL = 1260) //metal costs are very roughly based around 1 .45 casing = 75 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.63)) //metal costs are very roughly based around 1 .45 casing = 75 metal caliber = ".44" max_ammo = 6 multiple_sprites = 1 @@ -707,7 +707,7 @@ icon_state = "m762-small" mag_type = MAGAZINE caliber = "7.62mm" - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 10 multiple_sprites = 1 @@ -723,7 +723,7 @@ /obj/item/ammo_magazine/m762/ext name = "extended magazine (7.62mm)" icon_state = "m762" - matter = list(MAT_STEEL = 4000) + matter = list(MAT_STEEL = MATERIAL_COST(2)) max_ammo = 20 /obj/item/ammo_magazine/m762/ext/empty @@ -739,7 +739,7 @@ icon_state = "enbloc" mag_type = MAGAZINE caliber = "7.62mm" - matter = list(MAT_STEEL = 1600) + matter = list(MAT_STEEL = MATERIAL_COST(0.8)) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 8 multiple_sprites = 1 @@ -757,7 +757,7 @@ icon_state = "clip_rifle" caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762 - matter = list(MAT_STEEL = 1000) // metal costs are very roughly based around one 7.62 casing = 200 metal + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) // metal costs are very roughly based around one 7.62 casing = 200 metal max_ammo = 5 multiple_sprites = 1 @@ -779,7 +779,7 @@ icon_state = "SVD" mag_type = MAGAZINE caliber = "7.62mm" - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 10 multiple_sprites = 1 @@ -798,7 +798,7 @@ icon_state = "ashot-mag" mag_type = MAGAZINE caliber = "12g" - matter = list(MAT_STEEL = 13000) + matter = list(MAT_STEEL = MATERIAL_COST(6.5)) ammo_type = /obj/item/ammo_casing/a12g max_ammo = 24 multiple_sprites = 1 @@ -825,7 +825,7 @@ desc = "A metal clip for holding and quickly loading two shotgun shells." caliber = "12g" ammo_type = /obj/item/ammo_casing/a12g - matter = list(MAT_STEEL = 1070) + matter = list(MAT_STEEL = MATERIAL_COST(0.535)) max_ammo = 2 multiple_sprites = 1 @@ -833,13 +833,13 @@ name = "ammo clip (12g buckshot)" icon_state = "12gclipshell" ammo_type = /obj/item/ammo_casing/a12g/pellet - matter = list(MAT_STEEL = 1070) + matter = list(MAT_STEEL = MATERIAL_COST(0.535)) /obj/item/ammo_magazine/clip/c12g/beanbag name = "ammo clip (12g beanbag)" icon_state = "12gclipbean" ammo_type = /obj/item/ammo_casing/a12g/beanbag - matter = list(MAT_STEEL = 710) + matter = list(MAT_STEEL = MATERIAL_COST(0.355)) ///////// .75 Gyrojet ///////// diff --git a/code/modules/projectiles/ammunition/magnetic.dm b/code/modules/projectiles/ammunition/magnetic.dm index f2e72616c67..db1043379d9 100644 --- a/code/modules/projectiles/ammunition/magnetic.dm +++ b/code/modules/projectiles/ammunition/magnetic.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "caseless-mag" w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 1800) + matter = list(MAT_STEEL = MATERIAL_COST(0.9)) var/remaining = 9 preserve_item = 1 diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index fe45cf3e188..9c5600eec73 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -27,7 +27,7 @@ name = "foam dart" desc = "It's Donk or Don't! Ages 8 and up." projectile_type = /obj/item/projectile/bullet/foam_dart - matter = list(MAT_PLASTIC = 60) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.03)) caliber = "foam" icon = 'icons/obj/gun_toy.dmi' icon_state = "foamdart" @@ -37,7 +37,7 @@ name = "riot foam dart" desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." projectile_type = /obj/item/projectile/bullet/foam_dart_riot - matter = list(MAT_STEEL = 210, MAT_PLASTIC = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.105), MAT_PLASTIC = MATERIAL_COST(0.03)) icon_state = "foamdart_riot" /* @@ -48,12 +48,12 @@ desc = "A .357 bullet casing." caliber = ".357" projectile_type = /obj/item/projectile/bullet/pistol/strong - matter = list(MAT_STEEL = 210) + matter = list(MAT_STEEL = MATERIAL_COST(0.105)) /obj/item/ammo_casing/a357/bb desc = "A .357 BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /obj/item/ammo_casing/a357/rubber @@ -61,7 +61,7 @@ caliber = ".357" icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a357/flash desc = "A .357 flash bullet casing." @@ -83,7 +83,7 @@ desc = "A .38 bullet casing." caliber = ".38" projectile_type = /obj/item/projectile/bullet/pistol - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a38/rubber desc = "A .38 rubber bullet casing." @@ -95,12 +95,12 @@ desc = "A .38 bullet casing fitted with a single-use ion pulse generator." icon_state = "empcasing" projectile_type = /obj/item/projectile/ion/small - matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.065), MAT_URANIUM = MATERIAL_COST(0.05)) /obj/item/ammo_casing/a38/bb desc = "A .38 BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -111,23 +111,23 @@ desc = "A .44 bullet casing." caliber = ".44" projectile_type = /obj/item/projectile/bullet/pistol/strong - matter = list(MAT_STEEL = 210) + matter = list(MAT_STEEL = MATERIAL_COST(0.105)) /obj/item/ammo_casing/a44/rubber icon_state = "r-casing" desc = "A .44 rubber bullet casing." projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a44/rifle desc = "A proprietary Hedberg-Hammarstrom .44 bullet casing designed for use in revolving rifles." projectile_type = /obj/item/projectile/bullet/rifle/a44rifle - matter = list(MAT_STEEL = 210) + matter = list(MAT_STEEL = MATERIAL_COST(0.105)) /obj/item/ammo_casing/a44/bb desc = "A .44 BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -138,7 +138,7 @@ desc = "A .75 gyrojet rocket sheathe." caliber = ".75" projectile_type = /obj/item/projectile/bullet/gyro - matter = list(MAT_STEEL = 4000) + matter = list(MAT_STEEL = MATERIAL_COST(2)) /* * 9mm @@ -148,12 +148,12 @@ desc = "A 9mm bullet casing." caliber = "9mm" projectile_type = /obj/item/projectile/bullet/pistol - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a9mm/ap desc = "A 9mm armor-piercing bullet casing." projectile_type = /obj/item/projectile/bullet/pistol/ap - matter = list(MAT_STEEL = 80) + matter = list(MAT_STEEL = MATERIAL_COST(0.04)) /obj/item/ammo_casing/a9mm/hp desc = "A 9mm hollow-point bullet casing." @@ -177,7 +177,7 @@ /obj/item/ammo_casing/a9mm/bb desc = "A 9mm BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -188,48 +188,48 @@ desc = "A .45 bullet casing." caliber = ".45" projectile_type = /obj/item/projectile/bullet/pistol/medium - matter = list(MAT_STEEL = 75) + matter = list(MAT_STEEL = MATERIAL_COST(0.0375)) /obj/item/ammo_casing/a45/ap desc = "A .45 Armor-Piercing bullet casing." icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/pistol/medium/ap - matter = list(MAT_STEEL = 50, MAT_PLASTEEL = 25) + matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_PLASTEEL = MATERIAL_COST(0.0125)) /obj/item/ammo_casing/a45/practice desc = "A .45 practice bullet casing." icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/practice - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a45/rubber desc = "A .45 rubber bullet casing." icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/pistol/rubber - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a45/flash desc = "A .45 flash shell casing." icon_state = "r-casing" projectile_type = /obj/item/projectile/energy/flash - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a45/emp name = ".45 haywire round" desc = "A .45 bullet casing fitted with a single-use ion pulse generator." projectile_type = /obj/item/projectile/ion/small icon_state = "empcasing" - matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.065), MAT_URANIUM = MATERIAL_COST(0.05)) /obj/item/ammo_casing/a45/hp desc = "A .45 hollow-point bullet casing." projectile_type = /obj/item/projectile/bullet/pistol/medium/hp - matter = list(MAT_STEEL = 60, MAT_PLASTIC = 15) + matter = list(MAT_STEEL = MATERIAL_COST(0.03), MAT_PLASTIC = MATERIAL_COST(0.0075)) /obj/item/ammo_casing/a45/bb desc = "A .45 BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -240,31 +240,31 @@ desc = "A 10mm bullet casing." caliber = "10mm" projectile_type = /obj/item/projectile/bullet/pistol/medium - matter = list(MAT_STEEL = 75) + matter = list(MAT_STEEL = MATERIAL_COST(0.0375)) /obj/item/ammo_casing/a10mm/practice desc = "A 10mm practice bullet casing." icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/practice - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a10mm/rubber desc = "A 10mm rubber bullet casing." projectile_type = /obj/item/projectile/bullet/pistol/rubber icon_state = "r-casing" - matter = list(MAT_STEEL = 60) + matter = list(MAT_STEEL = MATERIAL_COST(0.03)) /obj/item/ammo_casing/a10mm/emp name = "10mm haywire round" desc = "A 10mm bullet casing fitted with a single-use ion pulse generator." projectile_type = /obj/item/projectile/ion/small icon_state = "empcasing" - matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.065), MAT_URANIUM = MATERIAL_COST(0.05)) /obj/item/ammo_casing/a10mm/bb desc = "A 10mm BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -277,7 +277,7 @@ icon_state = "slshell" caliber = "12g" projectile_type = /obj/item/projectile/bullet/shotgun - matter = list(MAT_STEEL = 360) + matter = list(MAT_STEEL = MATERIAL_COST(0.18)) /obj/item/ammo_casing/a12g/pellet name = "shotgun shell" @@ -290,21 +290,21 @@ desc = "A blank shell." icon_state = "blshell" projectile_type = /obj/item/projectile/bullet/blank - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a12g/practice name = "shotgun shell" desc = "A practice shell." icon_state = "pshell" projectile_type = /obj/item/projectile/bullet/practice - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a12g/beanbag name = "beanbag shell" desc = "A 12 gauge beanbag shell." icon_state = "bshell" projectile_type = /obj/item/projectile/bullet/shotgun/beanbag - matter = list(MAT_STEEL = 180) + matter = list(MAT_STEEL = MATERIAL_COST(0.09)) //Can stun in one hit if aimed at the head, but //is blocked by clothing that stops tasers and is vulnerable to EMP @@ -313,7 +313,7 @@ desc = "A 12 gauge taser cartridge." icon_state = "stunshell" projectile_type = /obj/item/projectile/energy/electrode/stunshot - matter = list(MAT_STEEL = 360, MAT_GLASS = 720) + matter = list(MAT_STEEL = MATERIAL_COST(0.18), MAT_GLASS = MATERIAL_COST(0.36)) /obj/item/ammo_casing/a12g/stunshell/emp_act(severity, recursive) . = ..() @@ -328,7 +328,7 @@ desc = "A chemical shell used to signal distress or provide illumination." icon_state = "fshell" projectile_type = /obj/item/projectile/energy/flash/flare - matter = list(MAT_STEEL = 90, MAT_GLASS = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045), MAT_GLASS = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a12g/emp name = "ion shell" @@ -336,7 +336,7 @@ icon_state = "empshell" projectile_type = /obj/item/projectile/ion // projectile_type = /obj/item/projectile/bullet/shotgun/ion - matter = list(MAT_STEEL = 360, MAT_URANIUM = 240) + matter = list(MAT_STEEL = MATERIAL_COST(0.18), MAT_URANIUM = MATERIAL_COST(0.12)) /obj/item/ammo_casing/a12g/flechette name = "shotgun flechette" @@ -344,12 +344,12 @@ icon_state = "slshell" caliber = "12g" projectile_type = /obj/item/projectile/scatter/flechette - matter = list(MAT_STEEL = 360, MAT_PLASTEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.18), MAT_PLASTEEL = MATERIAL_COST(0.05)) /obj/item/ammo_casing/a12g/bb desc = "A shotgun BB shell." projectile_type = /obj/item/projectile/bullet/pellet/shotgun/bb // Shotgun - matter = list(MAT_PLASTIC = 120) // 6 pellets + matter = list(MAT_PLASTIC = MATERIAL_COST(0.06)) // 6 pellets /* * 7.62mm @@ -360,23 +360,23 @@ caliber = "7.62mm" icon_state = "rifle-casing" projectile_type = /obj/item/projectile/bullet/rifle/a762 - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) /obj/item/ammo_casing/a762/ap desc = "A 7.62mm armor-piercing bullet casing." projectile_type = /obj/item/projectile/bullet/rifle/a762/ap - matter = list(MAT_STEEL = 300) + matter = list(MAT_STEEL = MATERIAL_COST(0.15)) /obj/item/ammo_casing/a762/practice desc = "A 7.62mm practice bullet casing." icon_state = "rifle-casing" // Need to make an icon for these projectile_type = /obj/item/projectile/bullet/practice - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a762/blank desc = "A blank 7.62mm bullet casing." projectile_type = /obj/item/projectile/bullet/blank - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a762/hp desc = "A 7.62mm hollow-point bullet casing." @@ -389,7 +389,7 @@ /obj/item/ammo_casing/a762/bb desc = "A 7.62mm BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -401,7 +401,7 @@ icon_state = "lcasing" caliber = "14.5mm" projectile_type = /obj/item/projectile/bullet/rifle/a145 - matter = list(MAT_STEEL = 1250) + matter = list(MAT_STEEL = MATERIAL_COST(0.625)) /obj/item/ammo_casing/a145/highvel desc = "A 14.5mm sabot shell." @@ -420,23 +420,23 @@ caliber = "5.45mm" icon_state = "rifle-casing" projectile_type = /obj/item/projectile/bullet/rifle/a545 - matter = list(MAT_STEEL = 180) + matter = list(MAT_STEEL = MATERIAL_COST(0.09)) /obj/item/ammo_casing/a545/ap desc = "A 5.45mm armor-piercing bullet casing." projectile_type = /obj/item/projectile/bullet/rifle/a545/ap - matter = list(MAT_STEEL = 270) + matter = list(MAT_STEEL = MATERIAL_COST(0.135)) /obj/item/ammo_casing/a545/practice desc = "A 5.45mm practice bullet casing." icon_state = "rifle-casing" // Need to make an icon for these projectile_type = /obj/item/projectile/bullet/practice - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a545/blank desc = "A blank 5.45mm bullet casing." projectile_type = /obj/item/projectile/bullet/blank - matter = list(MAT_STEEL = 90) + matter = list(MAT_STEEL = MATERIAL_COST(0.045)) /obj/item/ammo_casing/a545/hp desc = "A 5.45mm hollow-point bullet casing." @@ -449,7 +449,7 @@ /obj/item/ammo_casing/a545/bb desc = "A 5.45mm BB." projectile_type = /obj/item/projectile/bullet/bb - matter = list(MAT_PLASTIC = 20) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.01)) caseless = TRUE /* @@ -461,7 +461,7 @@ caliber = "5mm caseless" icon_state = "casing" // Placeholder. Should probably be purple. projectile_type = /obj/item/projectile/bullet/pistol // Close enough to be comparable. - matter = list(MAT_STEEL = 180) + matter = list(MAT_STEEL = MATERIAL_COST(0.09)) caseless = 1 /obj/item/ammo_casing/a5mmcaseless/stun @@ -478,7 +478,7 @@ icon_state = "sshell_alt" projectile_type = /obj/item/projectile/bullet/srmrocket caliber = "rocket" - matter = list(MAT_STEEL = 10000) + matter = list(MAT_STEEL = MATERIAL_COST(5)) /obj/item/ammo_casing/cap name = "cap" @@ -487,7 +487,7 @@ icon = 'icons/obj/gun_toy.dmi' icon_state = "cap" projectile_type = /obj/item/projectile/bullet/cap - matter = list(MAT_STEEL = 85) + matter = list(MAT_STEEL = MATERIAL_COST(0.0425)) caseless = 1 /obj/item/ammo_casing/spent // For simple hostile mobs only, so they don't cough up usable bullets when firing. This is for literally nothing else. diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c5d5f74489f..c8d1660c6f1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -39,7 +39,7 @@ icon_state = "detective" item_state = "gun" slot_flags = SLOT_BELT|SLOT_HOLSTER - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) w_class = ITEMSIZE_NORMAL throwforce = 5 throw_speed = 4 diff --git a/code/modules/projectiles/guns/energy/altevian_vr.dm b/code/modules/projectiles/guns/energy/altevian_vr.dm index 392c82bf442..1dd324e5959 100644 --- a/code/modules/projectiles/guns/energy/altevian_vr.dm +++ b/code/modules/projectiles/guns/energy/altevian_vr.dm @@ -7,7 +7,7 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 5 - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) projectile_type = /obj/item/projectile/beam/meeplaser charge_cost = 400 @@ -19,7 +19,7 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_LARGE force = 10 - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) projectile_type = /obj/item/projectile/beam/meeplaser/strong charge_cost = 200 @@ -68,7 +68,7 @@ slot_flags = SLOT_BACK w_class = ITEMSIZE_HUGE force = 10 - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) projectile_type = /obj/item/projectile/scatter/ratminer charge_cost = 400 fire_sound = 'sound/weapons/laser3.ogg' diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index ac607e049c7..46865e1bb81 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -13,7 +13,7 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE force = 10 - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) projectile_type = /obj/item/projectile/beam/midlaser one_handed_penalty = 30 @@ -357,7 +357,7 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 10 - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) fire_sound = 'sound/weapons/mandalorian.ogg' projectile_type = /obj/item/projectile/beam/imperial @@ -373,7 +373,7 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE force = 15 - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) projectile_type = /obj/item/projectile/beam/mininglaser firemodes = list( @@ -395,7 +395,7 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 8 - matter = list(MAT_STEEL = 1500) + matter = list(MAT_STEEL = MATERIAL_COST(0.75)) projectile_type = /obj/item/projectile/beam/midlaser /* diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index a08e7fc51f4..6daf7f84cc8 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -47,7 +47,7 @@ icon_state = "crossbow" w_class = ITEMSIZE_SMALL item_state = "crossbow" - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) slot_flags = SLOT_BELT | SLOT_HOLSTER silenced = 1 projectile_type = /obj/item/projectile/energy/bolt @@ -66,7 +66,7 @@ icon_state = "crossbowlarge" w_class = ITEMSIZE_LARGE force = 10 - matter = list(MAT_STEEL = 200000) + matter = list(MAT_STEEL = MATERIAL_COST(100)) slot_flags = SLOT_BELT projectile_type = /obj/item/projectile/energy/bolt/large diff --git a/code/modules/projectiles/guns/lasertag.dm b/code/modules/projectiles/guns/lasertag.dm index ac623040a48..82221864cf2 100644 --- a/code/modules/projectiles/guns/lasertag.dm +++ b/code/modules/projectiles/guns/lasertag.dm @@ -36,7 +36,7 @@ icon = 'icons/obj/gun_toy.dmi' item_state = "omnitag" item_state = "retro" - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) projectile_type = /obj/item/projectile/beam/lasertag/omni cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 34fa42cd2f9..43325970d21 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -15,7 +15,7 @@ var/obj/item/grenade/chambered var/list/grenades = new/list() var/max_grenades = 5 //holds this + one in the chamber - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) special_handling = TRUE var/underslung = FALSE diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 02c399f6e92..5519a941828 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "syringe-cartridge" var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot - matter = list(MAT_STEEL = 125, MAT_GLASS = 375) + matter = list(MAT_STEEL = MATERIAL_COST(0.0625), MAT_GLASS = MATERIAL_COST(0.1875)) slot_flags = SLOT_BELT | SLOT_EARS throwforce = 3 force = 3 @@ -76,7 +76,7 @@ item_state = "syringegun" w_class = ITEMSIZE_NORMAL force = 7 - matter = list(MAT_STEEL = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1)) slot_flags = SLOT_BELT | SLOT_HOLSTER fire_sound = 'sound/weapons/empty.ogg' diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index f254694fc90..9904b58c2c0 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -3,7 +3,7 @@ desc = "A gun that fires bullets." icon_state = "revolver" w_class = ITEMSIZE_NORMAL - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) recoil = 1 projectile_type = /obj/item/projectile/bullet/pistol/strong //Only used for chameleon guns diff --git a/code/modules/projectiles/guns/projectile/altevian_vr.dm b/code/modules/projectiles/guns/projectile/altevian_vr.dm index 255cbecb235..48a1be13ba0 100644 --- a/code/modules/projectiles/guns/projectile/altevian_vr.dm +++ b/code/modules/projectiles/guns/projectile/altevian_vr.dm @@ -22,7 +22,7 @@ caliber = ".48" ammo_type = /obj/item/ammo_casing/sam48 mag_type = MAGAZINE - matter = list(MAT_STEEL = 240) + matter = list(MAT_STEEL = MATERIAL_COST(0.12)) max_ammo = 5 multiple_sprites = 1 @@ -30,7 +30,7 @@ desc = "A .48 bolt casing." caliber = ".48" projectile_type = /obj/item/projectile/bullet/sam48 - matter = list(MAT_STEEL = 30) + matter = list(MAT_STEEL = MATERIAL_COST(0.015)) /obj/item/projectile/bullet/sam48 fire_sound = 'sound/weapons/gunshot4.ogg' diff --git a/code/modules/projectiles/guns/projectile/automatic_vr.dm b/code/modules/projectiles/guns/projectile/automatic_vr.dm index c081a984aad..b465c3be8d9 100644 --- a/code/modules/projectiles/guns/projectile/automatic_vr.dm +++ b/code/modules/projectiles/guns/projectile/automatic_vr.dm @@ -124,7 +124,7 @@ icon = 'icons/obj/ammo_vr.dmi' icon_state = "smg" mag_type = MAGAZINE - matter = list(MAT_STEEL = 1800) + matter = list(MAT_STEEL = MATERIAL_COST(0.9)) caliber = "9mm" ammo_type = /obj/item/ammo_casing/a9mm max_ammo = 30 diff --git a/code/modules/projectiles/guns/projectile/revolver_vr.dm b/code/modules/projectiles/guns/projectile/revolver_vr.dm index 1bd1951c510..db341cdf9cf 100644 --- a/code/modules/projectiles/guns/projectile/revolver_vr.dm +++ b/code/modules/projectiles/guns/projectile/revolver_vr.dm @@ -10,7 +10,7 @@ name = "magazine (.380)" icon_state = "m92" mag_type = MAGAZINE - matter = list(MAT_STEEL = 480) + matter = list(MAT_STEEL = MATERIAL_COST(0.24)) caliber = ".380" ammo_type = /obj/item/ammo_casing/a380 max_ammo = 8 diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm index c7d8ef612d8..957e2b258a9 100644 --- a/code/modules/projectiles/guns/projectile/smartgun.dm +++ b/code/modules/projectiles/guns/projectile/smartgun.dm @@ -10,7 +10,7 @@ icon_override = 'icons/obj/guns/projectile/smartgun_mob.dmi' item_state = "smartgun" w_class = ITEMSIZE_LARGE - matter = list(MAT_STEEL = 6000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(3), MAT_DIAMOND = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1)) recoil = 1 projectile_type = /obj/item/projectile/bullet/smartgun //Only used for chameleon guns slot_flags = SLOT_BACK @@ -138,7 +138,7 @@ icon = 'icons/obj/guns/projectile/smartgun_32.dmi' icon_state = "smartgunmag" slot_flags = SLOT_BELT - matter = list(MAT_STEEL = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.25)) w_class = ITEMSIZE_SMALL mag_type = MAGAZINE diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm index 3038e6fc3df..105dacd6d9b 100644 --- a/code/modules/projectiles/guns/toy.dm +++ b/code/modules/projectiles/guns/toy.dm @@ -27,7 +27,7 @@ caliber = "caps" ammo_type = /obj/item/ammo_casing/cap projectile_type = /obj/item/projectile/bullet/cap - matter = list(MAT_STEEL = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5)) handle_casings = null recoil = 1 //it's a toy @@ -48,7 +48,7 @@ load_method = SINGLE_CASING ammo_type = /obj/item/ammo_casing/afoam_dart projectile_type = /obj/item/projectile/bullet/foam_dart - matter = list(MAT_PLASTIC = 2000) + matter = list(MAT_PLASTIC = MATERIAL_COST(1)) handle_casings = null recoil = null //it's a toy @@ -63,7 +63,7 @@ icon_state = "moistnugget" item_state = "moistnugget" max_shells = 5 - matter = list(MAT_PLASTIC = 2500) + matter = list(MAT_PLASTIC = MATERIAL_COST(1.25)) /* * Pistol @@ -79,7 +79,7 @@ projectile_type = /obj/item/projectile/bullet/foam_dart caliber = "foam" load_method = MAGAZINE - matter = list(MAT_PLASTIC = 1000) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.5)) recoil = null //it's a toy /obj/item/gun/projectile/pistol/toy/update_icon() @@ -128,7 +128,7 @@ projectile_type = /obj/item/projectile/bullet/foam_dart load_method = SINGLE_CASING max_shells = 6 - matter = list(MAT_PLASTIC = 1000) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.5)) handle_casings = null recoil = null //it's a toy @@ -174,7 +174,7 @@ item_state = "dshotgun" max_shells = 2 w_class = ITEMSIZE_NORMAL - matter = list(MAT_PLASTIC = 1500) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.75)) /* * SMG @@ -191,7 +191,7 @@ magazine_type = /obj/item/ammo_magazine/mfoam_dart/smg allowed_magazines = list(/obj/item/ammo_magazine/mfoam_dart/smg) projectile_type = /obj/item/projectile/bullet/foam_dart - matter = list(MAT_PLASTIC = 1500) + matter = list(MAT_PLASTIC = MATERIAL_COST(0.75)) recoil = null //it's a toy firemodes = list( diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 9a7ac898af8..2b2f2f7e22d 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -168,7 +168,7 @@ item_state = "beaker" center_of_mass_x = 15 center_of_mass_y = 11 - matter = list(MAT_GLASS = 500) + matter = list(MAT_GLASS = MATERIAL_COST(0.25)) drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' var/rating = 1 @@ -225,7 +225,7 @@ icon_state = "beakerlarge" center_of_mass_x = 16 center_of_mass_y = 11 - matter = list(MAT_GLASS = 5000) + matter = list(MAT_GLASS = MATERIAL_COST(2.5)) volume = 120 amount_per_transfer_from_this = 10 max_transfer_amount = 120 @@ -238,7 +238,7 @@ icon_state = "beakernoreact" center_of_mass_x = 16 center_of_mass_y = 13 - matter = list(MAT_GLASS = 500) + matter = list(MAT_GLASS = MATERIAL_COST(0.25)) volume = 60 amount_per_transfer_from_this = 10 flags = OPENCONTAINER | NOREACT @@ -249,7 +249,7 @@ icon_state = "beakerbluespace" center_of_mass_x = 16 center_of_mass_y = 11 - matter = list(MAT_GLASS = 5000) + matter = list(MAT_GLASS = MATERIAL_COST(2.5)) volume = 300 amount_per_transfer_from_this = 10 max_transfer_amount = 300 @@ -262,7 +262,7 @@ icon_state = "vial" center_of_mass_x = 15 center_of_mass_y = 9 - matter = list(MAT_GLASS = 250) + matter = list(MAT_GLASS = MATERIAL_COST(0.125)) volume = 30 w_class = ITEMSIZE_TINY amount_per_transfer_from_this = 10 @@ -295,7 +295,7 @@ item_state = "bucket" center_of_mass_x = 16 center_of_mass_y = 10 - matter = list(MAT_STEEL = 200) + matter = list(MAT_STEEL = MATERIAL_COST(0.1)) w_class = ITEMSIZE_NORMAL amount_per_transfer_from_this = 20 max_transfer_amount = 120 @@ -354,7 +354,7 @@ item_state = "woodbucket" center_of_mass_x = 16 center_of_mass_y = 8 - matter = list(MAT_WOOD = 50) + matter = list(MAT_WOOD = MATERIAL_COST(0.025)) w_class = ITEMSIZE_LARGE amount_per_transfer_from_this = 20 max_transfer_amount = 120 @@ -390,7 +390,7 @@ name = "water-cooler bottle" icon = 'icons/obj/vending.dmi' icon_state = "water_cooler_bottle" - matter = list(MAT_PLASTIC = 2000) + matter = list(MAT_PLASTIC = MATERIAL_COST(1)) w_class = ITEMSIZE_NO_CONTAINER amount_per_transfer_from_this = 20 max_transfer_amount = 120 @@ -403,7 +403,7 @@ name = "pint mug" icon = 'icons/obj/drinks.dmi' icon_state = "pint_mug" - matter = list(MAT_WOOD = 50) + matter = list(MAT_WOOD = MATERIAL_COST(0.025)) drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' @@ -420,6 +420,6 @@ volume = 60 w_class = ITEMSIZE_SMALL flags = OPENCONTAINER - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) drop_sound = 'sound/items/drop/crowbar.ogg' pickup_sound = 'sound/items/pickup/drinkglass.ogg' diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fefe2a980e8..7d39399a717 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -7,7 +7,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 flags = OPENCONTAINER|NOBLUDGEON - matter = list(MAT_GLASS = 300, MAT_STEEL = 300) + matter = list(MAT_GLASS = MATERIAL_COST(0.15), MAT_STEEL = MATERIAL_COST(0.15)) slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 263dbc0300c..1b2a72c6f3f 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -17,7 +17,7 @@ icon_state = "0" center_of_mass_x = 16 center_of_mass_y = 14 - matter = list(MAT_GLASS = 150) + matter = list(MAT_GLASS = MATERIAL_COST(0.075)) amount_per_transfer_from_this = 5 max_transfer_amount = null volume = 15 diff --git a/code/modules/research/tg/designs/ai_designs.dm b/code/modules/research/tg/designs/ai_designs.dm index 5ee5a424ae4..3279b59d0c2 100644 --- a/code/modules/research/tg/designs/ai_designs.dm +++ b/code/modules/research/tg/designs/ai_designs.dm @@ -13,7 +13,7 @@ id = "mmi" // req_tech = list(TECH_DATA = 2, TECH_BIO = 3) build_type = PROTOLATHE | PROSFAB - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/mmi category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CONTROL_INTERFACES @@ -25,7 +25,7 @@ id = "posibrain" // req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 2, TECH_DATA = 4) build_type = PROTOLATHE | PROSFAB - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500, MAT_PHORON = 500, MAT_DIAMOND = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.25), MAT_DIAMOND = MATERIAL_COST(0.05)) build_path = /obj/item/mmi/digital/posibrain category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CONTROL_INTERFACES @@ -37,7 +37,7 @@ id = "dronebrain" // req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_DATA = 4) build_type = PROTOLATHE | PROSFAB - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.25)) build_path = /obj/item/mmi/digital/robot category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CONTROL_INTERFACES @@ -49,7 +49,7 @@ id = "paicard" build_type = PROTOLATHE // req_tech = list(TECH_DATA = 2) - materials = list(MAT_GLASS = 500, MAT_STEEL = 500) + materials = list(MAT_GLASS = MATERIAL_COST(0.25), MAT_STEEL = MATERIAL_COST(0.25)) build_path = /obj/item/paicard category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE @@ -62,7 +62,7 @@ id = "intellicore" build_type = PROTOLATHE // req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) - materials = list(MAT_GLASS = 1000, MAT_GOLD = 200) + materials = list(MAT_GLASS = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.1)) build_path = /obj/item/aicard category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE @@ -72,7 +72,7 @@ /datum/design_techweb/aimodule desc = "A circuit used to change a silicon's configured laws." build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, MAT_GOLD = 100) + materials = list(MAT_GLASS = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.05)) category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION ) @@ -211,7 +211,7 @@ // Illegal modules /datum/design_techweb/aimodule/illegal - materials = list(MAT_GLASS = 4000, MAT_GOLD = 500) + materials = list(MAT_GLASS = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(0.25)) // req_tech = list(TECH_DATA = 6, TECH_ILLEGAL = 7, TECH_MATERIAL = 9, TECH_COMBAT = 7) /datum/design_techweb/aimodule/illegal/New() diff --git a/code/modules/research/tg/designs/ammunition_designs.dm b/code/modules/research/tg/designs/ammunition_designs.dm index 6a819ff43da..c67d623c55f 100644 --- a/code/modules/research/tg/designs/ammunition_designs.dm +++ b/code/modules/research/tg/designs/ammunition_designs.dm @@ -5,7 +5,7 @@ /datum/design_techweb/ammobox_12g_slug SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge slug)") id = "ammobox_12g_slug" - materials = list(MAT_STEEL = 3600) + materials = list(MAT_STEEL = MATERIAL_COST(1.8)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g category = list( @@ -17,7 +17,7 @@ /datum/design_techweb/ammobox_12g_blank SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge blank)") id = "ammobox_12g_blank" - materials = list(MAT_STEEL = 3600) + materials = list(MAT_STEEL = MATERIAL_COST(1.8)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/blank category = list( @@ -28,7 +28,7 @@ /datum/design_techweb/ammobox_12g_beanbag SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge beanbag)") id = "ammobox_12g_beanbag" - materials = list(MAT_STEEL = 3600) + materials = list(MAT_STEEL = MATERIAL_COST(1.8)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/beanbag category = list( @@ -39,7 +39,7 @@ /datum/design_techweb/ammobox_12g_flash SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge flash)") id = "ammobox_12g_flash" - materials = list(MAT_STEEL = 920, MAT_GLASS = 920) + materials = list(MAT_STEEL = MATERIAL_COST(0.46), MAT_GLASS = MATERIAL_COST(0.46)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/flash category = list( @@ -50,7 +50,7 @@ /datum/design_techweb/ammobox_12g_pellet SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge buckshot)") id = "ammobox_12g_pellet" - materials = list(MAT_STEEL = 3600) + materials = list(MAT_STEEL = MATERIAL_COST(1.8)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/pellet category = list( @@ -62,7 +62,7 @@ /datum/design_techweb/ammobox_12g_stunshell SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge stun)") id = "ammobox_12g_stunshell" - materials = list(MAT_STEEL = 3600, MAT_GLASS = 7200) + materials = list(MAT_STEEL = MATERIAL_COST(1.8), MAT_GLASS = MATERIAL_COST(3.6)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell category = list( @@ -74,7 +74,7 @@ /datum/design_techweb/ammobox_12g_emp SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge EMP)") id = "ammobox_12g_emp" - materials = list(MAT_STEEL = 3600, MAT_URANIUM = 7200) + materials = list(MAT_STEEL = MATERIAL_COST(1.8), MAT_URANIUM = MATERIAL_COST(3.6)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/emp category = list( @@ -86,7 +86,7 @@ /datum/design_techweb/ammobox_12g_flechette SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge flechette)") id = "ammobox_12g_flechette" - materials = list(MAT_STEEL = 3600, MAT_PLASTEEL = 7200) + materials = list(MAT_STEEL = MATERIAL_COST(1.8), MAT_PLASTEEL = MATERIAL_COST(3.6)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/flechette category = list( @@ -98,7 +98,7 @@ /datum/design_techweb/ammobox_12g_practice SET_AMMO_DESIGN_NAMEDESC("ammo box (12 gauge practice)") id = "ammobox_12g_practice" - materials = list(MAT_STEEL = 3600) + materials = list(MAT_STEEL = MATERIAL_COST(1.8)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b12g/practice category = list( @@ -113,7 +113,7 @@ /datum/design_techweb/rifle_145_sabot SET_AMMO_DESIGN_NAMEDESC("14.5mm round (sabot)") id = "rifle_145_sabot" - materials = list(MAT_STEEL = 1560) + materials = list(MAT_STEEL = MATERIAL_COST(0.78)) build_type = AUTOLATHE build_path = /obj/item/ammo_casing/a145/highvel category = list( @@ -131,7 +131,7 @@ /datum/design_techweb/pistol_mag_44 SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.44)") id = "pistol_mag_44" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m44 category = list( @@ -143,7 +143,7 @@ /datum/design_techweb/pistol_mag_44_rubber SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.44 rubber)") id = "pistol_mag_44_rubber" - materials = list(MAT_STEEL = 2200) + materials = list(MAT_STEEL = MATERIAL_COST(1.1)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m44/rubber category = list( @@ -157,7 +157,7 @@ /datum/design_techweb/pistol_mag_45 SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.45)") id = "pistol_mag_45" - materials = list(MAT_STEEL = 650) + materials = list(MAT_STEEL = MATERIAL_COST(0.325)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45 category = list( @@ -169,7 +169,7 @@ /datum/design_techweb/pistol_mag_45_practice SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.45 practice)") id = "pistol_mag_45_practice" - materials = list(MAT_STEEL = 650) + materials = list(MAT_STEEL = MATERIAL_COST(0.325)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45/practice category = list( @@ -180,7 +180,7 @@ /datum/design_techweb/pistol_mag_45_rubber SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.45 rubber)") id = "pistol_mag_45_rubber" - materials = list(MAT_STEEL = 650) + materials = list(MAT_STEEL = MATERIAL_COST(0.325)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45/rubber category = list( @@ -191,7 +191,7 @@ /datum/design_techweb/pistol_mag_45_flash SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.45 flash)") id = "pistol_mag_45_flash" - materials = list(MAT_STEEL = 650) + materials = list(MAT_STEEL = MATERIAL_COST(0.325)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45/flash category = list( @@ -202,7 +202,7 @@ /datum/design_techweb/pistol_mag_45_piercing SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.45 armor piercing)") id = "pistol_mag_45_piercing" - materials = list(MAT_STEEL = 500, MAT_PLASTEEL = 300) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_PLASTEEL = MATERIAL_COST(0.15)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45/ap category = list( @@ -214,7 +214,7 @@ /datum/design_techweb/pistol_mag_45_hollow SET_AMMO_DESIGN_NAMEDESC("pistol magazine (.45 hollowpoint)") id = "pistol_mag_45_hollow" - materials = list(MAT_STEEL = 500, MAT_PLASTEEL = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_PLASTEEL = MATERIAL_COST(0.1)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45/hp category = list( @@ -228,7 +228,7 @@ /datum/design_techweb/uzi_mag_45 SET_AMMO_DESIGN_NAMEDESC("uzi magazine (.45)") id = "uzi_mag_45" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45uzi category = list( @@ -240,7 +240,7 @@ /datum/design_techweb/tommy_mag_45 SET_AMMO_DESIGN_NAMEDESC("Tommy Gun magazine (.45)") id = "tommy_mag_45" - materials = list(MAT_STEEL = 1875) + materials = list(MAT_STEEL = MATERIAL_COST(0.9375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45tommy category = list( @@ -252,7 +252,7 @@ /datum/design_techweb/tommy_mag_45_pierce SET_AMMO_DESIGN_NAMEDESC("Tommy Gun magazine (.45 armor piercing)") id = "tommy_mag_45_pierce" - materials = list(MAT_STEEL = 1875, MAT_PLASTEEL = 1600) + materials = list(MAT_STEEL = MATERIAL_COST(0.9375), MAT_PLASTEEL = MATERIAL_COST(0.8)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45tommy/ap category = list( @@ -264,7 +264,7 @@ /datum/design_techweb/tommy_drum_45 SET_AMMO_DESIGN_NAMEDESC("Tommy Gun drum magazine (.45)") id = "tommy_drum_45" - materials = list(MAT_STEEL = 4680) + materials = list(MAT_STEEL = MATERIAL_COST(2.34)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45tommydrum category = list( @@ -276,7 +276,7 @@ /datum/design_techweb/tommy_drum_45_pierce SET_AMMO_DESIGN_NAMEDESC("Tommy Gun drum magazine (.45 piercing)") id = "tommy_drum_45_pierce" - materials = list(MAT_STEEL = 4680, MAT_PLASTEEL = 3200) + materials = list(MAT_STEEL = MATERIAL_COST(2.34), MAT_PLASTEEL = MATERIAL_COST(1.6)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m45tommydrum/ap category = list( @@ -292,7 +292,7 @@ /datum/design_techweb/pistol_mag_9mm SET_AMMO_DESIGN_NAMEDESC("pistol magazine (9mm)") id = "pistol_mag_9mm" - materials = list(MAT_STEEL = 750) + materials = list(MAT_STEEL = MATERIAL_COST(0.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm category = list( @@ -304,7 +304,7 @@ /datum/design_techweb/pistol_mag_9mm_rubber SET_AMMO_DESIGN_NAMEDESC("pistol magazine (9mm rubber)") id = "pistol_mag_9mm_rubber" - materials = list(MAT_STEEL = 750) + materials = list(MAT_STEEL = MATERIAL_COST(0.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/rubber category = list( @@ -315,7 +315,7 @@ /datum/design_techweb/pistol_mag_9mm_practice SET_AMMO_DESIGN_NAMEDESC("pistol magazine (9mm practice)") id = "pistol_mag_9mm_practice" - materials = list(MAT_STEEL = 750) + materials = list(MAT_STEEL = MATERIAL_COST(0.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/practice category = list( @@ -326,7 +326,7 @@ /datum/design_techweb/pistol_mag_9mm_flash SET_AMMO_DESIGN_NAMEDESC("pistol magazine (9mm flash)") id = "pistol_mag_9mm_flash" - materials = list(MAT_STEEL = 750) + materials = list(MAT_STEEL = MATERIAL_COST(0.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/flash category = list( @@ -337,7 +337,7 @@ /datum/design_techweb/pistol_mag_9mm_spectral SET_AMMO_DESIGN_NAMEDESC("pistol magazine (9mm spectral)") id = "pistol_mag_9mm_spectral" - materials = list(MAT_STEEL = 750) + materials = list(MAT_STEEL = MATERIAL_COST(0.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/spectral category = list( @@ -349,7 +349,7 @@ /datum/design_techweb/pistol_mag_compact_9mm SET_AMMO_DESIGN_NAMEDESC("compact pistol magazine (9mm)") id = "pistol_mag_compact_9mm" - materials = list(MAT_STEEL = 600) + materials = list(MAT_STEEL = MATERIAL_COST(0.3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/compact category = list( @@ -361,7 +361,7 @@ /datum/design_techweb/pistol_mag_compact_9mm_rubber SET_AMMO_DESIGN_NAMEDESC("compact pistol magazine (9mm rubber)") id = "pistol_mag_compact_9mm_rubber" - materials = list(MAT_STEEL = 600) + materials = list(MAT_STEEL = MATERIAL_COST(0.3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/compact/rubber category = list( @@ -373,7 +373,7 @@ /datum/design_techweb/pistol_mag_compact_9mm_practice SET_AMMO_DESIGN_NAMEDESC("compact pistol magazine (9mm practice)") id = "pistol_mag_compact_9mm_practice" - materials = list(MAT_STEEL = 600) + materials = list(MAT_STEEL = MATERIAL_COST(0.3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/compact/practice category = list( @@ -385,7 +385,7 @@ /datum/design_techweb/pistol_mag_compact_9mm_flash SET_AMMO_DESIGN_NAMEDESC("compact pistol magazine (9mm flash)") id = "pistol_mag_compact_9mm_flash" - materials = list(MAT_STEEL = 600) + materials = list(MAT_STEEL = MATERIAL_COST(0.3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mm/compact/flash category = list( @@ -399,7 +399,7 @@ /datum/design_techweb/smg_mag_9mm SET_AMMO_DESIGN_NAMEDESC("SMG magazine (9mm)") id = "smg_mag_9mm" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mml category = list( @@ -411,7 +411,7 @@ /datum/design_techweb/pistol_mag_topmount_9mm SET_AMMO_DESIGN_NAMEDESC("top-mounted SMG magazine (9mm)") id = "pistol_mag_topmount_9mm" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mmt category = list( @@ -423,7 +423,7 @@ /datum/design_techweb/pistol_mag_topmount_9mm_rubber SET_AMMO_DESIGN_NAMEDESC("top-mounted SMG magazine (9mm rubber)") id = "pistol_mag_topmount_9mm_rubber" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mmt/rubber category = list( @@ -434,7 +434,7 @@ /datum/design_techweb/pistol_mag_topmount_9mm_practice SET_AMMO_DESIGN_NAMEDESC("top-mounted SMG magazine (9mm practice)") id = "pistol_mag_topmount_9mm_practice" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mmt/practice category = list( @@ -445,7 +445,7 @@ /datum/design_techweb/pistol_mag_topmount_9mm_flash SET_AMMO_DESIGN_NAMEDESC("top-mounted SMG magazine (9mm flash)") id = "pistol_mag_topmount_9mm_flash" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mmt/flash category = list( @@ -456,7 +456,7 @@ /datum/design_techweb/pistol_mag_topmount_9mm_piercing SET_AMMO_DESIGN_NAMEDESC("top-mounted SMG magazine (9mm armor piercing)") id = "pistol_mag_topmount_9mm_piercing" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mmt/ap category = list( @@ -468,7 +468,7 @@ /datum/design_techweb/pistol_mag_ext_topmount_9mm_piercing SET_AMMO_DESIGN_NAMEDESC("top-mounted extended SMG magazine (9mm AP)") id = "pistol_mag_ext_topmount_9mm_piercing" - materials = list(MAT_STEEL = 3000, MAT_PLASTEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_PLASTEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mmp90 category = list( @@ -481,7 +481,7 @@ id = "ammo_9mm" // req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 3750, MAT_SILVER = 100) // Requires silver for proprietary magazines! Or something. + materials = list(MAT_STEEL = MATERIAL_COST(1.875), MAT_SILVER = MATERIAL_COST(0.05)) // Requires silver for proprietary magazines! Or something. build_path = /obj/item/ammo_magazine/m9mmAdvanced category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -491,7 +491,7 @@ /datum/design_techweb/smg_mag_9mm_spectral SET_AMMO_DESIGN_NAMEDESC("SMG magazine (9mm spectral)") id = "smg_mag_9mm_spectral" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m9mml/spectral category = list( @@ -503,7 +503,7 @@ /datum/design_techweb/smg_mag_10m SET_AMMO_DESIGN_NAMEDESC("SMG magazine (10mm)") id = "smg_mag_10m" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm category = list( @@ -515,7 +515,7 @@ /datum/design_techweb/smg_mag_10m_practice SET_AMMO_DESIGN_NAMEDESC("SMG magazine (10mm practice)") id = "smg_mag_10m_practice" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/practice category = list( @@ -526,7 +526,7 @@ /datum/design_techweb/smg_mag_10m_rubber SET_AMMO_DESIGN_NAMEDESC("SMG magazine (10mm rubber)") id = "smg_mag_10m_rubber" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/rubber category = list( @@ -538,7 +538,7 @@ /datum/design_techweb/smg_mag_10m_emp SET_AMMO_DESIGN_NAMEDESC("SMG magazine (10mm haywire)") id = "smg_mag_10m_emp" - materials = list(MAT_STEEL = 1800, MAT_URANIUM = 2400) + materials = list(MAT_STEEL = MATERIAL_COST(0.9), MAT_URANIUM = MATERIAL_COST(1.2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/emp category = list( @@ -550,7 +550,7 @@ /datum/design_techweb/pistol_mag_10m SET_AMMO_DESIGN_NAMEDESC("pistol magazine (10mm)") id = "pistol_mag_10m" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/pistol category = list( @@ -562,7 +562,7 @@ /datum/design_techweb/pistol_mag_10m_rubber SET_AMMO_DESIGN_NAMEDESC("pistol magazine (10mm rubber)") id = "pistol_mag_10m_rubber" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/pistol/rubber category = list( @@ -574,7 +574,7 @@ /datum/design_techweb/pistol_mag_10m_emp SET_AMMO_DESIGN_NAMEDESC("pistol magazine (10mm haywire)") id = "pistol_mag_10m_emp" - materials = list(MAT_STEEL = 1800, MAT_URANIUM = 2400) + materials = list(MAT_STEEL = MATERIAL_COST(0.9), MAT_URANIUM = MATERIAL_COST(1.2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/pistol/emp category = list( @@ -586,7 +586,7 @@ /datum/design_techweb/pistol_mag_10m_practice SET_AMMO_DESIGN_NAMEDESC("pistol magazine (10mm practice)") id = "pistol_mag_10m_practice" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m10mm/pistol/practice category = list( @@ -599,7 +599,7 @@ /datum/design_techweb/rifle_mag_545 SET_AMMO_DESIGN_NAMEDESC("rifle magazine (5.45mm)") id = "rifle_mag_545" - materials = list(MAT_STEEL = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(1.125)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545 category = list( @@ -611,7 +611,7 @@ /datum/design_techweb/rifle_mag_545_practice SET_AMMO_DESIGN_NAMEDESC("rifle magazine (5.45mm practice)") id = "rifle_mag_545_practice" - materials = list(MAT_STEEL = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(1.125)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545/practice category = list( @@ -622,7 +622,7 @@ /datum/design_techweb/rifle_mag_545_pierce SET_AMMO_DESIGN_NAMEDESC("Rifle Magazine (5.45mm AP)") id = "rifle_mag_545_pierce" - materials = list(MAT_STEEL = 2250, MAT_PLASTEEL = 1200) + materials = list(MAT_STEEL = MATERIAL_COST(1.125), MAT_PLASTEEL = MATERIAL_COST(0.6)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545/ap category = list( @@ -634,7 +634,7 @@ /datum/design_techweb/machinegun_box_545 SET_AMMO_DESIGN_NAMEDESC("machinegun box magazine (5.45)") id = "machinegun_box_545" - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545saw category = list( @@ -646,7 +646,7 @@ /datum/design_techweb/machinegun_box_545_pierce SET_AMMO_DESIGN_NAMEDESC("machinegun box magazine (5.45mm armor-piercing)") id = "machinegun_box_545_pierce" - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) build_type = AUTOLATHE build_path = /obj/item/ammo_casing/a545/ap category = list( @@ -658,7 +658,7 @@ /datum/design_techweb/machinegun_box_545_hunting SET_AMMO_DESIGN_NAMEDESC("machinegun box magazine (5.45mm hunting)") id = "machinegun_box_545_hunting" - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545saw/hunter category = list( @@ -670,7 +670,7 @@ /datum/design_techweb/machinegun_box_545_pierce SET_AMMO_DESIGN_NAMEDESC("Machinegun box magazine (5.45mm AP)") id = "machinegun_box_545_pierce" - materials = list(MAT_STEEL = 12500, MAT_PLASTEEL = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(6.25), MAT_PLASTEEL = MATERIAL_COST(7.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545saw/ap category = list( @@ -682,7 +682,7 @@ /datum/design_techweb/rifle_mag_545_hunting SET_AMMO_DESIGN_NAMEDESC("Rifle Magazine (5.45mm Hunting)") id = "rifle_mag_545_hunting" - materials = list(MAT_STEEL = 3375) + materials = list(MAT_STEEL = MATERIAL_COST(1.6875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m545/hunter category = list( @@ -696,7 +696,7 @@ /datum/design_techweb/rifle_mag_762 SET_AMMO_DESIGN_NAMEDESC("rifle magazine (7.62mm)") id = "rifle_mag_762" - materials = list(MAT_STEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m762 category = list( @@ -708,7 +708,7 @@ /datum/design_techweb/rifle_mag_762_pierce SET_AMMO_DESIGN_NAMEDESC("rifle magazine (7.62mm AP)") id = "rifle_mag_762_pierce" - materials = list(MAT_STEEL = 2500, MAT_PLASTEEL = 1200) + materials = list(MAT_STEEL = MATERIAL_COST(1.25), MAT_PLASTEEL = MATERIAL_COST(0.6)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m762/ap category = list( @@ -720,7 +720,7 @@ /datum/design_techweb/rifle_mag_762_ext SET_AMMO_DESIGN_NAMEDESC("rifle magazine (7.62mm) extended") id = "rifle_mag_762_ext" - materials = list(MAT_STEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m762/ext category = list( @@ -732,7 +732,7 @@ /datum/design_techweb/rifle_mag_762_ap_ext SET_AMMO_DESIGN_NAMEDESC("rifle magazine (7.62mm AP) extended") id = "rifle_mag_762_ext_pierce" - materials = list(MAT_STEEL = 5000, MAT_PLASTEEL = 2400) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTEEL = MATERIAL_COST(1.2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m762/ext/ap category = list( @@ -744,7 +744,7 @@ /datum/design_techweb/rifle_enblock_762 SET_AMMO_DESIGN_NAMEDESC("enbloc (7.62mm)") id = "rifle_enblock_762" - materials = list(MAT_STEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m762enbloc category = list( @@ -756,7 +756,7 @@ /datum/design_techweb/rifle_enblock_762_pierce SET_AMMO_DESIGN_NAMEDESC("enbloc (7.62mm AP)") id = "rifle_enblock_762_pierce" - materials = list(MAT_STEEL = 2500, MAT_PLASTEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(1.25), MAT_PLASTEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m762enbloc/ap category = list( @@ -770,7 +770,7 @@ /datum/design_techweb/shotgun_mag_12g_drum SET_AMMO_DESIGN_NAMEDESC("drum magazine (12 gauge)") id = "shotgun_mag_12g_drum" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m12gdrum category = list( @@ -782,7 +782,7 @@ /datum/design_techweb/shotgun_mag_12g_drum_beanbag SET_AMMO_DESIGN_NAMEDESC("drum magazine (12 gauge beanbag)") id = "shotgun_mag_12g_drum_beanbag" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m12gdrum/beanbag category = list( @@ -794,7 +794,7 @@ /datum/design_techweb/shotgun_mag_12g_drum_pellet SET_AMMO_DESIGN_NAMEDESC("drum magazine (12 gauge pellet)") id = "shotgun_mag_12g_drum_pellet" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m12gdrum/pellet category = list( @@ -806,7 +806,7 @@ /datum/design_techweb/shotgun_mag_12g_drum_flash SET_AMMO_DESIGN_NAMEDESC("drum magazine (12 gauge flash)") id = "shotgun_mag_12g_drum_flash" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/m12gdrum/flash category = list( @@ -824,7 +824,7 @@ /datum/design_techweb/loader_12g_beanbag SET_AMMO_DESIGN_NAMEDESC("2-round 12g speedloader (beanbag)") id = "loader_12g_beanbag" - materials = list(MAT_STEEL = 900) + materials = list(MAT_STEEL = MATERIAL_COST(0.45)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c12g/beanbag category = list( @@ -835,7 +835,7 @@ /datum/design_techweb/loader_12g_slug SET_AMMO_DESIGN_NAMEDESC("2-round 12g speedloader (slug)") id = "loader_12g_slug" - materials = list(MAT_STEEL = 1350) + materials = list(MAT_STEEL = MATERIAL_COST(0.675)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c12g category = list( @@ -847,7 +847,7 @@ /datum/design_techweb/loader_12g_buck SET_AMMO_DESIGN_NAMEDESC("2-round 12g speedloader (buckshot)") id = "loader_12g_buck" - materials = list(MAT_STEEL = 1350) + materials = list(MAT_STEEL = MATERIAL_COST(0.675)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c12g/pellet category = list( @@ -861,7 +861,7 @@ /datum/design_techweb/loader_38 SET_AMMO_DESIGN_NAMEDESC("speedloader (.38)") id = "loader_38" - materials = list(MAT_STEEL = 450) + materials = list(MAT_STEEL = MATERIAL_COST(0.225)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s38 category = list( @@ -873,7 +873,7 @@ /datum/design_techweb/loader_38_rubber SET_AMMO_DESIGN_NAMEDESC("speedloader (.38 rubber)") id = "loader_38_rubber" - materials = list(MAT_STEEL = 450) + materials = list(MAT_STEEL = MATERIAL_COST(0.225)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s38/rubber category = list( @@ -886,7 +886,7 @@ /datum/design_techweb/loader_45 SET_AMMO_DESIGN_NAMEDESC("speedloader (.45)") id = "loader_45" - materials = list(MAT_STEEL = 660) + materials = list(MAT_STEEL = MATERIAL_COST(0.33)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s45 category = list( @@ -898,7 +898,7 @@ /datum/design_techweb/loader_45_rubber SET_AMMO_DESIGN_NAMEDESC("speedloader (.45 rubber)") id = "loader_45_rubber" - materials = list(MAT_STEEL = 660) + materials = list(MAT_STEEL = MATERIAL_COST(0.33)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s45/rubber category = list( @@ -911,7 +911,7 @@ /datum/design_techweb/loader_545 SET_AMMO_DESIGN_NAMEDESC("ammo clip (5.45mm)") id = "loader_545" - materials = list(MAT_STEEL = 560) + materials = list(MAT_STEEL = MATERIAL_COST(0.28)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c545 category = list( @@ -923,7 +923,7 @@ /datum/design_techweb/loader_545_practice SET_AMMO_DESIGN_NAMEDESC("ammo clip (5.45mm practice)") id = "loader_545_practice" - materials = list(MAT_STEEL = 560) + materials = list(MAT_STEEL = MATERIAL_COST(0.28)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c545/practice category = list( @@ -936,7 +936,7 @@ /datum/design_techweb/loader_762 SET_AMMO_DESIGN_NAMEDESC("ammo clip (7.62mm)") id = "loader_762" - materials = list(MAT_STEEL = 1250) + materials = list(MAT_STEEL = MATERIAL_COST(0.625)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c762 category = list( @@ -948,7 +948,7 @@ /datum/design_techweb/loader_762_practice SET_AMMO_DESIGN_NAMEDESC("ammo clip (7.62mm practice)") id = "loader_762_practice" - materials = list(MAT_STEEL = 1250) + materials = list(MAT_STEEL = MATERIAL_COST(0.625)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/clip/c762/practice category = list( @@ -962,7 +962,7 @@ /datum/design_techweb/loader_357 SET_AMMO_DESIGN_NAMEDESC("speedloader (.357)") id = "loader_357" - materials = list(MAT_STEEL = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s357 category = list( @@ -974,7 +974,7 @@ /datum/design_techweb/loader_357_flash SET_AMMO_DESIGN_NAMEDESC("speedloader (.357 flash)") id = "loader_357_flash" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s357/flash category = list( @@ -986,7 +986,7 @@ /datum/design_techweb/loader_357_stun SET_AMMO_DESIGN_NAMEDESC("speedloader (.357 stun)") id = "loader_357_stun" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s357/stun category = list( @@ -998,7 +998,7 @@ /datum/design_techweb/loader_357_rubber SET_AMMO_DESIGN_NAMEDESC("speedloader (.357 rubber)") id = "loader_357_rubber" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s357/rubber category = list( @@ -1010,7 +1010,7 @@ /datum/design_techweb/loader_357_spectral SET_AMMO_DESIGN_NAMEDESC("speedloader (.357 spectral)") id = "loader_357_spectral" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s357/spectral category = list( @@ -1022,7 +1022,7 @@ /datum/design_techweb/loader_44 SET_AMMO_DESIGN_NAMEDESC("speedloader (.44)") id = "loader_44" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s44 category = list( @@ -1034,7 +1034,7 @@ /datum/design_techweb/loader_44_rubber SET_AMMO_DESIGN_NAMEDESC("speedloader (.44 rubber)") id = "loader_44_rubber" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s44/rubber category = list( @@ -1046,7 +1046,7 @@ /datum/design_techweb/loader_44_spectral SET_AMMO_DESIGN_NAMEDESC("speedloader (.44 spectral)") id = "loader_44_spectral" - materials = list(MAT_STEEL = 1575) + materials = list(MAT_STEEL = MATERIAL_COST(0.7875)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/s44/spectral category = list( @@ -1064,7 +1064,7 @@ /datum/design_techweb/ammobox_357 SET_AMMO_DESIGN_NAMEDESC("ammo box (.357)") id = "ammobox_357" - materials = list(MAT_STEEL = 5040) + materials = list(MAT_STEEL = MATERIAL_COST(2.52)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b357 category = list( @@ -1076,7 +1076,7 @@ /datum/design_techweb/ammobox_357_rubber SET_AMMO_DESIGN_NAMEDESC("ammo box (.357 rubber)") id = "ammobox_357_rubber" - materials = list(MAT_STEEL = 5040) + materials = list(MAT_STEEL = MATERIAL_COST(2.52)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b357/rubber category = list( @@ -1091,7 +1091,7 @@ /datum/design_techweb/ammobox_38 SET_AMMO_DESIGN_NAMEDESC("ammo box (.38)") id = "ammobox_38" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b38 category = list( @@ -1103,7 +1103,7 @@ /datum/design_techweb/ammobox_38_rubber SET_AMMO_DESIGN_NAMEDESC("ammo box (.38 rubber)") id = "ammobox_38_rubber" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b38/rubber category = list( @@ -1114,7 +1114,7 @@ /datum/design_techweb/ammobox_38_spectral SET_AMMO_DESIGN_NAMEDESC("ammo box (.38 spectral)") id = "ammobox_38_spectral" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b38/spectral category = list( @@ -1128,7 +1128,7 @@ /datum/design_techweb/ammobox_10mm SET_AMMO_DESIGN_NAMEDESC("ammo box (10mm)") id = "ammobox_10mm" - materials = list(MAT_STEEL = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b10mm category = list( @@ -1140,7 +1140,7 @@ /datum/design_techweb/ammobox_10mm_practice SET_AMMO_DESIGN_NAMEDESC("ammo box (10mm practice)") id = "ammobox_10mm_practice" - materials = list(MAT_STEEL = 2400) + materials = list(MAT_STEEL = MATERIAL_COST(1.2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b10mm/practice category = list( @@ -1151,7 +1151,7 @@ /datum/design_techweb/ammobox_10mm_rubber SET_AMMO_DESIGN_NAMEDESC("ammo box (10mm rubber)") id = "ammobox_10mm_rubber" - materials = list(MAT_STEEL = 2400) + materials = list(MAT_STEEL = MATERIAL_COST(1.2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b10mm/rubber category = list( @@ -1162,7 +1162,7 @@ /datum/design_techweb/ammobox_10mm_haywire SET_AMMO_DESIGN_NAMEDESC("ammo box (10mm haywire)") id = "ammobox_10mm_haywire" - materials = list(MAT_STEEL = 5200, MAT_URANIUM = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2.6), MAT_URANIUM = MATERIAL_COST(2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b10mm/emp category = list( @@ -1178,7 +1178,7 @@ /datum/design_techweb/ammobox_44 SET_AMMO_DESIGN_NAMEDESC("ammo box (.44)") id = "ammobox_44" - materials = list(MAT_STEEL = 5040) + materials = list(MAT_STEEL = MATERIAL_COST(2.52)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b44 category = list( @@ -1190,7 +1190,7 @@ /datum/design_techweb/ammobox_44_rubber SET_AMMO_DESIGN_NAMEDESC("ammo box (.44 rubber)") id = "ammobox_44_rubber" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b44/rubber category = list( @@ -1201,7 +1201,7 @@ /datum/design_techweb/ammobox_44_spectral SET_AMMO_DESIGN_NAMEDESC("ammo box (.44 spectral)") id = "ammobox_44_spectral" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b44/spectral category = list( @@ -1215,7 +1215,7 @@ /datum/design_techweb/ammobox_45 SET_AMMO_DESIGN_NAMEDESC("ammo box (.45)") id = "ammobox_45" - materials = list(MAT_STEEL = 1800) + materials = list(MAT_STEEL = MATERIAL_COST(0.9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b45 category = list( @@ -1227,7 +1227,7 @@ /datum/design_techweb/ammobox_45_practice SET_AMMO_DESIGN_NAMEDESC("ammo box (.45 practice)") id = "ammobox_45_practice" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b45/practice category = list( @@ -1238,7 +1238,7 @@ /datum/design_techweb/ammobox_45_ap SET_AMMO_DESIGN_NAMEDESC("ammo box (.45 armor piercing)") id = "ammobox_45_ap" - materials = list(MAT_STEEL = 1200, MAT_PLASTEEL = 600) + materials = list(MAT_STEEL = MATERIAL_COST(0.6), MAT_PLASTEEL = MATERIAL_COST(0.3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b45/ap category = list( @@ -1250,7 +1250,7 @@ /datum/design_techweb/ammobox_45_hp SET_AMMO_DESIGN_NAMEDESC("ammo box (.45 hollow point)") id = "ammobox_45_hp" - materials = list(MAT_STEEL = 1440, MAT_PLASTIC = 360) + materials = list(MAT_STEEL = MATERIAL_COST(0.72), MAT_PLASTIC = MATERIAL_COST(0.18)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b45/hp category = list( @@ -1262,7 +1262,7 @@ /datum/design_techweb/ammobox_45_rubber SET_AMMO_DESIGN_NAMEDESC("ammo box (.45 rubber)") id = "ammobox_45_rubber" - materials = list(MAT_STEEL = 1440) + materials = list(MAT_STEEL = MATERIAL_COST(0.72)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b45/rubber category = list( @@ -1273,7 +1273,7 @@ /datum/design_techweb/ammobox_45_haywire SET_AMMO_DESIGN_NAMEDESC("ammo box (.45 haywire)") id = "ammobox_45_haywire" - materials = list(MAT_STEEL = 3120, MAT_URANIUM = 2400) + materials = list(MAT_STEEL = MATERIAL_COST(1.56), MAT_URANIUM = MATERIAL_COST(1.2)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b45/emp category = list( @@ -1289,7 +1289,7 @@ /datum/design_techweb/ammobox_145 SET_AMMO_DESIGN_NAMEDESC("ammo box (14.5mm)") id = "ammobox_145" - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b145 category = list( @@ -1301,7 +1301,7 @@ /datum/design_techweb/ammobox_145_highvel SET_AMMO_DESIGN_NAMEDESC("ammo box (14.5mm sabot)") id = "ammobox_145_highvel" - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b145/highvel category = list( @@ -1317,7 +1317,7 @@ /datum/design_techweb/ammobox_762 SET_AMMO_DESIGN_NAMEDESC("ammo box (7.62mm)") id = "ammobox_762" - materials = list(MAT_STEEL = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b762 category = list( @@ -1329,7 +1329,7 @@ /datum/design_techweb/ammobox_762_hp SET_AMMO_DESIGN_NAMEDESC("ammo box (7.62mm hollow point)") id = "ammobox_762_hp" - materials = list(MAT_STEEL = 9000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b762/hp category = list( @@ -1341,7 +1341,7 @@ /datum/design_techweb/ammobox_762_ap SET_AMMO_DESIGN_NAMEDESC("ammo box (7.62mm armor piercing)") id = "ammobox_762_ap" - materials = list(MAT_STEEL = 9000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b762/ap category = list( @@ -1353,7 +1353,7 @@ /datum/design_techweb/ammobox_762_practice SET_AMMO_DESIGN_NAMEDESC("ammo box (7.62mm practice)") id = "ammobox_762_practice" - materials = list(MAT_STEEL = 2700) + materials = list(MAT_STEEL = MATERIAL_COST(1.35)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b762/practice category = list( @@ -1364,7 +1364,7 @@ /datum/design_techweb/ammobox_762_hunter SET_AMMO_DESIGN_NAMEDESC("ammo box (7.62mm hunter)") id = "ammobox_762_hunter" - materials = list(MAT_STEEL = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b762/hunter category = list( @@ -1380,7 +1380,7 @@ /datum/design_techweb/ammobox_545 SET_AMMO_DESIGN_NAMEDESC("ammo box (5.45mm)") id = "ammobox_545" - materials = list(MAT_STEEL = 5400) + materials = list(MAT_STEEL = MATERIAL_COST(2.7)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545 category = list( @@ -1392,7 +1392,7 @@ /datum/design_techweb/ammobox_545_ap SET_AMMO_DESIGN_NAMEDESC("ammo box (5.45mm armor piercing)") id = "ammobox_545_ap" - materials = list(MAT_STEEL = 8100) + materials = list(MAT_STEEL = MATERIAL_COST(4.05)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/ap category = list( @@ -1404,7 +1404,7 @@ /datum/design_techweb/ammobox_545_hp SET_AMMO_DESIGN_NAMEDESC("ammo box (5.45mm hollow point)") id = "ammobox_545_hp" - materials = list(MAT_STEEL = 5400) + materials = list(MAT_STEEL = MATERIAL_COST(2.7)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/hp category = list( @@ -1416,7 +1416,7 @@ /datum/design_techweb/ammobox_545_practice SET_AMMO_DESIGN_NAMEDESC("ammo box (5.45mm practice)") id = "ammobox_545_practice" - materials = list(MAT_STEEL = 2700) + materials = list(MAT_STEEL = MATERIAL_COST(1.35)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/practice category = list( @@ -1427,7 +1427,7 @@ /datum/design_techweb/ammobox_545_hunter SET_AMMO_DESIGN_NAMEDESC("ammo box (5.45mm hunter)") id = "ammobox_545_hunter" - materials = list(MAT_STEEL = 5400) + materials = list(MAT_STEEL = MATERIAL_COST(2.7)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/hunter category = list( @@ -1439,7 +1439,7 @@ /datum/design_techweb/ammobox_545_blank SET_AMMO_DESIGN_NAMEDESC("ammo box (5.45mm blanks)") id = "ammobox_545_blank" - materials = list(MAT_STEEL = 2700) + materials = list(MAT_STEEL = MATERIAL_COST(1.35)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/blank category = list( @@ -1452,7 +1452,7 @@ /datum/design_techweb/ammocrate_545 SET_AMMO_DESIGN_NAMEDESC("large ammo crate (5.45mm)") id = "ammocrate_545" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/large category = list( @@ -1464,7 +1464,7 @@ /datum/design_techweb/ammocrate_545_ap SET_AMMO_DESIGN_NAMEDESC("large ammo crate (5.45mm armor piercing)") id = "ammocrate_545_ap" - materials = list(MAT_STEEL = 27000) + materials = list(MAT_STEEL = MATERIAL_COST(13.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/large/ap category = list( @@ -1476,7 +1476,7 @@ /datum/design_techweb/ammocrate_545_hp SET_AMMO_DESIGN_NAMEDESC("large ammo crate (5.45mm hollow point)") id = "ammocrate_545_hp" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/large/hp category = list( @@ -1488,7 +1488,7 @@ /datum/design_techweb/ammocrate_545_practice SET_AMMO_DESIGN_NAMEDESC("large ammo crate (5.45mm practice)") id = "ammocrate_545_practice" - materials = list(MAT_STEEL = 9000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/large/practice category = list( @@ -1499,7 +1499,7 @@ /datum/design_techweb/ammocrate_545_hunter SET_AMMO_DESIGN_NAMEDESC("large ammo crate (5.45mm hunter)") id = "ammocrate_545_hunter" - materials = list(MAT_STEEL = 18000) + materials = list(MAT_STEEL = MATERIAL_COST(9)) build_type = AUTOLATHE build_path = /obj/item/ammo_magazine/ammo_box/b545/large/hunter category = list( diff --git a/code/modules/research/tg/designs/boards/telecomms.dm b/code/modules/research/tg/designs/boards/telecomms.dm index 7c57f5dea73..7c21966cd8c 100644 --- a/code/modules/research/tg/designs/boards/telecomms.dm +++ b/code/modules/research/tg/designs/boards/telecomms.dm @@ -97,41 +97,41 @@ /datum/design_techweb/subspace/subspace_ansible id = "s-ansible" // req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 80, MAT_SILVER = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.04), MAT_SILVER = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/subspace/ansible /datum/design_techweb/subspace/hyperwave_filter id = "s-filter" // req_tech = list(TECH_DATA = 3, TECH_MAGNET = 3) - materials = list(MAT_STEEL = 40, MAT_SILVER = 10) + materials = list(MAT_STEEL = MATERIAL_COST(0.02), MAT_SILVER = MATERIAL_COST(0.005)) build_path = /obj/item/stock_parts/subspace/sub_filter /datum/design_techweb/subspace/subspace_amplifier id = "s-amplifier" // req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 10, MAT_GOLD = 30, MAT_URANIUM = 15) + materials = list(MAT_STEEL = MATERIAL_COST(0.005), MAT_GOLD = MATERIAL_COST(0.015), MAT_URANIUM = MATERIAL_COST(0.0075)) build_path = /obj/item/stock_parts/subspace/amplifier /datum/design_techweb/subspace/subspace_treatment id = "s-treatment" // req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 10, MAT_SILVER = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.005), MAT_SILVER = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/subspace/treatment /datum/design_techweb/subspace/subspace_analyzer id = "s-analyzer" // req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 10, MAT_GOLD = 15) + materials = list(MAT_STEEL = MATERIAL_COST(0.005), MAT_GOLD = MATERIAL_COST(0.0075)) build_path = /obj/item/stock_parts/subspace/analyzer /datum/design_techweb/subspace/subspace_crystal id = "s-crystal" // req_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - materials = list(MAT_GLASS = 1000, MAT_SILVER = 20, MAT_GOLD = 20) + materials = list(MAT_GLASS = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.01), MAT_GOLD = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/subspace/crystal /datum/design_techweb/subspace/subspace_transmitter id = "s-transmitter" // req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) - materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15) + materials = list(MAT_GLASS = MATERIAL_COST(0.05), MAT_SILVER = MATERIAL_COST(0.005), MAT_URANIUM = MATERIAL_COST(0.0075)) build_path = /obj/item/stock_parts/subspace/transmitter diff --git a/code/modules/research/tg/designs/circuitry_designs.dm b/code/modules/research/tg/designs/circuitry_designs.dm index f76a946baed..a5f34be37e5 100644 --- a/code/modules/research/tg/designs/circuitry_designs.dm +++ b/code/modules/research/tg/designs/circuitry_designs.dm @@ -4,7 +4,7 @@ id = "ic_printer" // req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 4, TECH_DATA = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/integrated_circuit_printer category = list( RND_CATEGORY_CIRCUITRY @@ -17,7 +17,7 @@ id = "ic_printer_upgrade_adv" // req_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/disk/integrated_circuit/upgrade/advanced category = list( RND_CATEGORY_CIRCUITRY @@ -30,7 +30,7 @@ id = "ic_printer_upgrade_clone" // req_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/disk/integrated_circuit/upgrade/clone category = list( RND_CATEGORY_CIRCUITRY @@ -42,7 +42,7 @@ id = "wirer" // req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25)) build_path = /obj/item/integrated_electronics/wirer category = list( RND_CATEGORY_CIRCUITRY @@ -54,7 +54,7 @@ id = "debugger" // req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25)) build_path = /obj/item/integrated_electronics/debugger category = list( RND_CATEGORY_CIRCUITRY @@ -68,7 +68,7 @@ id = "assembly-small" // req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_POWER = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/electronic_assembly category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -81,7 +81,7 @@ id = "assembly-medium" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 20000) + materials = list(MAT_STEEL = MATERIAL_COST(10)) build_path = /obj/item/electronic_assembly/medium category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -94,7 +94,7 @@ id = "assembly-large" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 40000) + materials = list(MAT_STEEL = MATERIAL_COST(20)) build_path = /obj/item/electronic_assembly/large category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -107,7 +107,7 @@ id = "assembly-drone" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4, TECH_POWER = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30000) + materials = list(MAT_STEEL = MATERIAL_COST(15)) build_path = /obj/item/electronic_assembly/drone category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -120,7 +120,7 @@ id = "assembly-device" // req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5)) build_path = /obj/item/assembly/electronic_assembly category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -133,7 +133,7 @@ id = "assembly-implant" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 3, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/implant/integrated_circuit category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -145,7 +145,7 @@ desc = "A tiny circuit assembly that can easily be hidden." id = "circuit-bug" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/electronic_assembly/circuit_bug category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS diff --git a/code/modules/research/tg/designs/construction_designs.dm b/code/modules/research/tg/designs/construction_designs.dm index 02eb8e650aa..a10dcd7cc13 100644 --- a/code/modules/research/tg/designs/construction_designs.dm +++ b/code/modules/research/tg/designs/construction_designs.dm @@ -67,7 +67,7 @@ name = "light bulb" id = "light_bulb" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 125) + materials = list(MAT_GLASS = MATERIAL_COST(0.0625)) build_path = /obj/item/light/bulb category = list( RND_CATEGORY_INITIAL, @@ -79,7 +79,7 @@ name = "large light bulb" id = "large_light_bulb" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 200) + materials = list(MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/light/bulb/large category = list( RND_CATEGORY_INITIAL, @@ -91,7 +91,7 @@ name = "light tube" id = "light_tube" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 125) + materials = list(MAT_GLASS = MATERIAL_COST(0.0625)) build_path = /obj/item/light/tube category = list( RND_CATEGORY_INITIAL, @@ -103,7 +103,7 @@ name = "large light tube" id = "large_light_tube" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 200) + materials = list(MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/light/tube/large category = list( RND_CATEGORY_INITIAL, @@ -116,7 +116,7 @@ desc = "A backlit floor panel, ready for installation!" id = "floor_light" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/floor_light category = list( RND_CATEGORY_INITIAL, @@ -128,7 +128,7 @@ name = "cable coil" id = "cable_coil" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 1500, MAT_GLASS = 600) // For a 30 stack, temporary workaround due to not having the correct /five and /thirty subtypes, and it breaking the lathe math... but it requires repathing all coils mapped to /thirty subtype. + materials = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(0.3)) // For a 30 stack, temporary workaround due to not having the correct /five and /thirty subtypes, and it breaking the lathe math... but it requires repathing all coils mapped to /thirty subtype. build_path = /obj/item/stack/cable_coil category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/tg/designs/equipment_designs.dm b/code/modules/research/tg/designs/equipment_designs.dm index 29ad8e17fa5..10ed4775f6a 100644 --- a/code/modules/research/tg/designs/equipment_designs.dm +++ b/code/modules/research/tg/designs/equipment_designs.dm @@ -2,7 +2,7 @@ name = "Size Standardization Bracelet" id = "bluespacebracelet" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/clothing/gloves/bluespace category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -13,7 +13,7 @@ name = "Deluxe Size Standardization Bracelet" id = "deluxebluespacebracelet" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/gloves/bluespace/deluxe category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -24,7 +24,7 @@ name = "Bluespace Collar" id = "bluespacecollar" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/clothing/accessory/collar/shock/bluespace category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -35,7 +35,7 @@ name = "HYPER jumpsuit" id = "hfjumpsuit" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/under/hyperfiber category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -46,7 +46,7 @@ name = "Bluespace Jumpsuit" id = "bluespace_jumpsuit" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/clothing/under/hyperfiber/bluespace category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -59,7 +59,7 @@ id = "ore_holding" // req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3) build_type = PROTOLATHE - materials = list(MAT_GOLD = 1000, MAT_DIAMOND = 500, MAT_URANIUM = 250) // Less expensive since it can only hold ores + materials = list(MAT_GOLD = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.125)) // Less expensive since it can only hold ores build_path = /obj/item/ore_bag/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -72,7 +72,7 @@ id = "sheet_holding" // req_tech = list(TECH_BLUESPACE = 1, TECH_MATERIAL = 2) build_type = PROTOLATHE - materials = list(MAT_GOLD = 300, MAT_DIAMOND = 200, MAT_URANIUM = 150) // Even less expensive because it has a more limited use + materials = list(MAT_GOLD = MATERIAL_COST(0.15), MAT_DIAMOND = MATERIAL_COST(0.1), MAT_URANIUM = MATERIAL_COST(0.075)) // Even less expensive because it has a more limited use build_path = /obj/item/storage/bag/sheetsnatcher/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -85,7 +85,7 @@ id = "bag_holding" // req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) build_type = PROTOLATHE - materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) + materials = list(MAT_GOLD = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(0.125)) build_path = /obj/item/storage/backpack/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -98,7 +98,7 @@ id = "dufflebag_holding" // req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) build_type = PROTOLATHE - materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) + materials = list(MAT_GOLD = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(0.125)) build_path = /obj/item/storage/backpack/holding/duffle category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -111,7 +111,7 @@ id = "trashbag_holding" // req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5) build_type = PROTOLATHE - materials = list(MAT_GOLD = 2000, MAT_DIAMOND = 1000, MAT_URANIUM = 250) + materials = list(MAT_GOLD = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.125)) build_path = /obj/item/storage/bag/trash/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -124,7 +124,7 @@ id = "pouch_holding" // req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5) build_type = PROTOLATHE - materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_URANIUM = 250) + materials = list(MAT_GOLD = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(0.125)) build_path = /obj/item/storage/pouch/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -138,7 +138,7 @@ id = "belt_holding_med" // req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) build_type = PROTOLATHE - materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_TITANIUM = 500) + materials = list(MAT_GOLD = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(1), MAT_TITANIUM = MATERIAL_COST(0.25)) build_path = /obj/item/storage/belt/medical/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -151,7 +151,7 @@ id = "belt_holding_utility" // req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) build_type = PROTOLATHE - materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_TITANIUM = 500) + materials = list(MAT_GOLD = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(1), MAT_TITANIUM = MATERIAL_COST(0.25)) build_path = /obj/item/storage/belt/utility/holding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -160,7 +160,7 @@ // HUDs /datum/design_techweb/hud - materials = list(MAT_STEEL = 50, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) build_type = PROTOLATHE /datum/design_techweb/hud/New() @@ -221,7 +221,7 @@ name = "graviton visor" id = "graviton_goggles" // req_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3, TECH_PHORON = 3, TECH_ARCANE = 1) - materials = list(MAT_PLASTEEL = 2000, MAT_GLASS = 3000, MAT_PHORON = 1500, MAT_DIAMOND = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.25)) build_path = /obj/item/clothing/glasses/graviton category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -232,7 +232,7 @@ name = "AR glasses" id = "omnihud" // req_tech = list(TECH_MAGNET = 4, TECH_COMBAT = 3, TECH_BIO = 3) - materials = list(MAT_STEEL = 1000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/glasses/omnihud category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -244,7 +244,7 @@ desc = "A global positioning system reciever, used to safely navigate when far away from the station." // req_tech = list(TECH_MATERIAL = 2, TECH_DATA = 2, TECH_BLUESPACE = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25)) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC ) @@ -303,7 +303,7 @@ id = "beacon_locator" // req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5),MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/beacon_locator category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -315,7 +315,7 @@ id = "beacon" // req_tech = list(TECH_BLUESPACE = 1) build_type = PROTOLATHE - materials = list (MAT_STEEL = 20, MAT_GLASS = 10) + materials = list (MAT_STEEL = MATERIAL_COST(0.01), MAT_GLASS = MATERIAL_COST(0.005)) build_path = /obj/item/radio/beacon category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -327,7 +327,7 @@ id = "ear_translator" // req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5) //It's been hella miniaturized. build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/universal_translator/ear category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -338,7 +338,7 @@ id = "walkpod" // req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/walkpod category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -349,7 +349,7 @@ id = "juke_remote" // req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/juke_remote category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -360,7 +360,7 @@ id = "translocator" // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_ILLEGAL = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(2), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/perfect_tele category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -372,7 +372,7 @@ id = "mini_translocator" // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_ILLEGAL = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_PHORON = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/perfect_tele/one_beacon category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -383,7 +383,7 @@ id = "bluespace_crystal" // req_tech = list(TECH_BLUESPACE = 3, TECH_PHORON = 4) build_type = PROTOLATHE - materials = list(MAT_DIAMOND = 1500, MAT_PHORON = 1500) + materials = list(MAT_DIAMOND = MATERIAL_COST(0.75), MAT_PHORON = MATERIAL_COST(0.75)) build_path = /obj/item/bluespace_crystal/artificial category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -395,7 +395,7 @@ desc = "An updated, modular intercom that fits over the head. Takes encryption keys" id = "radio_headset" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 120) + materials = list(MAT_STEEL = MATERIAL_COST(0.06)) build_path = /obj/item/radio/headset category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -407,7 +407,7 @@ desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." id = "welding_helmet" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 3750, MAT_GLASS = 1250) + materials = list(MAT_STEEL = MATERIAL_COST(1.875), MAT_GLASS = MATERIAL_COST(0.625)) build_path = /obj/item/clothing/head/welding category = list( RND_CATEGORY_INITIAL, @@ -420,7 +420,7 @@ desc = "Protects the eyes from welders, approved by the mad scientist association." id = "welding_goggles" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.75)) build_path = /obj/item/clothing/glasses/welding category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -432,7 +432,7 @@ desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling." id = "suit_cooling_unit" build_type = PROTOLATHE - materials = list(MAT_STEEL = 18000, MAT_GLASS = 4400) + materials = list(MAT_STEEL = MATERIAL_COST(9), MAT_GLASS = MATERIAL_COST(2.2)) build_path = /obj/item/suit_cooling_unit category = list( RND_CATEGORY_INITIAL, @@ -445,7 +445,7 @@ desc = "An expensive holo-collar for the modern day pet." id = "holocollar" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.03)) build_path = /obj/item/clothing/accessory/collar/holo category = list( RND_CATEGORY_INITIAL, @@ -458,7 +458,7 @@ desc = "A simple tether that can easily be hooked onto a collar. Usually used to keep pets nearby." id = "leash" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025)) build_path = /obj/item/leash category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/tg/designs/experisci_designs.dm b/code/modules/research/tg/designs/experisci_designs.dm index 93f1e316486..7036571a1f6 100644 --- a/code/modules/research/tg/designs/experisci_designs.dm +++ b/code/modules/research/tg/designs/experisci_designs.dm @@ -3,7 +3,7 @@ desc = "Experimental scanning unit used for performing scanning experiments." id = "experi_scanner" build_type = PROTOLATHE - materials = list(MAT_GLASS = 500, MAT_STEEL = 500) + materials = list(MAT_GLASS = MATERIAL_COST(0.25), MAT_STEEL = MATERIAL_COST(0.25)) build_path = /obj/item/experi_scanner category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE diff --git a/code/modules/research/tg/designs/firework_designs.dm b/code/modules/research/tg/designs/firework_designs.dm index 0a97021e2a0..c4d12c71027 100644 --- a/code/modules/research/tg/designs/firework_designs.dm +++ b/code/modules/research/tg/designs/firework_designs.dm @@ -22,7 +22,7 @@ id = "fireworkaesthetic" // req_tech = list(TECH_MATERIAL = 2) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 500, MAT_GLASS = 500) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/firework_star/aesthetic /datum/design_techweb/firework_star/aesthetic_config @@ -31,7 +31,7 @@ id = "fireworkaestheticconfig" // req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 1000, MAT_GLASS = 1000) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/firework_star/aesthetic/configurable /datum/design_techweb/firework_star/weather_clear @@ -40,7 +40,7 @@ id = "fireworkclearsky" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_STEEL = 4000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/firework_star/weather/clear /datum/design_techweb/firework_star/weather_overcast @@ -49,7 +49,7 @@ id = "fireworkcloudy" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 1000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/firework_star/weather/overcast /datum/design_techweb/firework_star/weather_fog @@ -58,7 +58,7 @@ id = "fireworkfog" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 2000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1)) build_path = /obj/item/firework_star/weather/fog /datum/design_techweb/firework_star/weather_rain @@ -67,7 +67,7 @@ id = "fireworkrain" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 4000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(2)) build_path = /obj/item/firework_star/weather/rain /datum/design_techweb/firework_star/weather_storm @@ -76,7 +76,7 @@ id = "fireworkstorm" // req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_GOLD = 1000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/firework_star/weather/storm /datum/design_techweb/firework_star/weather_light_snow @@ -85,7 +85,7 @@ id = "fireworklightsnow" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_LEAD = 2000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1), MAT_LEAD = MATERIAL_COST(1)) build_path = /obj/item/firework_star/weather/light_snow /datum/design_techweb/firework_star/weather_snow @@ -94,7 +94,7 @@ id = "fireworksnow" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_LEAD = 2000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_LEAD = MATERIAL_COST(1)) build_path = /obj/item/firework_star/weather/snow /datum/design_techweb/firework_star/weather_blizzard @@ -103,7 +103,7 @@ id = "fireworkblizzard" // req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_LEAD = 3000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_LEAD = MATERIAL_COST(1.5)) build_path = /obj/item/firework_star/weather/blizzard /datum/design_techweb/firework_star/weather_hail @@ -112,7 +112,7 @@ id = "fireworkhail" // req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5, TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_LEAD = 3000, MAT_PLASTEEL = 4000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_LEAD = MATERIAL_COST(1.5), MAT_PLASTEEL = MATERIAL_COST(2)) build_path = /obj/item/firework_star/weather/hail /datum/design_techweb/firework_star/weather_confetti @@ -121,7 +121,7 @@ id = "fireworkconfetti" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 10000, MAT_GLASS = 10000) + materials = list(MAT_PLASTIC = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(5)) build_path = /obj/item/firework_star/weather/confetti /datum/design_techweb/firework_star/weather_fallout @@ -130,5 +130,5 @@ id = "fireworkfallout" // req_tech = list(TECH_MATERIAL = 8, TECH_ENGINEERING = 6, TECH_ILLEGAL = 7) build_type = PROTOLATHE - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_URANIUM = 12000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(6)) build_path = /obj/item/firework_star/weather/fallout diff --git a/code/modules/research/tg/designs/illegal_designs.dm b/code/modules/research/tg/designs/illegal_designs.dm index 2a6e6e0364f..4596d8467c6 100644 --- a/code/modules/research/tg/designs/illegal_designs.dm +++ b/code/modules/research/tg/designs/illegal_designs.dm @@ -4,7 +4,7 @@ id = "binaryencrypt" // req_tech = list(TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 300, MAT_GLASS = 300) + materials = list(MAT_STEEL = MATERIAL_COST(0.15), MAT_GLASS = MATERIAL_COST(0.15)) build_path = /obj/item/encryptionkey/binary category = list( RND_CATEGORY_HACKED, @@ -18,7 +18,7 @@ id = "chameleon" // req_tech = list(TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25)) build_path = /obj/item/storage/box/syndie_kit/chameleon category = list( RND_CATEGORY_HACKED, @@ -32,7 +32,7 @@ id = "clerical" // req_tech = list(TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25)) build_path = /obj/item/storage/box/syndie_kit/clerical category = list( RND_CATEGORY_HACKED, @@ -45,7 +45,7 @@ id = "bodysnatcher" // req_tech = list(TECH_MAGNET = 3, TECH_BIO = 3, TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/bodysnatcher category = list( RND_CATEGORY_HACKED, @@ -58,7 +58,7 @@ desc = "Dance my monkeys! DANCE!!!" id = "electropack" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 12500, MAT_GLASS = 3125) + materials = list(MAT_STEEL = MATERIAL_COST(6.25), MAT_GLASS = MATERIAL_COST(1.5625)) build_path = /obj/item/radio/electropack category = list( RND_CATEGORY_HACKED, diff --git a/code/modules/research/tg/designs/implant_designs.dm b/code/modules/research/tg/designs/implant_designs.dm index d85ccb4e85b..48e86b2a8bd 100644 --- a/code/modules/research/tg/designs/implant_designs.dm +++ b/code/modules/research/tg/designs/implant_designs.dm @@ -1,12 +1,12 @@ /datum/design_techweb/implant - materials = list(MAT_STEEL = 50, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) /datum/design_techweb/implant/backup name = "Backup implant" id = "implant_backup" // req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_DATA = 4, TECH_ENGINEERING = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/implantcase/backup category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -18,7 +18,7 @@ id = "implant_size" // req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_DATA = 4, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/implanter/sizecontrol category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -53,7 +53,7 @@ id = "research_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/organ/internal/augment/armmounted/hand category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS @@ -66,7 +66,7 @@ id = "tool_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 2, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3)) build_path = /obj/item/organ/internal/augment/armmounted/shoulder/multiple category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS @@ -79,7 +79,7 @@ id = "surgical_implant" // req_tech = list(TECH_BIO = 6, TECH_MATERIAL = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/organ/internal/augment/armmounted/shoulder/multiple/medical category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS @@ -92,7 +92,7 @@ id = "blade_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 4, TECH_COMBAT = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/organ/internal/augment/armmounted/hand/blade category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -105,7 +105,7 @@ id = "armblade_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 5, TECH_COMBAT = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 1000, MAT_GOLD = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(1)) build_path = /obj/item/organ/internal/augment/armmounted/shoulder/blade category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -118,7 +118,7 @@ id = "sword_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 6, TECH_COMBAT = 6, TECH_ENGINEERING = 5, TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 1000, MAT_GOLD = 2000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/organ/internal/augment/armmounted/hand/sword category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -130,7 +130,7 @@ desc = "A small implant that fits into a subject's pelvix. It deploys allows the user to analyze their vitals on demand." id = "health_scan_implant" build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/organ/internal/augment/bioaugment/health_scan category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -143,7 +143,7 @@ id = "dartbow_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 4, TECH_COMBAT = 6, TECH_ILLEGAL = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_PHORON = 4000, MAT_GOLD = 4000, MAT_DIAMOND = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(2), MAT_DIAMOND = MATERIAL_COST(3)) build_path = /obj/item/organ/internal/augment/armmounted/dartbow category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -156,7 +156,7 @@ id = "taser_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 4, TECH_COMBAT = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 2000, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/organ/internal/augment/armmounted/taser category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -169,7 +169,7 @@ id = "laser_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 4, TECH_COMBAT = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 6000, MAT_GOLD = 4000, MAT_DIAMOND = 4000, MAT_PHORON = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(3), MAT_GOLD = MATERIAL_COST(2), MAT_DIAMOND = MATERIAL_COST(2), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/organ/internal/augment/armmounted category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -182,7 +182,7 @@ id = "surge_implant" // req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 4, TECH_POWER = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_PHORON = 1000, MAT_GOLD = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(1)) build_path = /obj/item/organ/internal/augment/armmounted/shoulder/surge category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -195,7 +195,7 @@ id = "thermal_implant" // req_tech = list(TECH_BIO = 7, TECH_MATERIAL = 4, TECH_POWER = 7, TECH_ENGINEERING = 7, TECH_COMBAT = 5, TECH_ILLEGAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_PHORON = 10000, MAT_GOLD = 2000, MAT_DIAMOND = 10000, MAT_SILVER = 4000, MAT_TITANIUM = 1000) //this is thermals. this is expensive, yo. + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(5), MAT_GOLD = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(5), MAT_SILVER = MATERIAL_COST(2), MAT_TITANIUM = MATERIAL_COST(0.5)) //this is thermals. this is expensive, yo. build_path = /obj/item/organ/internal/augment/bioaugment/thermalshades category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -207,7 +207,7 @@ id = "nif" // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 8000, MAT_URANIUM = 6000, MAT_DIAMOND = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(4), MAT_URANIUM = MATERIAL_COST(3), MAT_DIAMOND = MATERIAL_COST(3)) build_path = /obj/item/nif category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC @@ -219,7 +219,7 @@ id = "bioadapnif" // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000, MAT_GLASS = 15000, MAT_URANIUM = 10000, MAT_DIAMOND = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(7.5), MAT_URANIUM = MATERIAL_COST(5), MAT_DIAMOND = MATERIAL_COST(5)) build_path = /obj/item/nif/bioadap category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC diff --git a/code/modules/research/tg/designs/mecha_designs.dm b/code/modules/research/tg/designs/mecha_designs.dm index 088e192fe55..ffc163e12af 100644 --- a/code/modules/research/tg/designs/mecha_designs.dm +++ b/code/modules/research/tg/designs/mecha_designs.dm @@ -5,7 +5,7 @@ id = "high_mech_cell" build_type = PROTOLATHE | MECHFAB // req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 600, MAT_SILVER = 150, MAT_GLASS = 70) + materials = list(MAT_STEEL = MATERIAL_COST(0.3), MAT_SILVER = MATERIAL_COST(0.075), MAT_GLASS = MATERIAL_COST(0.035)) build_path = /obj/item/cell/mech/high category = list( RND_CATEGORY_MECHFAB_EQUIPMENT @@ -18,7 +18,7 @@ id = "super_mech_cell" build_type = PROTOLATHE | MECHFAB // req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 500, MAT_GOLD = 200, MAT_SILVER = 200, MAT_GLASS = 80) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.1), MAT_SILVER = MATERIAL_COST(0.1), MAT_GLASS = MATERIAL_COST(0.04)) build_path = /obj/item/cell/mech/super category = list( RND_CATEGORY_MECHFAB_EQUIPMENT @@ -31,7 +31,7 @@ id = "sflash" //req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2) build_type = MECHFAB - materials = list(MAT_STEEL = 562, MAT_GLASS = 562) + materials = list(MAT_STEEL = MATERIAL_COST(0.281), MAT_GLASS = MATERIAL_COST(0.281)) build_path = /obj/item/flash/synthetic category = list( RND_CATEGORY_TOOLS diff --git a/code/modules/research/tg/designs/mechfab_designs.dm b/code/modules/research/tg/designs/mechfab_designs.dm index 20a3a3d4db3..0cf298021ce 100644 --- a/code/modules/research/tg/designs/mechfab_designs.dm +++ b/code/modules/research/tg/designs/mechfab_designs.dm @@ -27,37 +27,37 @@ name = "Ripley Chassis" id = "ripley_chassis" build_path = /obj/item/mecha_parts/chassis/ripley - materials = list(MAT_STEEL = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5)) /datum/design_techweb/mechfab/ripley/torso name = "Ripley Torso" id = "ripley_torso" build_path = /obj/item/mecha_parts/part/ripley_torso - materials = list(MAT_STEEL = 30000, MAT_GLASS = 11250) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(5.625)) /datum/design_techweb/mechfab/ripley/left_arm name = "Ripley Left Arm" id = "ripley_left_arm" build_path = /obj/item/mecha_parts/part/ripley_left_arm - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) /datum/design_techweb/mechfab/ripley/right_arm name = "Ripley Right Arm" id = "ripley_right_arm" build_path = /obj/item/mecha_parts/part/ripley_right_arm - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) /datum/design_techweb/mechfab/ripley/left_leg name = "Ripley Left Leg" id = "ripley_left_leg" build_path = /obj/item/mecha_parts/part/ripley_left_leg - materials = list(MAT_STEEL = 22500) + materials = list(MAT_STEEL = MATERIAL_COST(11.25)) /datum/design_techweb/mechfab/ripley/right_leg name = "Ripley Right Leg" id = "ripley_right_leg" build_path = /obj/item/mecha_parts/part/ripley_right_leg - materials = list(MAT_STEEL = 22500) + materials = list(MAT_STEEL = MATERIAL_COST(11.25)) ///FIREFIGHTER /datum/design_techweb/mechfab/ripley/chassis/firefighter @@ -91,43 +91,43 @@ name = "Odysseus Chassis" id = "odysseus_chassis" build_path = /obj/item/mecha_parts/chassis/odysseus - materials = list(MAT_STEEL = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5)) /datum/design_techweb/mechfab/odysseus/torso name = "Odysseus Torso" id = "odysseus_torso" build_path = /obj/item/mecha_parts/part/odysseus_torso - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) /datum/design_techweb/mechfab/odysseus/head name = "Odysseus Head" id = "odysseus_head" build_path = /obj/item/mecha_parts/part/odysseus_head - materials = list(MAT_STEEL = 1500, MAT_GLASS = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/odysseus/left_arm name = "Odysseus Left Arm" id = "odysseus_left_arm" build_path = /obj/item/mecha_parts/part/odysseus_left_arm - materials = list(MAT_STEEL = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/odysseus/right_arm name = "Odysseus Right Arm" id = "odysseus_right_arm" build_path = /obj/item/mecha_parts/part/odysseus_right_arm - materials = list(MAT_STEEL = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/odysseus/left_leg name = "Odysseus Left Leg" id = "odysseus_left_leg" build_path = /obj/item/mecha_parts/part/odysseus_left_leg - materials = list(MAT_STEEL = 11250) + materials = list(MAT_STEEL = MATERIAL_COST(5.625)) /datum/design_techweb/mechfab/odysseus/right_leg name = "Odysseus Right Leg" id = "odysseus_right_leg" build_path = /obj/item/mecha_parts/part/odysseus_right_leg - materials = list(MAT_STEEL = 11250) + materials = list(MAT_STEEL = MATERIAL_COST(5.625)) ///GYGAX /datum/design_techweb/mechfab/gygax @@ -168,55 +168,55 @@ name = "Serenity Chassis" id = "serenity_chassis" build_path = /obj/item/mecha_parts/chassis/serenity - materials = list(MAT_STEEL = 18750, MAT_PHORON = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(9.375), MAT_PHORON = MATERIAL_COST(2)) /datum/design_techweb/mechfab/gygax/chassis name = "Gygax Chassis" id = "gygax_chassis" build_path = /obj/item/mecha_parts/chassis/gygax - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) /datum/design_techweb/mechfab/gygax/torso name = "Gygax Torso" id = "gygax_torso" build_path = /obj/item/mecha_parts/part/gygax_torso - materials = list(MAT_STEEL = 37500, MAT_GLASS = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(18.75), MAT_GLASS = MATERIAL_COST(7.5)) /datum/design_techweb/mechfab/gygax/head name = "Gygax Head" id = "gygax_head" build_path = /obj/item/mecha_parts/part/gygax_head - materials = list(MAT_STEEL = 15000, MAT_GLASS = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/gygax/left_arm name = "Gygax Left Arm" id = "gygax_left_arm" build_path = /obj/item/mecha_parts/part/gygax_left_arm - materials = list(MAT_STEEL = 22500) + materials = list(MAT_STEEL = MATERIAL_COST(11.25)) /datum/design_techweb/mechfab/gygax/right_arm name = "Gygax Right Arm" id = "gygax_right_arm" build_path = /obj/item/mecha_parts/part/gygax_right_arm - materials = list(MAT_STEEL = 22500) + materials = list(MAT_STEEL = MATERIAL_COST(11.25)) /datum/design_techweb/mechfab/gygax/left_leg name = "Gygax Left Leg" id = "gygax_left_leg" build_path = /obj/item/mecha_parts/part/gygax_left_leg - materials = list(MAT_STEEL = 26250) + materials = list(MAT_STEEL = MATERIAL_COST(13.125)) /datum/design_techweb/mechfab/gygax/right_leg name = "Gygax Right Leg" id = "gygax_right_leg" build_path = /obj/item/mecha_parts/part/gygax_right_leg - materials = list(MAT_STEEL = 26250) + materials = list(MAT_STEEL = MATERIAL_COST(13.125)) /datum/design_techweb/mechfab/gygax/armour name = "Gygax Armour Plates" id = "gygax_armour" build_path = /obj/item/mecha_parts/part/gygax_armour - materials = list(MAT_STEEL = 37500, MAT_DIAMOND = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(18.75), MAT_DIAMOND = MATERIAL_COST(3.75)) ///DURAND /datum/design_techweb/mechfab/durand @@ -229,7 +229,7 @@ name = "'Durand' central control circuit" id = "durand_main" // req_tech = list(TECH_DATA = 4) - materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) + materials = list(MAT_GLASS = MATERIAL_COST(1), MAT_GRAPHITE = 1250) build_path = /obj/item/circuitboard/mecha/durand/main materials = DEFAULT_CIRCUIT_MATERIALS @@ -237,7 +237,7 @@ name = "'Durand' peripherals control circuit" id = "durand_peri" // req_tech = list(TECH_DATA = 4) - materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) + materials = list(MAT_GLASS = MATERIAL_COST(1), MAT_GRAPHITE = 1250) build_path = /obj/item/circuitboard/mecha/durand/peripherals materials = DEFAULT_CIRCUIT_MATERIALS @@ -245,7 +245,7 @@ name = "'Durand' weapon control and targeting circuit" id = "durand_targ" // req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) - materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) + materials = list(MAT_GLASS = MATERIAL_COST(1), MAT_GRAPHITE = 1250) build_path = /obj/item/circuitboard/mecha/durand/targeting materials = DEFAULT_CIRCUIT_MATERIALS @@ -253,49 +253,49 @@ name = "Durand Chassis" id = "durand_chassis" build_path = /obj/item/mecha_parts/chassis/durand - materials = list(MAT_STEEL = 18750, MAT_PLASTEEL = 20000) + materials = list(MAT_STEEL = MATERIAL_COST(9.375), MAT_PLASTEEL = MATERIAL_COST(10)) /datum/design_techweb/mechfab/durand/torso name = "Durand Torso" id = "durand_torso" build_path = /obj/item/mecha_parts/part/durand_torso - materials = list(MAT_STEEL = 41250, MAT_PLASTEEL = 15000, MAT_SILVER = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(20.625), MAT_PLASTEEL = MATERIAL_COST(7.5), MAT_SILVER = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/durand/head name = "Durand Head" id = "durand_head" build_path = /obj/item/mecha_parts/part/durand_head - materials = list(MAT_STEEL = 18750, MAT_GLASS = 7500, MAT_SILVER = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(9.375), MAT_GLASS = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(1.125)) /datum/design_techweb/mechfab/durand/left_arm name = "Durand Left Arm" id = "durand_left_arm" build_path = /obj/item/mecha_parts/part/durand_left_arm - materials = list(MAT_STEEL = 26250, MAT_SILVER = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(13.125), MAT_SILVER = MATERIAL_COST(1.125)) /datum/design_techweb/mechfab/durand/right_arm name = "Durand Right Arm" id = "durand_right_arm" build_path = /obj/item/mecha_parts/part/durand_right_arm - materials = list(MAT_STEEL = 26250, MAT_SILVER = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(13.125), MAT_SILVER = MATERIAL_COST(1.125)) /datum/design_techweb/mechfab/durand/left_leg name = "Durand Left Leg" id = "durand_left_leg" build_path = /obj/item/mecha_parts/part/durand_left_leg - materials = list(MAT_STEEL = 30000, MAT_SILVER = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_SILVER = MATERIAL_COST(1.125)) /datum/design_techweb/mechfab/durand/right_leg name = "Durand Right Leg" id = "durand_right_leg" build_path = /obj/item/mecha_parts/part/durand_right_leg - materials = list(MAT_STEEL = 30000, MAT_SILVER = 2250) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_SILVER = MATERIAL_COST(1.125)) /datum/design_techweb/mechfab/durand/armour name = "Durand Armour Plates" id = "durand_armour" build_path = /obj/item/mecha_parts/part/durand_armour - materials = list(MAT_STEEL = 27500, MAT_PLASTEEL = 10000, MAT_URANIUM = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(13.75), MAT_PLASTEEL = MATERIAL_COST(5), MAT_URANIUM = MATERIAL_COST(3.75)) ///JANUS /datum/design_techweb/mechfab/janus @@ -313,7 +313,7 @@ ) id = "janus_module" // req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 2) - materials = list(MAT_DURASTEEL = 3000, MAT_MORPHIUM = 2000, MAT_METALHYDROGEN = 6000, MAT_URANIUM = 6000, MAT_VERDANTIUM = 1500) + materials = list(MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_MORPHIUM = MATERIAL_COST(1), MAT_METALHYDROGEN = MATERIAL_COST(3), MAT_URANIUM = MATERIAL_COST(3), MAT_VERDANTIUM = MATERIAL_COST(0.75)) build_path = /obj/random/janusmodule /datum/design_techweb/mechfab/janusmodule/create_item(target) @@ -324,50 +324,50 @@ name = "Janus Chassis" id = "janus_chassis" build_path = /obj/item/mecha_parts/chassis/janus - materials = list(MAT_DURASTEEL = 19000, MAT_MORPHIUM = 10500, MAT_PLASTEEL = 5500, MAT_LEAD = 2500) + materials = list(MAT_DURASTEEL = MATERIAL_COST(9.5), MAT_MORPHIUM = MATERIAL_COST(5.25), MAT_PLASTEEL = MATERIAL_COST(2.75), MAT_LEAD = MATERIAL_COST(1.25)) //req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 3) /datum/design_techweb/mechfab/janus/torso name = "Imperion Torso" id = "janus_torso" build_path = /obj/item/mecha_parts/part/janus_torso - materials = list(MAT_STEEL = 30000, MAT_DURASTEEL = 8000, MAT_MORPHIUM = 10000, MAT_GOLD = 5000, MAT_VERDANTIUM = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_DURASTEEL = MATERIAL_COST(4), MAT_MORPHIUM = MATERIAL_COST(5), MAT_GOLD = MATERIAL_COST(2.5), MAT_VERDANTIUM = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/janus/head name = "Imperion Head" id = "janus_head" build_path = /obj/item/mecha_parts/part/janus_head - materials = list(MAT_STEEL = 30000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 6000, MAT_GOLD = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(3), MAT_GOLD = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/janus/left_arm name = "Prototype Gygax Left Arm" id = "janus_left_arm" build_path = /obj/item/mecha_parts/part/janus_left_arm - materials = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_DIAMOND = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_METALHYDROGEN = MATERIAL_COST(1.5), MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/janus/right_arm name = "Prototype Gygax Right Arm" id = "janus_right_arm" build_path = /obj/item/mecha_parts/part/janus_right_arm - materials = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_DIAMOND = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_METALHYDROGEN = MATERIAL_COST(1.5), MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/janus/left_leg name = "Prototype Durand Left Leg" id = "janus_left_leg" build_path = /obj/item/mecha_parts/part/janus_left_leg - materials = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_URANIUM = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_METALHYDROGEN = MATERIAL_COST(1.5), MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_URANIUM = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/janus/right_leg name = "Prototype Durand Right Leg" id = "janus_right_leg" build_path = /obj/item/mecha_parts/part/janus_right_leg - materials = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_URANIUM = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_METALHYDROGEN = MATERIAL_COST(1.5), MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_URANIUM = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/janus/phase_coil name = "Janus Phase Coil" id = "janus_coil" build_path = /obj/item/prop/alien/phasecoil - materials = list(MAT_SUPERMATTER = 2000, MAT_PLASTEEL = 60000, MAT_URANIUM = 3250, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_VERDANTIUM = 5000, MAT_DIAMOND = 10000, MAT_LEAD = 15000) + materials = list(MAT_SUPERMATTER = MATERIAL_COST(1), MAT_PLASTEEL = MATERIAL_COST(30), MAT_URANIUM = MATERIAL_COST(1.625), MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_VERDANTIUM = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(5), MAT_LEAD = MATERIAL_COST(7.5)) ///--------/// ///Fighters/// @@ -413,49 +413,49 @@ name = "Pinnace Chassis" id = "pinnace_chassis" build_path = /obj/item/mecha_parts/fighter/chassis/pinnace - materials = list(MAT_STEEL = 25000, MAT_GLASS = 10000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(12.5), MAT_GLASS = MATERIAL_COST(5), MAT_PLASTEEL = MATERIAL_COST(5)) /datum/design_techweb/mechfab/pinnace/core name = "Pinnace Core" id = "pinnace_core" build_path = /obj/item/mecha_parts/fighter/part/pinnace_core - materials = list(MAT_STEEL = 25000, MAT_GLASS = 7000, MAT_PLASTEEL = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(12.5), MAT_GLASS = MATERIAL_COST(3.5), MAT_PLASTEEL = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/pinnace/cockpit name = "Pinnace Cockpit" id = "pinnace_cockpit" build_path = /obj/item/mecha_parts/fighter/part/pinnace_cockpit - materials = list(MAT_STEEL = 2500, MAT_PLASTEEL = 2500, MAT_GLASS = 7500, MAT_PLASTIC = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25), MAT_PLASTEEL = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(3.75), MAT_PLASTIC = MATERIAL_COST(1.25)) /datum/design_techweb/mechfab/pinnace/main_engine name = "Pinnace Main Engine" id = "pinnace_main_engine" build_path = /obj/item/mecha_parts/fighter/part/pinnace_main_engine - materials = list(MAT_STEEL = 15000, MAT_PLASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_PLASTEEL = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/pinnace/left_engine name = "Pinnace Left Engine" id = "pinnace_left_engine" build_path = /obj/item/mecha_parts/fighter/part/pinnace_left_engine - materials = list(MAT_STEEL = 10000, MAT_PLASTEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_PLASTEEL = MATERIAL_COST(1.25)) /datum/design_techweb/mechfab/pinnace/right_engine name = "Pinnace Right Engine" id = "pinnace_right_engine" build_path = /obj/item/mecha_parts/fighter/part/pinnace_right_engine - materials = list(MAT_STEEL = 10000, MAT_PLASTEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_PLASTEEL = MATERIAL_COST(1.25)) /datum/design_techweb/mechfab/pinnace/left_wing name = "Pinnace Left Wing" id = "pinnace_left_wing" build_path = /obj/item/mecha_parts/fighter/part/pinnace_left_wing - materials = list(MAT_STEEL = 7000, MAT_PLASTIC = 3000, MAT_PLASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_PLASTEEL = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/pinnace/right_wing name = "Pinnace Right Wing" id = "pinnace_right_wing" build_path = /obj/item/mecha_parts/fighter/part/pinnace_right_wing - materials = list(MAT_STEEL = 7000, MAT_PLASTIC = 3000, MAT_PLASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_PLASTEEL = MATERIAL_COST(2.5)) ///Baron/// @@ -497,49 +497,49 @@ name = "Baron Chassis" id = "baron_chassis" build_path = /obj/item/mecha_parts/fighter/chassis/baron - materials = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_PLASTEEL = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(18.75), MAT_GLASS = MATERIAL_COST(7.5), MAT_PLASTEEL = MATERIAL_COST(7.5)) /datum/design_techweb/mechfab/baron/core name = "Baron Core" id = "baron_core" build_path = /obj/item/mecha_parts/fighter/part/baron_core - materials = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_PLASTEEL = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(18.75), MAT_GLASS = MATERIAL_COST(7.5), MAT_PLASTEEL = MATERIAL_COST(7.5)) /datum/design_techweb/mechfab/baron/cockpit name = "Baron Cockpit" id = "baron_cockpit" build_path = /obj/item/mecha_parts/fighter/part/baron_cockpit - materials = list(MAT_STEEL = 5000, MAT_PLASTEEL = 5000, MAT_GLASS = 10000, MAT_PLASTIC = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(5), MAT_PLASTIC = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/baron/main_engine name = "Baron Main Engine" id = "baron_main_engine" build_path = /obj/item/mecha_parts/fighter/part/baron_main_engine - materials = list(MAT_STEEL = 25000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(12.5), MAT_PLASTEEL = MATERIAL_COST(5)) /datum/design_techweb/mechfab/baron/left_engine name = "Baron Left Engine" id = "baron_left_engine" build_path = /obj/item/mecha_parts/fighter/part/baron_left_engine - materials = list(MAT_STEEL = 20000, MAT_PLASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTEEL = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/baron/right_engine name = "Baron Right Engine" id = "baron_right_engine" build_path = /obj/item/mecha_parts/fighter/part/baron_right_engine - materials = list(MAT_STEEL = 20000, MAT_PLASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTEEL = MATERIAL_COST(2.5)) /datum/design_techweb/mechfab/baron/left_wing name = "Baron Left Wing" id = "baron_left_wing" build_path = /obj/item/mecha_parts/fighter/part/baron_left_wing - materials = list(MAT_STEEL = 15000, MAT_PLASTIC = 6000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_PLASTIC = MATERIAL_COST(3), MAT_PLASTEEL = MATERIAL_COST(5)) /datum/design_techweb/mechfab/baron/right_wing name = "Baron Right Wing" id = "baron_right_wing" build_path = /obj/item/mecha_parts/fighter/part/baron_right_wing - materials = list(MAT_STEEL = 15000, MAT_PLASTIC = 6000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_PLASTIC = MATERIAL_COST(3), MAT_PLASTEEL = MATERIAL_COST(5)) ///EXOSUIT INTERNALS @@ -557,7 +557,7 @@ desc = "Armor plating that fits all mecha." id = "exo_int_armor_standard" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/component/armor /datum/design_techweb/mechfab/exointernal/light_armor @@ -565,7 +565,7 @@ desc = "Armor plating that fits all mecha." id = "exo_int_armor_lightweight" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/component/armor/lightweight /datum/design_techweb/mechfab/exointernal/reinf_armor @@ -573,14 +573,14 @@ desc = "Armor plating that fits all mecha." id = "exo_int_armor_reinforced" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 20000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/component/armor/reinforced /datum/design_techweb/mechfab/exointernal/mining_armor name = "Armor Plate (Blast)" id = "exo_int_armor_blast" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 20000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/component/armor/mining /datum/design_techweb/mechfab/exointernal/gygax_armor @@ -588,7 +588,7 @@ desc = "Armor plating that fits combat mecha." id = "exo_int_armor_gygax" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_COMBAT = 2) - materials = list(MAT_STEEL = 40000, MAT_DIAMOND = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(20), MAT_DIAMOND = MATERIAL_COST(4)) build_path = /obj/item/mecha_parts/component/armor/marshal /datum/design_techweb/mechfab/exointernal/darkgygax_armor @@ -596,7 +596,7 @@ desc = "Armor plating that fits combat mecha." id = "exo_int_armor_dgygax" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_COMBAT = 4, TECH_ILLEGAL = 2) - materials = list(MAT_PLASTEEL = 20000, MAT_DIAMOND = 10000, MAT_GRAPHITE = 20000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(10), MAT_DIAMOND = MATERIAL_COST(5), MAT_GRAPHITE = 20000) build_path = /obj/item/mecha_parts/component/armor/marshal/reinforced /datum/design_techweb/mechfab/exointernal/durand_armour @@ -604,7 +604,7 @@ desc = "Armor plating that fits combat mecha." id = "exo_int_armor_durand" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_COMBAT = 2) - materials = list(MAT_STEEL = 40000, MAT_PLASTEEL = 9525, MAT_URANIUM = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(20), MAT_PLASTEEL = MATERIAL_COST(4.7625), MAT_URANIUM = MATERIAL_COST(4)) build_path = /obj/item/mecha_parts/component/armor/military /datum/design_techweb/mechfab/exointernal/marauder_armour @@ -612,7 +612,7 @@ desc = "Armor plating that fits marauder mecha." id = "exo_int_armor_marauder" //req_tech = list(TECH_MATERIAL = 8, TECH_ENGINEERING = 7, TECH_COMBAT = 6, TECH_ILLEGAL = 4) - materials = list(MAT_DURASTEEL = 40000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 8000) + materials = list(MAT_DURASTEEL = MATERIAL_COST(20), MAT_GRAPHITE = 8000, MAT_OSMIUM = MATERIAL_COST(4)) build_path = /obj/item/mecha_parts/component/armor/military/marauder /datum/design_techweb/mechfab/exointernal/phazon_armour @@ -620,7 +620,7 @@ desc = "Armor plating that fits all mecha." id = "exo_int_armor_phazon" //req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 6, TECH_COMBAT = 6, TECH_ILLEGAL = 4) - materials = list(MAT_MORPHIUM = 40000, MAT_DURASTEEL = 8000, MAT_OSMIUM = 8000) + materials = list(MAT_MORPHIUM = MATERIAL_COST(20), MAT_DURASTEEL = MATERIAL_COST(4), MAT_OSMIUM = MATERIAL_COST(4)) build_path = /obj/item/mecha_parts/component/armor/alien /datum/design_techweb/mechfab/exointernal/stan_hull @@ -628,14 +628,14 @@ desc = "Hull that fits all mecha." id = "exo_int_hull_standard" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/component/hull /datum/design_techweb/mechfab/exointernal/durable_hull name = "Hull (Durable)" id = "exo_int_hull_durable" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 8000, MAT_PLASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_PLASTEEL = MATERIAL_COST(2.5)) build_path = /obj/item/mecha_parts/component/hull/durable /datum/design_techweb/mechfab/exointernal/light_hull @@ -643,7 +643,7 @@ desc = "Hull that fits all mecha." id = "exo_int_hull_light" //req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/component/hull/lightweight /datum/design_techweb/mechfab/exointernal/stan_gas @@ -651,7 +651,7 @@ desc = "Life support module for mecha." id = "exo_int_lifesup_standard" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/component/gas /datum/design_techweb/mechfab/exointernal/reinf_gas @@ -659,7 +659,7 @@ desc = "Upgraded life support module for mecha." id = "exo_int_lifesup_reinforced" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 8000, MAT_PLASTEEL = 8000, MAT_GRAPHITE = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_PLASTEEL = MATERIAL_COST(4), MAT_GRAPHITE = 1000) build_path = /obj/item/mecha_parts/component/gas/reinforced /datum/design_techweb/mechfab/exointernal/stan_electric @@ -667,7 +667,7 @@ desc = "Electrical harness for a mecha." id = "exo_int_electric_standard" //req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/component/electrical /datum/design_techweb/mechfab/exointernal/efficient_electric @@ -675,7 +675,7 @@ desc = "Electrical harness for a mecha." id = "exo_int_electric_efficient" //req_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 4, TECH_DATA = 2) - materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 3000, MAT_SILVER = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_SILVER = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/component/electrical/high_current /datum/design_techweb/mechfab/exointernal/stan_actuator @@ -683,7 +683,7 @@ desc = "Actuator Lattice for a mecha." id = "exo_int_actuator_standard" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/component/actuator /datum/design_techweb/mechfab/exointernal/hispeed_actuator @@ -691,7 +691,7 @@ desc = "Actuator Lattice for a mecha." id = "exo_int_actuator_overclock" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 10000, MAT_OSMIUM = 3000, MAT_GOLD = 5000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(5), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(2.5)) build_path = /obj/item/mecha_parts/component/actuator/hispeed /datum/design_techweb/mechfab/vehicle @@ -706,7 +706,7 @@ desc = "A space-bike's un-assembled frame." id = "vehicle_chassis_spacebike" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_BLUESPACE = 3, TECH_PHORON = 3) - materials = list(MAT_STEEL = 12000, MAT_SILVER = 3000, MAT_PHORON = 3000, MAT_OSMIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(6), MAT_SILVER = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(1.5), MAT_OSMIUM = MATERIAL_COST(0.5)) build_path = /obj/item/vehicle_assembly/spacebike /datum/design_techweb/mechfab/vehicle/quadbike_chassis @@ -714,7 +714,7 @@ desc = "A quad bike's un-assembled frame." id = "vehicle_chassis_quadbike" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 15000, MAT_SILVER = 3000, MAT_PLASTIC = 3000, MAT_OSMIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_SILVER = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_OSMIUM = MATERIAL_COST(0.5)) build_path = /obj/item/vehicle_assembly/quadbike /datum/design_techweb/mechfab/vehicle/snowmobile_chassis @@ -722,7 +722,7 @@ desc = "A snowmobile's un-assembled frame." id = "vehicle_chassis_snowmobile" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 12000, MAT_SILVER = 3000, MAT_PLASTIC = 3000, MAT_OSMIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(6), MAT_SILVER = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_OSMIUM = MATERIAL_COST(0.5)) build_path = /obj/item/vehicle_assembly/snowmobile /datum/design_techweb/mechfab/vehicle/basic //I'm going to just count this as a vehicle... @@ -734,7 +734,7 @@ ) build_path = /obj/item/uav //req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5, TECH_PHORON = 3, TECH_MAGNET = 4, TECH_POWER = 6) - materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_SILVER = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(2)) ///Micromechs...I know downstream is going to disable these from orbit, so feel free to take the line below to add your disable start: @@ -761,45 +761,45 @@ name = "Gopher Chassis" id = "gopher_chassis" build_path = /obj/item/mecha_parts/micro/chassis/gopher - materials = list(MAT_STEEL = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/gopher/torso name = "Gopher Torso" id = "gopher_torso" build_path = /obj/item/mecha_parts/micro/part/gopher_torso - materials = list(MAT_STEEL = 15000, MAT_GLASS = 5250) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(2.625)) /datum/design_techweb/mechfab/gopher/left_arm name = "Gopher Left Arm" id = "gopher_left_arm" build_path = /obj/item/mecha_parts/micro/part/gopher_left_arm - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) /datum/design_techweb/mechfab/gopher/right_arm name = "Gopher Right Arm" id = "gopher_right_arm" build_path = /obj/item/mecha_parts/micro/part/gopher_right_arm - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) /datum/design_techweb/mechfab/gopher/left_leg name = "Gopher Left Leg" id = "gopher_left_leg" build_path = /obj/item/mecha_parts/micro/part/gopher_left_leg - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) /datum/design_techweb/mechfab/gopher/right_leg name = "Gopher Right Leg" id = "gopher_right_leg" build_path = /obj/item/mecha_parts/micro/part/gopher_right_leg - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) /datum/design_techweb/micro name = "Miniature Drill" id = "micro_drill" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/micro - materials = list(MAT_STEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT ) @@ -810,7 +810,7 @@ id = "ore_scoop" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/micro/orescoop - materials = list(MAT_STEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT ) @@ -847,43 +847,43 @@ name = "Polecat Chassis" id = "polecat_chassis" build_path = /obj/item/mecha_parts/micro/chassis/polecat - materials = list(MAT_STEEL = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/polecat/torso name = "Polecat Torso" id = "polecat_torso" build_path = /obj/item/mecha_parts/micro/part/polecat_torso - materials = list(MAT_STEEL = 15000, MAT_GLASS = 5250) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(2.625)) /datum/design_techweb/mechfab/polecat/left_arm name = "Polecat Left Arm" id = "polecat_left_arm" build_path = /obj/item/mecha_parts/micro/part/polecat_left_arm - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) /datum/design_techweb/mechfab/polecat/right_arm name = "Polecat Right Arm" id = "polecat_right_arm" build_path = /obj/item/mecha_parts/micro/part/polecat_right_arm - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) /datum/design_techweb/mechfab/polecat/left_leg name = "Polecat Left Leg" id = "polecat_left_leg" build_path = /obj/item/mecha_parts/micro/part/polecat_left_leg - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) /datum/design_techweb/mechfab/polecat/right_leg name = "Polecat Right Leg" id = "polecat_right_leg" build_path = /obj/item/mecha_parts/micro/part/polecat_right_leg - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) /datum/design_techweb/mechfab/polecat/armour name = "Polecat Armour Plates" id = "polecat_armour" build_path = /obj/item/mecha_parts/micro/part/polecat_armour - materials = list(MAT_STEEL = 12500, MAT_PLASTIC = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25), MAT_PLASTIC = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/weasel desc = "A part used in the construction of the Weasel micro mech series" @@ -916,48 +916,48 @@ name = "Weasel Chassis" id = "weasel_chassis" build_path = /obj/item/mecha_parts/micro/chassis/weasel - materials = list(MAT_STEEL = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5)) /datum/design_techweb/mechfab/weasel/torso name = "Weasel Torso" id = "weasel_torso" build_path = /obj/item/mecha_parts/micro/part/weasel_torso - materials = list(MAT_STEEL = 15000, MAT_GLASS = 5250) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(2.625)) /datum/design_techweb/mechfab/weasel/left_arm name = "Weasel Left Arm" id = "weasel_left_arm" build_path = /obj/item/mecha_parts/micro/part/weasel_left_arm - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) /datum/design_techweb/mechfab/weasel/right_arm name = "Weasel Right Arm" id = "weasel_right_arm" build_path = /obj/item/mecha_parts/micro/part/weasel_right_arm - materials = list(MAT_STEEL = 8750) + materials = list(MAT_STEEL = MATERIAL_COST(4.375)) /*/datum/design_techweb/mechfab/weasel/left_leg name = "Weasel Left Leg" id = "weasel_left_leg" build_path = /obj/item/mecha_parts/micro/part/weasel_left_leg - materials = list(MAT_STEEL = 12500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25)) /datum/design_techweb/mechfab/weasel/right_leg name = "Weasel Right Leg" id = "weasel_right_leg" build_path = /obj/item/mecha_parts/micro/part/weasel_right_leg - materials = list(MAT_STEEL = 12500)*/ + materials = list(MAT_STEEL = MATERIAL_COST(6.25))*/ /datum/design_techweb/mechfab/weasel/tri_leg name = "Weasel Tri Leg" id = "weasel_right_leg" build_path = /obj/item/mecha_parts/micro/part/weasel_tri_leg - materials = list(MAT_STEEL = 27500) + materials = list(MAT_STEEL = MATERIAL_COST(13.75)) /datum/design_techweb/mechfab/weasel/head name = "Weasel Head" id = "weasel_head" build_path = /obj/item/mecha_parts/micro/part/weasel_head - materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_GLASS = MATERIAL_COST(1.25)) //End of micromechs. diff --git a/code/modules/research/tg/designs/mechfab_equipment_designs.dm b/code/modules/research/tg/designs/mechfab_equipment_designs.dm index 16534e39a9e..0eb99ced0cd 100644 --- a/code/modules/research/tg/designs/mechfab_equipment_designs.dm +++ b/code/modules/research/tg/designs/mechfab_equipment_designs.dm @@ -3,12 +3,12 @@ category = list( RND_CATEGORY_MECHFAB_EQUIPMENT ) - materials = list(MAT_STEEL = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75)) /datum/design_techweb/mechfab/equipment/tracking name = "Exosuit Tracking Beacon" id = "mech_tracker" - materials = list(MAT_STEEL = 375) + materials = list(MAT_STEEL = MATERIAL_COST(0.1875)) build_path = /obj/item/mecha_parts/mecha_tracking category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -44,7 +44,7 @@ name = "Cable Layer" id = "mech_cable_layer" build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer - materials = list(MAT_STEEL = 7500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_PLASTIC = MATERIAL_COST(0.5)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC ) @@ -53,7 +53,7 @@ name = "Sleeper" id = "mech_sleeper" build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper - materials = list(MAT_STEEL = 3750, MAT_GLASS = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(1.875), MAT_GLASS = MATERIAL_COST(3.75)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MEDICAL ) @@ -63,7 +63,7 @@ name = "Passenger Compartment" id = "mech_passenger" build_path = /obj/item/mecha_parts/mecha_equipment/tool/passenger - materials = list(MAT_STEEL = 3750, MAT_GLASS = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(1.875), MAT_GLASS = MATERIAL_COST(1.875)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC ) @@ -74,7 +74,7 @@ id = "mech_shocker" //req_tech = list(TECH_COMBAT = 3, TECH_POWER = 6, TECH_MAGNET = 1) build_path = /obj/item/mecha_parts/mecha_equipment/shocker - materials = list(MAT_STEEL = 3500, MAT_GOLD = 750, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(1.75), MAT_GOLD = MATERIAL_COST(0.375), MAT_GLASS = MATERIAL_COST(0.5)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MODULES ) @@ -85,7 +85,7 @@ name = "Syringe Gun" id = "mech_syringe_gun" build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun - materials = list(MAT_STEEL = 2250, MAT_GLASS = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(1.125), MAT_GLASS = MATERIAL_COST(0.75)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MEDICAL ) @@ -97,7 +97,7 @@ desc = "A portable medical system used to treat external injuries from afar." id = "mech_medigun" //req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_BIO = 6) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 1750, MAT_DIAMOND = 1500, MAT_PHORON = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(0.875), MAT_DIAMOND = MATERIAL_COST(0.75), MAT_PHORON = MATERIAL_COST(2)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MEDICAL @@ -107,7 +107,7 @@ // *** Weapon modules /datum/design_techweb/mechfab/equipment/weapon //req_tech = list(TECH_COMBAT = 3) - materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(1)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_WEAPONS ) @@ -138,28 +138,28 @@ name = "Flare Launcher" id = "mecha_flare_gun" build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flare - materials = list(MAT_STEEL = 9375) + materials = list(MAT_STEEL = MATERIAL_COST(4.6875)) /datum/design_techweb/mechfab/equipment/weapon/scattershot name = "LBX AC 10 \"Scattershot\"" id = "mech_scattershot" //req_tech = list(TECH_COMBAT = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - materials = list(MAT_STEEL = 8000, MAT_GLASS = 3000, MAT_PLASTIC = 2000, MAT_SILVER = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.25)) /datum/design_techweb/mechfab/equipment/weapon/rigged_scattershot name = "Jury-Rigged Shrapnel Cannon" id = "mech_scattershot-r" //req_tech = list(TECH_COMBAT = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged - materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_PLASTIC = 2000, MAT_SILVER = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_GLASS = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/laser name = "CH-PS \"Immolator\" Laser" id = "mech_laser" //req_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser - materials = list(MAT_STEEL = 8000, MAT_GLASS = 3000, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/laser_rigged name = "Jury-Rigged Welder-Laser" @@ -173,70 +173,70 @@ id = "mech_laser_heavy" //req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy - materials = list(MAT_STEEL = 10000, MAT_GLASS = 3000, MAT_DIAMOND = 2000, MAT_OSMIUM = 5000, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(1), MAT_OSMIUM = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/rigged_laser_heavy name = "Jury-Rigged Emitter Cannon" id = "mech_laser_heavy-r" //req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_ILLEGAL = 1) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/rigged - materials = list(MAT_STEEL = 8000, MAT_GLASS = 4000, MAT_DIAMOND = 1500, MAT_OSMIUM = 4000, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(2), MAT_DIAMOND = MATERIAL_COST(0.75), MAT_OSMIUM = MATERIAL_COST(2), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/laser_xray name = "CH-XS \"Penetrator\" Laser" id = "mech_laser_xray" //req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray - materials = list(MAT_STEEL = 9000, MAT_GLASS = 3000, MAT_PHORON = 1000, MAT_SILVER = 1500, MAT_GOLD = 2500, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5), MAT_GLASS = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(1.25), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/rigged_laser_xray name = "Jury-Rigged Xray Rifle" id = "mech_laser_xray-r" //req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray/rigged - materials = list(MAT_STEEL = 8500, MAT_GLASS = 2500, MAT_PHORON = 1000, MAT_SILVER = 1250, MAT_GOLD = 2000, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4.25), MAT_GLASS = MATERIAL_COST(1.25), MAT_PHORON = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.625), MAT_GOLD = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/phase name = "NT-PE \"Scorpio\" Phase-Emitter" id = "mech_phase" //req_tech = list(TECH_MATERIAL = 1, TECH_COMBAT = 2, TECH_MAGNET = 2) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/phase - materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/mechfab/equipment/weapon/ion name = "MK-IV Ion Heavy Cannon" id = "mech_ion" //req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion - materials = list(MAT_STEEL = 15000, MAT_URANIUM = 2000, MAT_SILVER = 2000, MAT_OSMIUM = 4500, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_URANIUM = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1), MAT_OSMIUM = MATERIAL_COST(2.25), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/rigged_ion name = "Jury-Rigged Ion Cannon" id = "mech_ion-r" //req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion/rigged - materials = list(MAT_STEEL = 13000, MAT_URANIUM = 1000, MAT_SILVER = 1000, MAT_OSMIUM = 3000, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(6.5), MAT_URANIUM = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/grenade_launcher name = "SGL-6 Grenade Launcher" id = "mech_grenade_launcher" //req_tech = list(TECH_COMBAT = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade - materials = list(MAT_STEEL = 7000, MAT_GOLD = 2000, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_GOLD = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/mechfab/equipment/weapon/rigged_grenade_launcher name = "Jury-Rigged Pneumatic Flashlauncher" id = "mech_grenade_launcher-rig" //req_tech = list(TECH_COMBAT = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/rigged - materials = list(MAT_STEEL = 5000, MAT_GOLD = 2000, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GOLD = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1)) /datum/design_techweb/mechfab/equipment/weapon/clusterbang_launcher name = "SOP-6 Grenade Launcher" desc = "A weapon that violates the Geneva Convention at 6 rounds per minute." id = "clusterbang_launcher" //req_tech = list(TECH_COMBAT= 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) - materials = list(MAT_STEEL = 15000, MAT_GOLD = 4500, MAT_URANIUM = 4500) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GOLD = MATERIAL_COST(2.25), MAT_URANIUM = MATERIAL_COST(2.25)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang/limited /datum/design_techweb/mechfab/equipment/weapon/conc_grenade_launcher @@ -244,21 +244,21 @@ id = "mech_grenade_launcher_conc" //req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 1) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/concussion - materials = list(MAT_STEEL = 9000, MAT_GOLD = 1000, MAT_OSMIUM = 1000, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5), MAT_GOLD = MATERIAL_COST(0.5), MAT_OSMIUM = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/mechfab/equipment/weapon/frag_grenade_launcher name = "HEP-MI 6 Grenade Launcher" id = "mech_grenade_launcher_frag" //req_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 2, TECH_MATERIAL = 3, TECH_ILLEGAL = 2) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag/mini - materials = list(MAT_STEEL = 10000, MAT_GOLD = 2500, MAT_URANIUM = 3000, MAT_OSMIUM = 3000, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GOLD = MATERIAL_COST(1.25), MAT_URANIUM = MATERIAL_COST(1.5), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/mechfab/equipment/weapon/flamer name = "CR-3 Mark 8 Flamethrower" desc = "A weapon that violates the CCWC at two hundred gallons per minute." id = "mech_flamer_full" //req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 6, TECH_PHORON = 4, TECH_ILLEGAL = 4) - materials = list(MAT_STEEL = 10000, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_PHORON = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GOLD = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(4)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer /datum/design_techweb/mechfab/equipment/weapon/flamer_rigged @@ -266,7 +266,7 @@ desc = "A weapon that accidentally violates the CCWC at one hundred gallons per minute." id = "mech_flamer_rigged" //req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_ILLEGAL = 2) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 1500, MAT_SILVER = 1500, MAT_URANIUM = 2000, MAT_PHORON = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(0.75), MAT_SILVER = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(3)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged /datum/design_techweb/mechfab/equipment/weapon/flame_mg @@ -274,14 +274,14 @@ desc = "A weapon that violates the CCWC at sixty rounds a minute." id = "mech_lmg_flamer" //req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 5, TECH_PHORON = 2, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 1750, MAT_URANIUM = 1500, MAT_PHORON = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(0.875), MAT_URANIUM = MATERIAL_COST(0.75), MAT_PHORON = MATERIAL_COST(2)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/incendiary /datum/design_techweb/mechfab/equipment/weapon/laser_gamma name = "GA-X \"Render\" Experimental Gamma Laser" id = "mech_laser_gamma" //req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 4, TECH_PHORON = 4, TECH_POWER = 4, TECH_ILLEGAL = 3) - materials = list(MAT_STEEL = 6000, MAT_GLASS = 4000, MAT_PHORON = 2500, MAT_SILVER = 1000, MAT_GOLD = 500, MAT_URANIUM = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(2), MAT_PHORON = MATERIAL_COST(1.25), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/gamma // *** Nonweapon modules @@ -319,7 +319,7 @@ name = "RCD" desc = "An exosuit-mounted rapid construction device." id = "mech_rcd" - materials = list(MAT_STEEL = 20000, MAT_PLASTIC = 10000, MAT_PHORON = 18750, MAT_SILVER = 15000, MAT_GOLD = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTIC = MATERIAL_COST(5), MAT_PHORON = MATERIAL_COST(9.375), MAT_SILVER = MATERIAL_COST(7.5), MAT_GOLD = MATERIAL_COST(7.5)) //req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4, TECH_ENGINEERING = 4) build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd category = list( @@ -342,7 +342,7 @@ desc = "Automated repair droid, exosuits' best companion. BEEP BOOP" id = "mech_repair_droid" //req_tech = list(TECH_MAGNET = 3, TECH_DATA = 3, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 7500, MAT_GOLD = 750, MAT_SILVER = 1500, MAT_GLASS = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_GOLD = MATERIAL_COST(0.375), MAT_SILVER = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(1.875)) build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MODULES @@ -354,7 +354,7 @@ desc = "Linear shield projector. Deploys a large, familiar, and rectangular shield in one direction at a time." id = "mech_shield_droid" //req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.875)) build_path = /obj/item/mecha_parts/mecha_equipment/combat_shield category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MODULES @@ -365,7 +365,7 @@ desc = "Integral shield projector. Can only protect the exosuit, but has no weak angles." id = "mech_shield_omni" //req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.875)) build_path = /obj/item/mecha_parts/mecha_equipment/omni_shield category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MODULES @@ -377,7 +377,7 @@ desc = "Deploys a small medical drone capable of patching small wounds in order to stabilize nearby patients." id = "mech_med_droid" //req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_BIO = 5, TECH_DATA = 4, TECH_ARCANE = 1) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1.5), MAT_VERDANTIUM = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/mecha_equipment/crisis_drone category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MEDICAL @@ -389,7 +389,7 @@ desc = "Deploys a small hazmat drone capable of purging minor radiation damage in order to stabilize nearby patients." id = "mech_rad_droid" //req_tech = list(TECH_PHORON = 4, TECH_MAGNET = 5, TECH_BIO = 6, TECH_DATA = 4, TECH_ARCANE = 1) - materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1.5), MAT_VERDANTIUM = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/mecha_equipment/crisis_drone/rad category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MEDICAL @@ -401,7 +401,7 @@ desc = "An advanced mech-mounted device that is not quite as powerful as a stationary body scanner, though still suitably powerful." id = "mech_med_analyzer" //req_tech = list(TECH_PHORON = 4, TECH_MAGNET = 5, TECH_BIO = 5, TECH_DATA = 4) - materials = list(MAT_PLASTEEL = 4500, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_GLASS = 3000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(2.25), MAT_GOLD = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/medanalyzer category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MEDICAL @@ -414,7 +414,7 @@ id = "mech_jetpack" //req_tech = list(TECH_ENGINEERING = 3, TECH_MAGNET = 4) //One less magnet than the actual got-damn teleporter. build_path = /obj/item/mecha_parts/mecha_equipment/tool/jetpack - materials = list(MAT_STEEL = 7500, MAT_SILVER = 300, MAT_GLASS = 600) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(0.15), MAT_GLASS = MATERIAL_COST(0.3)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC ) @@ -425,7 +425,7 @@ id = "mech_phoron_generator" //req_tech = list(TECH_PHORON = 2, TECH_POWER= 2, TECH_ENGINEERING = 2) build_path = /obj/item/mecha_parts/mecha_equipment/generator - materials = list(MAT_STEEL = 7500, MAT_SILVER = 375, MAT_GLASS = 750) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(0.1875), MAT_GLASS = MATERIAL_COST(0.375)) category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC ) @@ -434,7 +434,7 @@ name = "Energy Relay" id = "mech_energy_relay" //req_tech = list(TECH_MAGNET = 4, TECH_POWER = 3) - materials = list(MAT_STEEL = 7500, MAT_GOLD = 1500, MAT_SILVER = 2250, MAT_GLASS = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_GOLD = MATERIAL_COST(0.75), MAT_SILVER = MATERIAL_COST(1.125), MAT_GLASS = MATERIAL_COST(0.75)) build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -445,7 +445,7 @@ desc = "Exosuit close-combat armor booster." id = "mech_ccw_armor" //req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4) - materials = list(MAT_STEEL = 11250, MAT_SILVER = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(5.625), MAT_SILVER = MATERIAL_COST(1.875)) build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MODULES @@ -457,7 +457,7 @@ desc = "Exosuit projectile armor booster." id = "mech_proj_armor" //req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 15000, MAT_GOLD = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GOLD = MATERIAL_COST(1.875)) build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MODULES @@ -469,7 +469,7 @@ desc = "A diamond version of the exosuit drill. It's harder, better, faster, stronger." id = "mech_diamond_drill" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 7500, MAT_DIAMOND = 4875) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_DIAMOND = MATERIAL_COST(2.4375)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MINING @@ -481,7 +481,7 @@ desc = "A heavy duty bore. Bigger, better, stronger than the core sampler, but not quite as good as a large drill." id = "mech_ground_drill" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2, TECH_PHORON = 1) - materials = list(MAT_STEEL = 7000, MAT_SILVER = 3000, MAT_PHORON = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_SILVER = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/bore category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MINING @@ -493,7 +493,7 @@ desc = "A hefty device used to scan for subterranean veins of ore." id = "mech_ore_scanner" //req_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MINING @@ -505,7 +505,7 @@ desc = "A hefty device used to scan for the exact volumes of subterranean veins of ore." id = "mech_ore_scanner_adv" //req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_POWER = 4, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 5000, MAT_OSMIUM = 3000, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner/advanced category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MINING @@ -517,7 +517,7 @@ desc = "A running board with a power-lifter attachment, to quickly catapult exosuit pilots into the cockpit. Only fits to working exosuits." id = "mech_runningboard" //req_tech = list(TECH_MATERIAL = 6) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/mecha_equipment/runningboard/limited category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -528,7 +528,7 @@ desc = "A large, hydraulic wrench." id = "mech_wrench" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 2000, MAT_GLASS = 1250) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.625)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -540,7 +540,7 @@ desc = "A large, hydraulic prybar." id = "mech_crowbar" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/prybar category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -552,7 +552,7 @@ desc = "A large, hydraulic cablecutter." id = "mech_wirecutter" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/cutter category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -564,7 +564,7 @@ desc = "A large, hydraulic screwdriver." id = "mech_screwdriver" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_OSMIUM = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/screwdriver category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -576,7 +576,7 @@ desc = "A large welding laser." id = "mech_welder" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000, MAT_PHORON = 3000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_PHORON = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/welding category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -588,7 +588,7 @@ desc = "A large pneumatic inflatable deployer." id = "mech_inflatables" //req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 2000, MAT_PLASTIC = 4000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -600,7 +600,7 @@ desc = "A complex device used to commandeer equipment from the ground." id = "mech_hardpoint_clamp" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_POWER = 5, TECH_COMBAT = 2, TECH_MAGNET = 4) - materials = list(MAT_PLASTEEL = 2500, MAT_PLASTIC = 3000, MAT_OSMIUM = 1500, MAT_SILVER = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.25), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_OSMIUM = MATERIAL_COST(0.75), MAT_SILVER = MATERIAL_COST(1)) build_path = /obj/item/mecha_parts/mecha_equipment/hardpoint_actuator category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -611,7 +611,7 @@ desc = "Exosuit-held nuclear reactor. Converts uranium and everyone's health to energy." id = "mech_generator_nuclear" //req_tech = list(TECH_POWER= 3, TECH_ENGINEERING = 3, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 7500, MAT_SILVER = 375, MAT_GLASS = 750) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(0.1875), MAT_GLASS = MATERIAL_COST(0.375)) build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -622,7 +622,7 @@ desc = "System enhancements and overdrives to make a mech's legs move faster." id = "mech_speedboost_ripley" //req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/mecha_parts/mecha_equipment/speedboost category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -633,7 +633,7 @@ desc = "An auxillary storage compartment, for attaching to exosuits." id = "mech_storage" //req_tech = list(TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/mecha_parts/mecha_equipment/storage category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -644,7 +644,7 @@ desc = "An auxillary storage wormhole, for attaching to exosuits." id = "mech_storage_bs" //req_tech = list(TECH_MATERIAL = 4) - materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(5), MAT_GRAPHITE = 8000, MAT_OSMIUM = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(2)) build_path = /obj/item/mecha_parts/mecha_equipment/storage/bluespace category = list( RND_CATEGORY_MECHFAB_EQUIPMENT + RND_SUBCATEGORY_MECHFAB_EQUIPMENT_MISC @@ -667,7 +667,7 @@ name = "MICRO PC-20 \"Lance\" light laser cannon" id = "micro_laser_heavy" //req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) - materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/microheavy /datum/design_techweb/mechfab/equipment/weapon/grenade_launcher/micro diff --git a/code/modules/research/tg/designs/medical_designs.dm b/code/modules/research/tg/designs/medical_designs.dm index 4b7427a8f15..dc2a35154a0 100644 --- a/code/modules/research/tg/designs/medical_designs.dm +++ b/code/modules/research/tg/designs/medical_designs.dm @@ -3,7 +3,7 @@ name = "Pill Bottle" id = "pillbottle" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_PLASTIC = 100, MAT_GLASS = 100) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/storage/pill_bottle category = list( RND_CATEGORY_INITIAL, @@ -15,7 +15,7 @@ name = "Syringe" id = "syringe" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 190) + materials = list(MAT_GLASS = MATERIAL_COST(0.095)) build_path = /obj/item/reagent_containers/syringe category = list( RND_CATEGORY_INITIAL, @@ -27,7 +27,7 @@ name = "Dropper" id = "dropper" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 100, MAT_PLASTIC = 500) + materials = list(MAT_GLASS = MATERIAL_COST(0.05), MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/reagent_containers/dropper category = list( RND_CATEGORY_INITIAL, @@ -39,7 +39,7 @@ name = "Scalpel" id = "scalpel" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/scalpel category = list( RND_CATEGORY_INITIAL, @@ -51,7 +51,7 @@ name = "Circular Saw" id = "circular_saw" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 1000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/surgical/circular_saw category = list( RND_CATEGORY_INITIAL, @@ -63,7 +63,7 @@ name = "Bonesetter" id = "bonesetter" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 1000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/surgical/bonesetter category = list( RND_CATEGORY_INITIAL, @@ -75,7 +75,7 @@ name = "Surgical Drill" id = "surgicaldrill" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/surgicaldrill category = list( RND_CATEGORY_INITIAL, @@ -87,7 +87,7 @@ name = "Retractor" id = "retractor" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/retractor category = list( RND_CATEGORY_INITIAL, @@ -99,7 +99,7 @@ name = "Cautery" id = "cautery" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/cautery category = list( RND_CATEGORY_INITIAL, @@ -111,7 +111,7 @@ name = "Hemostat" id = "hemostat" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/hemostat category = list( RND_CATEGORY_INITIAL, @@ -123,7 +123,7 @@ name = "FixOVein" id = "fixovein" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/FixOVein category = list( RND_CATEGORY_INITIAL, @@ -135,7 +135,7 @@ name = "bone gel" id = "bonegel" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/bonegel category = list( RND_CATEGORY_INITIAL, @@ -148,7 +148,7 @@ desc="A special tool used in surgeries which can pull toxins from and restore oxygen to organic tissue as well as recreate missing biological structures to allow otherwise irreperable flesh to be mended." id = "bioregen" build_type = PROTOLATHE - materials = list(MAT_STEEL = 1500, MAT_GLASS = 1000, MAT_SILVER = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.25)) build_path = /obj/item/surgical/bioregen category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED, @@ -171,7 +171,7 @@ name = "Penlight" id = "penlight" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 100, MAT_GLASS = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/flashlight/pen category = list( RND_CATEGORY_INITIAL, @@ -183,7 +183,7 @@ name = "Implanter" id = "implanter" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/implanter category = list( RND_CATEGORY_INITIAL, @@ -198,7 +198,7 @@ id = "scalpel_laser1" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2) - materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25), MAT_GLASS = MATERIAL_COST(3.75)) build_path = /obj/item/surgical/scalpel/laser1 category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -211,7 +211,7 @@ id = "scalpel_laser2" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 4, TECH_MAGNET = 4) - materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25), MAT_GLASS = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(1.25)) build_path = /obj/item/surgical/scalpel/laser2 category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -224,7 +224,7 @@ id = "scalpel_laser3" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 5) - materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2000, MAT_GOLD = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(6.25), MAT_GLASS = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.75)) build_path = /obj/item/surgical/scalpel/laser3 category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -237,7 +237,7 @@ id = "scalpel_manager" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 5, TECH_DATA = 4) - materials = list (MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_DIAMOND = 750) + materials = list (MAT_STEEL = MATERIAL_COST(6.25), MAT_GLASS = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.375)) build_path = /obj/item/surgical/scalpel/manager category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -250,7 +250,7 @@ id = "advanced_saw" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_DATA = 5) - materials = list (MAT_STEEL = 12500, MAT_PLASTIC = 800, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_OSMIUM = 1000) + materials = list (MAT_STEEL = MATERIAL_COST(6.25), MAT_PLASTIC = MATERIAL_COST(0.4), MAT_SILVER = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(0.75), MAT_OSMIUM = MATERIAL_COST(0.5)) build_path = /obj/item/surgical/circular_saw/manager category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -263,7 +263,7 @@ id = "organ_ripper" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_ILLEGAL = 3) - materials = list (MAT_STEEL = 12500, MAT_PLASTIC = 8000, MAT_OSMIUM = 2500) + materials = list (MAT_STEEL = MATERIAL_COST(6.25), MAT_PLASTIC = MATERIAL_COST(4), MAT_OSMIUM = MATERIAL_COST(1.25)) build_path = /obj/item/surgical/scalpel/ripper category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -276,7 +276,7 @@ id = "bone_clamp" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_DATA = 4) - materials = list (MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) + materials = list (MAT_STEEL = MATERIAL_COST(6.25), MAT_GLASS = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(1.25)) build_path = /obj/item/surgical/bone_clamp category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -289,7 +289,7 @@ id = "medical_analyzer" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/healthanalyzer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -302,7 +302,7 @@ id = "improved_analyzer" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 5, TECH_BIO = 6) - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.75)) build_path = /obj/item/healthanalyzer/improved category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -315,7 +315,7 @@ id = "advanced_analyzer" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 7, TECH_BIO = 7, TECH_DATA = 5) - materials = list(MAT_STEEL = 2000, MAT_GLASS = 4000, MAT_SILVER = 3500, MAT_GOLD = 2500, MAT_DIAMOND = 1250) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(2), MAT_SILVER = MATERIAL_COST(1.75), MAT_GOLD = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.625)) build_path = /obj/item/healthanalyzer/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -327,7 +327,7 @@ desc = "State of the art handheld health scanner, containing not only a full biosign monitor, on-board radiation, and neurological analysis suites, but also a chemical-analysis suite." id = "phasic_analyzer" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 4000, MAT_SILVER = 3500, MAT_GOLD = 2500, MAT_DIAMOND = 2500, MAT_PHORON = 1250) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(2), MAT_SILVER = MATERIAL_COST(1.75), MAT_GOLD = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(1.25), MAT_PHORON = MATERIAL_COST(0.625)) build_path = /obj/item/healthanalyzer/phasic category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -339,7 +339,7 @@ id = "gene_scanner" build_type = PROTOLATHE // req_tech = list(TECH_DATA = 1, TECH_BIO = 2) - materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/gene_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -351,7 +351,7 @@ desc = "A collapsed roller bed that can be carried around." id = "medicalbed" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/roller category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -364,7 +364,7 @@ id = "roller_bed" build_type = PROTOLATHE // req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 3, TECH_MAGNET = 3) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_PHORON = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/roller/adv category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -376,7 +376,7 @@ id = "sleevemate" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_BIO = 2) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/sleevemate category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -389,7 +389,7 @@ id = "protohypospray" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 2, TECH_BIO = 4, TECH_ILLEGAL = 2) - materials = list(MAT_STEEL = 500, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 1500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.75), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/reagent_containers/hypospray/science category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -401,7 +401,7 @@ desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance." id = "syringe_gun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/gun/launcher/syringe category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED @@ -413,7 +413,7 @@ desc = "An impact-triggered compressed gas cartridge that can be fitted to a syringe for rapid injection." id = "syringe_cartridge" build_type = PROTOLATHE - materials = list(MAT_STEEL = 150, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.075), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/syringe_cartridge category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED @@ -424,7 +424,7 @@ name = "Body Design Disk" desc = "Portable Body Record Storage Disk." id = "body_record_disk" - materials = list(MAT_STEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25)) build_path = /obj/item/disk/body_record build_type = PROTOLATHE category = list( @@ -439,10 +439,10 @@ id = "cybernetic_heart_anomalock" construction_time = 5 SECONDS materials = list( - MAT_STEEL = 2500, - MAT_GLASS = 2500, - MAT_TITANIUM = 10000, - MAT_DIAMOND = 5000 + MAT_STEEL = MATERIAL_COST(1.25), + MAT_GLASS = MATERIAL_COST(1.25), + MAT_TITANIUM = MATERIAL_COST(5), + MAT_DIAMOND = MATERIAL_COST(2.5) ) build_path = /obj/item/organ/internal/heart/machine/anomalock category = list( diff --git a/code/modules/research/tg/designs/mining_designs.dm b/code/modules/research/tg/designs/mining_designs.dm index 6b7f9723801..1c7f6b44524 100644 --- a/code/modules/research/tg/designs/mining_designs.dm +++ b/code/modules/research/tg/designs/mining_designs.dm @@ -2,7 +2,7 @@ name = "pickaxe" id = "pickaxe" build_type = AUTOLATHE - materials = list(MAT_STEEL = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25)) build_path = /obj/item/pickaxe category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/tg/designs/misc_designs.dm b/code/modules/research/tg/designs/misc_designs.dm index 0f79ef2c55e..56aec50b5f0 100644 --- a/code/modules/research/tg/designs/misc_designs.dm +++ b/code/modules/research/tg/designs/misc_designs.dm @@ -6,7 +6,7 @@ id = "pda" // req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/pda category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -18,7 +18,7 @@ desc = "A cartridge containing PDA software." // req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC ) @@ -109,7 +109,7 @@ id = "tech_disk" // req_tech = list(TECH_DATA = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30, MAT_GLASS = 10) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005)) build_path = /obj/item/disk/tech_disk category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -122,7 +122,7 @@ id = "disk_botany" // req_tech = list(TECH_DATA = 2, TECH_BIO = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30, MAT_GLASS = 10, MAT_URANIUM = 5) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005), MAT_URANIUM = MATERIAL_COST(0.0025)) build_path = /obj/item/disk/botany category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -133,7 +133,7 @@ name = "Borg-O's Recipe" desc = "A recipe for the cult classic Borg-O's meal. Warning: Not suitable for organic consumption." id = "borgos1" - materials = list(MAT_STEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5)) build_path = /obj/item/trash/rkibble build_type = PROTOLATHE //I...I guess??? category = list( @@ -146,7 +146,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule" build_type = PROTOLATHE - materials = list(MAT_STEEL = 25000, MAT_GLASS = 25000, MAT_TITANIUM = 2500, MAT_DURASTEEL = 1000, MAT_DIAMOND = 200, MAT_URANIUM = 500) + materials = list(MAT_STEEL = MATERIAL_COST(12.5), MAT_GLASS = MATERIAL_COST(12.5), MAT_TITANIUM = MATERIAL_COST(1.25), MAT_DURASTEEL = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.1), MAT_URANIUM = MATERIAL_COST(0.25)) build_path = /obj/item/survivalcapsule category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -158,7 +158,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_luxury" build_type = PROTOLATHE - materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 2500, MAT_DIAMOND = 500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(17.5), MAT_GLASS = MATERIAL_COST(17.5), MAT_TITANIUM = MATERIAL_COST(2.5), MAT_DURASTEEL = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/survivalcapsule/luxury category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -170,7 +170,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_sauna" build_type = PROTOLATHE - materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(17.5), MAT_GLASS = MATERIAL_COST(17.5), MAT_TITANIUM = MATERIAL_COST(2.5), MAT_DURASTEEL = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/survivalcapsule/sauna category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -182,7 +182,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_luxuryalt" build_type = PROTOLATHE - materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(17.5), MAT_GLASS = MATERIAL_COST(17.5), MAT_TITANIUM = MATERIAL_COST(2.5), MAT_DURASTEEL = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/survivalcapsule/luxuryalt category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -194,7 +194,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_kitchen" build_type = PROTOLATHE - materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(17.5), MAT_GLASS = MATERIAL_COST(17.5), MAT_TITANIUM = MATERIAL_COST(2.5), MAT_DURASTEEL = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/survivalcapsule/kitchen category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -206,7 +206,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_pocketdorm" build_type = PROTOLATHE - materials = list(MAT_STEEL = 25000, MAT_GLASS = 25000, MAT_TITANIUM = 2500, MAT_DURASTEEL = 1000, MAT_DIAMOND = 200, MAT_URANIUM = 500) + materials = list(MAT_STEEL = MATERIAL_COST(12.5), MAT_GLASS = MATERIAL_COST(12.5), MAT_TITANIUM = MATERIAL_COST(1.25), MAT_DURASTEEL = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.1), MAT_URANIUM = MATERIAL_COST(0.25)) build_path = /obj/item/survivalcapsule/pocketdorm category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -218,7 +218,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_recroom" build_type = PROTOLATHE - materials = list(MAT_STEEL = 40000, MAT_GLASS = 40000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 2500, MAT_DIAMOND = 500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(20), MAT_GLASS = MATERIAL_COST(20), MAT_TITANIUM = MATERIAL_COST(2.5), MAT_DURASTEEL = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/survivalcapsule/recroom category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -230,7 +230,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_luxurybar" build_type = PROTOLATHE - materials = list(MAT_STEEL = 50000, MAT_GLASS = 50000, MAT_TITANIUM = 6000, MAT_DURASTEEL = 3000, MAT_DIAMOND = 750, MAT_URANIUM = 1500) // These are 11x11 rooms in a pocket. They NEED to be expensive! + materials = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(25), MAT_TITANIUM = MATERIAL_COST(3), MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.375), MAT_URANIUM = MATERIAL_COST(0.75)) // These are 11x11 rooms in a pocket. They NEED to be expensive! build_path = /obj/item/survivalcapsule/luxurybar category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -242,7 +242,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_luxurycabin" build_type = PROTOLATHE - materials = list(MAT_STEEL = 50000, MAT_GLASS = 50000, MAT_TITANIUM = 6000, MAT_DURASTEEL = 3000, MAT_DIAMOND = 750, MAT_URANIUM = 1500) // These are 11x11 rooms in a pocket. They NEED to be expensive! + materials = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(25), MAT_TITANIUM = MATERIAL_COST(3), MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.375), MAT_URANIUM = MATERIAL_COST(0.75)) // These are 11x11 rooms in a pocket. They NEED to be expensive! build_path = /obj/item/survivalcapsule/luxurycabin category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -254,7 +254,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_cafe" build_type = PROTOLATHE - materials = list(MAT_STEEL = 50000, MAT_GLASS = 50000, MAT_TITANIUM = 6000, MAT_DURASTEEL = 3000, MAT_DIAMOND = 750, MAT_URANIUM = 1500) // These are 11x11 rooms in a pocket. They NEED to be expensive! + materials = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(25), MAT_TITANIUM = MATERIAL_COST(3), MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.375), MAT_URANIUM = MATERIAL_COST(0.75)) // These are 11x11 rooms in a pocket. They NEED to be expensive! build_path = /obj/item/survivalcapsule/cafe category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -266,7 +266,7 @@ desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth." id = "shelter_capsule_luxuryrecroom" build_type = PROTOLATHE - materials = list(MAT_STEEL = 50000, MAT_GLASS = 50000, MAT_TITANIUM = 6000, MAT_DURASTEEL = 3000, MAT_DIAMOND = 750, MAT_URANIUM = 1500) // These are 11x11 rooms in a pocket. They NEED to be expensive! + materials = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(25), MAT_TITANIUM = MATERIAL_COST(3), MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.375), MAT_URANIUM = MATERIAL_COST(0.75)) // These are 11x11 rooms in a pocket. They NEED to be expensive! build_path = /obj/item/survivalcapsule/luxuryrecroom category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -332,7 +332,7 @@ desc = "A roll of sticky tape. Possibly for taping ducks... or was that ducts?" id = "sticky_tape" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_PLASTIC = 500) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/tape_roll category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -345,7 +345,7 @@ desc = "A small electronic device able to ignite combustable substances." build_type = AUTOLATHE | PROTOLATHE id = "igniter" - materials = list(MAT_STEEL = 625, MAT_GLASS = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125), MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/assembly/igniter category = list( RND_CATEGORY_INITIAL, @@ -358,7 +358,7 @@ desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." build_type = AUTOLATHE | PROTOLATHE id = "infrared_emitter" - materials = list(MAT_STEEL = 1250, MAT_GLASS = 625) + materials = list(MAT_STEEL = MATERIAL_COST(0.625), MAT_GLASS = MATERIAL_COST(0.3125)) build_path = /obj/item/assembly/infra category = list( RND_CATEGORY_INITIAL, @@ -371,7 +371,7 @@ desc = "Used for scanning and alerting when someone enters a certain proximity." build_type = AUTOLATHE | PROTOLATHE id = "prox_sensor" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 250) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/assembly/prox_sensor category = list( RND_CATEGORY_INITIAL, @@ -384,7 +384,7 @@ desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration." build_type = AUTOLATHE | PROTOLATHE id = "signaler" - materials = list(MAT_STEEL = 1250, MAT_GLASS = 250) + materials = list(MAT_STEEL = MATERIAL_COST(0.625), MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/assembly/signaler category = list( RND_CATEGORY_INITIAL, @@ -397,7 +397,7 @@ desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." build_type = AUTOLATHE | PROTOLATHE id = "timer" - materials = list(MAT_STEEL = 625, MAT_GLASS = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125), MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/assembly/timer category = list( RND_CATEGORY_INITIAL, @@ -411,7 +411,7 @@ desc = "This upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." build_type = AUTOLATHE | PROTOLATHE id = "sleevecard" - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/paicard/sleevecard category = list( RND_CATEGORY_INITIAL, @@ -424,7 +424,7 @@ desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface." build_type = AUTOLATHE | PROTOLATHE id = "camera_assembly" - materials = list(MAT_STEEL = 875, MAT_GLASS = 375) + materials = list(MAT_STEEL = MATERIAL_COST(0.4375), MAT_GLASS = MATERIAL_COST(0.1875)) build_path = /obj/item/camera_assembly category = list( RND_CATEGORY_INITIAL, @@ -436,7 +436,7 @@ name = "hoist kit" desc = "A setup kit for a hoist that can be used to lift things." id = "hoist_kit" - materials = list(MAT_STEEL = 9000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5)) build_path = /obj/item/hoist_kit build_type = AUTOLATHE | PROTOLATHE category = list( diff --git a/code/modules/research/tg/designs/modsuit_designs.dm b/code/modules/research/tg/designs/modsuit_designs.dm index e85df6574c7..8c0c9fc3bc1 100644 --- a/code/modules/research/tg/designs/modsuit_designs.dm +++ b/code/modules/research/tg/designs/modsuit_designs.dm @@ -14,7 +14,7 @@ name = "Advanced Suit Control Belt" desc = "A belt holding a compressed space-suit." id = "rigmodule_belt_basic" - materials = list(MAT_PLASTEEL = 12000, MAT_GOLD = 3000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(6), MAT_GOLD = MATERIAL_COST(1.5), MAT_GRAPHITE = 3000, MAT_OSMIUM = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(2.5)) build_path = /obj/item/rig/robotics category = list( RND_CATEGORY_INITIAL, @@ -26,7 +26,7 @@ name = "EVA Suit Control Module" desc = "An engineering Hardsuit featuring a visor with welding protection, immunity to radiation, and insulated gauntlets. It is well insulated against the heat." id = "eva_rig_module" - materials = list(MAT_PLASTEEL = 16000, MAT_GOLD = 3000, MAT_GRAPHITE = 4500, MAT_OSMIUM = 1000, MAT_PLASTIC = 4500, MAT_LEAD = 2000, MAT_STEEL = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(8), MAT_GOLD = MATERIAL_COST(1.5), MAT_GRAPHITE = 4500, MAT_OSMIUM = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(2.25), MAT_LEAD = MATERIAL_COST(1), MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/rig/eva category = list( RND_CATEGORY_MODSUIT_MODULES @@ -36,7 +36,7 @@ name = "Advanced EVA Suit Control Module" desc = "A more advanced EVA hardsuit with the same features, plus additional atmospheric protection and advanced magboots. Finely polished for engineering clout." id = "advanced_eva_rig_module" - materials = list(MAT_PLASTEEL = 16000, MAT_GOLD = 6000, MAT_GRAPHITE = 4500, MAT_OSMIUM = 4000, MAT_PLASTIC = 8000, MAT_LEAD = 2000, MAT_PHORON = 6000, MAT_STEEL = 3000, MAT_TITANIUM = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(8), MAT_GOLD = MATERIAL_COST(3), MAT_GRAPHITE = 4500, MAT_OSMIUM = MATERIAL_COST(2), MAT_PLASTIC = MATERIAL_COST(4), MAT_LEAD = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(3), MAT_STEEL = MATERIAL_COST(1.5), MAT_TITANIUM = MATERIAL_COST(1)) build_path = /obj/item/rig/ce category = list( RND_CATEGORY_MODSUIT_MODULES @@ -46,7 +46,7 @@ name = "AMI Suit Control Module" desc = "A hardsuit for the rigors of science. In theory it should protect the wearer from the stranger things that the universe can offer. In 'theory.'" id = "ami_rig_module" - materials = list(MAT_PLASTEEL = 12000, MAT_GOLD = 3000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 2000, MAT_PLASTIC = 6000, MAT_LEAD = 2000, MAT_PHORON = 12000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(6), MAT_GOLD = MATERIAL_COST(1.5), MAT_GRAPHITE = 3000, MAT_OSMIUM = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(3), MAT_LEAD = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(6)) build_path = /obj/item/rig/hazmat category = list( RND_CATEGORY_MODSUIT_MODULES @@ -56,7 +56,7 @@ name = "Industrial Suit Control Module" desc = "Ugly as hell, and heavier than I-Beam. Designed to protect thickly beardered miners in the depths." id = "industrial_rig_module" - materials = list(MAT_PLASTEEL = 14000, MAT_GOLD = 4000, MAT_GRAPHITE = 5000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000, MAT_STEEL = 10000, MAT_TITANIUM = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(7), MAT_GOLD = MATERIAL_COST(2), MAT_GRAPHITE = 5000, MAT_OSMIUM = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(2.5), MAT_STEEL = MATERIAL_COST(5), MAT_TITANIUM = MATERIAL_COST(1)) build_path = /obj/item/rig/industrial category = list( RND_CATEGORY_MODSUIT_MODULES @@ -66,7 +66,7 @@ name = "Hazard Suit Control Module" desc = "A security hardsuit with protection for bringing justice into the blackness of the void." id = "hazard_rig_module" - materials = list(MAT_PLASTEEL = 14000, MAT_GOLD = 4000, MAT_GRAPHITE = 5000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000, MAT_STEEL = 10000, MAT_TITANIUM = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(7), MAT_GOLD = MATERIAL_COST(2), MAT_GRAPHITE = 5000, MAT_OSMIUM = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(2.5), MAT_STEEL = MATERIAL_COST(5), MAT_TITANIUM = MATERIAL_COST(1)) build_path = /obj/item/rig/hazard category = list( RND_CATEGORY_MODSUIT_MODULES @@ -76,7 +76,7 @@ name = "Rescue Suit Control Module" desc = "A hardsuit designed for medical rescue in hazardous environments. Just don't expect it to stop a bullet." id = "medical_rig_module" - materials = list(MAT_PLASTEEL = 12000, MAT_GOLD = 6000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 4000, MAT_PLASTIC = 10000, MAT_LEAD = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(6), MAT_GOLD = MATERIAL_COST(3), MAT_GRAPHITE = 3000, MAT_OSMIUM = MATERIAL_COST(2), MAT_PLASTIC = MATERIAL_COST(5), MAT_LEAD = MATERIAL_COST(1)) build_path = /obj/item/rig/medical category = list( RND_CATEGORY_MODSUIT_MODULES @@ -86,7 +86,7 @@ name = "Zero Suit Control Module" desc = "A very bare bones and stylish suit designed for pilots with advanced holographic interfaces for the task." id = "zero_rig_module" - materials = list(MAT_PLASTEEL = 12000, MAT_GOLD = 3000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(6), MAT_GOLD = MATERIAL_COST(1.5), MAT_GRAPHITE = 3000, MAT_OSMIUM = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(2.5)) build_path = /obj/item/rig/zero category = list( RND_CATEGORY_INITIAL, @@ -105,7 +105,7 @@ desc = "A suit mounted rescue drug dispenser." id = "rig_component_rescuepharm" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_BIO = 4) - materials = list(MAT_PLASTEEL = 3000, MAT_GRAPHITE = 2000, MAT_PLASTIC = 3500, MAT_SILVER = 1750, MAT_GOLD = 1250) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_GRAPHITE = 2000, MAT_PLASTIC = MATERIAL_COST(1.75), MAT_SILVER = MATERIAL_COST(0.875), MAT_GOLD = MATERIAL_COST(0.625)) build_path = /obj/item/rig_module/rescue_pharm category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -117,7 +117,7 @@ desc = "Pre-emptive Access Tunneling for first responders to access areas they normally cannot. Use responsibly." id = "rig_component_pat" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_BIO = 4) - materials = list(MAT_PLASTEEL = 3000, MAT_GRAPHITE = 2000, MAT_SILVER = 1750, MAT_GOLD = 1250, MAT_OSMIUM = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_GRAPHITE = 2000, MAT_SILVER = MATERIAL_COST(0.875), MAT_GOLD = MATERIAL_COST(0.625), MAT_OSMIUM = MATERIAL_COST(1)) build_path = /obj/item/rig_module/pat_module category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -129,7 +129,7 @@ desc = "A suit mounted size gun. Features interface-based target size adjustment for hands-free size-altering shenanigans." id = "rig_gun_sizegun" //req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/rig_module/mounted/sizegun //Not giving this a department flag intentionally.tIT @@ -137,7 +137,7 @@ name = "hardsuit maneuvering jets" desc = "A compact gas thruster system for a hardsuit." id = "rig_thrusters" - materials = list(MAT_PLASTEEL = 1000, MAT_GOLD = 1000, MAT_GRAPHITE = 1000, MAT_PLASTIC = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.5), MAT_GRAPHITE = 1000, MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/maneuvering_jets category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL @@ -148,7 +148,7 @@ desc = "A complex device used to pull power from machines." id = "rig_siphon" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_PHORON = 4, TECH_MAGNET = 5, TECH_POWER = 6, TECH_ILLEGAL = 3) - materials = list(MAT_PLASTEEL = 3000, MAT_METALHYDROGEN = 1000, MAT_GRAPHITE = 1000, MAT_PLASTIC = 5000, MAT_PHORON = 2000, MAT_VERDANTIUM = 1500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(0.5), MAT_GRAPHITE = 1000, MAT_PLASTIC = MATERIAL_COST(2.5), MAT_PHORON = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(0.75)) build_path = /obj/item/rig_module/power_sink category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL @@ -159,7 +159,7 @@ desc = "A suit-mounted flash." id = "rig_device_flash" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_PLASTIC = 3000, MAT_METALHYDROGEN = 200, MAT_GRAPHITE = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(0.1), MAT_GRAPHITE = 500) build_path = /obj/item/rig_module/device/flash category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -170,7 +170,7 @@ desc = "A suit-mounted plasmacutter." id = "rig_device_plasmacutter" //req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 3000, MAT_PLASTIC = 3000, MAT_PHORON = 2500, MAT_GRAPHITE = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(1.25), MAT_GRAPHITE = 500) build_path = /obj/item/rig_module/device/plasmacutter category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -182,7 +182,7 @@ desc = "A hardsuit mounted health analyzer." id = "rig_device_healthanalyzer" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_BIO = 4, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 1000, MAT_SILVER = 1000, MAT_GRAPHITE = 1000, MAT_PLASTIC = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GRAPHITE = 1000, MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/device/healthscanner category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -194,7 +194,7 @@ desc = "A hardsuit mounted drill." id = "rig_device_drill" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 1500, MAT_DIAMOND = 2500, MAT_GRAPHITE = 1000, MAT_PLASTIC = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(1.25), MAT_GRAPHITE = 1000, MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/device/drill category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -206,7 +206,7 @@ desc = "A hardsuit mounted excavation drill." id = "rig_device_excdrill" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 6, TECH_MAGNET = 5, TECH_POWER = 5, TECH_ARCANE = 1) - materials = list(MAT_PLASTEEL = 1500, MAT_DIAMOND = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/device/arch_drill category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -218,7 +218,7 @@ desc = "A suit-mounted anomaly scanner." id = "rig_device_anomscanner" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_PLASTIC = 3000, MAT_METALHYDROGEN = 200, MAT_GRAPHITE = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(0.1), MAT_GRAPHITE = 500) build_path = /obj/item/rig_module/device/anomaly_scanner category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -230,7 +230,7 @@ desc = "A suit-mounted ore scanner." id = "rig_device_orescanner" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 3) - materials = list(MAT_PLASTEEL = 2000, MAT_PLASTIC = 2000, MAT_GRAPHITE = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(1), MAT_GRAPHITE = 500) build_path = /obj/item/rig_module/device/orescanner category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -242,7 +242,7 @@ desc = "A suit-mounted rcd." id = "rig_device_rcd" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 5000, MAT_URANIUM = 3000, MAT_PHORON = 2000, MAT_GRAPHITE = 1500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(2.5), MAT_URANIUM = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(1), MAT_GRAPHITE = 1500) build_path = /obj/item/rig_module/device/rcd category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -254,7 +254,7 @@ desc = "A suit-mounted paper dispenser." id = "rig_device_paperdispenser" //req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_MAGNET = 2, TECH_BIO = 2, TECH_POWER = 2) - materials = list(MAT_PLASTEEL = 1000, MAT_PLASTIC = 500, MAT_PHORON = 500, MAT_GRAPHITE = 100) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.25), MAT_GRAPHITE = 100) build_path = /obj/item/rig_module/device/paperdispenser category = list( RND_CATEGORY_INITIAL, @@ -267,7 +267,7 @@ desc = "A suit-mounted pen." id = "rig_device_pen" //req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_MAGNET = 2, TECH_BIO = 2, TECH_POWER = 2) - materials = list(MAT_PLASTEEL = 1000, MAT_PLASTIC = 500, MAT_PHORON = 500, MAT_GRAPHITE = 100) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.5), MAT_PLASTIC = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.25), MAT_GRAPHITE = 100) build_path = /obj/item/rig_module/device/pen category = list( RND_CATEGORY_INITIAL, @@ -280,7 +280,7 @@ desc = "A compact metalfoam grenade system for a hardsuit." id = "rig_grenade_metalfoam" //req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 2, TECH_POWER = 3) - materials = list(MAT_PLASTEEL = 2000, MAT_OSMIUM = 1000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_OSMIUM = MATERIAL_COST(0.5), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/grenade_launcher/metalfoam category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -292,7 +292,7 @@ desc = "A compact flashbang grenade system for a hardsuit." id = "rig_grenade_flashbang" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_PHORON = 3, TECH_MAGNET = 4, TECH_POWER = 5, TECH_COMBAT = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_OSMIUM = 1500, MAT_GRAPHITE = 1000, MAT_PLASTIC = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_OSMIUM = MATERIAL_COST(0.75), MAT_GRAPHITE = 1000, MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/grenade_launcher/flash category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -304,7 +304,7 @@ desc = "A compact cleaning-foam grenade system for a hardsuit." id = "rig_grenade_cleanfoam" //req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2, TECH_POWER = 2) - materials = list(MAT_PLASTEEL = 2000, MAT_GLASS = 1000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 750) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.375)) build_path = /obj/item/rig_module/cleaner_launcher category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SERVICE @@ -316,7 +316,7 @@ desc = "A compact taser system for a hardsuit." id = "rig_gun_taser" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 3, TECH_MAGNET = 2, TECH_POWER = 3, TECH_COMBAT = 2) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/mounted/taser category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -328,7 +328,7 @@ desc = "A compact egun system for a hardsuit." id = "rig_gun_egun" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_MAGNET = 3, TECH_POWER = 4, TECH_COMBAT = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_GOLD = 1250, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.625), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/mounted/egun category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -340,7 +340,7 @@ desc = "An advanced cleaning device." id = "rig_gun_tempgun" //req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 5, TECH_POWER = 4, TECH_COMBAT = 6) - materials = list(MAT_PLASTEEL = 2000, MAT_GOLD = 1750, MAT_URANIUM = 1500, MAT_GRAPHITE = 1500, MAT_PLASTIC = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.875), MAT_URANIUM = MATERIAL_COST(0.75), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/mounted/mop category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SERVICE @@ -352,7 +352,7 @@ desc = "A compact overclocking system for a hardsuit." id = "rig_component_sprinter" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_BIO = 4, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_VERDANTIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.25), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/sprinter /datum/design_techweb/mechfab/modsuit/modules/meson @@ -360,7 +360,7 @@ desc = "A compact meson visor for a hardsuit." id = "rig_component_meson" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 5, TECH_MAGNET = 3, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_OSMIUM = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/vision/meson category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -372,7 +372,7 @@ desc = "A compact material visor for a hardsuit." id = "rig_component_material" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 5, TECH_MAGNET = 3, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_OSMIUM = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/vision/material category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -384,7 +384,7 @@ desc = "A compact night-vision visor for a hardsuit." id = "rig_component_nvg" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 4, TECH_POWER = 5) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500, MAT_URANIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_OSMIUM = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/vision/nvg category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -395,7 +395,7 @@ name = "hardsuit thermal scanning visor" desc = "A compact thermal visor for a hardsuit." id = "rig_component_thermal" - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500, MAT_URANIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_OSMIUM = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/vision/thermal category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -406,7 +406,7 @@ name = "hardsuit complete visor suite" desc = "An optical package for the bounty-hunter in you. Contains all available visors in a tight package." id = "rig_component_multi_visor" - materials = list(MAT_PLASTEEL = 8000, MAT_GRAPHITE = 5500, MAT_OSMIUM = 4500, MAT_URANIUM = 6000, MAT_MORPHIUM = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(4), MAT_GRAPHITE = 5500, MAT_OSMIUM = MATERIAL_COST(2.25), MAT_URANIUM = MATERIAL_COST(3), MAT_MORPHIUM = MATERIAL_COST(1)) build_path = /obj/item/rig_module/vision/multi category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -417,7 +417,7 @@ desc = "A visor suite for miners featuring Material and Mesons." id = "rig_component_mining" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 4, TECH_POWER = 5) - materials = list(MAT_PLASTEEL = 3500, MAT_GRAPHITE = 2000, MAT_OSMIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.75), MAT_GRAPHITE = 2000, MAT_OSMIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/vision/mining category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY @@ -429,7 +429,7 @@ desc = "Advanced Visor suite that combines the features of mesons and material into a single package." id = "rig_component_graviton" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 4, TECH_POWER = 5) - materials = list(MAT_PLASTEEL = 3500, MAT_GRAPHITE = 2000, MAT_OSMIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.75), MAT_GRAPHITE = 2000, MAT_OSMIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/vision/graviton category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -440,7 +440,7 @@ desc = "A compact security visor for a hardsuit." id = "rig_component_sechud" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 2) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_SILVER = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/vision/sechud category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY @@ -452,7 +452,7 @@ desc = "A compact medical visor for a hardsuit." id = "rig_component_medhud" //req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_BIO = 2) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_SILVER = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.25)) build_path = /obj/item/rig_module/vision/medhud category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -464,7 +464,7 @@ desc = "A compact voice-changer for a hardsuit." id = "rig_component_voice" //req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_BIO = 4, TECH_ILLEGAL = 3) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 1000, MAT_SILVER = 500, MAT_PHORON = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_PLASTIC = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/voice category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL @@ -475,7 +475,7 @@ desc = "A compact AI network system for a hardsuit." id = "rig_component_aicontainer" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_BIO = 4, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_DIAMOND = 1000, MAT_GOLD = 500, MAT_SILVER = 750, MAT_VERDANTIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_DIAMOND = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.375), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/ai_container category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SCIENCE @@ -486,7 +486,7 @@ desc = "A compact datajack for a hardsuit." id = "rig_component_datajack" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 5) - materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_METALHYDROGEN = 1000, MAT_GOLD = 500, MAT_SILVER = 750, MAT_VERDANTIUM = 1000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_GRAPHITE = 1500, MAT_METALHYDROGEN = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.375), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/rig_module/datajack category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL @@ -497,7 +497,7 @@ desc = "A compact chemical injector network for a hardsuit." id = "rig_component_chemicals" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_BIO = 4) - materials = list(MAT_PLASTEEL = 3000, MAT_GRAPHITE = 2000, MAT_PLASTIC = 3500, MAT_SILVER = 1750, MAT_GOLD = 1250) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_GRAPHITE = 2000, MAT_PLASTIC = MATERIAL_COST(1.75), MAT_SILVER = MATERIAL_COST(0.875), MAT_GOLD = MATERIAL_COST(0.625)) build_path = /obj/item/rig_module/chem_dispenser/injector/advanced/empty category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL @@ -509,7 +509,7 @@ desc = "An enigmatic teleporter system for a hardsuit." id = "rig_component_teleport" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 6, TECH_ILLEGAL = 3, TECH_BLUESPACE = 4, TECH_ARCANE = 2, TECH_PRECURSOR = 3) - materials = list(MAT_DURASTEEL = 5000, MAT_GRAPHITE = 3000, MAT_MORPHIUM = 1500, MAT_OSMIUM = 1500, MAT_PHORON = 1750, MAT_VERDANTIUM = 3000, MAT_SUPERMATTER = 2000) + materials = list(MAT_DURASTEEL = MATERIAL_COST(2.5), MAT_GRAPHITE = 3000, MAT_MORPHIUM = MATERIAL_COST(0.75), MAT_OSMIUM = MATERIAL_COST(0.75), MAT_PHORON = MATERIAL_COST(0.875), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_SUPERMATTER = MATERIAL_COST(1)) build_path = /obj/item/rig_module/teleporter category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -521,7 +521,7 @@ desc = "A miniaturized radiation absorption array, for use in hardsuits and providing full radiation protection." id = "rig_component_radshield" //req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_POWER = 3, TECH_BLUESPACE = 4) - materials = list(MAT_STEEL = 8000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 1500, MAT_PHORON = 2250, MAT_SILVER = 1500, MAT_GOLD = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GRAPHITE = 3000, MAT_OSMIUM = MATERIAL_COST(0.75), MAT_PHORON = MATERIAL_COST(1.125), MAT_SILVER = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(0.75)) build_path = /obj/item/rig_module/rad_shield category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -533,7 +533,7 @@ desc = "An optimized, miniaturized radiation absorption array, for use in hardsuits and providing full radiation protection. Reduced power draw." id = "rig_component_radshield_adv" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 6, TECH_BLUESPACE = 4) - materials = list(MAT_PLASTEEL = 8000, MAT_GRAPHITE = 4000, MAT_OSMIUM = 2000, MAT_PHORON = 3250, MAT_SILVER = 2250, MAT_GOLD = 2250) + materials = list(MAT_PLASTEEL = MATERIAL_COST(4), MAT_GRAPHITE = 4000, MAT_OSMIUM = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(1.625), MAT_SILVER = MATERIAL_COST(1.125), MAT_GOLD = MATERIAL_COST(1.125)) build_path = /obj/item/rig_module/rad_shield/advanced category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -545,7 +545,7 @@ desc = "An advanced atmospheric protection suite, providing protection against both pressure and heat. At the cost of concerningly high power draw." id = "rig_component_atmosshield" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 6, TECH_BLUESPACE = 4) - materials = list(MAT_PLASTEEL = 8000, MAT_DURASTEEL = 4000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(4), MAT_DURASTEEL = MATERIAL_COST(2), MAT_GRAPHITE = 8000, MAT_OSMIUM = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(2)) build_path = /obj/item/rig_module/atmos_shield category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -557,7 +557,7 @@ desc = "An advanced atmospheric protection suite, providing protection against both pressure and heat. Reduced Power Draw." id = "rig_component_atmosshield_adv" //req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 6, TECH_BLUESPACE = 4) - materials = list(MAT_PLASTEEL = 8000, MAT_DURASTEEL = 4000, MAT_GRAPHITE = 9000, MAT_OSMIUM = 7500, MAT_PHORON = 6000, MAT_SILVER = 8000, MAT_GOLD = 6000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(4), MAT_DURASTEEL = MATERIAL_COST(2), MAT_GRAPHITE = 9000, MAT_OSMIUM = MATERIAL_COST(3.75), MAT_PHORON = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(4), MAT_GOLD = MATERIAL_COST(3)) build_path = /obj/item/rig_module/atmos_shield/advanced category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -568,7 +568,7 @@ name = "hardsuit electrical protection enhancement suite" desc = "An advanced faraday shielding suite, providing protection against electrical discharges. At the cost of concerningly high power draw." id = "rig_component_faradayshield" - materials = list(MAT_PLASTEEL = 8000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000, MAT_PLASTIC = 6000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(4), MAT_GRAPHITE = 8000, MAT_OSMIUM = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(2), MAT_PLASTIC = MATERIAL_COST(3)) build_path = /obj/item/rig_module/faraday_shield category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING @@ -579,7 +579,7 @@ name = "hardsuit advanced electrical protection enhancement suite" desc = "An optimized faraday shielding suite, providing protection against electrical discharges. At the cost of concerningly high power draw." id = "rig_component_faradayshield_adv" - materials = list(MAT_PLASTEEL = 8000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 8000, MAT_PHORON = 7000, MAT_SILVER = 5500, MAT_GOLD = 5500, MAT_PLASTIC = 6000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(4), MAT_GRAPHITE = 8000, MAT_OSMIUM = MATERIAL_COST(4), MAT_PHORON = MATERIAL_COST(3.5), MAT_SILVER = MATERIAL_COST(2.75), MAT_GOLD = MATERIAL_COST(2.75), MAT_PLASTIC = MATERIAL_COST(3)) build_path = /obj/item/rig_module/faraday_shield/advanced category = list( RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING diff --git a/code/modules/research/tg/designs/modular_computer_designs.dm b/code/modules/research/tg/designs/modular_computer_designs.dm index 53794cbc91d..6bf86454c8a 100644 --- a/code/modules/research/tg/designs/modular_computer_designs.dm +++ b/code/modules/research/tg/designs/modular_computer_designs.dm @@ -12,41 +12,41 @@ name = "basic hard drive" id = "hdd_basic" // req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 2000, MAT_GLASS = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/computer_hardware/hard_drive/ /datum/design_techweb/modularcomponent/disk/advanced name = "advanced hard drive" id = "hdd_advanced" - materials = list(MAT_STEEL = 4000, MAT_GLASS = 200) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/computer_hardware/hard_drive/advanced /datum/design_techweb/modularcomponent/disk/super name = "super hard drive" id = "hdd_super" // req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 8000, MAT_GLASS = 400) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(0.2)) build_path = /obj/item/computer_hardware/hard_drive/super /datum/design_techweb/modularcomponent/disk/cluster name = "cluster hard drive" id = "hdd_cluster" // req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 16000, MAT_GLASS = 800) + materials = list(MAT_STEEL = MATERIAL_COST(8), MAT_GLASS = MATERIAL_COST(0.4)) build_path = /obj/item/computer_hardware/hard_drive/cluster /datum/design_techweb/modularcomponent/disk/small name = "small hard drive" id = "hdd_small" // req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 200) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/computer_hardware/hard_drive/small /datum/design_techweb/modularcomponent/disk/micro name = "micro hard drive" id = "hdd_micro" // req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 2000, MAT_GLASS = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/computer_hardware/hard_drive/micro // Network cards @@ -55,21 +55,21 @@ name = "basic network card" id = "netcard_basic" // req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 500, MAT_GLASS = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/computer_hardware/network_card /datum/design_techweb/modularcomponent/netcard/advanced name = "advanced network card" id = "netcard_advanced" // req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 1000, MAT_GLASS = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/computer_hardware/network_card/advanced /datum/design_techweb/modularcomponent/netcard/wired name = "wired network card" id = "netcard_wired" // req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 5000, MAT_GLASS = 400) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.2)) build_path = /obj/item/computer_hardware/network_card/wired // Batteries @@ -78,42 +78,42 @@ name = "standard battery module" id = "bat_normal" // req_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/computer_hardware/battery_module /datum/design_techweb/modularcomponent/battery/advanced name = "advanced battery module" id = "bat_advanced" // req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/computer_hardware/battery_module/advanced /datum/design_techweb/modularcomponent/battery/super name = "super battery module" id = "bat_super" // req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(4)) build_path = /obj/item/computer_hardware/battery_module/super /datum/design_techweb/modularcomponent/battery/ultra name = "ultra battery module" id = "bat_ultra" // req_tech = list(TECH_POWER = 5, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 16000) + materials = list(MAT_STEEL = MATERIAL_COST(8)) build_path = /obj/item/computer_hardware/battery_module/ultra /datum/design_techweb/modularcomponent/battery/nano name = "nano battery module" id = "bat_nano" // req_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/computer_hardware/battery_module/nano /datum/design_techweb/modularcomponent/battery/micro name = "micro battery module" id = "bat_micro" // req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/computer_hardware/battery_module/micro // Processor unit @@ -122,28 +122,28 @@ name = "computer processor unit" id = "cpu_normal" // req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(4)) build_path = /obj/item/computer_hardware/processor_unit /datum/design_techweb/modularcomponent/cpu/small name = "computer microprocessor unit" id = "cpu_small" // req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/computer_hardware/processor_unit/small /datum/design_techweb/modularcomponent/cpu/photonic name = "computer photonic processor unit" id = "pcpu_normal" // req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 32000, glass = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(16), glass = 8000) build_path = /obj/item/computer_hardware/processor_unit/photonic /datum/design_techweb/modularcomponent/cpu/photonic/small name = "computer photonic microprocessor unit" id = "pcpu_small" // req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 16000, glass = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(8), glass = 4000) build_path = /obj/item/computer_hardware/processor_unit/photonic/small // Other parts @@ -152,21 +152,21 @@ name = "RFID card slot" id = "cardslot" // req_tech = list(TECH_DATA = 2) - materials = list(MAT_STEEL = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5)) build_path = /obj/item/computer_hardware/card_slot /datum/design_techweb/modularcomponent/nanoprinter name = "nano printer" id = "nanoprinter" // req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5)) build_path = /obj/item/computer_hardware/nano_printer /datum/design_techweb/modularcomponent/teslalink name = "tesla link" id = "teslalink" // req_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/computer_hardware/tesla_link // Data crystals (USB flash drives) @@ -174,19 +174,19 @@ name = "basic data crystal" id = "portadrive_basic" // req_tech = list(TECH_DATA = 1) - materials = list(MAT_GLASS = 8000) + materials = list(MAT_GLASS = MATERIAL_COST(4)) build_path = /obj/item/computer_hardware/hard_drive/portable /datum/design_techweb/modularcomponent/portabledrive/advanced name = "advanced data crystal" id = "portadrive_advanced" // req_tech = list(TECH_DATA = 2) - materials = list(MAT_GLASS = 16000) + materials = list(MAT_GLASS = MATERIAL_COST(8)) build_path = /obj/item/computer_hardware/hard_drive/portable/advanced /datum/design_techweb/modularcomponent/portabledrive/super name = "super data crystal" id = "portadrive_super" // req_tech = list(TECH_DATA = 4) - materials = list(MAT_GLASS = 32000) + materials = list(MAT_GLASS = MATERIAL_COST(16)) build_path = /obj/item/computer_hardware/hard_drive/portable/super diff --git a/code/modules/research/tg/designs/multi-department_designs.dm b/code/modules/research/tg/designs/multi-department_designs.dm index 1959799d2ef..e8154725cbc 100644 --- a/code/modules/research/tg/designs/multi-department_designs.dm +++ b/code/modules/research/tg/designs/multi-department_designs.dm @@ -2,7 +2,7 @@ name = "Beaker" id = "beaker" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 500) + materials = list(MAT_GLASS = MATERIAL_COST(0.25)) category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY, @@ -14,7 +14,7 @@ name = "Large Beaker" id = "large_beaker" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 1000) + materials = list(MAT_GLASS = MATERIAL_COST(0.5)) category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY, @@ -26,7 +26,7 @@ name = "Vial" id = "vial" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 100) + materials = list(MAT_GLASS = MATERIAL_COST(0.05)) category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY, diff --git a/code/modules/research/tg/designs/prosfab_designs.dm b/code/modules/research/tg/designs/prosfab_designs.dm index 4cc31b4d280..fcd54826e8d 100644 --- a/code/modules/research/tg/designs/prosfab_designs.dm +++ b/code/modules/research/tg/designs/prosfab_designs.dm @@ -13,7 +13,7 @@ //////////////////// Prosthetics //////////////////// /datum/design_techweb/prosfab/pros/torso - materials = list(MAT_STEEL = 30000, MAT_GLASS = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(3.75)) var/gender = MALE /datum/design_techweb/prosfab/pros/torso/male @@ -38,7 +38,7 @@ name = "Prosthetic Head" id = "pros_head" build_path = /obj/item/organ/external/head - materials = list(MAT_STEEL = 18750, MAT_GLASS = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375), MAT_GLASS = MATERIAL_COST(1.875)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "head_m" @@ -46,7 +46,7 @@ name = "Prosthetic Left Arm" id = "pros_l_arm" build_path = /obj/item/organ/external/arm - materials = list(MAT_STEEL = 10125) + materials = list(MAT_STEEL = MATERIAL_COST(5.0625)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "l_arm" @@ -54,7 +54,7 @@ name = "Prosthetic Left Hand" id = "pros_l_hand" build_path = /obj/item/organ/external/hand - materials = list(MAT_STEEL = 3375) + materials = list(MAT_STEEL = MATERIAL_COST(1.6875)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "l_hand" @@ -62,7 +62,7 @@ name = "Prosthetic Right Arm" id = "pros_r_arm" build_path = /obj/item/organ/external/arm/right - materials = list(MAT_STEEL = 10125) + materials = list(MAT_STEEL = MATERIAL_COST(5.0625)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "r_arm" @@ -70,7 +70,7 @@ name = "Prosthetic Right Hand" id = "pros_r_hand" build_path = /obj/item/organ/external/hand/right - materials = list(MAT_STEEL = 3375) + materials = list(MAT_STEEL = MATERIAL_COST(1.6875)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "r_hand" @@ -78,7 +78,7 @@ name = "Prosthetic Left Leg" id = "pros_l_leg" build_path = /obj/item/organ/external/leg - materials = list(MAT_STEEL = 8437) + materials = list(MAT_STEEL = MATERIAL_COST(4.2185)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "l_leg" @@ -86,7 +86,7 @@ name = "Prosthetic Left Foot" id = "pros_l_foot" build_path = /obj/item/organ/external/foot - materials = list(MAT_STEEL = 2813) + materials = list(MAT_STEEL = MATERIAL_COST(1.4065)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "l_foot" @@ -94,7 +94,7 @@ name = "Prosthetic Right Leg" id = "pros_r_leg" build_path = /obj/item/organ/external/leg/right - materials = list(MAT_STEEL = 8437) + materials = list(MAT_STEEL = MATERIAL_COST(4.2185)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "r_leg" @@ -102,7 +102,7 @@ name = "Prosthetic Right Foot" id = "pros_r_foot" build_path = /obj/item/organ/external/foot/right - materials = list(MAT_STEEL = 2813) + materials = list(MAT_STEEL = MATERIAL_COST(1.4065)) research_icon = 'icons/mob/human_races/robotic.dmi' research_icon_state = "r_foot" @@ -115,79 +115,79 @@ name = "Prosthetic Powercell" id = "pros_cell" build_path = /obj/item/organ/internal/cell - materials = list(MAT_STEEL = 7500, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_GLASS = MATERIAL_COST(1.5)) /datum/design_techweb/prosfab/pros/internal/eyes name = "Prosthetic Eyes" id = "pros_eyes" build_path = /obj/item/organ/internal/eyes/robot - materials = list(MAT_STEEL = 5625, MAT_GLASS = 5625) + materials = list(MAT_STEEL = MATERIAL_COST(2.8125), MAT_GLASS = MATERIAL_COST(2.8125)) /datum/design_techweb/prosfab/pros/internal/hydraulic name = "Hydraulic Hub" id = "pros_hydraulic" build_path = /obj/item/organ/internal/heart/machine - materials = list(MAT_STEEL = 7500, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/prosfab/pros/internal/reagcycler name = "Reagent Cycler" id = "pros_reagcycler" build_path = /obj/item/organ/internal/stomach/machine - materials = list(MAT_STEEL = 7500, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/prosfab/pros/internal/heatsink name = "Heatsink" id = "pros_heatsink" build_path = /obj/item/organ/internal/robotic/heatsink - materials = list(MAT_STEEL = 7500, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/prosfab/pros/internal/diagnostic name = "Diagnostic Controller" id = "pros_diagnostic" build_path = /obj/item/organ/internal/robotic/diagnostic - materials = list(MAT_STEEL = 7500, MAT_PLASTIC = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_PLASTIC = MATERIAL_COST(1.5)) /datum/design_techweb/prosfab/pros/internal/heart name = "Prosthetic Heart" id = "pros_heart" build_path = /obj/item/organ/internal/heart - materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.8125), MAT_GLASS = MATERIAL_COST(0.5)) /datum/design_techweb/prosfab/pros/internal/lungs name = "Prosthetic Lungs" id = "pros_lung" build_path = /obj/item/organ/internal/lungs - materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.8125), MAT_GLASS = MATERIAL_COST(0.5)) /datum/design_techweb/prosfab/pros/internal/liver name = "Prosthetic Liver" id = "pros_liver" build_path = /obj/item/organ/internal/liver - materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.8125), MAT_GLASS = MATERIAL_COST(0.5)) /datum/design_techweb/prosfab/pros/internal/kidneys name = "Prosthetic Kidneys" id = "pros_kidney" build_path = /obj/item/organ/internal/kidneys - materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.8125), MAT_GLASS = MATERIAL_COST(0.5)) /datum/design_techweb/prosfab/pros/internal/spleen name = "Prosthetic Spleen" id = "pros_spleen" build_path = /obj/item/organ/internal/spleen - materials = list(MAT_STEEL = 3000, MAT_GLASS = 750) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.375)) /datum/design_techweb/prosfab/pros/internal/larynx name = "Prosthetic Larynx" id = "pros_larynx" build_path = /obj/item/organ/internal/voicebox - materials = list(MAT_STEEL = 2000, MAT_GLASS = 750, MAT_PLASTIC = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.375), MAT_PLASTIC = MATERIAL_COST(0.25)) /datum/design_techweb/prosfab/pros/internal/stomach name = "Prosthetic Stomach" id = "pros_stomach" build_path = /obj/item/organ/internal/stomach - materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.8125), MAT_GLASS = MATERIAL_COST(0.5)) //////////////////// Cyborg Parts //////////////////// /datum/design_techweb/prosfab/cyborg @@ -195,49 +195,49 @@ category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_COMPONENTS ) - materials = list(MAT_STEEL = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(1.875)) /datum/design_techweb/prosfab/cyborg/exoskeleton name = "Robot Exoskeleton" id = "robot_exoskeleton" build_path = /obj/item/robot_parts/robot_suit - materials = list(MAT_STEEL = 37500) + materials = list(MAT_STEEL = MATERIAL_COST(18.75)) /datum/design_techweb/prosfab/cyborg/torso name = "Robot Torso" id = "robot_torso" build_path = /obj/item/robot_parts/chest - materials = list(MAT_STEEL = 30000) + materials = list(MAT_STEEL = MATERIAL_COST(15)) /datum/design_techweb/prosfab/cyborg/head name = "Robot Head" id = "robot_head" build_path = /obj/item/robot_parts/head - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) /datum/design_techweb/prosfab/cyborg/l_arm name = "Robot Left Arm" id = "robot_l_arm" build_path = /obj/item/robot_parts/l_arm - materials = list(MAT_STEEL = 13500) + materials = list(MAT_STEEL = MATERIAL_COST(6.75)) /datum/design_techweb/prosfab/cyborg/r_arm name = "Robot Right Arm" id = "robot_r_arm" build_path = /obj/item/robot_parts/r_arm - materials = list(MAT_STEEL = 13500) + materials = list(MAT_STEEL = MATERIAL_COST(6.75)) /datum/design_techweb/prosfab/cyborg/l_leg name = "Robot Left Leg" id = "robot_l_leg" build_path = /obj/item/robot_parts/l_leg - materials = list(MAT_STEEL = 11250) + materials = list(MAT_STEEL = MATERIAL_COST(5.625)) /datum/design_techweb/prosfab/cyborg/r_leg name = "Robot Right Leg" id = "robot_r_leg" build_path = /obj/item/robot_parts/r_leg - materials = list(MAT_STEEL = 11250) + materials = list(MAT_STEEL = MATERIAL_COST(5.625)) //////////////////// Cyborg Internals //////////////////// @@ -246,7 +246,7 @@ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_INTERNALS ) build_type = PROSFAB - materials = list(MAT_STEEL = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75)) /datum/design_techweb/prosfab/cyborg/component/binary_communication_device name = "Binary Communication Device" @@ -294,42 +294,42 @@ id = "improved_radio" build_path = /obj/item/robot_parts/robot_component/radio/upgraded // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 10000, MAT_DIAMOND = 2000, MAT_PLASTEEL = 3000, MAT_GLASS = 6500, MAT_SILVER = 3000, MAT_MORPHIUM = 560, MAT_DURASTEEL = 800) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_DIAMOND = MATERIAL_COST(1), MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(3.25), MAT_SILVER = MATERIAL_COST(1.5), MAT_MORPHIUM = MATERIAL_COST(0.28), MAT_DURASTEEL = MATERIAL_COST(0.4)) /datum/design_techweb/prosfab/cyborg/component/actuator_upgraded name = "Improved Actuator" id = "improved_actuator" build_path = /obj/item/robot_parts/robot_component/actuator/upgraded // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 10000, MAT_PLASTEEL = 2500, MAT_MORPHIUM = 500, MAT_DURASTEEL = 500) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_PLASTEEL = MATERIAL_COST(1.25), MAT_MORPHIUM = MATERIAL_COST(0.25), MAT_DURASTEEL = MATERIAL_COST(0.25)) /datum/design_techweb/prosfab/cyborg/component/diagnosis_unit_upgraded name = "Improved Diagnosis Unit" id = "improved_diagnosis_unit" build_path = /obj/item/robot_parts/robot_component/diagnosis_unit/upgraded // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 10000, MAT_DIAMOND = 2000, MAT_URANIUM = 4000, MAT_PLASTEEL = 1000, MAT_GLASS = 400, MAT_SILVER = 1000, MAT_MORPHIUM = 420, MAT_DURASTEEL = 600) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_DIAMOND = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(2), MAT_PLASTEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.2), MAT_SILVER = MATERIAL_COST(0.5), MAT_MORPHIUM = MATERIAL_COST(0.21), MAT_DURASTEEL = MATERIAL_COST(0.3)) /datum/design_techweb/prosfab/cyborg/component/camera_upgraded name = "Improved Camera" id = "improved_camera" build_path = /obj/item/robot_parts/robot_component/camera/upgraded // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 10000, MAT_DIAMOND = 2000, MAT_PLASTEEL = 3000, MAT_GLASS = 6500, MAT_SILVER = 3000, MAT_MORPHIUM = 560, MAT_DURASTEEL = 800) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_DIAMOND = MATERIAL_COST(1), MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(3.25), MAT_SILVER = MATERIAL_COST(1.5), MAT_MORPHIUM = MATERIAL_COST(0.28), MAT_DURASTEEL = MATERIAL_COST(0.4)) /datum/design_techweb/prosfab/cyborg/component/binary_communication_device/upgraded name = "Improved Binary Communication Device" id = "improved_binary_communication_device" build_path = /obj/item/robot_parts/robot_component/binary_communication_device/upgraded // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 10000, MAT_DIAMOND = 2000, MAT_PLASTEEL = 3000, MAT_GLASS = 6500, MAT_GOLD = 3000, MAT_DURASTEEL = 800) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_DIAMOND = MATERIAL_COST(1), MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(3.25), MAT_GOLD = MATERIAL_COST(1.5), MAT_DURASTEEL = MATERIAL_COST(0.4)) /datum/design_techweb/prosfab/cyborg/component/armour_very_heavy name = "Armour Plating (Prototype)" id = "titan_armour" build_path = /obj/item/robot_parts/robot_component/armour/armour_titan // req_tech = list(TECH_MATERIAL = 9, TECH_PRECURSOR = 3) - materials = list(MAT_STEEL = 12000, MAT_MORPHIUM = 3000, MAT_DURASTEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(6), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_DURASTEEL = MATERIAL_COST(2.5)) //////////////////// Cyborg Modules //////////////////// @@ -338,7 +338,7 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_UTILITY ) build_type = PROSFAB - materials = list(MAT_STEEL = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75)) // Section for utility upgrades @@ -358,7 +358,7 @@ name = "Emergency Restart Module" desc = "Used to force a restart of a disabled-but-repaired robot, bringing it back online." id = "borg_restart_module" - materials = list(MAT_STEEL = 45000, MAT_GLASS = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(22.5), MAT_GLASS = MATERIAL_COST(1.875)) build_path = /obj/item/borg/upgrade/utility/restart // Section for basic upgrades for all cyborgs @@ -371,14 +371,14 @@ name = "Size Alteration Module" id = "borg_sizeshift_module" // req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/borg/upgrade/basic/sizeshift /datum/design_techweb/prosfab/robot_upgrade/basic/vtec name = "VTEC Module" desc = "Used to kick in a robot's VTEC systems, increasing their speed." id = "borg_vtec_module" - materials = list(MAT_STEEL = 60000, MAT_GLASS = 4500, MAT_GOLD = 3750) + materials = list(MAT_STEEL = MATERIAL_COST(30), MAT_GLASS = MATERIAL_COST(2.25), MAT_GOLD = MATERIAL_COST(1.875)) build_path = /obj/item/borg/upgrade/basic/vtec /datum/design_techweb/prosfab/robot_upgrade/basic/syndicate @@ -386,7 +386,7 @@ desc = "Allows for the construction of lethal upgrades for cyborgs." id = "borg_syndicate_module" // req_tech = list(TECH_COMBAT = 4, TECH_ILLEGAL = 3) - materials = list(MAT_STEEL = 7500, MAT_GLASS = 11250, MAT_DIAMOND = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_GLASS = MATERIAL_COST(5.625), MAT_DIAMOND = MATERIAL_COST(3.75)) build_path = /obj/item/borg/upgrade/basic/syndicate /datum/design_techweb/prosfab/robot_upgrade/basic/language @@ -394,7 +394,7 @@ desc = "Used to let cyborgs other than clerical or service speak a variety of languages." id = "borg_language_module" // req_tech = list(TECH_DATA = 6, TECH_MATERIAL = 6) - materials = list(MAT_STEEL = 25000, MAT_GLASS = 3000, MAT_GOLD = 350) + materials = list(MAT_STEEL = MATERIAL_COST(12.5), MAT_GLASS = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(0.175)) build_path = /obj/item/borg/upgrade/basic/language // Section for advanced upgrades for all cyborgs @@ -407,28 +407,28 @@ name = "Robohound Capacity Expansion Module" id = "borg_hound_capacity_module" // req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/borg/upgrade/advanced/bellysizeupgrade /datum/design_techweb/prosfab/robot_upgrade/advanced/sizegun name = "Size Gun Module" id = "borg_sizegun_module" // req_tech = list(TECH_COMBAT = 3, TECH_BLUESPACE = 3, TECH_MATERIAL = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 6000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/borg/upgrade/advanced/sizegun /datum/design_techweb/prosfab/robot_upgrade/advanced/jetpack name = "Jetpack Module" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." id = "borg_jetpack_module" - materials = list(MAT_STEEL = 7500, MAT_PHORON = 11250, MAT_URANIUM = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(3.75), MAT_PHORON = MATERIAL_COST(5.625), MAT_URANIUM = MATERIAL_COST(7.5)) build_path = /obj/item/borg/upgrade/advanced/jetpack /datum/design_techweb/prosfab/robot_upgrade/advanced/advhealth name = "Advanced Health Analyzer Module" desc = "An advanced health analyzer suitable for diagnosing more serious injuries." id = "borg_advhealth_module" - materials = list(MAT_STEEL = 10000, MAT_GLASS = 6500, MAT_DIAMOND = 350) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(3.25), MAT_DIAMOND = MATERIAL_COST(0.175)) build_path = /obj/item/borg/upgrade/advanced/advhealth /* @@ -443,7 +443,7 @@ name = "Robohound Capability Expansion Module" id = "borg_hound_capability_module" // req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 8000, MAT_GLASS = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(3)) build_path = /obj/item/borg/upgrade/restricted/bellycapupgrade /datum/design_techweb/prosfab/robot_upgrade/restricted/advrped @@ -454,7 +454,7 @@ desc = "Exactly the same as a standard Advanced RPED, but this one has mounting hardware for a Science Borg." id = "borg_advrped_module" // req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 6) - materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(5)) build_path = /obj/item/borg/upgrade/restricted/advrped /datum/design_techweb/prosfab/robot_upgrade/restricted/diamonddrill @@ -465,7 +465,7 @@ desc = "A mining drill with a diamond tip, made for use by Mining Borgs." id = "borg_ddrill_module" // req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 5, TECH_ENGINEERING = 5) - materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/borg/upgrade/restricted/diamonddrill /datum/design_techweb/prosfab/robot_upgrade/restricted/pka @@ -476,7 +476,7 @@ desc = "A mining weapon designed for clearing rocks and hostile wildlife. This model is equiped with a self upgrade system, allowing it to attach modules hands free." id = "borg_pka_module" // req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4) - materials = list(MAT_PLASTEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500, MAT_PLATINUM = 350) + materials = list(MAT_PLASTEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.25), MAT_PLATINUM = MATERIAL_COST(0.175)) build_path = /obj/item/borg/upgrade/restricted/pka /datum/design_techweb/prosfab/robot_upgrade/restricted/adv_scanner @@ -487,7 +487,7 @@ desc = "An upgrade module to improve the potency of the integrated ore scanner." id = "borg_adv_scanner_module" // req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 5, TECH_POWER = 4) - materials = list(MAT_STEEL = 6000, MAT_GLASS = 4000, MAT_GOLD = 2000, MAT_VERDANTIUM = 1500, MAT_DIAMOND = 350) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.175)) build_path = /obj/item/borg/upgrade/restricted/adv_scanner /datum/design_techweb/prosfab/robot_upgrade/restricted/adv_snatcher @@ -498,7 +498,7 @@ desc = "An upgrade module to expand the robot's sheet storage capacity." id = "borg_adv_snatcher_module" // req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 8, TECH_POWER = 6) - materials = list(MAT_STEEL = 12000, MAT_GLASS = 8000, MAT_PLASTEEL = 2000, MAT_DURASTEEL = 500, MAT_DIAMOND = 700) + materials = list(MAT_STEEL = MATERIAL_COST(6), MAT_GLASS = MATERIAL_COST(4), MAT_PLASTEEL = MATERIAL_COST(1), MAT_DURASTEEL = MATERIAL_COST(0.25), MAT_DIAMOND = MATERIAL_COST(0.35)) build_path = /obj/item/borg/upgrade/restricted/adv_snatcher /datum/design_techweb/prosfab/robot_upgrade/restricted/adv_mailbag @@ -508,7 +508,7 @@ name = "Mail Compartment Upgrade" desc = "An upgrade module to expand the robot's postage capacity." id = "borg_adv_mailbag" - materials = list(MAT_STEEL = 12000, MAT_GLASS = 8000, MAT_PLASTEEL = 2000, MAT_DURASTEEL = 500, MAT_DIAMOND = 700) + materials = list(MAT_STEEL = MATERIAL_COST(6), MAT_GLASS = MATERIAL_COST(4), MAT_PLASTEEL = MATERIAL_COST(1), MAT_DURASTEEL = MATERIAL_COST(0.25), MAT_DIAMOND = MATERIAL_COST(0.35)) build_path = /obj/item/borg/upgrade/restricted/adv_mailbag /datum/design_techweb/prosfab/robot_upgrade/restricted/tasercooler @@ -518,7 +518,7 @@ name = "Rapid Taser Cooling Module" desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate." id = "borg_taser_module" - materials = list(MAT_STEEL = 60000, MAT_GLASS = 4500, MAT_GOLD = 1500, MAT_DIAMOND = 375) + materials = list(MAT_STEEL = MATERIAL_COST(30), MAT_GLASS = MATERIAL_COST(2.25), MAT_GOLD = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.1875)) build_path = /obj/item/borg/upgrade/restricted/tasercooler // Synthmorph Bags. @@ -526,42 +526,42 @@ name = "Synthmorph Storage Bag" desc = "Used to store or slowly defragment an FBP." id = "misc_synth_bag" - materials = list(MAT_STEEL = 250, MAT_GLASS = 250, MAT_PLASTIC = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(0.125), MAT_GLASS = MATERIAL_COST(0.125), MAT_PLASTIC = MATERIAL_COST(1)) build_path = /obj/item/bodybag/cryobag/robobag /datum/design_techweb/prosfab/badge_nt name = "NanoTrasen Tag" desc = "Used to identify an empty NanoTrasen FBP." id = "misc_synth_bag_tag_nt" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag /datum/design_techweb/prosfab/badge_morph name = "Morpheus Tag" desc = "Used to identify an empty Morpheus FBP." id = "misc_synth_bag_tag_morph" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/morpheus /datum/design_techweb/prosfab/badge_wardtaka name = "Ward-Takahashi Tag" desc = "Used to identify an empty Ward-Takahashi FBP." id = "misc_synth_bag_tag_wardtaka" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/wardtaka /datum/design_techweb/prosfab/badge_zenghu name = "Zeng-Hu Tag" desc = "Used to identify an empty Zeng-Hu FBP." id = "misc_synth_bag_tag_zenghu" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/zenghu /datum/design_techweb/prosfab/badge_gilthari name = "Gilthari Tag" desc = "Used to identify an empty Gilthari FBP." id = "misc_synth_bag_tag_gilthari" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/gilthari // req_tech = list(TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_PHORON = 2) @@ -569,7 +569,7 @@ name = "Vey-Medical Tag" desc = "Used to identify an empty Vey-Medical FBP." id = "misc_synth_bag_tag_veymed" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/veymed // req_tech = list(TECH_MATERIAL = 3, TECH_ILLEGAL = 1, TECH_BIO = 4) @@ -577,28 +577,28 @@ name = "Hephaestus Tag" desc = "Used to identify an empty Hephaestus FBP." id = "misc_synth_bag_tag_heph" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/hephaestus /datum/design_techweb/prosfab/badge_grayson name = "Grayson Tag" desc = "Used to identify an empty Grayson FBP." id = "misc_synth_bag_tag_grayson" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/grayson /datum/design_techweb/prosfab/badge_xion name = "Xion Tag" desc = "Used to identify an empty Xion FBP." id = "misc_synth_bag_tag_xion" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_PLASTIC = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/xion /datum/design_techweb/prosfab/badge_bishop name = "Bishop Tag" desc = "Used to identify an empty Bishop FBP." id = "misc_synth_bag_tag_bishop" - materials = list(MAT_STEEL = 500, MAT_GLASS = 2000, MAT_PLASTIC = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(1), MAT_PLASTIC = MATERIAL_COST(0.25)) build_path = /obj/item/clothing/accessory/badge/corporate_tag/bishop // Replacement protean bits @@ -607,14 +607,14 @@ name = "Protean Orchestrator" id = "prot_orch" build_path = /obj/item/organ/internal/nano/orchestrator - materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_GOLD = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(1)) // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) /datum/design_techweb/prosfab/refactory name = "Protean Refactory" id = "prot_refact" build_path = /obj/item/organ/internal/nano/refactory - materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_GOLD = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(1)) // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) ///// pAI parts!!! @@ -625,7 +625,7 @@ category = list( RND_CATEGORY_PROSFAB_PAI ) - materials = list(MAT_STEEL = 1000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5)) /datum/design_techweb/prosfab/paiparts/cell name = "pAI Cell" @@ -664,7 +664,7 @@ /datum/design_techweb/disk build_type = IMPRINTER - materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 1000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5)) lathe_time_factor = 1.5 category = list( RND_CATEGORY_PROSFAB @@ -710,5 +710,5 @@ name = "Anomalous Particle Gun Module" desc = "An anomalous particle gun, for anomaly harvesting." id = "borg_anomgun_module" - materials = list(MAT_STEEL = 4000, MAT_GLASS = 3500, MAT_PHORON = 1500, MAT_DIAMOND = 1500, MAT_URANIUM = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1.75), MAT_PHORON = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(0.75)) build_path = /obj/item/borg/upgrade/restricted/anomalygun diff --git a/code/modules/research/tg/designs/service_designs.dm b/code/modules/research/tg/designs/service_designs.dm index 327faf5c29c..cfe8ccd846a 100644 --- a/code/modules/research/tg/designs/service_designs.dm +++ b/code/modules/research/tg/designs/service_designs.dm @@ -53,7 +53,7 @@ desc = "An ashtray." id = "ashtray" build_type = PROTOLATHE - materials = list(MAT_STEEL = 250) + materials = list(MAT_STEEL = MATERIAL_COST(0.125)) build_path = /obj/item/material/ashtray category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE @@ -65,7 +65,7 @@ desc = "An shinier ashtray." id = "glasstray" build_type = PROTOLATHE - materials = list(MAT_GLASS = 250) + materials = list(MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/material/ashtray/glass category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE @@ -79,7 +79,7 @@ desc = "A bottle for a water-cooler." id = "watercooler_bottle" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_PLASTIC = 2500) + materials = list(MAT_PLASTIC = MATERIAL_COST(1.25)) build_path = /obj/item/reagent_containers/glass/cooler_bottle category = list( RND_CATEGORY_INITIAL, @@ -92,7 +92,7 @@ desc = "Your standard drinking glass." id = "barglass_square" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 75) + materials = list(MAT_GLASS = MATERIAL_COST(0.0375)) build_path = /obj/item/reagent_containers/food/drinks/glass2/square category = list( RND_CATEGORY_INITIAL, @@ -105,7 +105,7 @@ desc = "Your standard drinking glass." id = "barglass_rocks" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 50) + materials = list(MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/reagent_containers/food/drinks/glass2/rocks category = list( RND_CATEGORY_INITIAL, @@ -118,7 +118,7 @@ desc = "Your standard drinking glass." id = "barglass_milkshake" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 40) + materials = list(MAT_GLASS = MATERIAL_COST(0.02)) build_path = /obj/item/reagent_containers/food/drinks/glass2/shake category = list( RND_CATEGORY_INITIAL, @@ -131,7 +131,7 @@ desc = "Your standard drinking glass." id = "barglass_cocktail" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 40) + materials = list(MAT_GLASS = MATERIAL_COST(0.02)) build_path = /obj/item/reagent_containers/food/drinks/glass2/cocktail category = list( RND_CATEGORY_INITIAL, @@ -144,7 +144,7 @@ desc = "Your standard drinking glass." id = "barglass_shot" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 15) + materials = list(MAT_GLASS = MATERIAL_COST(0.0075)) build_path = /obj/item/reagent_containers/food/drinks/glass2/shot category = list( RND_CATEGORY_INITIAL, @@ -157,7 +157,7 @@ desc = "Your standard drinking glass." id = "barglass_pint" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 150) + materials = list(MAT_GLASS = MATERIAL_COST(0.075)) build_path = /obj/item/reagent_containers/food/drinks/glass2/pint category = list( RND_CATEGORY_INITIAL, @@ -170,7 +170,7 @@ desc = "Your standard drinking glass." id = "barglass_mug" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 100) + materials = list(MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/reagent_containers/food/drinks/glass2/mug category = list( RND_CATEGORY_INITIAL, @@ -183,7 +183,7 @@ desc = "Your standard drinking glass." id = "barglass_wine" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 60) + materials = list(MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/reagent_containers/food/drinks/glass2/wine category = list( RND_CATEGORY_INITIAL, @@ -196,7 +196,7 @@ desc = "This glass changes shape and form depending on the drink inside... fancy!" id = "barglass_metaglass" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 625) + materials = list(MAT_GLASS = MATERIAL_COST(0.3125)) build_path = /obj/item/reagent_containers/food/drinks/metaglass category = list( RND_CATEGORY_INITIAL, @@ -209,7 +209,7 @@ desc = "This glass changes shape and form depending on the drink inside... fancy!" id = "barglass_metapint" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 625) + materials = list(MAT_GLASS = MATERIAL_COST(0.3125)) build_path = /obj/item/reagent_containers/food/drinks/metaglass/metapint category = list( RND_CATEGORY_INITIAL, @@ -222,7 +222,7 @@ desc = "Your standard drinking glass." id = "barglass_carafe" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 60) + materials = list(MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/reagent_containers/food/drinks/glass2/carafe category = list( RND_CATEGORY_INITIAL, @@ -234,7 +234,7 @@ name = "plastic pitcher" id = "barglass_pitcher" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_PLASTIC = 60) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.03)) build_path = /obj/item/reagent_containers/food/drinks/glass2/pitcher category = list( RND_CATEGORY_INITIAL, @@ -246,7 +246,7 @@ name = "coffee mug" id = "barglass_coffeemug" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 50) + materials = list(MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/reagent_containers/food/drinks/glass2/coffeemug category = list( RND_CATEGORY_INITIAL, @@ -259,7 +259,7 @@ desc = "A small empty jar." id = "barglass_jar" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_GLASS = 250) + materials = list(MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/glass_jar category = list( RND_CATEGORY_INITIAL, @@ -271,7 +271,7 @@ name = "ID Card" id = "idcard" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 100, MAT_GLASS = 100, MAT_PLASTIC = 300) + materials = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.05), MAT_PLASTIC = MATERIAL_COST(0.15)) build_path = /obj/item/card/id category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE @@ -283,7 +283,7 @@ desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." id = "cleaver" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 800) + materials = list(MAT_STEEL = MATERIAL_COST(0.4)) build_path = /obj/item/material/knife/butch category = list( RND_CATEGORY_INITIAL, @@ -296,7 +296,7 @@ desc = "A simple tool for rolling dough flat." id = "rollingpin" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_WOOD = 1000) + materials = list(MAT_WOOD = MATERIAL_COST(0.5)) build_path = /obj/item/material/kitchen/rollingpin category = list( RND_CATEGORY_INITIAL, @@ -309,7 +309,7 @@ desc = "A device for scanning items for cargo value." id = "cargo_scanner" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/cargo_scanner category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/tg/designs/stock_part_designs.dm b/code/modules/research/tg/designs/stock_part_designs.dm index 85a0c546549..f8042c44ac0 100644 --- a/code/modules/research/tg/designs/stock_part_designs.dm +++ b/code/modules/research/tg/designs/stock_part_designs.dm @@ -4,7 +4,7 @@ desc = "A tier 1 stock part used in the construction of various devices." id = "basic_matter_bin" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 80) + materials = list(MAT_STEEL = MATERIAL_COST(0.04)) build_path = /obj/item/stock_parts/matter_bin category = list( RND_CATEGORY_INITIAL, @@ -18,7 +18,7 @@ desc = "A tier 2 stock part used in the construction of various devices." id = "adv_matter_bin" build_type = PROTOLATHE - materials = list(MAT_STEEL = 80) + materials = list(MAT_STEEL = MATERIAL_COST(0.04)) build_path = /obj/item/stock_parts/matter_bin/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -32,7 +32,7 @@ id = "super_matter_bin" // req_tech = list(TECH_MATERIAL = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 80) + materials = list(MAT_STEEL = MATERIAL_COST(0.04)) build_path = /obj/item/stock_parts/matter_bin/super category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -46,7 +46,7 @@ id = "hyper_matter_bin" // req_tech = list(TECH_MATERIAL = 6, TECH_ARCANE = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 200, MAT_VERDANTIUM = 60, MAT_DURASTEEL = 75) + materials = list(MAT_STEEL = MATERIAL_COST(0.1), MAT_VERDANTIUM = MATERIAL_COST(0.03), MAT_DURASTEEL = MATERIAL_COST(0.0375)) build_path = /obj/item/stock_parts/matter_bin/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -60,7 +60,7 @@ id = "omni_matter_bin" // req_tech = list(TECH_MATERIAL = 7, TECH_PRECURSOR = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_PLASTEEL = 100, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_PLASTEEL = MATERIAL_COST(0.05), MAT_MORPHIUM = MATERIAL_COST(0.05), MAT_DURASTEEL = MATERIAL_COST(0.05)) build_path = /obj/item/stock_parts/matter_bin/omni category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -74,7 +74,7 @@ desc = "A tier 1 stock part used in the construction of various devices." id = "micro_manipulator" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 30) + materials = list(MAT_STEEL = MATERIAL_COST(0.015)) build_path = /obj/item/stock_parts/manipulator category = list( RND_CATEGORY_INITIAL, @@ -88,7 +88,7 @@ desc = "A tier 2 stock part used in the construction of various devices." id = "nano_mani" build_type = PROTOLATHE - materials = list(MAT_STEEL = 30) + materials = list(MAT_STEEL = MATERIAL_COST(0.015)) build_path = /obj/item/stock_parts/manipulator/nano category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -102,7 +102,7 @@ id = "pico_mani" // req_tech = list(TECH_MATERIAL = 5, TECH_DATA = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30) + materials = list(MAT_STEEL = MATERIAL_COST(0.015)) build_path = /obj/item/stock_parts/manipulator/pico category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -116,7 +116,7 @@ id = "hyper_mani" // req_tech = list(TECH_MATERIAL = 6, TECH_DATA = 3, TECH_ARCANE = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 200, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.1), MAT_VERDANTIUM = MATERIAL_COST(0.025), MAT_DURASTEEL = MATERIAL_COST(0.025)) build_path = /obj/item/stock_parts/manipulator/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -130,7 +130,7 @@ id = "omni_mani" // req_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4, TECH_PRECURSOR = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_PLASTEEL = 500, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_PLASTEEL = MATERIAL_COST(0.25), MAT_MORPHIUM = MATERIAL_COST(0.05), MAT_DURASTEEL = MATERIAL_COST(0.05)) build_path = /obj/item/stock_parts/manipulator/omni category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -144,7 +144,7 @@ desc = "A tier 1 stock part used in the construction of various devices." id = "basic_capacitor" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/stock_parts/capacitor category = list( RND_CATEGORY_INITIAL, @@ -158,7 +158,7 @@ desc = "A tier 2 stock part used in the construction of various devices." id = "adv_capacitor" build_type = PROTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/stock_parts/capacitor/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -172,7 +172,7 @@ id = "super_capacitor" build_type = PROTOLATHE // req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 50, MAT_GLASS = 50, MAT_GOLD = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025), MAT_GOLD = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/capacitor/super category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -186,7 +186,7 @@ id = "hyper_capacitor" build_type = PROTOLATHE // req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 1, TECH_ARCANE = 1) - materials = list(MAT_STEEL = 200, MAT_GLASS = 100, MAT_VERDANTIUM = 30, MAT_DURASTEEL = 25) + materials = list(MAT_STEEL = MATERIAL_COST(0.1), MAT_GLASS = MATERIAL_COST(0.05), MAT_VERDANTIUM = MATERIAL_COST(0.015), MAT_DURASTEEL = MATERIAL_COST(0.0125)) build_path = /obj/item/stock_parts/capacitor/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -200,7 +200,7 @@ id = "omni_capacitor" build_type = PROTOLATHE // req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 2000, MAT_DIAMOND = 1000, MAT_GLASS = 1000, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_MORPHIUM = MATERIAL_COST(0.05), MAT_DURASTEEL = MATERIAL_COST(0.05)) build_path = /obj/item/stock_parts/capacitor/omni category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -214,7 +214,7 @@ desc = "A tier 1 stock part used in the construction of various devices." id = "basic_sensor" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/scanning_module category = list( RND_CATEGORY_INITIAL, @@ -228,7 +228,7 @@ desc = "A tier 2 stock part used in the construction of various devices." id = "adv_sensor" build_type = PROTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/scanning_module/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -242,7 +242,7 @@ id = "phasic_sensor" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 10) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01), MAT_SILVER = MATERIAL_COST(0.005)) build_path = /obj/item/stock_parts/scanning_module/phasic category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -256,7 +256,7 @@ id = "hyper_sensor" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 4, TECH_ARCANE = 1) - materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 50, MAT_VERDANTIUM = 40, MAT_DURASTEEL = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01), MAT_SILVER = MATERIAL_COST(0.025), MAT_VERDANTIUM = MATERIAL_COST(0.02), MAT_DURASTEEL = MATERIAL_COST(0.025)) build_path = /obj/item/stock_parts/scanning_module/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -270,7 +270,7 @@ id = "omni_sensor" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 1000, MAT_PLASTEEL = 500, MAT_GLASS = 750, MAT_SILVER = 500, MAT_MORPHIUM = 60, MAT_DURASTEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_PLASTEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.375), MAT_SILVER = MATERIAL_COST(0.25), MAT_MORPHIUM = MATERIAL_COST(0.03), MAT_DURASTEEL = MATERIAL_COST(0.05)) build_path = /obj/item/stock_parts/scanning_module/omni category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -285,7 +285,7 @@ desc = "A tier 1 stock part used in the construction of various devices." id = "basic_micro_laser" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 10, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.005), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/micro_laser category = list( RND_CATEGORY_INITIAL, @@ -299,7 +299,7 @@ desc = "A tier 2 stock part used in the construction of various devices." id = "high_micro_laser" build_type = PROTOLATHE - materials = list(MAT_STEEL = 10, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.005), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/stock_parts/micro_laser/high category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -313,7 +313,7 @@ id = "ultra_micro_laser" // req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10, MAT_GLASS = 20, MAT_URANIUM = 10) + materials = list(MAT_STEEL = MATERIAL_COST(0.005), MAT_GLASS = MATERIAL_COST(0.01), MAT_URANIUM = MATERIAL_COST(0.005)) build_path = /obj/item/stock_parts/micro_laser/ultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -327,7 +327,7 @@ id = "hyper_micro_laser" // req_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 6, TECH_ARCANE = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 200, MAT_GLASS = 20, MAT_URANIUM = 30, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.1), MAT_GLASS = MATERIAL_COST(0.01), MAT_URANIUM = MATERIAL_COST(0.015), MAT_VERDANTIUM = MATERIAL_COST(0.025), MAT_DURASTEEL = MATERIAL_COST(0.05)) build_path = /obj/item/stock_parts/micro_laser/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -341,7 +341,7 @@ id = "omni_micro_laser" // req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 7, TECH_PRECURSOR = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 2000, MAT_MORPHIUM = 50, MAT_DURASTEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(0.025), MAT_DURASTEEL = MATERIAL_COST(0.05)) build_path = /obj/item/stock_parts/micro_laser/omni category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -355,7 +355,7 @@ desc = "A tier 1 power cell." id = "basic_cell" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 700, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/cell/empty category = list( RND_CATEGORY_INITIAL, @@ -368,7 +368,7 @@ desc = "A tier 2 power cell." id = "high_cell" build_type = PROTOLATHE - materials = list(MAT_STEEL = 700, MAT_GLASS = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/cell/high/empty category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -380,7 +380,7 @@ desc = "A tier 3 power cell." id = "super_cell" build_type = PROTOLATHE - materials = list(MAT_STEEL = 700, MAT_GLASS = 70) + materials = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.035)) build_path = /obj/item/cell/super/empty category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -393,7 +393,7 @@ id = "hyper_cell" // req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 400, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 70) + materials = list(MAT_STEEL = MATERIAL_COST(0.2), MAT_GOLD = MATERIAL_COST(0.075), MAT_SILVER = MATERIAL_COST(0.075), MAT_GLASS = MATERIAL_COST(0.035)) build_path = /obj/item/cell/hyper/empty category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -405,7 +405,7 @@ name = "Device Cell" id = "device_cell" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 350, MAT_GLASS = 25) + materials = list(MAT_STEEL = MATERIAL_COST(0.175), MAT_GLASS = MATERIAL_COST(0.0125)) build_path = /obj/item/cell/device/empty category = list( RND_CATEGORY_INITIAL, @@ -417,7 +417,7 @@ name = "Weapon Cell" id = "weapon_cell" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 700, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/cell/device/weapon/empty category = list( RND_CATEGORY_INITIAL, @@ -431,7 +431,7 @@ desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE - materials = list(MAT_STEEL = 15000, MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/storage/part_replacer category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -445,7 +445,7 @@ id = "arped" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5) - materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(5)) build_path = /obj/item/storage/part_replacer/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -459,7 +459,7 @@ id = "pbrped" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 5) - materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000, MAT_SILVER = 5000, MAT_GOLD = 5000, MAT_DIAMOND = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(5), MAT_SILVER = MATERIAL_COST(2.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(0.5)) build_path = /obj/item/storage/part_replacer/adv/discount_bluespace category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -473,7 +473,7 @@ id = "brped" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_PRECURSOR = 1) - materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000, MAT_SILVER = 5000, MAT_GOLD = 5000, MAT_DIAMOND = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(5), MAT_SILVER = MATERIAL_COST(2.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_DIAMOND = MATERIAL_COST(0.5)) build_path = /obj/item/storage/part_replacer/adv/bluespace category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -486,7 +486,7 @@ /datum/design_techweb/potato_cell name = "Potato Cell" id = "potato_cell" - materials = list(MAT_STEEL = 100, MAT_GLASS = 10) + materials = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.005)) build_path = /obj/item/cell/potato build_type = PROTOLATHE category = list( @@ -497,7 +497,7 @@ /datum/design_techweb/giga_cell name = "Giga-Capacity Cell" id = "giga_cell" - materials = list(MAT_STEEL = 1000, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 100, MAT_PHORON = 1000, MAT_DURASTEEL = 100, MAT_URANIUM = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.15), MAT_SILVER = MATERIAL_COST(0.15), MAT_GLASS = MATERIAL_COST(0.05), MAT_PHORON = MATERIAL_COST(0.5), MAT_DURASTEEL = MATERIAL_COST(0.05), MAT_URANIUM = MATERIAL_COST(0.05)) build_path = /obj/item/cell/giga/empty build_type = PROTOLATHE category = list( @@ -512,7 +512,7 @@ /datum/design_techweb/cell_device_empproof name = "Device Cell, EMP-Proof" id = "empproof_device" - materials = list(MAT_STEEL = 350, MAT_GLASS = 25, MAT_MORPHIUM = 25, MAT_PHORON = 25) + materials = list(MAT_STEEL = MATERIAL_COST(0.175), MAT_GLASS = MATERIAL_COST(0.0125), MAT_MORPHIUM = MATERIAL_COST(0.0125), MAT_PHORON = MATERIAL_COST(0.0125)) build_path = /obj/item/cell/device/empproof build_type = PROTOLATHE category = list( @@ -523,7 +523,7 @@ /datum/design_techweb/cell_advance_device_empproof name = "Device Cell, Advanced EMP-Proof" id = "empproof_advanced_device" - materials = list(MAT_STEEL = 700, MAT_GLASS = 50, MAT_MORPHIUM = 50, MAT_PHORON = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.025), MAT_MORPHIUM = MATERIAL_COST(0.025), MAT_PHORON = MATERIAL_COST(0.025)) build_path = /obj/item/cell/device/weapon/empproof build_type = PROTOLATHE category = list( @@ -534,7 +534,7 @@ /datum/design_techweb/cell_advance_device_recharge name = "Device Cell, Advanced Recharging" id = "recharging_advanced_device" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 400, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.2), MAT_DURASTEEL = MATERIAL_COST(0.05), MAT_METALHYDROGEN = MATERIAL_COST(0.1), MAT_VERDANTIUM = MATERIAL_COST(0.075), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/cell/device/weapon/recharge build_type = PROTOLATHE category = list( @@ -545,7 +545,7 @@ /datum/design_techweb/cell_super_device name = "Device Cell, Super" id = "super_device" - materials = list(MAT_STEEL = 700, MAT_GLASS = 70, MAT_GOLD = 50, MAT_SILVER = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.35), MAT_GLASS = MATERIAL_COST(0.035), MAT_GOLD = MATERIAL_COST(0.025), MAT_SILVER = MATERIAL_COST(0.01)) build_path = /obj/item/cell/device/super/empty build_type = PROTOLATHE category = list( @@ -556,7 +556,7 @@ /datum/design_techweb/cell_hype_device name = "Device Cell, Hyper" id = "hyper_device" - materials = list(MAT_STEEL = 1400, MAT_GLASS = 1400, MAT_GOLD = 150, MAT_SILVER = 150) + materials = list(MAT_STEEL = MATERIAL_COST(0.7), MAT_GLASS = MATERIAL_COST(0.7), MAT_GOLD = MATERIAL_COST(0.075), MAT_SILVER = MATERIAL_COST(0.075)) build_path = /obj/item/cell/device/hyper/empty build_type = PROTOLATHE category = list( @@ -567,7 +567,7 @@ /datum/design_techweb/cell_giga_device name = "Device Cell, Giga" id = "giga_device" - materials = list(MAT_STEEL = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_GLASS = 100, MAT_PHORON = 2000, MAT_DURASTEEL = 200, MAT_URANIUM = 200) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.05), MAT_PHORON = MATERIAL_COST(1), MAT_DURASTEEL = MATERIAL_COST(0.1), MAT_URANIUM = MATERIAL_COST(0.1)) build_path = /obj/item/cell/device/giga/empty build_type = PROTOLATHE category = list( @@ -579,7 +579,7 @@ name = "Device Cell, Omni" build_type = PROTOLATHE id = "omni-device" - materials = list(MAT_STEEL = 1700, MAT_GLASS = 550, MAT_DURASTEEL = 230, MAT_MORPHIUM = 320, MAT_METALHYDROGEN = 600, MAT_URANIUM = 60, MAT_VERDANTIUM = 150, MAT_PHORON = 900) + materials = list(MAT_STEEL = MATERIAL_COST(0.85), MAT_GLASS = MATERIAL_COST(0.275), MAT_DURASTEEL = MATERIAL_COST(0.115), MAT_MORPHIUM = MATERIAL_COST(0.16), MAT_METALHYDROGEN = MATERIAL_COST(0.3), MAT_URANIUM = MATERIAL_COST(0.03), MAT_VERDANTIUM = MATERIAL_COST(0.075), MAT_PHORON = MATERIAL_COST(0.45)) build_path = /obj/item/cell/device/weapon/recharge/alien/omni build_type = PROTOLATHE category = list( @@ -592,7 +592,7 @@ name = "Superconductive Magnetic Coil" build_type = PROTOLATHE id = "smes_magnetic_coil" - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_COPPER = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2), MAT_COPPER = MATERIAL_COST(1)) build_path = /obj/item/smes_coil category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 @@ -603,7 +603,7 @@ name = "Superconductive Capacity Coil" build_type = PROTOLATHE id = "smes_cap_basic" - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(1)) build_path = /obj/item/smes_coil/super_capacity category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -614,7 +614,7 @@ name = "Ultraconductive Capacity Coil" build_type = PROTOLATHE id = "smes_cap_ultra" - materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_GOLD = 5000, MAT_SILVER = 5000, MAT_DURASTEEL = 3000, MAT_METALHYDROGEN = 2000, MAT_VERDANTIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(3), MAT_GOLD = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(2.5), MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1)) build_path = /obj/item/smes_coil/super_capacity/ultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -625,7 +625,7 @@ name = "Hyperconductive Capacity Coil" build_type = PROTOLATHE id = "smes_cap_hyper" - materials = list(MAT_STEEL = 15000, MAT_GLASS = 9000, MAT_GOLD = 7500, MAT_SILVER = 7500, MAT_DURASTEEL = 4500, MAT_METALHYDROGEN = 3000, MAT_VERDANTIUM = 3000, MAT_MORPHIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(4.5), MAT_GOLD = MATERIAL_COST(3.75), MAT_SILVER = MATERIAL_COST(3.75), MAT_DURASTEEL = MATERIAL_COST(2.25), MAT_METALHYDROGEN = MATERIAL_COST(1.5), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_MORPHIUM = MATERIAL_COST(1)) build_path = /obj/item/smes_coil/super_capacity/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -636,7 +636,7 @@ name = "Superconductive Transmission Coil" build_type = PROTOLATHE id = "smes_trans_basic" - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_SILVER = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2), MAT_SILVER = MATERIAL_COST(2)) build_path = /obj/item/smes_coil/super_io category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -647,7 +647,7 @@ name = "Ultraconductive Transmission Coil" build_type = PROTOLATHE id = "smes_trans_ultra" - materials = list(MAT_STEEL = 6000, MAT_GLASS = 4000, MAT_GOLD = 6000, MAT_SILVER = 6000, MAT_DURASTEEL = 2000, MAT_METALHYDROGEN = 2000, MAT_VERDANTIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(2), MAT_GOLD = MATERIAL_COST(3), MAT_SILVER = MATERIAL_COST(3), MAT_DURASTEEL = MATERIAL_COST(1), MAT_METALHYDROGEN = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1)) build_path = /obj/item/smes_coil/super_io/ultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -658,7 +658,7 @@ name = "Hyperconductive Transmission Coil" build_type = PROTOLATHE id = "smes_trans_hyper" - materials = list(MAT_STEEL = 9000, MAT_GLASS = 6000, MAT_GOLD = 9000, MAT_SILVER = 9000, MAT_DURASTEEL = 3000, MAT_METALHYDROGEN = 3000, MAT_VERDANTIUM = 3000, MAT_MORPHIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(4.5), MAT_GLASS = MATERIAL_COST(3), MAT_GOLD = MATERIAL_COST(4.5), MAT_SILVER = MATERIAL_COST(4.5), MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(1.5), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_MORPHIUM = MATERIAL_COST(1)) build_path = /obj/item/smes_coil/super_io/hyper category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 @@ -670,7 +670,7 @@ name = "console screen" build_type = PROTOLATHE | AUTOLATHE id = "console_screen" - materials = list(MAT_GLASS = 250) + materials = list(MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/stock_parts/console_screen category = list( RND_CATEGORY_INITIAL, @@ -682,7 +682,7 @@ name = "motor" build_type = PROTOLATHE | AUTOLATHE id = "motor" - materials = list(MAT_STEEL = 75, MAT_GLASS = 15) + materials = list(MAT_STEEL = MATERIAL_COST(0.0375), MAT_GLASS = MATERIAL_COST(0.0075)) build_path = /obj/item/stock_parts/motor category = list( RND_CATEGORY_INITIAL, @@ -694,7 +694,7 @@ name = "gear" build_type = PROTOLATHE | AUTOLATHE id = "gear" - materials = list(MAT_STEEL = 65) + materials = list(MAT_STEEL = MATERIAL_COST(0.0325)) build_path = /obj/item/stock_parts/gear category = list( RND_CATEGORY_INITIAL, @@ -706,7 +706,7 @@ name = "spring" build_type = PROTOLATHE | AUTOLATHE id = "spring" - materials = list(MAT_STEEL = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025)) build_path = /obj/item/stock_parts/spring category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/tg/designs/tool_designs.dm b/code/modules/research/tg/designs/tool_designs.dm index 0bbc58515b4..80273521328 100644 --- a/code/modules/research/tg/designs/tool_designs.dm +++ b/code/modules/research/tg/designs/tool_designs.dm @@ -3,7 +3,7 @@ desc = "A steel bar with a wedge, designed specifically for opening unpowered doors in an emergency." id = "prybar" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 40) + materials = list(MAT_STEEL = MATERIAL_COST(0.02)) build_path = /obj/item/tool/prybar category = list( RND_CATEGORY_INITIAL, @@ -16,7 +16,7 @@ desc = "A steel bar with a wedge, designed specifically for opening unpowered doors in an emergency." id = "crowbar" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.03)) build_path = /obj/item/tool/crowbar category = list( RND_CATEGORY_INITIAL, @@ -29,7 +29,7 @@ desc = "Used for pulsing wires to test which to cut." id = "multitool" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 60, MAT_GLASS = 25) + materials = list(MAT_STEEL = MATERIAL_COST(0.03), MAT_GLASS = MATERIAL_COST(0.0125)) build_path = /obj/item/multitool category = list( RND_CATEGORY_INITIAL, @@ -42,7 +42,7 @@ desc = "A miniature welder used during emergencies." id = "mini_welding_tool" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 50, MAT_GLASS = 30) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.015)) build_path = /obj/item/weldingtool/mini category = list( RND_CATEGORY_INITIAL, @@ -55,7 +55,7 @@ desc = "Used to repair machinery, or cut through plating." id = "welding_tool" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 90, MAT_GLASS = 40) + materials = list(MAT_STEEL = MATERIAL_COST(0.045), MAT_GLASS = MATERIAL_COST(0.02)) build_path = /obj/item/weldingtool category = list( RND_CATEGORY_INITIAL, @@ -68,7 +68,7 @@ desc = "A slightly larger welder with a larger tank." id = "large_welding_tool" build_type = PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 250) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/weldingtool/largetank category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -80,7 +80,7 @@ desc = "You can be totally screwwy with this." id = "screwdriver" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 90) + materials = list(MAT_STEEL = MATERIAL_COST(0.045)) build_path = /obj/item/tool/screwdriver category = list( RND_CATEGORY_INITIAL, @@ -93,7 +93,7 @@ desc = "This cuts wires." id = "wirecutters" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.05)) build_path = /obj/item/tool/wirecutters category = list( RND_CATEGORY_INITIAL, @@ -106,7 +106,7 @@ desc = "A wrench with many common uses." id = "wrench" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.1)) build_path = /obj/item/tool/wrench category = list( RND_CATEGORY_INITIAL, @@ -119,7 +119,7 @@ desc = "It's used for removing weeds or scratching your back." id = "spade" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 625) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125)) build_path = /obj/item/material/minihoe category = list( RND_CATEGORY_INITIAL, @@ -132,7 +132,7 @@ desc = "A traditional red fire extinguisher." id = "fire_extinguisher" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 120) + materials = list(MAT_STEEL = MATERIAL_COST(0.06)) build_path = /obj/item/extinguisher category = list( RND_CATEGORY_INITIAL, @@ -145,7 +145,7 @@ desc = "Used to talk to people when headsets don't function. Range is limited." id = "bounced_radio" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 90, MAT_GLASS = 30) + materials = list(MAT_STEEL = MATERIAL_COST(0.045), MAT_GLASS = MATERIAL_COST(0.015)) build_path = /obj/item/radio/off category = list( RND_CATEGORY_INITIAL, @@ -158,7 +158,7 @@ desc = "Used to set the destination of properly wrapped packages." id = "desttagger" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 250, MAT_GLASS = 125) + materials = list(MAT_STEEL = MATERIAL_COST(0.125), MAT_GLASS = MATERIAL_COST(0.0625)) build_path = /obj/item/destTagger category = list( RND_CATEGORY_INITIAL, @@ -171,7 +171,7 @@ desc = "A hand-held emergency light." id = "flashlight" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 60, MAT_GLASS = 25) + materials = list(MAT_STEEL = MATERIAL_COST(0.03), MAT_GLASS = MATERIAL_COST(0.0125)) build_path = /obj/item/flashlight category = list( RND_CATEGORY_INITIAL, @@ -184,7 +184,7 @@ desc = "A very, very heavy duty flashlight." id = "maglight" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 250, MAT_GLASS = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.125), MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/flashlight/maglight category = list( RND_CATEGORY_INITIAL, @@ -197,7 +197,7 @@ desc = "A device that can record to cassette tapes, and play them. It automatically translates the content in playback." id = "taperecorder" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 75, MAT_GLASS = 40) + materials = list(MAT_STEEL = MATERIAL_COST(0.0375), MAT_GLASS = MATERIAL_COST(0.02)) build_path = /obj/item/taperecorder category = list( RND_CATEGORY_INITIAL, @@ -210,7 +210,7 @@ desc = "A magnetic tape that can hold up to ten minutes of content." id = "recordingcassette" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 25, MAT_GLASS = 15) + materials = list(MAT_STEEL = MATERIAL_COST(0.0125), MAT_GLASS = MATERIAL_COST(0.0075)) build_path = /obj/item/rectape/random category = list( RND_CATEGORY_INITIAL, @@ -223,7 +223,7 @@ desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." id = "hatchet" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_PLASTEEL = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(0.25)) build_path = /obj/item/material/knife/machete/hatchet category = list( RND_CATEGORY_INITIAL, @@ -236,7 +236,7 @@ desc = "It's a bucket." id = "bucket" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.1)) build_path = /obj/item/reagent_containers/glass/bucket category = list( RND_CATEGORY_INITIAL, @@ -249,7 +249,7 @@ desc = "The world of janitalia wouldn't be complete without a mop." id = "mop" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 250) + materials = list(MAT_STEEL = MATERIAL_COST(0.125)) build_path = /obj/item/mop category = list( RND_CATEGORY_INITIAL, @@ -262,7 +262,7 @@ desc = "An advanced mop with pressured water jets that break away the toughest stains." id = "advmop" build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 2000, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/mop/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -274,7 +274,7 @@ desc = "A device to automatically replace lights. Refill with working lightbulbs. Can also recycle broken bulbs, but this requires several broken bulbs to make a functioning one." id = "light_replacer" build_type = PROTOLATHE - materials = list(MAT_STEEL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_SILVER = MATERIAL_COST(0.075), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/lightreplacer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -286,7 +286,7 @@ desc = "A device to configure the emission color of lighting fixtures. For those moodier moments, or just making the bar into a clown-vomit hellscape." id = "light_painter" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.75)) build_path = /obj/item/lightpainter category = list( RND_CATEGORY_INITIAL, @@ -299,7 +299,7 @@ desc = "A spray bottle, with an unscrewable top." id = "spraybottle" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_PLASTIC = 2000) + materials = list(MAT_PLASTIC = MATERIAL_COST(1)) build_path = /obj/item/reagent_containers/spray category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -311,7 +311,7 @@ desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off." id = "beartrap" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) build_path = /obj/item/beartrap category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -321,7 +321,7 @@ name = "spring trap kit" desc = "A mechanically activated spring trap. Low-tech, but reliable." build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 18750) + materials = list(MAT_STEEL = MATERIAL_COST(9.375)) id = "springtrap" build_path = /obj/item/spring_trap_kit category = list( @@ -334,7 +334,7 @@ id = "expwelder" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3, TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 70, MAT_GLASS = 120, MAT_PHORON = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06), MAT_PHORON = MATERIAL_COST(0.05)) build_path = /obj/item/weldingtool/experimental category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -347,7 +347,7 @@ id = "handdrill" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 300, MAT_SILVER = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.15), MAT_SILVER = MATERIAL_COST(0.05)) build_path = /obj/item/tool/transforming/powerdrill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -360,7 +360,7 @@ id = "jawslife" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 300, MAT_SILVER = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.15), MAT_SILVER = MATERIAL_COST(0.05)) build_path = /obj/item/tool/transforming/jawsoflife category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -373,7 +373,7 @@ id = "rapidpipedispenser" build_type = AUTOLATHE | PROTOLATHE // req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/pipe_dispenser category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -386,7 +386,7 @@ id = "qpad_booster" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 6) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/quantum_pad_booster category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -399,7 +399,7 @@ id = "tscanner" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.1)) build_path = /obj/item/t_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -412,7 +412,7 @@ id = "upgradedtscanner" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 500, MAT_PHORON = 150) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.075)) build_path = /obj/item/t_scanner/upgraded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -425,7 +425,7 @@ id = "advancedtscanner" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6, TECH_MATERIAL = 6) - materials = list(MAT_STEEL = 1250, MAT_PHORON = 500, MAT_SILVER = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.625), MAT_PHORON = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.025)) build_path = /obj/item/t_scanner/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -438,7 +438,7 @@ id = "atmosanalyzer" build_type = PROTOLATHE // req_tech = list(TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 200, MAT_GLASS = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.1), MAT_GLASS = MATERIAL_COST(0.05)) build_path = /obj/item/analyzer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -450,7 +450,7 @@ desc = "A personal device used to enable long range dialog between two people." id = "communicator" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/communicator category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -462,7 +462,7 @@ desc = "A tool for inductively charging internal power cells." id = "inducersci" build_type = PROTOLATHE - materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(2), MAT_PHORON = MATERIAL_COST(2)) build_path = /obj/item/inducer/sci category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -474,7 +474,7 @@ desc = "A tool for inductively charging internal power cells." id = "inducerind" build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1), MAT_TITANIUM = MATERIAL_COST(1)) build_path = /obj/item/inducer/unloaded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -487,7 +487,7 @@ id = "splitbeaker" // req_tech = list(TECH_MATERIAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5)) build_path = /obj/item/reagent_containers/glass/beaker/noreact category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -500,7 +500,7 @@ id = "bluespacebeaker" // req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_PHORON = 3000, MAT_DIAMOND = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_PHORON = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.25)) build_path = /obj/item/reagent_containers/glass/beaker/bluespace category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -513,7 +513,7 @@ id = "anrt" // req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 3000, MAT_URANIUM = 2000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1.5), MAT_URANIUM = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/nifrepairer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -527,7 +527,7 @@ id = "mass_spectrometer" // req_tech = list(TECH_BIO = 2, TECH_MAGNET = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/mass_spectrometer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -540,7 +540,7 @@ id = "adv_mass_spectrometer" // req_tech = list(TECH_BIO = 2, TECH_MAGNET = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/mass_spectrometer/adv category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -553,7 +553,7 @@ id = "reagent_scanner" // req_tech = list(TECH_BIO = 2, TECH_MAGNET = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/reagent_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -566,7 +566,7 @@ id = "adv_reagent_scanner" // req_tech = list(TECH_BIO = 2, TECH_MAGNET = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + materials = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.01)) build_path = /obj/item/reagent_scanner/adv category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -579,7 +579,7 @@ id = "robot_scanner" // req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 200) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.1)) build_path = /obj/item/robotanalyzer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -592,7 +592,7 @@ id = "nanopaste" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 7000, MAT_GLASS = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_GLASS = MATERIAL_COST(3.5)) build_path = /obj/item/stack/nanopaste category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -605,7 +605,7 @@ id = "plant_analyzer" // req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/analyzer/plant_analyzer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE @@ -618,7 +618,7 @@ id = "drill" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners. + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(0.25)) //expensive, but no need for miners. build_path = /obj/item/pickaxe/drill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -630,7 +630,7 @@ id = "advanced_drill" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners. + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(0.5)) //expensive, but no need for miners. build_path = /obj/item/pickaxe/advdrill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -642,7 +642,7 @@ id = "jackhammer" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.25)) build_path = /obj/item/pickaxe/jackhammer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -654,7 +654,7 @@ id = "plasmacutter" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.25)) build_path = /obj/item/pickaxe/plasmacutter category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -666,7 +666,7 @@ id = "pick_diamond" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 6) - materials = list(MAT_DIAMOND = 3000) + materials = list(MAT_DIAMOND = MATERIAL_COST(1.5)) build_path = /obj/item/pickaxe/diamond category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -678,7 +678,7 @@ id = "drill_diamond" build_type = PROTOLATHE // req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/pickaxe/diamonddrill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -693,7 +693,7 @@ id = "depth_scanner" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 1000,MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(0.5),MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/depth_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -705,7 +705,7 @@ id = "mining_scanner" build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1) - materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5),MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/mining_scanner/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -720,7 +720,7 @@ build_type = PROTOLATHE // req_tech = list(TECH_MAGNET = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 100, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/laser_pointer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -733,7 +733,7 @@ build_type = PROTOLATHE // req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/universal_translator category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -746,7 +746,7 @@ build_type = PROTOLATHE // req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(1)) build_path = /obj/item/spaceflare category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -758,7 +758,7 @@ id = "motion_tracker" // req_tech = list(TECH_MAGNET = 1, TECH_DATA = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25)) build_path = /obj/item/motiontracker category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -770,7 +770,7 @@ id = "slime_scanner" // req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/slime_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -783,7 +783,7 @@ id = "slime_grinder" // req_tech = list(TECH_MAGNET = 4, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 200, MAT_GLASS = 200, MAT_SILVER = 500, MAT_GOLD = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.1), MAT_GLASS = MATERIAL_COST(0.1), MAT_SILVER = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.05)) build_path = /obj/item/slime_grinder category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -797,7 +797,7 @@ desc = "Aids in triangulation of exotic particles." // req_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000,MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(5),MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/ano_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -810,7 +810,7 @@ // req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3) build_type = PROTOLATHE build_path = /obj/item/xenoarch_multi_tool - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_URANIUM = 500, MAT_PHORON = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.25)) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC ) @@ -821,7 +821,7 @@ id = "excavationdrill" // req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/pickaxe/excavationdrill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -833,7 +833,7 @@ id = "anobattery-basic" // req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 4, TECH_ENGINEERING = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(3)) build_path = /obj/item/anobattery category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -845,7 +845,7 @@ id = "anobattery-moderate" // req_tech = list(TECH_MATERIAL = 5, TECH_POWER = 4, TECH_ENGINEERING = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 2000) //Same object, different materials + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(1)) //Same object, different materials build_path = /obj/item/anobattery/moderate category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -857,7 +857,7 @@ id = "anobattery-advanced" // req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_ENGINEERING = 5, TECH_BLUESPACE = 5, TECH_DATA = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2500, MAT_GLASS = 2500, MAT_SILVER = 2000, MAT_GOLD = 2500, MAT_PHORON = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(1.25), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(1.25), MAT_PHORON = MATERIAL_COST(1.25)) build_path = /obj/item/anobattery/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -869,7 +869,7 @@ id = "anobattery-exotic" // req_tech = list(TECH_MATERIAL = 8, TECH_POWER = 7, TECH_ENGINEERING = 6, TECH_BLUESPACE = 6, TECH_DATA = 6, TECH_PRECURSOR = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 1500, MAT_GLASS = 1500, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_PHORON = 2000, MAT_DIAMOND = 2000, MAT_MORPHIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(0.75), MAT_SILVER = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(0.75), MAT_PHORON = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1)) build_path = /obj/item/anobattery/exotic category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MISC @@ -883,7 +883,7 @@ id = "hybridcrowbar" // req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) build_type = PROTOLATHE - materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_GOLD = 250, MAT_URANIUM = 2500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_GOLD = MATERIAL_COST(0.125), MAT_URANIUM = MATERIAL_COST(1.25)) build_path = /obj/item/tool/crowbar/hybrid category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN @@ -896,7 +896,7 @@ id = "hybridwrench" // req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 3, TECH_PRECURSOR = 1) build_type = PROTOLATHE - materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_SILVER = 300, MAT_URANIUM = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_SILVER = MATERIAL_COST(0.15), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/tool/wrench/hybrid category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN @@ -909,7 +909,7 @@ id = "hybridscrewdriver" // req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 3, TECH_PRECURSOR = 1) build_type = PROTOLATHE - materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_PLASTIC = 8000, MAT_DIAMOND = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(4), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/tool/screwdriver/hybrid category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN @@ -922,7 +922,7 @@ id = "hybridwirecutters" // req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_PHORON = 2, TECH_PRECURSOR = 1) build_type = PROTOLATHE - materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_PLASTIC = 8000, MAT_PHORON = 2750, MAT_DIAMOND = 2000) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1.5), MAT_PLASTIC = MATERIAL_COST(4), MAT_PHORON = MATERIAL_COST(1.375), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/tool/wirecutters/hybrid category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN @@ -935,7 +935,7 @@ id = "hybridwelder" // req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PHORON = 3, TECH_MAGNET = 5, TECH_PRECURSOR = 1) build_type = PROTOLATHE - materials = list(MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_METALHYDROGEN = 4750, MAT_URANIUM = 6000) + materials = list(MAT_DURASTEEL = MATERIAL_COST(1), MAT_MORPHIUM = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(2.375), MAT_URANIUM = MATERIAL_COST(3)) build_path = /obj/item/weldingtool/experimental/hybrid category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN @@ -948,7 +948,7 @@ id = "hunt_trap" // req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_PHORON = 2, TECH_ARCANE = 2) build_type = PROTOLATHE - materials = list(MAT_DURASTEEL = 3000, MAT_METALHYDROGEN = 1000, MAT_PHORON = 2000) + materials = list(MAT_DURASTEEL = MATERIAL_COST(1.5), MAT_METALHYDROGEN = MATERIAL_COST(0.5), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/beartrap/hunting category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY @@ -959,7 +959,7 @@ name = "Protean Reboot Programmer" id = "protean_reboot" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_PLASTEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.5), MAT_PLASTEEL = MATERIAL_COST(5)) build_path = /obj/item/protean_reboot category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC @@ -972,7 +972,7 @@ id = "tk_gloves" // req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 4) build_type = PROTOLATHE - materials = list(MAT_VERDANTIUM = 1000, MAT_SILVER = 300, MAT_PLASTEEL = 1000) + materials = list(MAT_VERDANTIUM = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.15), MAT_PLASTEEL = MATERIAL_COST(0.5)) build_path = /obj/item/clothing/gloves/telekinetic category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED @@ -983,7 +983,7 @@ /datum/design_techweb/mail_scanner name = "Mail Scanner" id = "mail_scanner" - materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/mail_scanner build_type = PROTOLATHE category = list( @@ -994,7 +994,7 @@ /datum/design_techweb/atmos_holosign name = "Atmos Holosign" id = "atmos_holosign" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/holosign_creator/combifan build_type = PROTOLATHE category = list( @@ -1006,7 +1006,7 @@ name = "Confetti Cannon" desc = "Stuff it with paper and shoot! You'll be a hit at every party." id = "confetti_cannon" - materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/gun/launcher/confetti_cannon build_type = PROTOLATHE category = list( @@ -1018,7 +1018,7 @@ /datum/design_techweb/floor_painter name = "Floor Painter" id = "floor_painter" - materials = list(MAT_STEEL = 3000, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/floor_painter build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1030,7 +1030,7 @@ /datum/design_techweb/medical_holosign name = "Medical Holosign" id = "medical_holosign" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/holosign_creator/medical build_type = PROTOLATHE category = list( @@ -1042,7 +1042,7 @@ name = "handcuffs" desc = "Use this to keep prisoners in line." id = "handcuffs" - materials = list(MAT_STEEL = 625) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125)) build_path = /obj/item/handcuffs build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1054,7 +1054,7 @@ name = "legcuffs" desc = "Use this to keep prisoners in line." id = "legcuffs" - materials = list(MAT_STEEL = 625) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125)) build_path = /obj/item/handcuffs/legcuffs build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1066,7 +1066,7 @@ name = "fuzzy legcuffs" desc = "Use this to keep... 'prisoners' in line." id = "legcuffs_fuzzy" - materials = list(MAT_STEEL = 625) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125)) build_path = /obj/item/handcuffs/legcuffs/fuzzy build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1079,7 +1079,7 @@ name = "kitchen knife" desc = "A general purpose " + JOB_CHEF + "'s knife." id = "kitchen_knife" - materials = list(MAT_STEEL = 375) + materials = list(MAT_STEEL = MATERIAL_COST(0.1875)) build_path = /obj/item/material/knife build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1092,7 +1092,7 @@ name = "fork" desc = "It's a fork. Sure is pointy." id = "fork" - materials = list(MAT_STEEL = 75) + materials = list(MAT_STEEL = MATERIAL_COST(0.0375)) build_path = /obj/item/material/kitchen/utensil/fork build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1105,7 +1105,7 @@ name = "spoon" desc = "It's a spoon." id = "spoon" - materials = list(MAT_STEEL = 75) + materials = list(MAT_STEEL = MATERIAL_COST(0.0375)) build_path = /obj/item/material/kitchen/utensil/spoon build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1118,7 +1118,7 @@ name = "plastic knife" desc = "A simple plastic knife." id = "plastic_knife" - materials = list(MAT_PLASTIC = 75) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.0375)) build_path = /obj/item/material/knife/plastic build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1131,7 +1131,7 @@ name = "plastic fork" desc = "It's a plastic fork. Sure is pointy." id = "plastic_fork" - materials = list(MAT_PLASTIC = 75) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.0375)) build_path = /obj/item/material/kitchen/utensil/fork/plastic build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1144,7 +1144,7 @@ name = "plastic spoon" desc = "It's a plastic spoon." id = "plastic_spoon" - materials = list(MAT_PLASTIC = 75) + materials = list(MAT_PLASTIC = MATERIAL_COST(0.0375)) build_path = /obj/item/material/kitchen/utensil/spoon/plastic build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1157,7 +1157,7 @@ name = "barbedwire" desc = "A coil of wire." id = "barbedwire" - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/material/barbedwire build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1170,7 +1170,7 @@ name = "snare wire" desc = "A coil of plastic snares." id = "snarewire" - materials = list(MAT_PLASTIC = 10000) + materials = list(MAT_PLASTIC = MATERIAL_COST(5)) build_path = /obj/item/material/barbedwire/plastic build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1183,7 +1183,7 @@ name = "rapid construction device" desc = "A device used to rapidly build and deconstruct. Reload with compressed matter cartridges." id = "rcd_loaded" - materials = list(MAT_STEEL = 62500) + materials = list(MAT_STEEL = MATERIAL_COST(31.25)) build_path = /obj/item/rcd build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1195,7 +1195,7 @@ name = "compressed matter cartridge" desc = "Highly compressed matter for the RCD." id = "rcd_ammo" - materials = list(MAT_STEEL = 30000, MAT_GLASS = 15000) + materials = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(7.5)) build_path = /obj/item/rcd_ammo build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1207,7 +1207,7 @@ name = "Rapid-Service-Fabricator" desc = "A device used to rapidly deploy service items." id = "rsf" - materials = list(MAT_STEEL = 31250) + materials = list(MAT_STEEL = MATERIAL_COST(15.625)) build_path = /obj/item/rsf build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1219,7 +1219,7 @@ name = "Rapid Material Synthesizer" desc = "A device used to rapidly synthesize materials." id = "rms" - materials = list(MAT_STEEL = 62500, MAT_GLASS = 15000, MAT_SILVER = 7500) + materials = list(MAT_STEEL = MATERIAL_COST(31.25), MAT_GLASS = MATERIAL_COST(7.5), MAT_SILVER = MATERIAL_COST(3.75)) build_path = /obj/item/rms build_type = AUTOLATHE | PROTOLATHE category = list( @@ -1232,7 +1232,7 @@ desc = "A welder which runs off of electricity." id = "electric_welding_tool" build_type = AUTOLATHE | PROTOLATHE - materials = list(MAT_STEEL = 90, MAT_GLASS = 40) + materials = list(MAT_STEEL = MATERIAL_COST(0.045), MAT_GLASS = MATERIAL_COST(0.02)) build_path = /obj/item/weldingtool/electric/unloaded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -1244,7 +1244,7 @@ desc = "Prismatic path illumination devices. Used by explorers and miners to mark paths and warn of danger." id = "marker_beacon" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 500, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/stack/marker_beacon/ten category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -1256,7 +1256,7 @@ desc = "A glowing stick embedded in the ground with a light on top, commonly used in snowy installations and in tundra conditions. This one is red." id = "trailblazer_red" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/stack/lightpole/red category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -1268,7 +1268,7 @@ desc = "A glowing stick embedded in the ground with a light on top, commonly used in snowy installations and in tundra conditions. This one is blue." id = "trailblazer_blue" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/stack/lightpole/blue category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -1280,7 +1280,7 @@ desc = "A glowing stick embedded in the ground with a light on top, commonly used in snowy installations and in tundra conditions. This one is yellow." id = "trailblazer_yellow" build_type = PROTOLATHE | AUTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/stack/lightpole/yellow category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -1290,7 +1290,7 @@ /datum/design_techweb/shovel name = "Shovel" id = "shovel" - materials = list(MAT_STEEL = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/shovel build_type = PROTOLATHE | AUTOLATHE category = list( @@ -1302,7 +1302,7 @@ /datum/design_techweb/iceaxe name = "Ice Axe" id = "iceaxe" - materials = list(MAT_STEEL = 12000) + materials = list(MAT_STEEL = MATERIAL_COST(6)) build_path = /obj/item/ice_pick build_type = PROTOLATHE | AUTOLATHE category = list( @@ -1314,7 +1314,7 @@ /datum/design_techweb/anomaly_scanner name = "Anomaly Scanner" id = "anomaly_scanner" - materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25)) build_path = /obj/item/anomaly_scanner build_type = PROTOLATHE category = list( diff --git a/code/modules/research/tg/designs/weapon_designs.dm b/code/modules/research/tg/designs/weapon_designs.dm index af7d7a4742c..661679b8a5f 100644 --- a/code/modules/research/tg/designs/weapon_designs.dm +++ b/code/modules/research/tg/designs/weapon_designs.dm @@ -3,7 +3,7 @@ name = "Size Gun" id = "sizegun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/gun/energy/sizegun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -13,7 +13,7 @@ name = "Gradual Size Gun" id = "gradsizegun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/slow_sizegun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -25,7 +25,7 @@ id = "stunrevolver" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/gun/energy/stunrevolver category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -37,7 +37,7 @@ id = "nuclear_gun" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.25)) build_path = /obj/item/gun/energy/gun/nuclear category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -49,7 +49,7 @@ id = "ppistol" // req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_PHORON = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_PHORON = MATERIAL_COST(1.5)) build_path = /obj/item/gun/energy/toxgun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -59,7 +59,7 @@ /datum/design_techweb/caselessrifle_prototype name = "Caseless Rifle" id = "caselessrifle" - materials = list(MAT_STEEL = 7000, MAT_TITANIUM = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5), MAT_TITANIUM = MATERIAL_COST(2)) build_path = /obj/item/gun/projectile/caseless/prototype build_type = PROTOLATHE category = list( @@ -70,7 +70,7 @@ /datum/design_techweb/caselessrifle_ammo name = "Caseless Ammo" id = "caselessrifle_ammo" - materials = list(MAT_PHORON = 10000, MAT_STEEL = 4000) + materials = list(MAT_PHORON = MATERIAL_COST(5), MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/ammo_magazine/m5mmcaseless build_type = PROTOLATHE category = list( @@ -81,7 +81,7 @@ /datum/design_techweb/caselessrifle_ammo_stun name = "Caseless Ammo - Stun" id = "caselessrifle_ammo_stun" - materials = list(MAT_PHORON = 10000, MAT_STEEL = 4000) + materials = list(MAT_PHORON = MATERIAL_COST(5), MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/ammo_magazine/m5mmcaseless/stun build_type = PROTOLATHE category = list( @@ -95,7 +95,7 @@ id = "lasercannon" // req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/gun/energy/lasercannon category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -107,7 +107,7 @@ name = "Cryo Gun" desc = "An improperly researched and poorly built weapon, specialized in utlizing frost offensively.." id = "cryogun" - materials = list(MAT_GLASS = 3000, MAT_MORPHIUM = 4000, MAT_DURASTEEL = 6000, MAT_LEAD = 6000, MAT_METALHYDROGEN = 3000) + materials = list(MAT_GLASS = MATERIAL_COST(1.5), MAT_MORPHIUM = MATERIAL_COST(2), MAT_DURASTEEL = MATERIAL_COST(3), MAT_LEAD = MATERIAL_COST(3), MAT_METALHYDROGEN = MATERIAL_COST(1.5)) build_path = /obj/item/gun/energy/freezegun build_type = PROTOLATHE category = list( @@ -121,7 +121,7 @@ id = "decloner" // req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6) build_type = PROTOLATHE - materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000) + materials = list(MAT_GOLD = MATERIAL_COST(2.5),MAT_URANIUM = MATERIAL_COST(5)) build_path = /obj/item/gun/energy/decloner category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -134,7 +134,7 @@ id = "temp_gun" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 500, MAT_SILVER = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(1.5)) build_path = /obj/item/gun/energy/temperature category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -146,7 +146,7 @@ id = "flora_gun" // req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.25)) build_path = /obj/item/gun/energy/floragun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -158,7 +158,7 @@ id = "vinstunrevolver" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2)) build_path = /obj/item/gun/energy/stunrevolver/vintage category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -172,7 +172,7 @@ desc = "An advanced 9mm SMG with a reflective laser optic." // req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_SILVER = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(0.5)) build_path = /obj/item/gun/projectile/automatic/advanced_smg category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -185,7 +185,7 @@ id = "rapidsyringe" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.5)) build_path = /obj/item/gun/launcher/syringe/rapid category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -198,7 +198,7 @@ id = "dartgun_r" // req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GOLD = 5000, MAT_SILVER = 2500, MAT_GLASS = 750) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GOLD = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(0.375)) build_path = /obj/item/gun/projectile/dartgun/research category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -211,7 +211,7 @@ id = "chemsprayer" // req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_STEEL = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_STEEL = MATERIAL_COST(1)) build_path = /obj/item/reagent_containers/spray/chemsprayer category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -223,7 +223,7 @@ id = "fuelrod_gun" // req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_URANIUM = 1000, MAT_PHORON = 3000, MAT_DIAMOND = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(0.25), MAT_SILVER = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(0.5), MAT_PHORON = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(0.5)) build_path = /obj/item/gun/magnetic/fuelrod category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -237,7 +237,7 @@ id = "dartgun_mag_s" // req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 300, MAT_GOLD = 100, MAT_SILVER = 100, MAT_GLASS = 300) + materials = list(MAT_STEEL = MATERIAL_COST(0.15), MAT_GOLD = MATERIAL_COST(0.05), MAT_SILVER = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.15)) build_path = /obj/item/ammo_magazine/chemdart/small category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -252,7 +252,7 @@ id = "dartgun_ammo_s" // req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 50, MAT_GOLD = 30, MAT_SILVER = 30, MAT_GLASS = 50) + materials = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GOLD = MATERIAL_COST(0.015), MAT_SILVER = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.025)) build_path = /obj/item/ammo_casing/chemdart/small category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -267,7 +267,7 @@ id = "dartgun_mag_m" // req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GOLD = 150, MAT_SILVER = 150, MAT_DIAMOND = 200, MAT_GLASS = 400) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.075), MAT_SILVER = MATERIAL_COST(0.075), MAT_DIAMOND = MATERIAL_COST(0.1), MAT_GLASS = MATERIAL_COST(0.2)) build_path = /obj/item/ammo_magazine/chemdart category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -279,7 +279,7 @@ id = "dartgun_ammo_m" // req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) build_type = PROTOLATHE - materials = list(MAT_STEEL = 80, MAT_GOLD = 40, MAT_SILVER = 40, MAT_GLASS = 60) + materials = list(MAT_STEEL = MATERIAL_COST(0.04), MAT_GOLD = MATERIAL_COST(0.02), MAT_SILVER = MATERIAL_COST(0.02), MAT_GLASS = MATERIAL_COST(0.03)) build_path = /obj/item/ammo_casing/chemdart category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -291,7 +291,7 @@ id = "magnetic_ammo" // req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 500, MAT_GOLD = 300, MAT_GLASS = 150, MAT_PHORON = 100) + materials = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.15), MAT_GLASS = MATERIAL_COST(0.075), MAT_PHORON = MATERIAL_COST(0.05)) build_path = /obj/item/magnetic_ammo category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -304,7 +304,7 @@ id = "chargesword" // req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1) build_type = PROTOLATHE - materials = list(MAT_PLASTEEL = 3500, MAT_GLASS = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.75), MAT_GLASS = MATERIAL_COST(0.5), MAT_LEAD = MATERIAL_COST(1.125), MAT_METALHYDROGEN = MATERIAL_COST(0.25)) build_path = /obj/item/melee/energy/sword/charge category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MELEE @@ -316,7 +316,7 @@ id = "chargeaxe" // req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4) build_type = PROTOLATHE - materials = list(MAT_PLASTEEL = 3500, MAT_OSMIUM = 2000, MAT_LEAD = 2000, MAT_METALHYDROGEN = 500) + materials = list(MAT_PLASTEEL = MATERIAL_COST(1.75), MAT_OSMIUM = MATERIAL_COST(1), MAT_LEAD = MATERIAL_COST(1), MAT_METALHYDROGEN = MATERIAL_COST(0.25)) build_path = /obj/item/melee/energy/axe/charge category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MELEE @@ -329,7 +329,7 @@ id = "large_Grenade" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5)) build_path = /obj/item/grenade/chem_grenade/large category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -343,7 +343,7 @@ id = "protector" // req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/gun/energy/gun/protector category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -356,7 +356,7 @@ id = "sickshot" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1)) build_path = /obj/item/gun/energy/sickshot category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -369,7 +369,7 @@ id = "netgun" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/gun/energy/netgun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -381,7 +381,7 @@ desc = "The \"Varmint Compactor\" is an energy net projector designed to immobilize its targets while simultaneously reducing them to a more manageable size." id = "sizenetgun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/gun/energy/netgun/shrink category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -394,7 +394,7 @@ id = "bolablaster" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(1.5)) build_path = /obj/item/gun/energy/bolagun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -409,7 +409,7 @@ id = "pummeler" // req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(1.5), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/gun/energy/pummeler category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -422,7 +422,7 @@ id = "advparticle" // req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 5, TECH_POWER = 3, TECH_MAGNET = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_URANIUM = 750) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.375)) build_path = /obj/item/gun/energy/particle/advanced category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -434,7 +434,7 @@ id = "particlecannon" // req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000, MAT_GLASS = 1500, MAT_GOLD = 2000, MAT_URANIUM = 1000, MAT_DIAMOND = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(1)) build_path = /obj/item/gun/energy/particle/cannon category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -447,7 +447,7 @@ id = "pressureinterlock" // req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 1000, MAT_GLASS = 250) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.125)) build_path = /obj/item/pressurelock category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_FIRING_PINS @@ -460,7 +460,7 @@ id = "nsfw_prototype" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7) build_type = PROTOLATHE - materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_PHORON = 8000, MAT_URANIUM = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(3), MAT_PHORON = MATERIAL_COST(4), MAT_URANIUM = MATERIAL_COST(2)) build_path = /obj/item/gun/projectile/cell_loaded/combat/prototype category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -472,7 +472,7 @@ id = "nsfw_mag_prototype" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7) build_type = PROTOLATHE - materials = list(MAT_STEEL = 8000, MAT_GLASS = 4000, MAT_PHORON = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(2), MAT_PHORON = MATERIAL_COST(2)) build_path = /obj/item/ammo_magazine/cell_mag/combat/prototype category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -484,7 +484,7 @@ id = "nsfw_cell_stun" // req_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 2, TECH_POWER = 3, TECH_COMBAT = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/ammo_casing/microbattery/combat/stun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -496,7 +496,7 @@ id = "nsfw_cell_lethal" // req_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PHORON = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PHORON = MATERIAL_COST(1.5)) build_path = /obj/item/ammo_casing/microbattery/combat/lethal category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -508,7 +508,7 @@ id = "nsfw_cell_net" // req_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_URANIUM = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_URANIUM = MATERIAL_COST(1.5)) build_path = /obj/item/ammo_casing/microbattery/combat/net category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -520,7 +520,7 @@ id = "nsfw_cell_ion" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 5, TECH_COMBAT = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(1.5)) build_path = /obj/item/ammo_casing/microbattery/combat/ion category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -532,7 +532,7 @@ id = "nsfw_cell_shotstun" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 6, TECH_COMBAT = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 2000, MAT_GOLD = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(1), MAT_GOLD = MATERIAL_COST(1)) build_path = /obj/item/ammo_casing/microbattery/combat/shotstun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -544,7 +544,7 @@ id = "nsfw_cell_xray" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 5, TECH_COMBAT = 7) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_URANIUM = 1000, MAT_PHORON = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.5), MAT_PHORON = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/combat/xray category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -556,7 +556,7 @@ id = "nsfw_cell_stripper" // req_tech = list(TECH_MATERIAL = 7, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 4, TECH_ILLEGAL = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_URANIUM = 2000, MAT_PHORON = 2000, MAT_DIAMOND = 500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_URANIUM = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(0.25)) build_path = /obj/item/ammo_casing/microbattery/combat/stripper category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -569,7 +569,7 @@ id = "ptrshell" // req_tech = list(TECH_COMBAT = 7, TECH_ILLEGAL = 4) build_type = PROTOLATHE - materials = list(MAT_TITANIUM = 4000, MAT_URANIUM = 500, MAT_PLASTEEL = 500) + materials = list(MAT_TITANIUM = MATERIAL_COST(2), MAT_URANIUM = MATERIAL_COST(0.25), MAT_PLASTEEL = MATERIAL_COST(0.25)) build_path = /obj/item/ammo_casing/a145 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -583,7 +583,7 @@ id = "recombobray" // req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_POWER = 4, TECH_BIO = 5, TECH_BLUESPACE = 4) //Not like these matter. *Glares at circuit printer.* build_type = PROTOLATHE - materials = list(MAT_STEEL = 1000, MAT_GLASS = 2000, MAT_URANIUM = 500, MAT_PHORON = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(0.25), MAT_PHORON = MATERIAL_COST(0.75)) build_path = /obj/item/gun/energy/mouseray/medical category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -596,7 +596,7 @@ id = "cell_medigun" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 3, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 8000, MAT_PLASTIC = 8000, MAT_GLASS = 5000, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_PLASTIC = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/gun/projectile/cell_loaded/medical category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -608,7 +608,7 @@ id = "cell_medigun_mag" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 3, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_PLASTIC = 6000, MAT_GLASS = 3000, MAT_SILVER = 500, MAT_GOLD = 500) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_PLASTIC = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(1.5), MAT_SILVER = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.25)) build_path = /obj/item/ammo_magazine/cell_mag/medical category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -620,7 +620,7 @@ id = "cell_medigun_mag_advanced" // req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 4, TECH_BIO = 7) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 10000, MAT_GLASS = 5000, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_DIAMOND = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(0.75), MAT_GOLD = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(2.5)) build_path = /obj/item/ammo_magazine/cell_mag/medical/advanced category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -633,7 +633,7 @@ id = "ml3m_cell_brute" // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/ammo_casing/microbattery/medical/brute category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -645,7 +645,7 @@ id = "ml3m_cell_burn" // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/ammo_casing/microbattery/medical/burn category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -657,7 +657,7 @@ id = "ml3m_cell_stabilize" // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_BIO = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5)) build_path = /obj/item/ammo_casing/microbattery/medical/stabilize category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -671,7 +671,7 @@ id = "ml3m_cell_toxin" // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_BIO = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25)) build_path = /obj/item/ammo_casing/microbattery/medical/toxin category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -683,7 +683,7 @@ id = "ml3m_cell_omni" // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_BIO = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25)) build_path = /obj/item/ammo_casing/microbattery/medical/omni category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -695,7 +695,7 @@ id = "ml3m_cell_antirad" // req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_BIO = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25)) build_path = /obj/item/ammo_casing/microbattery/medical/antirad category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -709,7 +709,7 @@ id = "ml3m_cell_brute2" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/brute2 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -721,7 +721,7 @@ id = "ml3m_cell_burn2" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_GOLD = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_GOLD = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/burn2 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -733,7 +733,7 @@ id = "ml3m_cell_stabilize2" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_SILVER = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_SILVER = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/stabilize2 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -745,7 +745,7 @@ id = "ml3m_cell_omni2" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/omni2 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -759,7 +759,7 @@ id = "ml3m_cell_toxin2" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_URANIUM = 1000, MAT_SILVER = 1000, MAT_DIAMOND = 500) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_URANIUM = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.25)) build_path = /obj/item/ammo_casing/microbattery/medical/toxin2 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -771,7 +771,7 @@ id = "ml3m_cell_haste" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_GOLD = 1000, MAT_SILVER = 1000, MAT_DIAMOND = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_GOLD = MATERIAL_COST(0.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/haste category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -783,7 +783,7 @@ id = "ml3m_cell_resist" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_GOLD = 1000, MAT_URANIUM = 1000, MAT_DIAMOND = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_GOLD = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/resist category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -795,7 +795,7 @@ id = "ml3m_cell_corpse_mend" // req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_PHORON = 3000, MAT_DIAMOND = 3000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_PHORON = MATERIAL_COST(1.5), MAT_DIAMOND = MATERIAL_COST(1.5)) build_path = /obj/item/ammo_casing/microbattery/medical/corpse_mend category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -809,7 +809,7 @@ id = "ml3m_cell_brute3" // req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_PRECURSOR = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_DIAMOND = 500, MAT_VERDANTIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/brute3 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -821,7 +821,7 @@ id = "ml3m_cell_burn3" // req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_PRECURSOR = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_DIAMOND = 500, MAT_VERDANTIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/burn3 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -833,7 +833,7 @@ id = "ml3m_cell_toxin3" // req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_ARCANE = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_DIAMOND = 500, MAT_VERDANTIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/toxin3 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -845,7 +845,7 @@ id = "ml3m_cell_omni3" // req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_ARCANE = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_DIAMOND = 500, MAT_VERDANTIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_DIAMOND = MATERIAL_COST(0.25), MAT_VERDANTIUM = MATERIAL_COST(0.5)) build_path = /obj/item/ammo_casing/microbattery/medical/omni3 category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -859,7 +859,7 @@ id = "ml3m_cell_shrink" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_URANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/ammo_casing/microbattery/medical/shrink category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -871,7 +871,7 @@ id = "ml3m_cell_grow" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_URANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/ammo_casing/microbattery/medical/grow category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -883,7 +883,7 @@ id = "ml3m_cell_normalsize" // req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_PLASTIC = 2500, MAT_URANIUM = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_PLASTIC = MATERIAL_COST(1.25), MAT_URANIUM = MATERIAL_COST(1)) build_path = /obj/item/ammo_casing/microbattery/medical/normalsize category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO @@ -894,7 +894,7 @@ name = "Prototype Bluespace Medigun Backpack" id = "medigun_constant" build_type = PROTOLATHE - materials = list(MAT_STEEL = 8000, MAT_PLASTIC = 8000, MAT_GLASS = 5000, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_URANIUM = 1000) + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_PLASTIC = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(0.5), MAT_GOLD = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.5)) build_path = /obj/item/medigun_backpack category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -907,7 +907,7 @@ id = "pka_mineaoe" // req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 8, TECH_ENGINEERING = 7) // Lets make this endgame level tech, due to it's power. build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 500, MAT_GOLD = 500, MAT_URANIUM = 2000, MAT_PHORON = 2000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5), MAT_SILVER = MATERIAL_COST(0.25), MAT_GOLD = MATERIAL_COST(0.25), MAT_URANIUM = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(1)) build_path = /obj/item/borg/upgrade/modkit/aoe/turfs category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS @@ -920,7 +920,7 @@ id = "riflescope" // req_tech = list(TECH_ILLEGAL = 2, TECH_MATERIAL = 2) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) build_path = /obj/item/binoculars/scope category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS @@ -932,7 +932,7 @@ id = "slimebaton" // req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_POWER = 3, TECH_COMBAT = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5)) build_path = /obj/item/melee/baton/slime category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MELEE @@ -944,7 +944,7 @@ id = "slimetaser" // req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4) build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5)) build_path = /obj/item/gun/energy/taser/xeno category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -957,7 +957,7 @@ id = "monkey_gun" // req_tech = list(TECH_BIO = 6, TECH_BLUESPACE = 5) build_type = PROTOLATHE - materials = list(MAT_STEEL = 3500, MAT_GLASS = 3500, MAT_PHORON = 1500, MAT_DIAMOND = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(1.75), MAT_GLASS = MATERIAL_COST(1.75), MAT_PHORON = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.75)) build_path = /obj/item/xenobio/monkey_gun category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -969,7 +969,7 @@ desc = "A pair of brass knuckles. Generally used to enhance the user's punches." id = "knuckledusters" build_type = AUTOLATHE - materials = list(MAT_STEEL = 625) + materials = list(MAT_STEEL = MATERIAL_COST(0.3125)) build_path = /obj/item/clothing/accessory/knuckledusters category = list( RND_CATEGORY_HACKED, @@ -983,7 +983,7 @@ desc = "A steel knife made for combat." id = "tacknife" build_type = AUTOLATHE - materials = list(MAT_STEEL = 800) + materials = list(MAT_STEEL = MATERIAL_COST(0.4)) build_path = /obj/item/material/knife/tacknife category = list( RND_CATEGORY_HACKED, @@ -998,7 +998,7 @@ desc = "A very large sword." id = "claymore" build_type = AUTOLATHE - materials = list(MAT_STEEL = 10000) + materials = list(MAT_STEEL = MATERIAL_COST(5)) build_path = /obj/item/material/sword category = list( RND_CATEGORY_HACKED, @@ -1012,7 +1012,7 @@ desc = "An ancient short sword, designed to stab and cut." id = "gladius" build_type = AUTOLATHE - materials = list(MAT_STEEL = 5000) + materials = list(MAT_STEEL = MATERIAL_COST(2.5)) build_path = /obj/item/material/sword/gladius category = list( RND_CATEGORY_HACKED, @@ -1026,7 +1026,7 @@ desc = "An ancient short sword, designed to slice and dice." id = "katana" build_type = AUTOLATHE - materials = list(MAT_STEEL = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3)) build_path = /obj/item/material/sword/katana category = list( RND_CATEGORY_HACKED, @@ -1040,7 +1040,7 @@ desc = "A slender, fancy and sharply pointed sword." id = "rapier" build_type = AUTOLATHE - materials = list(MAT_STEEL = 6000) + materials = list(MAT_STEEL = MATERIAL_COST(3)) build_path = /obj/item/material/sword/rapier category = list( RND_CATEGORY_HACKED, @@ -1054,7 +1054,7 @@ desc = "A sharp curved sword, a favored weapon of pirates far in the past." id = "sabre" build_type = AUTOLATHE - materials = list(MAT_STEEL = 7400) + materials = list(MAT_STEEL = MATERIAL_COST(3.7)) build_path = /obj/item/material/sword/sabre category = list( RND_CATEGORY_HACKED, @@ -1068,7 +1068,7 @@ desc = "a more elegant weapon from a more civilised age" id = "longsword" build_type = AUTOLATHE - materials = list(MAT_STEEL = 8000) + materials = list(MAT_STEEL = MATERIAL_COST(4)) build_path = /obj/item/material/twohanded/longsword category = list( RND_CATEGORY_HACKED, @@ -1083,7 +1083,7 @@ desc = "A one handed battle axe, still a deadly weapon." id = "battleaxe" build_type = AUTOLATHE - materials = list(MAT_STEEL = 7000) + materials = list(MAT_STEEL = MATERIAL_COST(3.5)) build_path = /obj/item/material/sword/battleaxe category = list( RND_CATEGORY_HACKED, @@ -1097,7 +1097,7 @@ name = "Handheld Anomalous Particle Releaser" id = "anom_gun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 3500, MAT_PHORON = 1500, MAT_DIAMOND = 1500, MAT_URANIUM = 1500) + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(1.75), MAT_PHORON = MATERIAL_COST(0.75), MAT_DIAMOND = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(0.75)) build_path = /obj/item/gun/energy/anomaly category = list( RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED @@ -1109,7 +1109,7 @@ name = "Photon Rifle" id = "ghost_gun" build_type = PROTOLATHE - materials = list(MAT_STEEL = 8000, MAT_GLASS = 8000, MAT_PHORON = 8000, MAT_DIAMOND = 6000, MAT_VERDANTIUM = 6000) //Expensive. + materials = list(MAT_STEEL = MATERIAL_COST(4), MAT_GLASS = MATERIAL_COST(4), MAT_PHORON = MATERIAL_COST(4), MAT_DIAMOND = MATERIAL_COST(3), MAT_VERDANTIUM = MATERIAL_COST(3)) //Expensive. build_path = /obj/item/ghost_catcher category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -1120,7 +1120,7 @@ name = "Proton Pack" id = "ghost_pack" build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_PHORON = 4000, MAT_DIAMOND = 2000, MAT_VERDANTIUM = 2000) //Expensive. + materials = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2), MAT_PHORON = MATERIAL_COST(2), MAT_DIAMOND = MATERIAL_COST(1), MAT_VERDANTIUM = MATERIAL_COST(1)) //Expensive. build_path = /obj/item/proton_pack category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -1131,7 +1131,7 @@ name = "Spectral Trap" id = "ghost_trap" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_PHORON = 1000, MAT_DIAMOND = 500) + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(0.5), MAT_DIAMOND = MATERIAL_COST(0.25)) build_path = /obj/item/ghost_trap category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -1143,7 +1143,7 @@ name = "Advanced EMF Reader" id = "ghost_emf" build_type = PROTOLATHE - materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000) //Assumed you're making this with the ghost_gun, so it has similar values. + materials = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(2.5)) //Assumed you're making this with the ghost_gun, so it has similar values. build_path = /obj/item/entrepreneur/emf/professional category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -1154,7 +1154,7 @@ name = "Spectral Goggles" id = "ghost_goggles" build_type = PROTOLATHE - materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_PHORON = 2000, MAT_DIAMOND = 500) //Assumed you're making this with the ghost_gun, so it has similar values. + materials = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1), MAT_PHORON = MATERIAL_COST(1), MAT_DIAMOND = MATERIAL_COST(0.25)) //Assumed you're making this with the ghost_gun, so it has similar values. build_path = /obj/item/clothing/glasses/ghost category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC diff --git a/code/modules/research/tg/disks.dm b/code/modules/research/tg/disks.dm index c1cfa035e7d..e9206f3ad65 100644 --- a/code/modules/research/tg/disks.dm +++ b/code/modules/research/tg/disks.dm @@ -6,7 +6,7 @@ item_state = "card-id" randpixel = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 30, MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005)) var/datum/techweb/stored_research /obj/item/disk/tech_disk/Initialize(mapload) @@ -31,7 +31,7 @@ item_state = "card-id" randpixel = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 30, MAT_GLASS = 10) + matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005)) ///List of all `/datum/design` stored on the disk. var/list/blueprints = list() diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index cb8f3c985f0..99b6e84c1bb 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -60,7 +60,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 2000, MAT_GLASS = 2000) + matter = list(MAT_STEEL = MATERIAL_COST(1), MAT_GLASS = MATERIAL_COST(1)) var/list/obj/item/implant/backup/imps = list() var/max_implants = 4 //Iconstates need to exist due to the update proc! diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 205c08b010d..f762e846600 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -132,7 +132,7 @@ density = TRUE anchored = TRUE - var/list/stored_material = list(MAT_STEEL = 30000, MAT_GLASS = 30000) + var/list/stored_material = list(MAT_STEEL = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(15)) var/connected //What console it's done up with var/busy = 0 //Busy cloning var/body_cost = 15000 //Cost of a cloned body (metal and glass ea.) diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index d745e456736..ff9c415c30c 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -3,7 +3,7 @@ desc = "This upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) show_messages = 0 - matter = list(MAT_STEEL = 4000, MAT_GLASS = 4000) + matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(2)) has_emag_toolkit = FALSE // sleevecards don't have multitools or signalers, you can just change their laws special_handling = TRUE diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index d5b7a35df96..7409739ac13 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -665,7 +665,7 @@ force = 5.0 throwforce = 7.0 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 50) + matter = list(MAT_STEEL = MATERIAL_COST(0.025)) attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") /obj/item/cane/fluff/tasald diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index af38cfee8cc..b616f064f66 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -3,7 +3,7 @@ desc = "A coiled metallic tape used to check dimensions and lengths." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "measuring" - matter = list(MAT_STEEL = 100) + matter = list(MAT_STEEL = MATERIAL_COST(0.05)) w_class = ITEMSIZE_SMALL /obj/item/storage/bag/fossils @@ -35,7 +35,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "xenoarch_scanner" item_state = "analyzer" - matter = list(MAT_STEEL = 10000,MAT_GLASS = 5000) + matter = list(MAT_STEEL = MATERIAL_COST(5),MAT_GLASS = MATERIAL_COST(2.5)) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT @@ -101,7 +101,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "depth_scanner" item_state = "analyzer" - matter = list(MAT_STEEL = 1000,MAT_GLASS = 1000) + matter = list(MAT_STEEL = MATERIAL_COST(0.5),MAT_GLASS = MATERIAL_COST(0.5)) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT var/list/positive_locations = list() @@ -233,7 +233,7 @@ icon = 'icons/obj/device.dmi' icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull item_state = "electronic" - matter = list(MAT_STEEL = 1000,MAT_GLASS = 500) + matter = list(MAT_STEEL = MATERIAL_COST(0.5),MAT_GLASS = MATERIAL_COST(0.25)) var/frequency = PUB_FREQ var/scan_ticks = 0 var/obj/item/radio/target_radio @@ -334,7 +334,7 @@ icon_state = "ano_scanner2" item_state = "lampgreen" icon = 'icons/obj/xenoarchaeology.dmi' - matter = list(MAT_STEEL = 10000,MAT_GLASS = 5000) + matter = list(MAT_STEEL = MATERIAL_COST(5),MAT_GLASS = MATERIAL_COST(2.5)) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT var/mode = 1 //Start off scanning. 1 = scanning, 0 = measuring