Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00
parent 4f4fe98240 a6a4deb94c
commit 04d071deda
252 changed files with 6549 additions and 5230 deletions
@@ -154,7 +154,7 @@


 	var/obj/item/device/assembly/flash/T = new(mob)
-	var/obj/item/organ/cyberimp/eyes/hud/security/S = new(mob)
+	var/obj/item/organ/cyberimp/eyes/hud/security/syndicate/S = new(mob)

 	var/list/slots = list (
 		"backpack" = slot_in_backpack,