cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape

Browse Source 
Conflicts:
	code/__defines/misc.dm
This commit is contained in:
PsiOmegaDelta
2015-12-13 11:50:06 +01:00
parent eda4a5d595 3996c2a57a
commit bbe65baf5c
91 changed files with 3150 additions and 2217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/research/designs.dm
View File

@@ -744,12 +744,19 @@ CIRCUITS BELOW
desc = "Allows for the construction of \a [item_name] circuit board."
/datum/design/circuit/arcademachine
name = "arcade machine"
name = "battle arcade machine"
id = "arcademachine"
req_tech = list(TECH_DATA = 1)
build_path = /obj/item/weapon/circuitboard/arcade
build_path = /obj/item/weapon/circuitboard/arcade/battle
sort_string = "MAAAA"
/datum/design/circuit/oriontrail
name = "orion trail arcade machine"
id = "oriontrail"
req_tech = list(TECH_DATA = 1)
build_path = /obj/item/weapon/circuitboard/arcade/orion_trail
sort_string = "MABAA"
/datum/design/circuit/seccamera
name = "security camera monitor"
id = "seccamera"