Merge branch 'master' into reagentToDefines

code/game/objects/items/blueprints_vr.dm

@@ -145,7 +145,7 @@
 		if(in_use)
 			return
 		var/area/A = get_area(usr)
-		if(A.flags & BLUE_SHIELDED)
+		if(A.flag_check(BLUE_SHIELDED))
 			to_chat(usr, span_warning("You cannot edit restricted areas."))
 			return
 		in_use = TRUE
@@ -156,7 +156,7 @@
 			return
 		in_use = TRUE
 		var/area/A = create_area_whole(usr, src)
-		if(A && (A.flags & BLUE_SHIELDED))
+		if(A?.flag_check(BLUE_SHIELDED))
 			to_chat(usr, span_warning("You cannot edit restricted areas."))
 			in_use = FALSE
 			return
@@ -485,7 +485,7 @@
 		var/area/place = get_area(turfs[i])
 		if(blacklisted_areas[place.type])
 			continue
-		if(!place.requires_power || (place.flags & BLUE_SHIELDED))
+		if(!place.requires_power || (place.flag_check(BLUE_SHIELDED)))
 			continue // No expanding powerless rooms etc
 		areas[place.name] = place
 
@@ -587,7 +587,7 @@
 				continue
 		if(!BUILDABLE_AREA_TYPES[place.type]) //TODOTODOTODO
 			can_make_new_area = 0
-		if(!place.requires_power || (place.flags & BLUE_SHIELDED))
+		if(!place.requires_power || (place.flag_check(BLUE_SHIELDED)))
 			continue // No expanding powerless rooms etc
 		areas[place.name] = place
 

code/game/objects/items/devices/personal_shield_generator_vr.dm

@@ -539,7 +539,7 @@
 //Misc belts. Admin-spawn only atm.
 
 /obj/item/personal_shield_generator/belt/adminbus
-	desc = "You should not see this. You REALLY should not see this. If you do, you have either been blessed or are about to be the target of some sick prank."
+	desc = DEVELOPER_WARNING_NAME + " You REALLY should not see this. If you do, you have either been blessed or are about to be the target of some sick prank."
 	modifier_type = /datum/modifier/shield_projection/admin
 	generator_hit_cost = 0
 	generator_active_cost = 0

code/game/objects/items/devices/radio/headset.dm

@@ -466,6 +466,7 @@
 /obj/item/radio/headset/alt/ert
 	name = "emergency response team bowman headset"
 	icon_state = "com_headset_alt"
+	centComm = 1
 	ks2type = /obj/item/encryptionkey/ert
 
 /obj/item/radio/headset/ia
@@ -493,6 +494,8 @@
 /obj/item/radio/headset/alt/centcom
 	name = "centcom bowman headset"
 	icon_state = "com_headset_alt"
+	centComm = 1
+	ks2type = /obj/item/encryptionkey/ert
 
 /obj/item/radio/headset/nanotrasen
 	name = "\improper NT radio headset"
@@ -503,6 +506,8 @@
 /obj/item/radio/headset/alt/nanotrasen
 	name = "\improper NT bowman headset"
 	icon_state = "nt_headset_alt"
+	centComm = 1
+	ks2type = /obj/item/encryptionkey/ert
 
 /obj/item/radio/headset/pathfinder
 	name = "pathfinder's headset"
@@ -513,6 +518,8 @@
 /obj/item/radio/headset/alt/pathfinder
 	name = "pathfinder's bowman headset"
 	icon_state = "exp_headset_alt"
+	adhoc_fallback = TRUE
+	ks2type = /obj/item/encryptionkey/pathfinder
 
 /obj/item/radio/headset/pilot
 	name = "pilot's headset"
@@ -522,6 +529,7 @@
 /obj/item/radio/headset/alt/pilot
 	name = "pilot's bowman headset"
 	icon_state = "pilot_headset_alt"
+	adhoc_fallback = TRUE
 
 /obj/item/radio/headset/explorer
 	name = "away team member's headset"
@@ -532,6 +540,8 @@
 /obj/item/radio/headset/alt/explorer
 	name = "away team's bowman headset"
 	icon_state = "exp_headset_alt"
+	adhoc_fallback = TRUE
+	ks2type = /obj/item/encryptionkey/explorer
 
 /obj/item/radio/headset/sar
 	name = "search and rescue headset"
@@ -635,4 +645,4 @@
 /obj/item/radio/headset/heads/ai_integrated/receive_range(freq, level)
 	if (disabledAi)
 		return -1 //Transciever Disabled.
-	return ..(freq, level, 1)
+	return ..(freq, level, 1)

code/game/objects/items/falling_object_vr.dm

@@ -1,5 +1,5 @@
 /obj/effect/falling_effect
-	name = "you should not see this"
+	name = DEVELOPER_WARNING_NAME
 	desc = "no data"
 	invisibility = 101
 	anchored = TRUE

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")