cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Reverts recipe changes from Industrial Expansion

Browse Source
This commit is contained in:
Chompstation Bot
2021-05-27 17:17:01 +00:00
parent bbafe17f3b
commit d76e756e5f
48 changed files with 71532 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/modules/research/designs/circuits/circuits.dm
View File

@@ -5,7 +5,7 @@ CIRCUITS BELOW
/datum/design/circuit
build_type = IMPRINTER
req_tech = list(TECH_DATA = 2)
materials = list("glass" = 1850, MAT_COPPER = 150)
materials = list("glass" = 2000)
chemicals = list("sacid" = 20)
time = 5
@@ -493,7 +493,7 @@ CIRCUITS BELOW
name = "'Durand' central control"
id = "durand_main"
req_tech = list(TECH_DATA = 4)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250, MAT_COPPER = 100)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/main
sort_string = "NAADA"
@@ -502,7 +502,7 @@ CIRCUITS BELOW
name = "'Durand' peripherals control"
id = "durand_peri"
req_tech = list(TECH_DATA = 4)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250, MAT_COPPER = 100)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
sort_string = "NAADB"
@@ -511,7 +511,7 @@ CIRCUITS BELOW
name = "'Durand' weapon control and targeting"
id = "durand_targ"
req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250, MAT_COPPER = 100)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
sort_string = "NAADC"
@@ -578,7 +578,7 @@ CIRCUITS BELOW
/datum/design/circuit/shield
req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
materials = list("glass" = 2000, MAT_COPPER = 100, "gold" = 1000)
materials = list("glass" = 2000, "gold" = 1000)
/datum/design/circuit/shield/AssembleDesignName()
name = "Shield generator circuit design ([name])"
@@ -662,6 +662,25 @@ CIRCUITS BELOW
build_path = /obj/item/weapon/circuitboard/microwave/advanced
sort_string = "HACAA"
<<<<<<< HEAD
||||||| parent of 21658b8d85... Merge pull request #10401 from VOREStation/upstream-merge-8075
/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"
=======
>>>>>>> 21658b8d85... Merge pull request #10401 from VOREStation/upstream-merge-8075
/datum/design/circuit/shield_generator
name = "shield generator"
id = "shield_generator"