Merge branch 'master' into Cargo_MKII

2019-11-03 17:53:06 -05:00
parent 40a47bb4e9 4e8c8ad335
commit 82b148b7b7
455 changed files with 5612 additions and 5488 deletions
@@ -288,7 +288,7 @@
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

 /datum/design/subspace_analyzer
-	name = "Subspace Analyzer"
+	name = "Subspace Wavelength Analyzer"
 	desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
 	id = "s-analyzer"
 	build_type = PROTOLATHE
@@ -67,6 +67,12 @@
 //Ammo Shells/
 //////////////

+/datum/design/beanbag_slug/sec
+	id = "sec_beanbag"
+	build_type = PROTOLATHE
+	category = list("Ammo")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
 /datum/design/rubbershot/sec
 	id = "sec_rshot"
 	build_type = PROTOLATHE