shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15099 from Hatterhat/tablets-gaming

Browse Source 
tablets gaming - an NT IRN "buff"
This commit is contained in:
silicons
2021-09-13 15:09:04 -07:00
committed by GitHub
parent 17b3c3db2a 9dbcfa24a5
commit faed0eff01
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/budgetordering.dm
+10 -5
View File
@@ -12,7 +12,7 @@
///Are you actually placing orders with it? ///Are you actually placing orders with it?
var/requestonly = TRUE var/requestonly = TRUE
///Can the tablet see or buy illegal stuff? ///Can the tablet see or buy illegal stuff?
var/contraband = FALSE var/contraband_view = FALSE
///Is it being bought from a personal account, or is it being done via a budget/cargo? ///Is it being bought from a personal account, or is it being done via a budget/cargo?
var/self_paid = FALSE var/self_paid = FALSE
///Can this console approve purchase requests? ///Can this console approve purchase requests?
@@ -27,10 +27,15 @@
/datum/computer_file/program/budgetorders/proc/get_export_categories() /datum/computer_file/program/budgetorders/proc/get_export_categories()
. = EXPORT_CARGO . = EXPORT_CARGO
/datum/computer_file/program/budgetorders/run_emag()
if(!contraband_view)
contraband_view = TRUE
return TRUE
/datum/computer_file/program/budgetorders/proc/is_visible_pack(mob/user, paccess_to_check, list/access, contraband) /datum/computer_file/program/budgetorders/proc/is_visible_pack(mob/user, paccess_to_check, list/access, contraband)
if(issilicon(user)) //Borgs can't buy things. if(issilicon(user)) //Borgs can't buy things.
return FALSE return FALSE
if(computer.obj_flags & EMAGGED) if((computer.obj_flags & EMAGGED) || contraband_view)
return TRUE return TRUE
else if(contraband) //Hide contrband when non-emagged. else if(contraband) //Hide contrband when non-emagged.
return FALSE return FALSE
@@ -80,14 +85,14 @@
data["supplies"] = list() data["supplies"] = list()
for(var/pack in SSshuttle.supply_packs) for(var/pack in SSshuttle.supply_packs)
var/datum/supply_pack/P = SSshuttle.supply_packs[pack] var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
if(!is_visible_pack(usr, P.access , null, P.contraband) || P.hidden) if(!is_visible_pack(usr, P.access , null, P.contraband))
continue continue
if(!data["supplies"][P.group]) if(!data["supplies"][P.group])
data["supplies"][P.group] = list( data["supplies"][P.group] = list(
"name" = P.group, "name" = P.group,
"packs" = list() "packs" = list()
) )
if((P.hidden && (P.contraband && !contraband) || (P.special && !P.special_enabled) || P.DropPodOnly)) if(((P.hidden || P.contraband) && !contraband_view) || (P.special && !P.special_enabled) || P.DropPodOnly)
continue continue
data["supplies"][P.group]["packs"] += list(list( data["supplies"][P.group]["packs"] += list(list(
"name" = P.name, "name" = P.name,
@@ -179,7 +184,7 @@
var/datum/supply_pack/pack = SSshuttle.supply_packs[id] var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
if(!istype(pack)) if(!istype(pack))
return return
if((pack.hidden && (pack.contraband && !contraband) || pack.DropPodOnly)) if(((pack.hidden || pack.contraband) && !contraband_view) || pack.DropPodOnly)
return return
var/name = "*None Provided*" var/name = "*None Provided*"