Merge pull request #460 from Markolie/master

Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes

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

@@ -238,6 +238,13 @@
 	icon_state = "com_headset"
 	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/blueshield
+	
+/obj/item/device/radio/headset/heads/blueshield/alt
+	name = "\proper blueshield's bowman headset"
+	desc = "The headset of the Blueshield. Protects ears from flashbangs."
+	flags = EARBANGPROTECT
+	icon_state = "com_headset_alt"
+	item_state = "com_headset_alt"
 
 /obj/item/device/radio/headset/ert
 	name = "emergency response team headset"

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

@@ -103,7 +103,9 @@ var/list/world_uplinks = list()
 
 
 /obj/item/device/uplink/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
+		
 	if(!active)
 		return
 
@@ -152,7 +154,8 @@ var/list/world_uplinks = list()
 	desc = "There is something wrong if you're examining this."
 
 /obj/item/device/uplink/hidden/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 	if(href_list["lock"])
 		toggle()
 		usr << browse(null, "window=hidden")

code/game/objects/objs.dm

@@ -21,15 +21,27 @@
 	// Reagent ID => friendly name
 	var/list/reagents_to_log=list()
 	
-/obj/Topic(href, href_list, var/nowindow = 0, var/checkrange = 1)
+/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/custom_state = default_state)
 	// Calling Topic without a corresponding window open causes runtime errors
 	if(!nowindow && ..())
 		return 1
 
-	if(usr.can_interact_with_interface(nano_host(), checkrange) != STATUS_INTERACTIVE)
-		return 1
-	add_fingerprint(usr)
-	return 0
+	// In the far future no checks are made in an overriding Topic() beyond if(..()) return
+	// Instead any such checks are made in CanUseTopic()
+	var/obj/host = nano_host()
+	if(host.CanUseTopic(usr, href_list, custom_state) == STATUS_INTERACTIVE)
+		CouldUseTopic(usr)
+		return 0
+
+	CouldNotUseTopic(usr)
+	return 1
+
+/obj/proc/CouldUseTopic(var/mob/user)
+	var/atom/host = nano_host()
+	host.add_fingerprint(user)
+
+/obj/proc/CouldNotUseTopic(var/mob/user)
+	// Nada
 
 /obj/Destroy()
 	machines -= src

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -22,7 +22,7 @@
 		new /obj/item/device/analyzer/plant_analyzer(src)
 		new /obj/item/device/radio/headset/headset_service(src)
 		new /obj/item/device/radio/headset/headset_service(src)
-		new /obj/item/clothing/head/greenbandana(src)
+		new /obj/item/clothing/mask/bandana/botany(src)
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
 		new /obj/item/weapon/bee_net(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -8,6 +8,9 @@
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/mask/bandana/blue(src)
+	new /obj/item/clothing/mask/bandana/blue(src)
+	new /obj/item/clothing/mask/bandana/blue(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/brown(src)
@@ -22,6 +25,9 @@
 /obj/structure/closet/wardrobe/red/New()
 	new /obj/item/weapon/storage/backpack/duffel/security(src)
 	new /obj/item/weapon/storage/backpack/duffel/security(src)
+	new /obj/item/clothing/mask/bandana/red(src)
+	new /obj/item/clothing/mask/bandana/red(src)
+	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)