cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Materials subsystem, material defines instead of strings, structure materials. (#8447)

Browse Source 
The shitcode crusade begins.
This commit is contained in:
Matt Atlas
2020-03-18 20:19:11 +01:00
committed by GitHub
parent d952493ca0
commit 82437acd43
127 changed files with 687 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
+1 -1
View File
@@ -9,7 +9,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
icon_state = "circuit_imprinter"
flags = OPENCONTAINER
var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0)
var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, MATERIAL_GLASS = 0, MATERIAL_GOLD = 0, MATERIAL_SILVER = 0, MATERIAL_PHORON = 0, MATERIAL_URANIUM = 0, MATERIAL_DIAMOND = 0)
var/list/datum/design/queue = list()
var/progress = 0
code/modules/research/designs.dm
+23 -23
View File
@@ -70,7 +70,7 @@ other types of metals and chemistry for reagents).
desc = "Produce additional disks for storing device designs."
id = "design_disk"
req_tech = list(TECH_DATA = 1)
materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
materials = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
build_path = /obj/item/disk/design_disk
sort_string = "GAAAA"
@@ -79,7 +79,7 @@ other types of metals and chemistry for reagents).
desc = "Produce additional disks for storing technology data."
id = "tech_disk"
req_tech = list(TECH_DATA = 1)
materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
materials = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
build_path = /obj/item/disk/tech_disk
sort_string = "GAAAB"
@@ -88,12 +88,12 @@ other types of metals and chemistry for reagents).
desc = "Produce additional disks for storing flora data."
id = "flora_disk"
req_tech = list(TECH_DATA = 1)
materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
materials = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
build_path = /obj/item/disk/botany
sort_string = "GAAAC"
/datum/design/item/hud
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
/datum/design/item/hud/AssembleDesignName()
..()
@@ -121,7 +121,7 @@ other types of metals and chemistry for reagents).
desc = "Using the meson-scanning technology those glasses allow you to see through walls, floor or anything else."
id = "mesons"
req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
build_path = /obj/item/clothing/glasses/meson
sort_string = "GAAAC"
@@ -131,7 +131,7 @@ other types of metals and chemistry for reagents).
desc = "An advanced drill designed to be faster than other drills."
id = "powerdrill"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 60, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 60, MATERIAL_GLASS = 50)
build_path = /obj/item/powerdrill
sort_string = "GAAAD"
@@ -140,10 +140,10 @@ other types of metals and chemistry for reagents).
///////////////////////////////////
/datum/design/circuit/shield
req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
materials = list("glass" = 2000, "sacid" = 20, "phoron" = 10000, "diamond" = 5000, "gold" = 10000)
materials = list(MATERIAL_GLASS = 2000, "sacid" = 20, MATERIAL_PHORON = 10000, MATERIAL_DIAMOND = 5000, MATERIAL_GOLD = 10000)
/datum/design/item/implant
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
/datum/design/item/implant/AssembleDesignName()
..()
@@ -177,7 +177,7 @@ other types of metals and chemistry for reagents).
desc = "The most advanced tool in a custodian's arsenal, complete with a condenser for self-wetting! Just think of all the viscera you will clean up with this!"
id = "advmop"
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 2500, "glass" = 200)
materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 200)
build_path = /obj/item/mop/advanced
sort_string = "VAAAI"
@@ -186,7 +186,7 @@ other types of metals and chemistry for reagents).
desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage."
id = "blutrash"
build_type = PROTOLATHE
materials = list("gold" = 1500, "uranium" = 250, "phoron" = 1500)
materials = list(MATERIAL_GOLD = 1500, MATERIAL_URANIUM = 250, MATERIAL_PHORON = 1500)
build_path = /obj/item/storage/bag/trash/bluespace
sort_string = "VAAAJ"
@@ -204,7 +204,7 @@ other types of metals and chemistry for reagents).
id = "mmi"
req_tech = list(TECH_DATA = 2, TECH_BIO = 3)
build_type = PROTOLATHE | MECHFAB
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500)
build_path = /obj/item/device/mmi
category = "Misc"
sort_string = "VACBA"
@@ -214,7 +214,7 @@ other types of metals and chemistry for reagents).
id = "mmi_radio"
req_tech = list(TECH_DATA = 2, TECH_BIO = 4)
build_type = PROTOLATHE | MECHFAB
materials = list(DEFAULT_WALL_MATERIAL = 1200, "glass" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 1200, MATERIAL_GLASS = 500)
build_path = /obj/item/device/mmi/radio_enabled
category = "Misc"
sort_string = "VACBB"
@@ -223,7 +223,7 @@ other types of metals and chemistry for reagents).
name = "Bluespace tracking beacon design"
id = "beacon"
req_tech = list(TECH_BLUESPACE = 1)
materials = list (DEFAULT_WALL_MATERIAL = 20, "glass" = 10)
materials = list (DEFAULT_WALL_MATERIAL = 20, MATERIAL_GLASS = 10)
build_path = /obj/item/device/radio/beacon
sort_string = "VADAA"
@@ -232,7 +232,7 @@ other types of metals and chemistry for reagents).
desc = "Using localized pockets of bluespace this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy."
id = "bag_holding"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250)
materials = list(MATERIAL_GOLD = 3000, MATERIAL_DIAMOND = 1500, MATERIAL_URANIUM = 250)
build_path = /obj/item/storage/backpack/holding
sort_string = "VAEAA"
@@ -241,7 +241,7 @@ other types of metals and chemistry for reagents).
desc = "An artificially made bluespace crystal."
id = "bluespace_crystal"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
materials = list("gold" = 1500, "diamond" = 1500, "phoron" = 1500)
materials = list(MATERIAL_GOLD = 1500, MATERIAL_DIAMOND = 1500, MATERIAL_PHORON = 1500)
build_path = /obj/item/bluespace_crystal/artificial
sort_string = "VAFAA"
@@ -250,7 +250,7 @@ other types of metals and chemistry for reagents).
desc = "Allows for deciphering the binary channel on-the-fly."
id = "binaryencrypt"
req_tech = list(TECH_ILLEGAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 300, "glass" = 300)
materials = list(DEFAULT_WALL_MATERIAL = 300, MATERIAL_GLASS = 300)
build_path = /obj/item/device/encryptionkey/binary
sort_string = "VASAA"
@@ -259,14 +259,14 @@ other types of metals and chemistry for reagents).
desc = "Cheaper than whiny non-digital assistants."
id = "pda"
req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
build_path = /obj/item/device/pda
sort_string = "VAAAA"
// Cartridges
/datum/design/item/pda_cartridge
req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
/datum/design/item/pda_cartridge/AssembleDesignName()
..()
@@ -352,7 +352,7 @@ other types of metals and chemistry for reagents).
name = "Custom wirer tool"
id = "wirer"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
build_path = /obj/item/device/integrated_electronics/wirer
sort_string = "VBVAA"
@@ -360,7 +360,7 @@ other types of metals and chemistry for reagents).
name = "Custom circuit debugger tool"
id = "debugger"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
build_path = /obj/item/device/integrated_electronics/debugger
sort_string = "VBVAB"
@@ -440,7 +440,7 @@ other types of metals and chemistry for reagents).
name = "Pin extraction device"
id = "pin_extractor"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
build_path = /obj/item/device/pin_extractor
sort_string = "VCBAA"
@@ -449,7 +449,7 @@ other types of metals and chemistry for reagents).
desc = "A hand-held plant scanner for hydroponicists and xenobotanists."
id = "plant_analyzer"
req_tech = list(TECH_MAGNET = 2, TECH_BIO = 3)
materials = list(DEFAULT_WALL_MATERIAL = 80,"glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 80, MATERIAL_GLASS = 20)
build_path = /obj/item/device/analyzer/plant_analyzer
sort_string = "VCBAB"
@@ -457,6 +457,6 @@ other types of metals and chemistry for reagents).
name = "implanter"
desc = "A specialized syringe for inserting implants to subjects."
req_tech = list(TECH_BIO = 5)
materials = list(DEFAULT_WALL_MATERIAL = 320, "glass" = 800)
materials = list(DEFAULT_WALL_MATERIAL = 320, MATERIAL_GLASS = 800)
build_path = /obj/item/implanter
sort_string = "VCBAC"
code/modules/research/designs/AI_modules_designs.dm
+3 -3
View File
@@ -3,7 +3,7 @@
////////////////////////////////////////
/datum/design/aimodule
build_type = IMPRINTER
materials = list("glass" = 2000, "gold" = 100)
materials = list(MATERIAL_GLASS = 2000, MATERIAL_GOLD = 100)
/datum/design/aimodule/AssembleDesignName()
name = "AI module design ([name])"
@@ -114,7 +114,7 @@
name = "'pAI', personal artificial intelligence device"
id = "paicard"
req_tech = list(TECH_DATA = 2)
materials = list("glass" = 500, DEFAULT_WALL_MATERIAL = 500)
materials = list(MATERIAL_GLASS = 500, DEFAULT_WALL_MATERIAL = 500)
build_path = /obj/item/device/paicard
sort_string = "VABAI"
@@ -123,6 +123,6 @@
desc = "Allows for the construction of an intelliCard."
id = "intellicard"
req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4)
materials = list("glass" = 1000, "gold" = 200)
materials = list(MATERIAL_GLASS = 1000, MATERIAL_GOLD = 200)
build_path = /obj/item/aicard
sort_string = "VACAA"
code/modules/research/designs/circuit_designs.dm
+2 -2
View File
@@ -5,7 +5,7 @@
/datum/design/circuit
build_type = IMPRINTER
req_tech = list(TECH_DATA = 2)
materials = list("glass" = 2000)
materials = list(MATERIAL_GLASS = 2000)
chemicals = list("sacid" = 20)
/datum/design/circuit/AssembleDesignName()
@@ -406,7 +406,7 @@
/datum/design/circuit/shield
req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
materials = list("glass" = 2000, "gold" = 1000)
materials = list(MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
/datum/design/circuit/shield/AssembleDesignName()
name = "Shield generator circuit design ([name])"
code/modules/research/designs/mechfab/hardsuit/modules.dm
+17 -17
View File
@@ -8,7 +8,7 @@
desc = "An integrated intelligence system module suitable for most hardsuits."
id = "iis_module"
req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 3)
materials = list("glass" = 7500, DEFAULT_WALL_MATERIAL = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 7500)
build_path = /obj/item/rig_module/ai_container
/datum/design/hardsuitmodules/sink_module
@@ -16,7 +16,7 @@
desc = "An heavy-duty power sink suitable for hardsuits."
id = "power_sink_module"
req_tech = list(TECH_POWER = 4, TECH_MATERIAL = 3, TECH_ENGINEERING = 4, TECH_ILLEGAL = 3)
materials = list(DEFAULT_WALL_MATERIAL = 10000, "gold"= 2000, "silver"= 3000, "glass"= 2000)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GOLD = 2000, MATERIAL_SILVER = 3000, MATERIAL_GLASS = 2000)
build_path = /obj/item/rig_module/power_sink
/datum/design/hardsuitmodules/meson_module
@@ -24,7 +24,7 @@
desc = "A layered, translucent visor system for a hardsuit."
id = "meson_module"
req_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
materials = list("glass"= 5000, DEFAULT_WALL_MATERIAL= 1500)
materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 5000)
build_path = /obj/item/rig_module/vision/meson
/datum/design/hardsuitmodules/sechud_module
@@ -32,7 +32,7 @@
desc = "A simple tactical information system for a hardsuit."
id = "sechud_module"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 2, TECH_MAGNET = 3)
materials = list("glass" = 5000, DEFAULT_WALL_MATERIAL =1500)
materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 5000)
build_path = /obj/item/rig_module/vision/sechud
/datum/design/hardsuitmodules/medhud_module
@@ -40,7 +40,7 @@
desc = "A simple medical status indicator for a hardsuit."
id = "medhu_module"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 2, TECH_MAGNET = 3)
materials = list("glass"= 5000, DEFAULT_WALL_MATERIAL =1500)
materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 5000)
build_path = /obj/item/rig_module/vision/medhud
/datum/design/hardsuitmodules/nvg_module
@@ -48,7 +48,7 @@
desc = "A multi input night vision system for a hardsuit."
id = "nvg_module"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 3, TECH_MAGNET = 4)
materials = list("glass" = 5000, DEFAULT_WALL_MATERIAL = 1500, "uranium" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 5000, MATERIAL_URANIUM = 5000)
build_path = /obj/item/rig_module/vision/nvg
/datum/design/hardsuitmodules/healthscanner_module
@@ -56,7 +56,7 @@
desc = "A hardsuit-mounted health scanner."
id = "healthscanner_module"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2)
materials = list("glass" = 5250, DEFAULT_WALL_MATERIAL = 2500)
materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 5250)
build_path = /obj/item/rig_module/device/healthscanner
/datum/design/hardsuitmodules/chem_module
@@ -64,7 +64,7 @@
desc = "A complex web of tubing and a large needle suitable for hardsuit use."
id = "chem_module"
req_tech = list(TECH_BIO = 5, TECH_MATERIAL = 4, TECH_DATA = 3, TECH_PHORON = 2)
materials = list("glass" = 9250, DEFAULT_WALL_MATERIAL = 10000, "gold" = 2500, "silver" = 4250, "phoron" = 5500)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 9250, MATERIAL_GOLD = 2500, MATERIAL_SILVER = 4250, MATERIAL_PHORON = 5500)
build_path = /obj/item/rig_module/chem_dispenser/injector
/datum/design/hardsuitmodules/plasmacutter_module
@@ -72,7 +72,7 @@
desc = "A self-sustaining plasma arc capable of cutting through walls."
id = "plasmacutter_module"
req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_PHORON = 4)
materials = list("glass" = 5250, DEFAULT_WALL_MATERIAL = 30000, "silver" = 5250, "phoron" = 7250)
materials = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_GLASS = 5250, MATERIAL_SILVER = 5250, MATERIAL_PHORON = 7250)
build_path = /obj/item/rig_module/mounted/plasmacutter
/datum/design/hardsuitmodules/jet_module
@@ -80,7 +80,7 @@
desc = "A compact gas thruster system for a hardsuit."
id = "jet_module"
req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list("glass" = 4250, DEFAULT_WALL_MATERIAL = 15000, "silver" = 4250,"uranium" = 5250)
materials = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 4250, MATERIAL_SILVER = 4250, MATERIAL_URANIUM = 5250)
build_path = /obj/item/rig_module/maneuvering_jets
/datum/design/hardsuitmodules/drill_module
@@ -88,7 +88,7 @@
desc = "A very heavy diamond-tipped drill."
id = "drill_module"
req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4)
materials = list("glass" = 2250, DEFAULT_WALL_MATERIAL = 55000, "silver" = 5250, "diamond" = 3750)
materials = list(DEFAULT_WALL_MATERIAL = 55000, MATERIAL_GLASS = 2250, MATERIAL_SILVER = 5250, MATERIAL_DIAMOND = 3750)
build_path = /obj/item/rig_module/device/drill
/datum/design/hardsuitmodules/rfd_c_module
@@ -96,7 +96,7 @@
desc = "A cell-powered Rapid-Fabrication-Device C-Class for a hardsuit."
id = "rcd_module"
req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 5, TECH_POWER = 5, TECH_BLUESPACE = 4)
materials = list(DEFAULT_WALL_MATERIAL= 30000, "phoron" = 12500, "silver" = 10000, "gold" = 10000)
materials = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_PHORON = 12500, MATERIAL_SILVER = 10000, MATERIAL_GOLD = 10000)
build_path = /obj/item/rig_module/device/rfd_c
/datum/design/hardsuitmodules/actuators_module
@@ -104,7 +104,7 @@
desc = "A set of electromechanical actuators, for safe traversal of multilevelled areas."
id = "actuators_module"
req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 85000, "glass" = 1250, "silver" = 5250, "gold" = 2750)
materials = list(DEFAULT_WALL_MATERIAL = 85000, MATERIAL_GLASS = 1250, MATERIAL_SILVER = 5250, MATERIAL_GOLD = 2750)
build_path = /obj/item/rig_module/actuators
/datum/design/hardsuitmodules/taser_module
@@ -112,7 +112,7 @@
desc = "A palm-mounted nonlethal energy projector."
id = "taser_module"
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_COMBAT = 3, TECH_MAGNET = 2)
materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 5250)
materials = list(DEFAULT_WALL_MATERIAL = 7000, MATERIAL_GLASS = 5250)
build_path = /obj/item/rig_module/mounted/taser
/datum/design/hardsuitmodules/egun_module
@@ -120,7 +120,7 @@
desc = "A forearm-mounted energy projector."
id = "egun_module"
req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 4, TECH_COMBAT = 4, TECH_MAGNET = 3)
materials = list(DEFAULT_WALL_MATERIAL= 7000, "glass"= 2250, "uranium"= 3250, "gold"= 2500)
materials = list(DEFAULT_WALL_MATERIAL = 7000, MATERIAL_GLASS = 2250, MATERIAL_URANIUM = 3250, MATERIAL_GOLD = 2500)
build_path = /obj/item/rig_module/mounted/egun
/datum/design/hardsuitmodules/cooling_module
@@ -128,5 +128,5 @@
desc = "A heat sink with liquid cooled radiator."
id = "cooling_module"
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL= 7000, "glass"= 5500)
build_path = /obj/item/rig_module/cooling_unit
materials = list(DEFAULT_WALL_MATERIAL = 7000, MATERIAL_GLASS = 5500)
build_path = /obj/item/rig_module/cooling_unit
code/modules/research/designs/mechfab/hardsuit/rigs.dm
+7 -7
View File
@@ -1,7 +1,7 @@
/datum/design/rig
build_type = MECHFAB
category = "Hardsuit (Assemblies)"
materials = list(DEFAULT_WALL_MATERIAL = 30000, "glass" = 12500)
materials = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_GLASS = 12500)
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_MAGNET = 3, TECH_POWER = 3)
time = 20
@@ -11,7 +11,7 @@
id = "rig_ce"
build_path = /obj/item/rig_assembly/ce
req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 4)
materials = list(DEFAULT_WALL_MATERIAL = 25000, "glass" = 12500, "silver" = 5500, "gold" = 5500, "phoron" = 7550)
materials = list(DEFAULT_WALL_MATERIAL = 25000, MATERIAL_GLASS = 12500, MATERIAL_SILVER = 5500, MATERIAL_GOLD = 5500, MATERIAL_PHORON = 7550)
/datum/design/rig/eva
name = "EVA suit control module assembly"
@@ -30,14 +30,14 @@
desc = "An assembly for Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
id = "rig_hazmat"
build_path = /obj/item/rig_assembly/hazmat
materials = list(DEFAULT_WALL_MATERIAL = 25000, "glass" = 25000, "silver" = 5500, "gold" = 5500, "phoron" = 7550)
materials = list(DEFAULT_WALL_MATERIAL = 25000, MATERIAL_GLASS = 25000, MATERIAL_SILVER = 5500, MATERIAL_GOLD = 5500, MATERIAL_PHORON = 7550)
/datum/design/rig/medical
name = "rescue suit control module assembly"
desc = "An assembly for a durable suit designed for medical rescue in high risk areas."
id = "rig_medical"
build_path = /obj/item/rig_assembly/medical
materials = list(DEFAULT_WALL_MATERIAL = 25000, "glass" = 12500, "silver" = 5500, "gold" = 3500, "phoron" = 7550)
materials = list(DEFAULT_WALL_MATERIAL = 25000, MATERIAL_GLASS = 12500, MATERIAL_SILVER = 5500, MATERIAL_GOLD = 3500, MATERIAL_PHORON = 7550)
/datum/design/rig/hazard
name = "hazard hardsuit control module"
@@ -45,7 +45,7 @@
id = "rig_hazard"
build_path = /obj/item/rig_assembly/combat/hazard
req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 3)
materials = list(DEFAULT_WALL_MATERIAL = 30000, "glass" = 12500, "silver" = 3500, "gold" = 5500)
materials = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_GLASS = 12500, MATERIAL_SILVER = 3500, MATERIAL_GOLD = 5500)
/datum/design/rig/combat
name = "combat hardsuit control module assembly"
@@ -53,7 +53,7 @@
id = "rig_combat"
build_path = /obj/item/rig_assembly/combat/combat
req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 5)
materials = list(DEFAULT_WALL_MATERIAL = 30000, "glass" = 12500, "silver" = 3500, "gold" = 3500, "uranium" = 5550, "diamond" = 7500)
materials = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_GLASS = 12500, MATERIAL_SILVER = 3500, MATERIAL_GOLD = 3500, MATERIAL_URANIUM = 5550, MATERIAL_DIAMOND = 7500)
/datum/design/rig/hacker
name = "cybersuit control module assembly"
@@ -61,4 +61,4 @@
id = "rig_hacker"
build_path = /obj/item/rig_assembly/combat/illegal/hacker
req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 2, TECH_POWER = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3)
materials = list(DEFAULT_WALL_MATERIAL = 25000, "glass" = 12500, "gold" = 2500, "silver" = 3500, "uranium" = 5550)
materials = list(DEFAULT_WALL_MATERIAL = 25000, MATERIAL_GLASS = 12500, MATERIAL_GOLD = 2500, MATERIAL_SILVER = 3500, MATERIAL_URANIUM = 5550)
code/modules/research/designs/mechfab/mechs/designs_exosuits.dm
+11 -11
View File
@@ -67,7 +67,7 @@
build_path = /obj/item/robot_parts/robot_component/armor/mech/em
time = 50
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 12500, "silver" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_SILVER = 1000)
/datum/design/item/mechfab/exosuit/combat_armour
name = "combat exosuit armor"
@@ -75,7 +75,7 @@
build_path = /obj/item/robot_parts/robot_component/armor/mech/combat
time = 50
req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 3)
materials = list(DEFAULT_WALL_MATERIAL = 20000, "diamond" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_DIAMOND = 5000)
/datum/design/item/mechfab/exosuit/control_module
name = "exosuit control module"
@@ -188,7 +188,7 @@
name = "heavy exosuit chassis"
id = "heavy_body"
time = 75
materials = list(DEFAULT_WALL_MATERIAL = 70000, "uranium" = 10000)
materials = list(DEFAULT_WALL_MATERIAL = 70000, MATERIAL_URANIUM = 10000)
build_path = /obj/item/mech_component/chassis/heavy
/datum/design/item/mechfab/exosuit/heavy_arms
@@ -268,7 +268,7 @@
/datum/design/item/mechfab/exosuit/plasma
name = "mounted plasma cutter"
id = "mech_plasma"
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "gold" = 1000, "phoron" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 1000, MATERIAL_GOLD = 1000, MATERIAL_PHORON = 1000)
req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
build_path = /obj/item/mecha_equipment/mounted_system/plasmacutter
@@ -290,21 +290,21 @@
name = "RFD-C"
id = "mech_rcd"
time = 90
materials = list(DEFAULT_WALL_MATERIAL = 30000, "phoron" = 25000, "steel" = 15000, "gold" = 15000)
materials = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_PHORON = 25000, DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GOLD = 15000)
req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4, TECH_ENGINEERING = 4)
build_path = /obj/item/mecha_equipment/mounted_system/rfd
/datum/design/item/mechfab/exosuit/floodlight
name = "floodlight"
id = "mech_floodlight"
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 5000)
req_tech = list(TECH_ENGINEERING = 1)
build_path = /obj/item/mecha_equipment/light
/datum/design/item/mechfab/exosuit/sleeper
name = "mounted sleeper"
id = "mech_sleeper"
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 10000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 10000)
build_path = /obj/item/mecha_equipment/sleeper
/datum/design/item/mechfab/exosuit/extinguisher
@@ -318,27 +318,27 @@
id = "xray_gun"
req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_MATERIAL = 5, TECH_ILLEGAL = 3)
build_path = /obj/item/mecha_equipment/mounted_system/xray
materials = list(DEFAULT_WALL_MATERIAL = 20000, "gold" = 6000, "phoron" = 6000)
materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GOLD = 6000, MATERIAL_PHORON = 6000)
/datum/design/item/mechfab/exosuit/flashbang
name = "flashbang launcher"
id = "flashbang_launcher"
req_tech = list(TECH_COMBAT = 3)
build_path = /obj/item/mecha_equipment/mounted_system/grenadeflash
materials = list(DEFAULT_WALL_MATERIAL = 20000, "gold" = 6000, "phoron" = 6000)
materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GOLD = 6000, MATERIAL_PHORON = 6000)
/datum/design/item/mechfab/exosuit/crisisdrone
name = "crisis drone"
id = "crisis_drone"
build_path = /obj/item/mecha_equipment/crisis_drone
req_tech = list(TECH_MAGNET = 3, TECH_DATA = 3, TECH_BIO = 3)
materials = list(DEFAULT_WALL_MATERIAL = 10000, "gold" = 1000, "silver" = 2000, "glass" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GOLD = 1000, MATERIAL_SILVER = 2000, MATERIAL_GLASS = 5000)
/datum/design/item/mechfab/exosuit/analyzer
name = "mounted health analyzer"
id = "mech_analyzer"
req_tech = list(TECH_MAGNET = 2, TECH_BIO = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 5000)
build_path = /obj/item/mecha_equipment/mounted_system/medanalyzer
/datum/design/item/mechfab/exosuit/flaregun
code/modules/research/designs/mechfab/prosthetics/internal.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/design/item/mechfab/prosthetic/internal
category = "Prosthetic (Internal)"
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 9000, "glass" = 3000)
materials = list(DEFAULT_WALL_MATERIAL = 9000, MATERIAL_GLASS = 3000)
//make sure the printed organ is actually robotic
/datum/design/item/mechfab/prosthetic/internal/Fabricate()
code/modules/research/designs/mechfab/robot/robot.dm
+2 -2
View File
@@ -69,7 +69,7 @@
name = "Synthetic flash"
id = "sflash"
req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2)
materials = list(DEFAULT_WALL_MATERIAL = 750, "glass" = 750)
materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 750)
build_path = /obj/item/device/flash/synthetic
/datum/design/item/mechfab/robot/component/binary_communication_device
@@ -106,6 +106,6 @@
name = "Heavy surge prevention module"
desc = "Used to boost prevent damage from EMP. Has limited surge preventions."
id = "borg_surge_module"
materials = list(DEFAULT_WALL_MATERIAL = 20000, "glass" = 6000, "gold" = 5000, "silver" = 7500) // Should be expensive
materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GLASS = 6000, MATERIAL_GOLD = 5000, MATERIAL_SILVER = 7500) // Should be expensive
req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 2, TECH_MAGNET = 5, TECH_POWER = 5, TECH_ENGINEERING = 4, TECH_COMBAT = 3)
build_path = /obj/item/robot_parts/robot_component/surge
code/modules/research/designs/mechfab/robot/robot_upgrades.dm
+4 -4
View File
@@ -26,21 +26,21 @@
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(DEFAULT_WALL_MATERIAL = 60000, "glass" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 60000, MATERIAL_GLASS = 5000)
build_path = /obj/item/borg/upgrade/restart
/datum/design/item/robot_upgrade/vtec
name = "VTEC module"
desc = "Used to kick in a robot's VTEC systems, increasing their speed."
id = "borg_vtec_module"
materials = list(DEFAULT_WALL_MATERIAL = 80000, "glass" = 6000, "gold" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 80000, MATERIAL_GLASS = 6000, MATERIAL_GOLD = 5000)
build_path = /obj/item/borg/upgrade/vtec
/datum/design/item/robot_upgrade/jetpack
name = "Jetpack module"
desc = "A carbon dioxide jetpack suitable for low-gravity mining operations."
id = "borg_jetpack_module"
materials = list(DEFAULT_WALL_MATERIAL = 10000, "phoron" = 15000, "uranium" = 20000)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_PHORON = 15000, MATERIAL_URANIUM = 20000)
build_path = /obj/item/robot_parts/robot_component/jetpack
/datum/design/item/robot_upgrade/syndicate
@@ -48,5 +48,5 @@
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(DEFAULT_WALL_MATERIAL = 10000, "glass" = 15000, "diamond" = 10000)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 15000, MATERIAL_DIAMOND = 10000)
build_path = /obj/item/borg/upgrade/syndicate
code/modules/research/designs/medical_designs.dm
+13 -13
View File
@@ -3,7 +3,7 @@
////////////////////////////////////////////
/datum/design/item/medical
materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
/datum/design/item/medical/AssembleDesignName()
..()
@@ -22,7 +22,7 @@
desc = "A hand-held scanner able to diagnose robotic injuries."
id = "robot_scanner"
req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
materials = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 200)
build_path = /obj/item/device/robotanalyzer
sort_string = "MACFA"
@@ -71,7 +71,7 @@
desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units."
id = "bluespacebeaker"
req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 6)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "phoron" = 3000, "diamond" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_PHORON = 3000, MATERIAL_DIAMOND = 500)
build_path = /obj/item/reagent_containers/glass/beaker/bluespace
sort_string = "MADAB"
@@ -79,7 +79,7 @@
desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
id = "nanopaste"
req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
materials = list(DEFAULT_WALL_MATERIAL = 7000, MATERIAL_GLASS = 7000)
build_path = /obj/item/stack/nanopaste
sort_string = "MBAAA"
@@ -88,7 +88,7 @@
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved."
id = "scalpel_laser1"
req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2)
materials = list(DEFAULT_WALL_MATERIAL = 12500, "glass" = 7500)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500)
build_path = /obj/item/scalpel/laser1
sort_string = "MBBAA"
@@ -97,7 +97,7 @@
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced."
id = "scalpel_laser2"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 4, TECH_MAGNET = 4)
materials = list(DEFAULT_WALL_MATERIAL = 12500, "glass" = 7500, "silver" = 2500)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 2500)
build_path = /obj/item/scalpel/laser2
sort_string = "MBBAB"
@@ -106,7 +106,7 @@
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!"
id = "scalpel_laser3"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 5)
materials = list(DEFAULT_WALL_MATERIAL = 12500, "glass" = 7500, "silver" = 2000, "gold" = 1500)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 2000, MATERIAL_GOLD = 1500)
build_path = /obj/item/scalpel/laser3
sort_string = "MBBAC"
@@ -115,7 +115,7 @@
desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps."
id = "scalpel_manager"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 5, TECH_DATA = 4)
materials = list (DEFAULT_WALL_MATERIAL = 12500, "glass" = 7500, "silver" = 1500, "gold" = 1500, "diamond" = 750)
materials = list (DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 1500, MATERIAL_GOLD = 1500, MATERIAL_DIAMOND = 750)
build_path = /obj/item/scalpel/manager
sort_string = "MBBAD"
@@ -124,7 +124,7 @@
desc = "A very basic personal inhaler that directly injects chemicals into the lungs using a basic cartridge aerosol method."
id = "inhaler"
req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 1000)
build_path = /obj/item/personal_inhaler
sort_string = "MBCAA"
@@ -133,7 +133,7 @@
desc = "An improved inhaler design that injects the entirety of the chemicals in the loaded cartridge in a single button press."
id = "inhaler_combat"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 4, TECH_ENGINEERING = 4 )
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000, "silver" = 1500)
materials = list(DEFAULT_WALL_MATERIAL = 6000, MATERIAL_GLASS = 3000, MATERIAL_SILVER = 1500)
build_path = /obj/item/personal_inhaler/combat
sort_string = "MBCAB"
@@ -142,7 +142,7 @@
desc = "A small aerosol cartridge that can hold a small amount of chemicals. For use in an inhaler."
id = "inhaler_cartridge_small"
req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500)
build_path = /obj/item/reagent_containers/personal_inhaler_cartridge
sort_string = "MBCAC"
@@ -151,7 +151,7 @@
desc = "A large aerosol cartridge that can hold a decent amount of chemicals. For use in an inhaler."
id = "inhaler_cartridge_large"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500, "silver" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500, MATERIAL_SILVER = 500)
build_path = /obj/item/reagent_containers/personal_inhaler_cartridge/large
sort_string = "MBCAD"
@@ -160,6 +160,6 @@
desc = "A bluespace aerosol cartridge that can hold a robust amount of chemicals. For use in an inhaler."
id = "inhaler_cartridge_bluespace"
req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 6, TECH_BIO = 6)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "phoron" = 3000, "diamond" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_PHORON = 3000, MATERIAL_DIAMOND = 500)
build_path = /obj/item/reagent_containers/personal_inhaler_cartridge/bluespace
sort_string = "MBCAE"
code/modules/research/designs/mining_designs.dm
+6 -6
View File
@@ -9,35 +9,35 @@
desc = "A hand-held environmental scanner which reports current gas levels."
id = "analyzer"
req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
build_path = /obj/item/device/analyzer
sort_string = "KCAAC"
/datum/design/item/weapon/mining/jackhammer
id = "jackhammer"
req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "silver" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 500, MATERIAL_SILVER = 500)
build_path = /obj/item/pickaxe/jackhammer
sort_string = "KAAAA"
/datum/design/item/weapon/mining/drill
id = "drill"
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000) //expensive, but no need for miners.
materials = list(DEFAULT_WALL_MATERIAL = 6000, MATERIAL_GLASS = 1000) //expensive, but no need for miners.
build_path = /obj/item/pickaxe/drill
sort_string = "KAAAB"
/datum/design/item/weapon/mining/plasmacutter
id = "plasmacutter"
req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1500, "glass" = 500, "gold" = 500, "phoron" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 500, MATERIAL_GOLD = 500, MATERIAL_PHORON = 500)
build_path = /obj/item/gun/energy/plasmacutter
sort_string = "KAAAC"
/datum/design/item/weapon/mining/pick_diamond
id = "pick_diamond"
req_tech = list(TECH_MATERIAL = 6)
materials = list("diamond" = 3000)
materials = list(MATERIAL_DIAMOND = 3000)
build_path = /obj/item/pickaxe/diamond
sort_string = "KAAAD"
@@ -56,7 +56,7 @@ datum/design/circuit/telepad
/datum/design/item/weapon/mining/drill_diamond
id = "drill_diamond"
req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000, "diamond" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 1000, MATERIAL_DIAMOND = 2000)
build_path = /obj/item/pickaxe/diamonddrill
sort_string = "KAAAE"
code/modules/research/designs/modular_computer_designs.dm
+12 -12
View File
@@ -8,7 +8,7 @@
id = "hdd_basic"
req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 400, "glass" = 100)
materials = list(DEFAULT_WALL_MATERIAL = 400, MATERIAL_GLASS = 100)
build_path = /obj/item/computer_hardware/hard_drive/
sort_string = "VBAAA"
@@ -17,7 +17,7 @@
id = "hdd_advanced"
req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 800, "glass" = 200)
materials = list(DEFAULT_WALL_MATERIAL = 800, MATERIAL_GLASS = 200)
build_path = /obj/item/computer_hardware/hard_drive/advanced
sort_string = "VBAAB"
@@ -26,7 +26,7 @@
id = "hdd_super"
req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 1600, "glass" = 400)
materials = list(DEFAULT_WALL_MATERIAL = 1600, MATERIAL_GLASS = 400)
build_path = /obj/item/computer_hardware/hard_drive/super
sort_string = "VBAAC"
@@ -35,7 +35,7 @@
id = "hdd_cluster"
req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 3200, "glass" = 800)
materials = list(DEFAULT_WALL_MATERIAL = 3200, MATERIAL_GLASS = 800)
build_path = /obj/item/computer_hardware/hard_drive/cluster
sort_string = "VBAAD"
@@ -44,7 +44,7 @@
id = "hdd_small"
req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 800, "glass" = 200)
materials = list(DEFAULT_WALL_MATERIAL = 800, MATERIAL_GLASS = 200)
build_path = /obj/item/computer_hardware/hard_drive/small
sort_string = "VBAAE"
@@ -53,7 +53,7 @@
id = "hdd_micro"
req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 400, "glass" = 100)
materials = list(DEFAULT_WALL_MATERIAL = 400, MATERIAL_GLASS = 100)
build_path = /obj/item/computer_hardware/hard_drive/micro
sort_string = "VBAAF"
@@ -63,7 +63,7 @@
id = "netcard_basic"
req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1)
build_type = IMPRINTER
materials = list(DEFAULT_WALL_MATERIAL = 250, "glass" = 100)
materials = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 100)
chemicals = list("sacid" = 20)
build_path = /obj/item/computer_hardware/network_card
sort_string = "VBAAG"
@@ -73,7 +73,7 @@
id = "netcard_advanced"
req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2)
build_type = IMPRINTER
materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
materials = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 200)
chemicals = list("sacid" = 20)
build_path = /obj/item/computer_hardware/network_card/advanced
sort_string = "VBAAH"
@@ -83,7 +83,7 @@
id = "netcard_wired"
req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3)
build_type = IMPRINTER
materials = list(DEFAULT_WALL_MATERIAL = 2500, "glass" = 400)
materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 400)
chemicals = list("sacid" = 20)
build_path = /obj/item/computer_hardware/network_card/wired
sort_string = "VBAAI"
@@ -94,7 +94,7 @@
id = "portadrive_basic"
req_tech = list(TECH_DATA = 1)
build_type = IMPRINTER
materials = list("glass" = 800)
materials = list(MATERIAL_GLASS = 800)
chemicals = list("sacid" = 20)
build_path = /obj/item/computer_hardware/hard_drive/portable
sort_string = "VBAAJ"
@@ -104,7 +104,7 @@
id = "portadrive_advanced"
req_tech = list(TECH_DATA = 2)
build_type = IMPRINTER
materials = list("glass" = 1600)
materials = list(MATERIAL_GLASS = 1600)
chemicals = list("sacid" = 20)
build_path = /obj/item/computer_hardware/hard_drive/portable/advanced
sort_string = "VBAAK"
@@ -114,7 +114,7 @@
id = "portadrive_super"
req_tech = list(TECH_DATA = 4)
build_type = IMPRINTER
materials = list("glass" = 3200)
materials = list(MATERIAL_GLASS = 3200)
chemicals = list("sacid" = 20)
build_path = /obj/item/computer_hardware/hard_drive/portable/super
sort_string = "VBAAL"
code/modules/research/designs/power_designs.dm
+5 -5
View File
@@ -23,7 +23,7 @@
build_type = PROTOLATHE | MECHFAB
id = "basic_cell"
req_tech = list(TECH_POWER = 1)
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 50)
build_path = /obj/item/cell
category = "Misc"
sort_string = "DAAAA"
@@ -33,7 +33,7 @@
build_type = PROTOLATHE | MECHFAB
id = "high_cell"
req_tech = list(TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 60)
materials = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 60)
build_path = /obj/item/cell/high
category = "Misc"
sort_string = "DAAAB"
@@ -42,7 +42,7 @@
name = "super-capacity"
id = "super_cell"
req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 70)
materials = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 70)
build_path = /obj/item/cell/super
category = "Misc"
sort_string = "DAAAC"
@@ -51,7 +51,7 @@
name = "hyper-capacity"
id = "hyper_cell"
req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 400, "gold" = 150, "silver" = 150, "glass" = 70)
materials = list(DEFAULT_WALL_MATERIAL = 400, MATERIAL_GOLD = 150, MATERIAL_SILVER = 150, MATERIAL_GLASS = 70)
build_path = /obj/item/cell/hyper
category = "Misc"
sort_string = "DAAAD"
@@ -61,7 +61,7 @@
build_type = PROTOLATHE | MECHFAB
id = "device_cell"
req_tech = list(TECH_POWER = 1)
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 50)
build_path = /obj/item/cell/device
category = "Misc"
sort_string = "DAAAE"
code/modules/research/designs/stock_parts_designs.dm
+17 -17
View File
@@ -15,21 +15,21 @@
/datum/design/item/stock_part/basic_capacitor
id = "basic_capacitor"
req_tech = list(TECH_POWER = 1)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
build_path = /obj/item/stock_parts/capacitor
sort_string = "CAAAA"
/datum/design/item/stock_part/adv_capacitor
id = "adv_capacitor"
req_tech = list(TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
build_path = /obj/item/stock_parts/capacitor/adv
sort_string = "CAAAB"
/datum/design/item/stock_part/super_capacitor
id = "super_capacitor"
req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, "gold" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50, MATERIAL_GOLD = 20)
build_path = /obj/item/stock_parts/capacitor/super
sort_string = "CAAAC"
@@ -78,42 +78,42 @@
/datum/design/item/stock_part/basic_micro_laser
id = "basic_micro_laser"
req_tech = list(TECH_MAGNET = 1)
materials = list(DEFAULT_WALL_MATERIAL = 10, "glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GLASS = 20)
build_path = /obj/item/stock_parts/micro_laser
sort_string = "CAADA"
/datum/design/item/stock_part/high_micro_laser
id = "high_micro_laser"
req_tech = list(TECH_MAGNET = 3)
materials = list(DEFAULT_WALL_MATERIAL = 10, "glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GLASS = 20)
build_path = /obj/item/stock_parts/micro_laser/high
sort_string = "CAADB"
/datum/design/item/stock_part/ultra_micro_laser
id = "ultra_micro_laser"
req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5)
materials = list(DEFAULT_WALL_MATERIAL = 10, "glass" = 20, "uranium" = 10)
materials = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GLASS = 20, MATERIAL_URANIUM = 10)
build_path = /obj/item/stock_parts/micro_laser/ultra
sort_string = "CAADC"
/datum/design/item/stock_part/basic_sensor
id = "basic_sensor"
req_tech = list(TECH_MAGNET = 1)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
build_path = /obj/item/stock_parts/scanning_module
sort_string = "CAAEA"
/datum/design/item/stock_part/adv_sensor
id = "adv_sensor"
req_tech = list(TECH_MAGNET = 3)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
build_path = /obj/item/stock_parts/scanning_module/adv
sort_string = "CAAEB"
/datum/design/item/stock_part/phasic_sensor
id = "phasic_sensor"
req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 3)
materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20, "silver" = 10)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20, MATERIAL_SILVER = 10)
build_path = /obj/item/stock_parts/scanning_module/phasic
sort_string = "CAAEC"
@@ -122,55 +122,55 @@
desc = "Special mechanical module made to store, sort, and apply standard machine parts."
id = "rped"
req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 3)
materials = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 5000)
build_path = /obj/item/storage/part_replacer
sort_string = "CBAAA"
/datum/design/item/stock_part/subspace_ansible
id = "s-ansible"
req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 80, "silver" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 80, MATERIAL_SILVER = 20)
build_path = /obj/item/stock_parts/subspace/ansible
sort_string = "UAAAA"
/datum/design/item/stock_part/hyperwave_filter
id = "s-filter"
req_tech = list(TECH_DATA = 3, TECH_MAGNET = 3)
materials = list(DEFAULT_WALL_MATERIAL = 40, "silver" = 10)
materials = list(DEFAULT_WALL_MATERIAL = 40, MATERIAL_SILVER = 10)
build_path = /obj/item/stock_parts/subspace/filter
sort_string = "UAAAB"
/datum/design/item/stock_part/subspace_amplifier
id = "s-amplifier"
req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 10, "gold" = 30, "uranium" = 15)
materials = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GOLD = 30, MATERIAL_URANIUM = 15)
build_path = /obj/item/stock_parts/subspace/amplifier
sort_string = "UAAAC"
/datum/design/item/stock_part/subspace_treatment
id = "s-treatment"
req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 10, "silver" = 20)
materials = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_SILVER = 20)
build_path = /obj/item/stock_parts/subspace/treatment
sort_string = "UAAAD"
/datum/design/item/stock_part/subspace_analyzer
id = "s-analyzer"
req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 10, "gold" = 15)
materials = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GOLD = 15)
build_path = /obj/item/stock_parts/subspace/analyzer
sort_string = "UAAAE"
/datum/design/item/stock_part/subspace_crystal
id = "s-crystal"
req_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
materials = list("glass" = 1000, "silver" = 20, "gold" = 20)
materials = list(MATERIAL_GLASS = 1000, MATERIAL_SILVER = 20, MATERIAL_GOLD = 20)
build_path = /obj/item/stock_parts/subspace/crystal
sort_string = "UAAAF"
/datum/design/item/stock_part/subspace_transmitter
id = "s-transmitter"
req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3)
materials = list("glass" = 100, "silver" = 10, "uranium" = 15)
materials = list(MATERIAL_GLASS = 100, MATERIAL_SILVER = 10, MATERIAL_URANIUM = 15)
build_path = /obj/item/stock_parts/subspace/transmitter
sort_string = "UAAAG"
code/modules/research/designs/weapon_designs.dm
+54 -54
View File
@@ -24,7 +24,7 @@
/datum/design/item/weapon/flora_gun
id = "flora_gun"
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "uranium" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 500, MATERIAL_URANIUM = 500)
build_path = /obj/item/gun/energy/floragun
sort_string = "TBAAA"
@@ -40,14 +40,14 @@
desc = "An advanced chem spraying device."
id = "chemsprayer"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000)
build_path = /obj/item/reagent_containers/spray/chemsprayer
sort_string = "TABAA"
/datum/design/item/weapon/rapidsyringe
id = "rapidsyringe"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000)
build_path = /obj/item/gun/launcher/syringe/rapid
sort_string = "TABAB"
@@ -55,7 +55,7 @@
desc = "A gun that shoots high-powered glass-encased energy temperature bullets."
id = "temp_gun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 500, "silver" = 3000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 500, MATERIAL_SILVER = 3000)
build_path = /obj/item/gun/energy/temperature
sort_string = "TABAC"
@@ -71,7 +71,7 @@
name = "energy glaive"
desc = "A Li'idra designed hardlight glaive reverse-engineered from schematics found amongst raider wreckages."
req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4,TECH_POWER = 4)
materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 18750, "phoron" = 3000, "silver" = 7500)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 18750, MATERIAL_PHORON = 3000, MATERIAL_SILVER = 7500)
build_path = /obj/item/melee/energy/glaive
sort_string = "TVAAA"
@@ -92,7 +92,7 @@
id = "eshield"
req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 4)
build_type = PROTOLATHE
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 3000, "phoron" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 3000, MATERIAL_PHORON = 1000)
build_path = /obj/item/shield/energy
category = "Weapons"
sort_string = "TVHAA"
@@ -100,7 +100,7 @@
/datum/design/item/weapon/gun/beegun
id = "beegun"
req_tech = list(TECH_MATERIAL = 6, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 6, TECH_MAGNET = 4)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "silver" = 500, "diamond" = 3000)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 2000, MATERIAL_SILVER = 500, MATERIAL_DIAMOND = 3000)
build_path = /obj/item/gun/energy/beegun
sort_string = "TVMAA"
@@ -150,56 +150,56 @@
/datum/design/item/weapon/modular_nuke
id = "stock_nuke_cap"
req_tech = list(TECH_POWER = 5, TECH_ENGINEERING = 5)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "uranium" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_URANIUM = 1000)
build_path = /obj/item/laser_components/capacitor/nuclear
sort_string = "TZZBD"
/datum/design/item/weapon/modular_teranium
id = "stock_teranium"
req_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 6)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 1000, "uranium" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_GLASS = 1000, MATERIAL_URANIUM = 500)
build_path = /obj/item/laser_components/capacitor/teranium
sort_string = "TZZBE"
/datum/design/item/weapon/modular_phoron
id = "stock_phoron"
req_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 5, TECH_PHORON = 5)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "phoron" = 3000, "uranium" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_PHORON = 3000, MATERIAL_URANIUM = 500)
build_path = /obj/item/laser_components/capacitor/phoron
sort_string = "TZZBF"
/datum/design/item/weapon/modular_bs
id = "stock_bs"
req_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 7, TECH_PHORON = 6, TECH_BLUESPACE = 5)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "phoron" = 3000, "uranium" = 500, "diamond" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_PHORON = 3000, MATERIAL_URANIUM = 500, MATERIAL_DIAMOND = 1000)
build_path = /obj/item/laser_components/capacitor/bluespace
sort_string = "TZZBG"
/datum/design/item/weapon/modular_lens
id = "stock_lens"
req_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 2000)
build_path = /obj/item/laser_components/focusing_lens
sort_string = "TZZCA"
/datum/design/item/weapon/modular_splitter
id = "stock_splitter"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 1)
materials = list(DEFAULT_WALL_MATERIAL = 750, "glass" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 2000)
build_path = /obj/item/laser_components/focusing_lens/shotgun
sort_string = "TZZCB"
/datum/design/item/weapon/modular_sniper
id = "stock_sniper"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 1)
materials = list(DEFAULT_WALL_MATERIAL = 750, "glass" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 2000)
build_path = /obj/item/laser_components/focusing_lens/sniper
sort_string = "TZZCC"
/datum/design/item/weapon/modular_reinforced
id = "stock_strong"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 1)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 1000)
build_path = /obj/item/laser_components/focusing_lens/strong
sort_string = "TZZCD"
@@ -213,49 +213,49 @@
/datum/design/item/weapon/modular_aeg
id = "stock_aeg"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "uranium" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000, MATERIAL_URANIUM = 500)
build_path = /obj/item/laser_components/modifier/aeg
sort_string = "TZZDB"
/datum/design/item/weapon/modular_surge
id = "stock_surge"
req_tech = list(TECH_MATERIAL = 5, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000)
build_path = /obj/item/laser_components/modifier/surge
sort_string = "TZZDC"
/datum/design/item/weapon/modular_repeater
id = "stock_repeater"
req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000)
build_path = /obj/item/laser_components/modifier/repeater
sort_string = "TZZDD"
/datum/design/item/weapon/modular_aux
id = "stock_aux"
req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000)
build_path = /obj/item/laser_components/modifier/auxiliarycap
sort_string = "TZZDE"
/datum/design/item/weapon/modular_overcharge
id = "stock_repeater"
req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4, TECH_POWER = 4)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000)
build_path = /obj/item/laser_components/modifier/overcharge
sort_string = "TZZDF"
/datum/design/item/weapon/modular_gatling
id = "stock_gat"
req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 5, TECH_MATERIAL = 6, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 750, "glass" = 3000, "phoron" = 2000, "silver" = 2000, "diamond" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 3000, MATERIAL_PHORON = 2000, MATERIAL_SILVER = 2000, MATERIAL_DIAMOND = 1000)
build_path = /obj/item/laser_components/modifier/gatling
sort_string = "TZZDG"
/datum/design/item/weapon/modular_scope
id = "stock_scope"
req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500)
build_path = /obj/item/laser_components/modifier/scope
sort_string = "TZZDH"
@@ -290,7 +290,7 @@
/datum/design/item/weapon/modular_ebayonet
id = "stock_ebayonet"
req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "silver" = 500, "phoron" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_SILVER = 500, MATERIAL_PHORON = 500)
build_path = /obj/item/laser_components/modifier/ebayonet
sort_string = "TZZDM"
@@ -311,35 +311,35 @@
/datum/design/item/weapon/modular_tesla
id = "stock_supertaser"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 6, TECH_POWER = 4)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "silver" = 1000, "phoron" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_SILVER = 1000, MATERIAL_PHORON = 2000)
build_path = /obj/item/laser_components/modulator/tesla
sort_string = "TZZEB"
/datum/design/item/weapon/modular_ion
id = "stock_ion"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 5)
materials = list(DEFAULT_WALL_MATERIAL = 750, "glass" = 500, "phoron" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 500, MATERIAL_PHORON = 2000)
build_path = /obj/item/laser_components/modulator/ion
sort_string = "TZZEC"
/datum/design/item/weapon/modular_soma
id = "stock_soma"
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 250, "uranium" = 250)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 250, MATERIAL_URANIUM = 250)
build_path = /obj/item/laser_components/modulator/floramut
sort_string = "TZZED"
/datum/design/item/weapon/modular_beta
id = "stock_beta"
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 250, "uranium" = 250)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 250, MATERIAL_URANIUM = 250)
build_path = /obj/item/laser_components/modulator/floramut2
sort_string = "TZZEE"
/datum/design/item/weapon/modular_pest
id = "stock_pest"
req_tech = list(TECH_MATERIAL = 1, TECH_BIO = 4, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "uranium" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 1000, MATERIAL_URANIUM = 500)
build_path = /obj/item/laser_components/modulator/arodentia
sort_string = "TZZEF"
@@ -374,42 +374,42 @@
/datum/design/item/weapon/modular_decloner
id = "stock_declone"
req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "phoron" = 3000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000, MATERIAL_PHORON = 3000)
build_path = /obj/item/laser_components/modulator/decloner
sort_string = "TZZEK"
/datum/design/item/weapon/modular_ebow
id = "stock_ebow"
req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4, TECH_ILLEGAL = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "phoron" = 3000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000, MATERIAL_PHORON = 3000)
build_path = /obj/item/laser_components/modulator/ebow
sort_string = "TZZEL"
/datum/design/item/weapon/modular_blaster
id = "stock_blaster"
req_tech = list(TECH_COMBAT = 2, TECH_PHORON = 4, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 8000, "glass" = 2000, "phoron" = 6000)
materials = list(DEFAULT_WALL_MATERIAL = 8000, MATERIAL_GLASS = 2000, MATERIAL_PHORON = 6000)
build_path = /obj/item/laser_components/modulator/blaster
sort_string = "TZZEM"
/datum/design/item/weapon/modular_laser
id = "stock_laser"
req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 750, "glass" = 500, "phoron" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 500, MATERIAL_PHORON = 1000)
build_path = /obj/item/laser_components/modulator
sort_string = "TZZEN"
/datum/design/item/weapon/modular_tox
id = "stock_tox"
req_tech = list(TECH_COMBAT = 4, TECH_PHORON = 3)
materials = list(DEFAULT_WALL_MATERIAL = 2500, "glass" = 1000, "phoron" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 1000, MATERIAL_PHORON = 2000)
build_path = /obj/item/laser_components/modulator/tox
sort_string = "TZZEO"
/datum/design/item/weapon/modular_net
id = "stock_net"
req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4, TECH_ILLEGAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "phoron" = 3000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 1000, MATERIAL_PHORON = 3000)
build_path = /obj/item/laser_components/modulator/net
sort_string = "TZZEP"
@@ -431,21 +431,21 @@
/datum/design/item/weapon/ka_frame03
id = "ka_frame03"
req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "silver" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_SILVER = 2000)
build_path = /obj/item/gun/custom_ka/frame03
sort_string = "TZZFC"
/datum/design/item/weapon/ka_frame04
id = "ka_frame04"
req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "silver" = 2000, "diamond" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_SILVER = 2000, MATERIAL_DIAMOND = 1000)
build_path = /obj/item/gun/custom_ka/frame04
sort_string = "TZZFD"
/datum/design/item/weapon/ka_frame05
id = "ka_frame05"
req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "silver" = 4000, "diamond" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 6000, MATERIAL_SILVER = 4000, MATERIAL_DIAMOND = 2000)
build_path = /obj/item/gun/custom_ka/frame05
sort_string = "TZZFE"
@@ -453,35 +453,35 @@
/datum/design/item/weapon/ka_cell01
id = "ka_cell01"
req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 1)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 1000)
build_path = /obj/item/custom_ka_upgrade/cells/cell01
sort_string = "TZZGA"
/datum/design/item/weapon/ka_cell02
id = "ka_cell02"
req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 1000, MATERIAL_SILVER = 1000)
build_path = /obj/item/custom_ka_upgrade/cells/cell02
sort_string = "TZZGB"
/datum/design/item/weapon/ka_cell03
id = "ka_cell03"
req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 2,TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 3000, "silver" = 3000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 3000, MATERIAL_SILVER = 3000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/cells/cell03
sort_string = "TZZGC"
/datum/design/item/weapon/ka_cell04
id = "ka_cell04"
req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 4,TECH_MAGNET = 3,TECH_POWER = 5)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 3000, "silver" = 3000, "gold" = 1000, "uranium" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_GLASS = 3000, MATERIAL_SILVER = 3000, MATERIAL_GOLD = 1000, MATERIAL_URANIUM = 5000)
build_path = /obj/item/custom_ka_upgrade/cells/cell04
sort_string = "TZZGD"
/datum/design/item/weapon/ka_cell05
id = "ka_cell05"
req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 6,TECH_MAGNET = 5,TECH_POWER = 5, TECH_PHORON = 5)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 3000, "silver" = 3000, "gold" = 1000, "phoron" = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 3000, MATERIAL_SILVER = 3000, MATERIAL_GOLD = 1000, MATERIAL_PHORON = 5000)
build_path = /obj/item/custom_ka_upgrade/cells/cell05
sort_string = "TZZGE"
@@ -489,35 +489,35 @@
/datum/design/item/weapon/ka_barrel01
id = "ka_barrel01"
req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1, TECH_PHORON = 2)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "phoron" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 2000, MATERIAL_PHORON = 500)
build_path = /obj/item/custom_ka_upgrade/barrels/barrel01
sort_string = "TZZHA"
/datum/design/item/weapon/ka_barrel02
id = "ka_barrel02"
req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 3, TECH_PHORON = 2)
materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000, "phoron" = 500)
materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 2000, MATERIAL_PHORON = 500)
build_path = /obj/item/custom_ka_upgrade/barrels/barrel02
sort_string = "TZZHB"
/datum/design/item/weapon/ka_barrel03
id = "ka_barrel03"
req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 3, TECH_PHORON = 3)
materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, "gold" = 2000, "phoron" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 4000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 2000, MATERIAL_PHORON = 1000)
build_path = /obj/item/custom_ka_upgrade/barrels/barrel03
sort_string = "TZZHC"
/datum/design/item/weapon/ka_barrel04
id = "ka_barrel04"
req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 3,TECH_MAGNET = 5, TECH_PHORON = 4)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 3000, "gold" = 3000, "phoron" = 3000, "diamond" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 3000, MATERIAL_GOLD = 3000, MATERIAL_PHORON = 3000, MATERIAL_DIAMOND = 1000)
build_path = /obj/item/custom_ka_upgrade/barrels/barrel04
sort_string = "TZZHD"
/datum/design/item/weapon/ka_barrel05
id = "ka_barrel05"
req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 6, TECH_PHORON = 5)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 4000, "gold" = 4000, "phoron" = 4000, "diamond" = 2000)
materials = list(DEFAULT_WALL_MATERIAL = 6000, MATERIAL_GLASS = 4000, MATERIAL_GOLD = 4000, MATERIAL_PHORON = 4000, MATERIAL_DIAMOND = 2000)
build_path = /obj/item/custom_ka_upgrade/barrels/barrel05
sort_string = "TZZHE"
@@ -525,48 +525,48 @@
/datum/design/item/weapon/ka_upgrade01
id = "ka_upgrade01"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/damage
sort_string = "TZZIA"
/datum/design/item/weapon/ka_upgrade02
id = "ka_upgrade02"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/firerate
sort_string = "TZZIB"
/datum/design/item/weapon/ka_upgrade03
id = "ka_upgrade03"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/effeciency
sort_string = "TZZIC"
/datum/design/item/weapon/ka_upgrade04
id = "ka_upgrade04"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/recoil
sort_string = "TZZID"
/datum/design/item/weapon/ka_upgrade05
id = "ka_upgrade05"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/focusing
sort_string = "TZZIE"
/datum/design/item/weapon/ka_upgrade06
id = "ka_upgrade06"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/capacity
sort_string = "TZZIF"
/datum/design/item/weapon/ka_upgrade07
id = "ka_upgrade07"
req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000)
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 2000, MATERIAL_GOLD = 1000)
build_path = /obj/item/custom_ka_upgrade/upgrade_chips/explosive
sort_string = "TZZIG"
code/modules/research/protolathe.dm
+1 -1
View File
@@ -8,7 +8,7 @@
active_power_usage = 5000
var/max_material_storage = 100000
var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0)
var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, MATERIAL_GLASS = 0, MATERIAL_GOLD = 0, MATERIAL_SILVER = 0, MATERIAL_PHORON = 0, MATERIAL_URANIUM = 0, MATERIAL_DIAMOND = 0)
var/list/datum/design/queue = list()
var/progress = 0
code/modules/research/research.dm
+2 -2
View File
@@ -218,7 +218,7 @@ research holder datum.
icon_state = "datadisk2"
item_state = "card-id"
w_class = 2.0
matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
var/datum/tech/stored
/obj/item/disk/tech_disk/New()
@@ -232,7 +232,7 @@ research holder datum.
icon_state = "datadisk2"
item_state = "card-id"
w_class = 2.0
matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
var/datum/design/blueprint
/obj/item/disk/design_disk/New()
code/modules/research/stockparts.dm
+16 -16
View File
@@ -19,21 +19,21 @@
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = list(TECH_MATERIAL = 1)
matter = list("glass" = 200)
matter = list(MATERIAL_GLASS = 200)
/obj/item/stock_parts/capacitor
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = list(TECH_POWER = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
/obj/item/stock_parts/scanning_module
name = "scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
/obj/item/stock_parts/manipulator
name = "micro-manipulator"
@@ -47,7 +47,7 @@
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GLASS = 20)
/obj/item/stock_parts/matter_bin
name = "matter bin"
@@ -63,7 +63,7 @@
desc = "An advanced capacitor used in the construction of a variety of devices."
origin_tech = list(TECH_POWER = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
/obj/item/stock_parts/scanning_module/adv
name = "advanced scanning module"
@@ -71,7 +71,7 @@
icon_state = "scan_module"
origin_tech = list(TECH_MAGNET = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
/obj/item/stock_parts/manipulator/nano
name = "nano-manipulator"
@@ -87,7 +87,7 @@
icon_state = "high_micro_laser"
origin_tech = list(TECH_MAGNET = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GLASS = 20)
/obj/item/stock_parts/matter_bin/adv
name = "advanced matter bin"
@@ -104,14 +104,14 @@
desc = "A super-high capacity capacitor used in the construction of a variety of devices."
origin_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
/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."
origin_tech = list(TECH_MAGNET = 5)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
/obj/item/stock_parts/manipulator/pico
name = "pico-manipulator"
@@ -127,7 +127,7 @@
desc = "A tiny laser used in certain devices."
origin_tech = list(TECH_MAGNET = 5)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 10, MATERIAL_GLASS = 20)
/obj/item/stock_parts/matter_bin/super
name = "super matter bin"
@@ -144,42 +144,42 @@
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 5 ,TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
/obj/item/stock_parts/subspace/filter
name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
origin_tech = list(TECH_DATA = 4, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
/obj/item/stock_parts/subspace/amplifier
name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
/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."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 5, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
/obj/item/stock_parts/subspace/analyzer
name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
origin_tech = list(TECH_DATA = 3, TECH_MAGNETS = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
/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."
origin_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list("glass" = 50)
matter = list(MATERIAL_GLASS = 50)
/obj/item/stock_parts/subspace/transmitter
name = "subspace transmitter"
code/modules/research/xenoarchaeology/chemistry.dm
+1 -1
View File
@@ -6,7 +6,7 @@
desc = "A small, open-topped glass container for delicate research samples. It sports a re-useable strip for labelling with a pen."
icon = 'icons/obj/device.dmi'
icon_state = "solution_tray"
matter = list("glass" = 5)
matter = list(MATERIAL_GLASS = 5)
w_class = 2.0
amount_per_transfer_from_this = 1
possible_transfer_amounts = list(1, 2)