Merge branch 'master' into var/const-to-define

This commit is contained in:
AffectedArc07
2020-03-09 10:33:59 +00:00
committed by GitHub
50 changed files with 182 additions and 96 deletions
@@ -872,14 +872,6 @@
build_path = /obj/item/assembly/mousetrap
category = list("initial", "Miscellaneous")
/datum/design/videocam
name = "Video Camera"
id = "videocam"
build_type = AUTOLATHE
materials = list(MAT_METAL = 120, MAT_GLASS = 60)
build_path = /obj/item/videocam
category = list("initial", "Miscellaneous")
/datum/design/logic_board
name = "Logic Circuit"
id = "logic_board"