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

Update circuits.dm

Browse Source
This commit is contained in:
Novacat
2020-07-30 15:19:40 -04:00
committed by GitHub
parent a354da4750
commit de6f55a86d
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,10 +625,7 @@ CIRCUITS BELOW
req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4) req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4)
build_path = /obj/item/weapon/circuitboard/microwave/advanced build_path = /obj/item/weapon/circuitboard/microwave/advanced
sort_string = "HACAA" sort_string = "HACAA"
<<<<<<< HEAD
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/datum/design/circuit/shield_generator /datum/design/circuit/shield_generator
name = "shield generator" name = "shield generator"