cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into to_chat

Browse Source 
Conflicts:
	code/game/machinery/door_control.dm
This commit is contained in:
Tigercat2000
2016-04-05 21:10:36 -07:00
parent bb5e3bca63 702ac3d367
commit dd79aaa967
21 changed files with 1125 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
+8
View File
@@ -638,4 +638,12 @@
build_type = AUTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 125)
build_path = /obj/item/weapon/hand_labeler
category = list("initial", "Electronics")
/datum/design/logic_board
name = "Logic Circuit"
id = "logic_board"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/weapon/circuitboard/logic_gate
category = list("initial", "Electronics")