Merge branch 'master' into protean-rework

This commit is contained in:
BlackMajor
2022-10-18 17:44:15 +13:00
committed by GitHub
302 changed files with 10544 additions and 5631 deletions

View File

@@ -676,6 +676,20 @@ CIRCUITS BELOW
build_path = /obj/item/weapon/circuitboard/microwave/advanced
sort_string = "HACAA"
/datum/design/circuit/pointdefense
name = "point defense battery"
id = "pointdefense"
req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4)
build_path = /obj/item/weapon/circuitboard/pointdefense
sort_string = "OAABA"
/datum/design/circuit/pointdefense_control
name = "point defense control"
id = "pointdefense_control"
req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2)
build_path = /obj/item/weapon/circuitboard/pointdefense_control
sort_string = "OAABB"
/datum/design/circuit/shield_generator
name = "shield generator"
id = "shield_generator"

View File

@@ -87,3 +87,7 @@
req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 2)
build_path = /obj/random/janusmodule
sort_string = "ZBBAA"
/datum/design/item/precursor/janusmodule/Fabricate(var/newloc, var/fabricator)
var/type_to_spawn = pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion))
return new type_to_spawn(newloc)