Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-06-05 00:25:36 +01:00
26 changed files with 1304 additions and 1000 deletions

View File

@@ -224,9 +224,13 @@ var/datum/controller/supply/supply_controller = new()
if(SP.access)
if(isnum(SP.access))
A.req_access = list(SP.access)
else if(islist(SP.access))
else if(islist(SP.access) && SP.one_access)
var/list/L = SP.access // access var is a plain var, we need a list
A.req_one_access = L.Copy() //VOREStation Edit: Lets make sense
A.req_one_access = L.Copy()
A.req_access.Cut()
else if(islist(SP.access) && !SP.one_access)
var/list/L = SP.access
A.req_access = L.Copy()
else
log_debug("<span class='danger'>Supply pack with invalid access restriction [SP.access] encountered!</span>")