Merge pull request #460 from Markolie/master

Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
This commit is contained in:
ZomgPonies
2015-03-01 12:30:15 -05:00
70 changed files with 2942 additions and 2022 deletions
@@ -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"
+5 -2
View File
@@ -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")