Merge branch 'master' into protean-rework

This commit is contained in:
BlackMajor
2023-02-23 14:31:09 +13:00
310 changed files with 144992 additions and 152112 deletions
@@ -1,3 +1,19 @@
/datum/design/item/mechfab/rigsuit/phase
name = "hardsuit phase rifle"
desc = "A compact phase rifle for a hardsuit."
id = "rig_gun_phase"
req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_MAGNET = 3, TECH_POWER = 4, TECH_COMBAT = 4)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1250)
build_path = /obj/item/rig_module/mounted/phase
/datum/design/item/mechfab/rigsuit/defib
name = "hardsuit defib unit"
desc = "A rig mounted defib and jumper kit combo."
id = "rig_defib"
req_tech = list(TECH_BIO = 5, TECH_MAGNET = 2, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 2000)
build_path = /obj/item/rig_module/device/defib
/datum/design/item/mecha/phoron_bore
name = "PB-23 \"Phobos\" Phoron Bore"
category = list("Exosuit Equipment")
@@ -111,18 +127,11 @@
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000, MAT_PHORON = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 500)
/datum/design/item/mechfab/rigsuit/phase
name = "hardsuit phase rifle"
desc = "A compact phase rifle for a hardsuit."
id = "rig_gun_phase"
req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_MAGNET = 3, TECH_POWER = 4, TECH_COMBAT = 4)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1250)
build_path = /obj/item/rig_module/mounted/phase
/datum/design/item/mechfab/rigsuit/defib
name = "hardsuit defib unit"
desc = "A rig mounted defib and jumper kit combo."
id = "rig_defib"
req_tech = list(TECH_BIO = 5, TECH_MAGNET = 2, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 2000)
build_path = /obj/item/rig_module/device/defib
/datum/design/item/mechfab/rigsuit/precursor
name = "Xenotech Rig"
desc = "A rig made of alien tech and materials."
id = "rigmodule_precursor"
time = 30
req_tech = list(TECH_MATERIAL = 9, TECH_ENGINEERING = 6, TECH_PHORON = 5, TECH_MAGNET = 6, TECH_POWER = 6, TECH_ILLEGAL = 8, TECH_PRECURSOR = 3)
materials = list(MAT_PLASTEEL = 12000, MAT_GOLD = 5000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 3000, MAT_PLASTIC = 6000, MAT_VERDANTIUM = 7500, MAT_MORPHIUM = 20000)
build_path = /obj/item/weapon/rig/ch/precursor