Merge branch 'master' into upstream-merge-8298

This commit is contained in:
Novacat
2022-03-22 08:53:45 -04:00
committed by GitHub
218 changed files with 4106 additions and 853 deletions
@@ -48,3 +48,12 @@
materials = list(MAT_STEEL = 1000,MAT_GLASS = 1000)
build_path = /obj/item/device/depth_scanner
sort_string = "FBAAA"
/datum/design/item/weapon/mining/upgradeAOE
name = "Mining Explosion Upgrade"
desc = "An area of effect upgrade for the Proto-Kinetic Accelerator."
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.
materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 500, MAT_GOLD = 500, MAT_URANIUM = 2000, MAT_PHORON = 2000)
build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
sort_string = "FAAF"
+9
View File
@@ -72,3 +72,12 @@
materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000)
build_path = /obj/item/device/spaceflare
sort_string = "TBAAC"
/datum/design/item/general/riflescope
name = "rifle scope"
desc = "A scope that can be mounted to certain rifles."
id = "riflescope"
req_tech = list(TECH_ILLEGAL = 2, TECH_MATERIAL = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
build_path = /obj/item/device/binoculars/scope
sort_string = "TBAAD"
+30 -1
View File
@@ -12,4 +12,33 @@
id = "borg_hound_capacity_module"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
build_path = /obj/item/borg/upgrade/bellysizeupgrade
build_path = /obj/item/borg/upgrade/bellysizeupgrade
/*
Some job related borg upgrade modules, adding useful items for puppers.
*/
/datum/design/item/prosfab/robot_upgrade/advrped
name = "Advanced Rapid Part Exchange Device"
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)
build_path = /obj/item/borg/upgrade/advrped
/datum/design/item/prosfab/robot_upgrade/diamonddrill
name = "Diamond Drill"
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)
build_path = /obj/item/borg/upgrade/diamonddrill
/datum/design/item/prosfab/robot_upgrade/pka
name = "Proto-Kinetic Accelerator"
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)
build_path = /obj/item/borg/upgrade/pka