Merge branch 'master' into reagentToDefines

code/game/objects/items/weapons/circuitboards/machinery/pandemic.dm

@@ -0,0 +1,16 @@
+#ifndef T_BOARD
+#error T_BOARD macro is not defined but we need it!
+#endif
+
+/obj/item/circuitboard/pandemic
+	name = T_BOARD("pandemic")
+	build_path = /obj/machinery/computer/pandemic
+	board_type = new /datum/frame/frame_types/computer
+	origin_tech = list(TECH_DATA = 2, TECH_BIO = 2)
+	req_components = list(
+		/obj/item/stock_parts/matter_bin = 2,
+		/obj/item/stock_parts/scanning_module = 1,
+		/obj/item/stock_parts/manipulator = 1,
+		/obj/item/stack/cable_coil = 5,
+		/obj/item/stock_parts/capacitor = 1
+	)

code/game/objects/items/weapons/id cards/id_stacks.dm

@@ -336,3 +336,9 @@
 /obj/item/card/id/syndicate/officer
 	name = "Syndicate Officer ID"
 	initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold")
+
+//Special
+
+/obj/item/card/id/civilian/lurker
+	name = "Outdated ID"
+	initial_sprite_stack = list("base-stamp", "stamp-silhouette", "top-olive", "digested")