Merge branch 'master' into development

This commit is contained in:
skull132
2018-04-06 21:53:02 +03:00
18 changed files with 74 additions and 34 deletions
+6 -8
View File
@@ -8,18 +8,16 @@
items = list()
/datum/uplink_category/proc/can_view(obj/item/device/uplink/U)
if(!LAZYLEN(antag_roles))
for(var/datum/uplink_item/item in items)
if(item.can_view(U))
return 1
return 0
for(var/antag_role in antag_roles)
var/datum/antagonist/antag = all_antag_types[antag_role]
if(antag.is_antagonist(U.uplink_owner))
return 1
for(var/datum/uplink_item/item in items)
if(item.can_view(U))
return 1
if(!LAZYLEN(antag_roles))
return 1
return 0
/datum/uplink_category/ammunition