diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm index 14761d6cd9..c33b2b120c 100644 --- a/code/datums/supplypacks/contraband.dm +++ b/code/datums/supplypacks/contraband.dm @@ -31,7 +31,7 @@ cost = 25 containertype = /obj/structure/closet/crate containername = "Special Ops crate" - hidden = 1 + contraband = 1 /datum/supply_packs/security/bolt_rifles_mosin name = "Surplus militia rifles" @@ -40,6 +40,6 @@ /obj/item/ammo_magazine/clip/a762 = 6 ) cost = 50 - hidden = 1 + contraband = 1 containertype = /obj/structure/closet/crate/secure/weapon containername = "Weapons crate" \ No newline at end of file diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index 4fcf7a737f..bb78fa00d5 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -8,7 +8,6 @@ circuit = /obj/item/weapon/circuitboard/supplycomp var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink - var/hacked = 0 var/can_order_contraband = 0 var/last_viewed_group = "categories" @@ -209,9 +208,8 @@ return /obj/machinery/computer/supplycomp/emag_act(var/remaining_charges, var/mob/user) - if(!hacked) + if(!can_order_contraband) user << "Special supplies unlocked." - hacked = 1 can_order_contraband = 1 req_access = list() return 1 @@ -267,18 +265,9 @@ temp += "Request from: [last_viewed_group]

" for(var/supply_name in supply_controller.supply_packs ) var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to + if((N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - /*temp = "Supply points: [supply_controller.points]


Request what?

" - - for(var/supply_name in supply_controller.supply_packs ) - var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if(N.hidden && !hacked) continue - if(N.contraband && !can_order_contraband) continue - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
OK"*/ - else if (href_list["doorder"]) if(world.time < reqtime) for(var/mob/V in hearers(src)) diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm index 882e2714f6..5924e19ac0 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/supply.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/weapon/circuitboard/supplycomp @@ -28,7 +28,6 @@ catastasis = "STANDARD" switch( alert("Current receiver spectrum is set to: [catastasis]","Multitool-Circuitboard interface","Switch to [opposite_catastasis]","Cancel") ) - //switch( alert("Current receiver spectrum is set to: " {(src.contraband_enabled) ? ("BROAD") : ("STANDARD")} , "Multitool-Circuitboard interface" , "Switch to " {(src.contraband_enabled) ? ("STANDARD") : ("BROAD")}, "Cancel") ) if("Switch to STANDARD","Switch to BROAD") src.contraband_enabled = !src.contraband_enabled