cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

jobs, access and radio to defines (#18297)

Browse Source 
* jobs, access and radio to defines

* .

* .

* urg

* .

* .

* finish the radio freqs

* why

* .

* .

* ticker initial

* eh

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2025-08-31 01:32:36 +02:00
committed by GitHub
co-authored by Cameron Lennox
parent 1cb38c22ec
commit e956d13a6b
313 changed files with 193679 additions and 12007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -2
View File
@@ -711,7 +711,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc = "Send an intercom message, like an arrivals announcement."
if(!check_rights(0)) return
var/channel = tgui_input_list(usr, "Channel for message:","Channel", radiochannels)
var/channel = tgui_input_list(usr, "Channel for message:","Channel", GLOB.radiochannels)
if(channel) //They picked a channel
var/sender = tgui_input_text(usr, "Name of sender (max 75):", "Announcement", "Announcement Computer")
@@ -740,7 +740,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set waitfor = FALSE //Why bother? We have some sleeps. You can leave tho!
if(!check_rights(0)) return
var/channel = tgui_input_list(usr, "Channel for message:","Channel", radiochannels)
var/channel = tgui_input_list(usr, "Channel for message:","Channel", GLOB.radiochannels)
if(!channel) //They picked a channel
return
code/modules/admin/modify_robot.dm
+7 -7
View File
@@ -93,7 +93,7 @@
for(var/channel in target.radio.channels)
radio_channels += channel
var/list/availalbe_channels = list()
for(var/channel in (radiochannels - target.radio.channels))
for(var/channel in (GLOB.radiochannels - target.radio.channels))
availalbe_channels += channel
.["target"]["radio_channels"] = radio_channels
.["target"]["availalbe_channels"] = availalbe_channels
@@ -390,7 +390,7 @@
target.radio.syndie = 1
target.module.channels += list("[selected_radio_channel]" = 1)
target.radio.channels[selected_radio_channel] = target.module.channels[selected_radio_channel]
target.radio.secure_radio_connections[selected_radio_channel] = SSradio.add_object(target.radio, radiochannels[selected_radio_channel], RADIO_CHAT)
target.radio.secure_radio_connections[selected_radio_channel] = SSradio.add_object(target.radio, GLOB.radiochannels[selected_radio_channel], RADIO_CHAT)
return TRUE
if("rem_channel")
var/selected_radio_channel = params["channel"]
@@ -404,7 +404,7 @@
target.radio.channels = list()
for(var/n_chan in target.module.channels)
target.radio.channels[n_chan] = target.module.channels[n_chan]
SSradio.remove_object(target.radio, radiochannels[selected_radio_channel])
SSradio.remove_object(target.radio, GLOB.radiochannels[selected_radio_channel])
target.radio.secure_radio_connections -= selected_radio_channel
return TRUE
if("add_component")
@@ -482,11 +482,11 @@
return TRUE
if("add_station")
target.idcard.access |= get_all_station_access()
target.idcard.access |= access_synth
target.idcard.access |= ACCESS_SYNTH
return TRUE
if("rem_station")
target.idcard.access -= get_all_station_access()
target.idcard.access -= access_synth
target.idcard.access -= ACCESS_SYNTH
return TRUE
if("law_channel")
if(params["law_channel"] in target.law_channels())
@@ -580,8 +580,8 @@
to_chat(target, span_danger("Law Notice"))
target.laws.show_laws(target)
if(isAI(target))
var/mob/living/silicon/ai/AI = target
for(var/mob/living/silicon/robot/R in AI.connected_robots)
var/mob/living/silicon/ai/our_ai = target
for(var/mob/living/silicon/robot/R in our_ai.connected_robots)
to_chat(R, span_danger("Law Notice"))
R.laws.show_laws(R)
if(ui.user != target)
code/modules/admin/verbs/secrets.dm
+1 -1
View File
@@ -118,7 +118,7 @@ ADMIN_VERB(secrets, R_HOLDER, "Secrets", "Abuse harder than you ever have before
if(H.wear_id)
var/obj/item/card/id/id = H.get_idcard()
for(var/A in id.GetAccess())
if(A == access_security)
if(A == ACCESS_SECURITY)
security++
if(!security)
//strip their stuff before they teleport into a cell :downs:
code/modules/assembly/signaler.dm
+2 -2
View File
@@ -10,7 +10,7 @@
secured = TRUE
var/code = 30
var/frequency = 1457
var/frequency = RSD_FREQ
var/delay = 0
var/airlock_wire = null
var/datum/wires/connected = null
@@ -144,5 +144,5 @@
/obj/item/assembly/signaler/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
frequency = 0
frequency = ZERO_FREQ
. = ..()
code/modules/awaymissions/exile.dm
+1 -1
View File
@@ -34,5 +34,5 @@
/obj/structure/closet/secure_closet/exile
name = "Exile Implants"
req_access = list(access_hos)
req_access = list(ACCESS_HOS)
starts_with = list(/obj/item/implanter/exile = 1, /obj/item/implantcase/exile = 5)
code/modules/casino/premium_vendors.dm
+6 -6
View File
@@ -77,8 +77,8 @@
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
req_access = list(access_bar)
req_log_access = access_bar
req_access = list(ACCESS_BAR)
req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
@@ -126,8 +126,8 @@
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
req_access = list(access_bar)
req_log_access = access_bar
req_access = list(ACCESS_BAR)
req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
@@ -148,8 +148,8 @@
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
req_access = list(access_bar)
req_log_access = access_bar
req_access = list(ACCESS_BAR)
req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
code/modules/clothing/accessories/accessory_vr.dm
+1 -1
View File
@@ -120,7 +120,7 @@
item_state = "collar_shk"
overlay_state = "collar_shk"
var/on = FALSE // 0 for off, 1 for on, starts off to encourage people to set non-default frequencies and codes.
var/frequency = 1449
var/frequency = AMAG_ELE_FREQ
var/code = 2
var/datum/radio_frequency/radio_connection
code/modules/clothing/accessories/badges.dm
+2 -2
View File
@@ -80,7 +80,7 @@
desc = "This glowing blue badge marks the holder as THE LAW."
icon_state = "holobadge"
var/emagged //Emagging removes Sec check.
var/valid_access = list(access_security) //Default access is security, to be overriden or expanded as desired
var/valid_access = list(ACCESS_SECURITY) //Default access is security, to be overriden or expanded as desired
/obj/item/clothing/accessory/badge/holo/cord
icon_state = "holobadge-cord"
@@ -162,7 +162,7 @@
desc = "This badge marks the holder as an investigative agent."
icon_state = "invbadge"
badge_string = "Corporate Investigator"
valid_access = list(access_security, access_lawyer) //Permitting both sec and IAA!
valid_access = list(ACCESS_SECURITY, ACCESS_LAWYER) //Permitting both sec and IAA!
slot_flags = SLOT_TIE | SLOT_BELT
/obj/item/clothing/accessory/badge/holo/sheriff
code/modules/clothing/spacesuits/rig/suits/alien.dm
+2 -2
View File
@@ -88,7 +88,7 @@
armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50)
emp_protection = 40 //change this to 30 if too high.
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
cell_type = /obj/item/cell/hyper
@@ -108,7 +108,7 @@
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50)
emp_protection = 40 //change this to 30 if too high.
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
cell_type = /obj/item/cell/hyper
code/modules/clothing/spacesuits/rig/suits/ert.dm
+1 -1
View File
@@ -10,7 +10,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/ert
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
siemens_coefficient= 0.5
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
code/modules/clothing/spacesuits/rig/suits/light.dm
+3 -3
View File
@@ -39,7 +39,7 @@
desc = "An advanced powered armour suit with many cyberwarfare enhancements. Comes with built-in insulated gloves for safely tampering with electronics."
icon_state = "hacker_rig"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
airtight = 1
seal_delay = 5 //Being straight out of a cyberpunk space movie has its perks.
@@ -90,7 +90,7 @@
boot_type = /obj/item/clothing/shoes/magboots/rig/light/ninja
cell_type = /obj/item/cell/hyper
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
initial_modules = list(
/obj/item/rig_module/teleporter,
@@ -123,7 +123,7 @@
desc = "A highly advanced and expensive suit designed for covert operations."
icon_state = "stealth_rig"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
initial_modules = list(
/obj/item/rig_module/stealth_field,
code/modules/clothing/spacesuits/rig/suits/pmc.dm
+1 -1
View File
@@ -9,7 +9,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/pmc
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95)
code/modules/clothing/spacesuits/rig/suits/station.dm
+5 -5
View File
@@ -42,7 +42,7 @@
/obj/item/rig/internalaffairs/equipped
req_access = list(access_lawyer)
req_access = list(ACCESS_LAWYER)
initial_modules = list(
/obj/item/rig_module/ai_container,
@@ -115,7 +115,7 @@
/obj/item/rig/eva/equipped
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
initial_modules = list(
/obj/item/rig_module/device/plasmacutter,
@@ -165,7 +165,7 @@
/obj/item/rig/ce/equipped
req_access = list(access_ce)
req_access = list(ACCESS_CE)
initial_modules = list(
/obj/item/rig_module/ai_container,
@@ -196,7 +196,7 @@
/obj/item/rig/hazmat/equipped
req_access = list(access_rd)
req_access = list(ACCESS_RD)
initial_modules = list(
/obj/item/rig_module/ai_container,
@@ -226,7 +226,7 @@
//Access restriction and seal delay, plus pat_module and rescue_pharm for medical suit
/obj/item/rig/medical/equipped
req_access = list(access_medical)
req_access = list(ACCESS_MEDICAL)
seal_delay = 5
initial_modules = list(
code/modules/economy/Accounts_DB.dm
+3 -3
View File
@@ -5,7 +5,7 @@
icon = 'icons/obj/computer.dmi'
icon_state = "account_computer"
density = TRUE
req_one_access = list(access_hop, access_captain, access_cent_captain)
req_one_access = list(ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_CENT_CAPTAIN)
anchored = TRUE
var/receipt_num
var/machine_id = ""
@@ -17,9 +17,9 @@
/obj/machinery/account_database/proc/get_access_level()
if(!held_card)
return 0
if(access_cent_captain in held_card.access)
if(ACCESS_CENT_CAPTAIN in held_card.access)
return 2
else if((access_hop in held_card.access) || (access_captain in held_card.access))
else if((ACCESS_HOP in held_card.access) || (ACCESS_CAPTAIN in held_card.access))
return 1
/obj/machinery/account_database/proc/create_transation(target, reason, amount)
code/modules/economy/EFTPOS.dm
+1 -1
View File
@@ -210,7 +210,7 @@
var/obj/item/I = usr.get_active_hand()
if (istype(I, /obj/item/card))
var/obj/item/card/id/C = I
if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access))
if((ACCESS_CENT_CAPTAIN in C.access) || (ACCESS_HOP in C.access) || (ACCESS_CAPTAIN in C.access))
access_code = 0
to_chat(usr, "[icon2html(src, usr.client)]" + span_info("Access code reset to 0."))
else if (istype(I, /obj/item/card/emag))
code/modules/economy/cash.dm
+1 -1
View File
@@ -14,7 +14,7 @@
throw_range = 2
w_class = ITEMSIZE_SMALL
var/access = list()
access = access_crate_cash
access = ACCESS_CRATE_CASH
var/worth = 0
drop_sound = 'sound/items/drop/paper.ogg'
pickup_sound = 'sound/items/pickup/paper.ogg'
code/modules/economy/cash_register.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "register_idle"
flags = NOBLUDGEON
req_access = list(access_heads)
req_access = list(ACCESS_HEADS)
anchored = TRUE
var/locked = 1
code/modules/economy/casinocash.dm
+1 -1
View File
@@ -49,7 +49,7 @@
throw_range = 2
w_class = ITEMSIZE_SMALL
var/access = list()
access = access_crate_cash
access = ACCESS_CRATE_CASH
var/worth = 0
/obj/item/spacecasinocash/attackby(obj/item/W as obj, mob/user as mob)
code/modules/economy/retail_scanner.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "retail_idle"
flags = NOBLUDGEON
slot_flags = SLOT_BELT
req_access = list(access_heads)
req_access = list(ACCESS_HEADS)
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1)
code/modules/economy/vending.dm
+1 -1
View File
@@ -76,7 +76,7 @@
var/datum/wires/vending/wires = null
var/list/log = list()
var/req_log_access = access_cargo //default access for checking logs is cargo
var/req_log_access = ACCESS_CARGO //default access for checking logs is cargo
var/has_logs = 0 //defaults to 0, set to anything else for vendor to have logs
var/can_rotate = 1 //Defaults to yes, can be set to 0 for vendors without or with unwanted directionals.
code/modules/economy/vending_machines.dm
+58 -58
View File
@@ -115,8 +115,8 @@
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
req_access = list(access_bar)
req_log_access = access_bar
req_access = list(ACCESS_BAR)
req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
@@ -371,11 +371,11 @@
desc = "Cartridges for PDAs."
product_slogans = "Carts to go!"
icon_state = "cart"
req_access = list(access_hop)
req_access = list(ACCESS_HOP)
products = list(/obj/item/cartridge/medical = 10,/obj/item/cartridge/engineering = 10,/obj/item/cartridge/security = 10,
/obj/item/cartridge/janitor = 10,/obj/item/cartridge/signal/science = 10,/obj/item/pda/heads = 10,
/obj/item/cartridge/captain = 3,/obj/item/cartridge/quartermaster = 10)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/cigarette
@@ -450,7 +450,7 @@
description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
icon_state = "med"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access = list(access_medical)
req_access = list(ACCESS_MEDICAL)
products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,
/obj/item/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/reagent_containers/glass/bottle/stoxin = 4,
@@ -475,7 +475,7 @@
/obj/item/reagent_containers/pill/stox = 4,
/obj/item/reagent_containers/pill/antitox = 6)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
req_log_access = access_cmo
req_log_access = ACCESS_CMO
has_logs = 1
/obj/machinery/vending/phoronresearch
@@ -489,7 +489,7 @@
/obj/item/assembly/signaler = 6,
/obj/item/assembly/prox_sensor = 6,
/obj/item/assembly/igniter = 6)
req_log_access = access_rd
req_log_access = ACCESS_RD
has_logs = 1
/obj/machinery/vending/wallmed1
@@ -508,7 +508,7 @@
contraband = list(/obj/item/reagent_containers/syringe/antitoxin = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,
/obj/item/reagent_containers/pill/tox = 1)
req_log_access = access_cmo
req_log_access = ACCESS_CMO
has_logs = 1
can_rotate = 0
@@ -526,7 +526,7 @@
/obj/item/healthanalyzer = 3,
/obj/item/bodybag/cryobag = 3)
contraband = list(/obj/item/reagent_containers/pill/tox = 3)
req_log_access = access_cmo
req_log_access = ACCESS_CMO
has_logs = 1
can_rotate = 0
@@ -543,7 +543,7 @@
description_fluff = "Security vending is kindly provided by the Lawson Arms company, Hephaestus Industries' law enforcement division."
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
products = list(/obj/item/handcuffs = 8,
/obj/item/grenade/flashbang = 4,
/obj/item/flash = 5,
@@ -558,7 +558,7 @@
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/box/donut = 2,
/obj/item/implanter/compliance = 1)
req_log_access = access_armory
req_log_access = ACCESS_ARMORY
has_logs = 1
/obj/machinery/vending/hydronutrients
@@ -707,7 +707,7 @@
name = "YouTool"
desc = "Tools for tools."
icon_state = "tool"
//req_access = list(access_maint_tunnels) //Maintenance access
//req_access = list(ACCESS_MAINT_TUNNELS) //Maintenance access
products = list(/obj/item/stack/cable_coil/random = 10,
/obj/item/tool/crowbar = 5,
/obj/item/weldingtool = 3,
@@ -726,14 +726,14 @@
contraband = list(/obj/item/weldingtool/hugetank = 2,
/obj/item/clothing/gloves/fyellow = 2)
premium = list(/obj/item/clothing/gloves/heavy_engineer = 1) //VOREStation Edit - yellow gloves are common in engineering, let's make "premium" actually mean something
req_log_access = access_ce
req_log_access = ACCESS_CE
has_logs = 1
/obj/machinery/vending/engivend
name = "Engi-Vend"
desc = "Spare tool vending. What? Did you expect some witty description?"
icon_state = "engivend"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/geiger = 4,
/obj/item/clothing/glasses/meson = 2,
/obj/item/multitool = 4,
@@ -772,14 +772,14 @@
/obj/item/rms = 5)
premium = list(/obj/item/storage/belt/utility = 3)
product_records = list()
req_log_access = access_ce
req_log_access = ACCESS_CE
has_logs = 1
/obj/machinery/vending/engineering
name = "Robco Tool Maker"
desc = "Everything you need for do-it-yourself station repair."
icon_state = "engi"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,
/obj/item/clothing/under/rank/engineer = 4,
/obj/item/clothing/shoes/orange = 4,
@@ -805,14 +805,14 @@
/obj/item/stock_parts/matter_bin = 5,
/obj/item/stock_parts/manipulator = 5,
/obj/item/stock_parts/console_screen = 5)
req_log_access = access_ce
req_log_access = ACCESS_CE
has_logs = 1
/obj/machinery/vending/robotics
name = "Robotech Deluxe"
desc = "All the tools you need to create your own robot army."
icon_state = "robotics"
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4,
/obj/item/clothing/under/rank/roboticist = 4,
/obj/item/stack/cable_coil = 4,
@@ -827,7 +827,7 @@
/obj/item/clothing/mask/breath/medical = 5,
/obj/item/tool/screwdriver = 5,
/obj/item/tool/crowbar = 5)
req_log_access = access_rd
req_log_access = ACCESS_RD
has_logs = 1
/obj/machinery/vending/giftvendor
@@ -1266,7 +1266,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "bardrobe"
req_access = list(access_bar)
req_access = list(ACCESS_BAR)
products = list(
/obj/item/clothing/under/rank/bartender = 5,
/obj/item/clothing/under/rank/bartender/skirt = 5,
@@ -1279,7 +1279,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep = 5,
/obj/item/clothing/accessory/permit/gun/bar = 1
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/secdrobe
@@ -1287,7 +1287,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "secdrobe"
req_access = list(access_brig)
req_access = list(ACCESS_BRIG)
products = list(
/obj/item/clothing/under/rank/security = 5,
/obj/item/clothing/under/rank/security2 = 5,
@@ -1338,7 +1338,7 @@
/obj/item/clothing/accessory/holster/leg/black = 2,
/obj/item/clothing/accessory/holster/waist/lanyard = 2
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/chefdrobe
@@ -1346,7 +1346,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "chefdrobe"
req_access = list(access_kitchen)
req_access = list(ACCESS_KITCHEN)
products = list(
/obj/item/clothing/under/rank/chef = 5,
/obj/item/clothing/shoes/black = 5,
@@ -1361,7 +1361,7 @@
/obj/item/clothing/under/waiter = 5,
/obj/item/clothing/under/sundress = 1
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/medidrobe
@@ -1369,7 +1369,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "medidrobe"
req_access = list(access_medical_equip)
req_access = list(ACCESS_MEDICAL_EQUIP)
products = list(
/obj/item/clothing/under/rank/medical = 5,
/obj/item/clothing/under/rank/medical/skirt = 5,
@@ -1411,7 +1411,7 @@
/obj/item/clothing/shoes/boots/winter/medical = 5,
/obj/item/clothing/head/beret/medical = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/chemdrobe
@@ -1419,7 +1419,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "chemdrobe"
req_access = list(access_chemistry)
req_access = list(ACCESS_CHEMISTRY)
products = list(
/obj/item/clothing/under/rank/chemist = 5,
/obj/item/clothing/under/rank/chemist/skirt = 5,
@@ -1436,7 +1436,7 @@
/obj/item/storage/backpack/satchel/chem = 5,
/obj/item/storage/bag/chemistry = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/genedrobe
@@ -1444,7 +1444,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "genedrobe"
req_access = list(access_genetics)
req_access = list(ACCESS_GENETICS)
products = list(
/obj/item/clothing/under/rank/geneticist = 5,
/obj/item/clothing/under/rank/geneticist/skirt = 5,
@@ -1455,7 +1455,7 @@
/obj/item/storage/backpack/genetics = 5,
/obj/item/storage/backpack/satchel/gen = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/virodrobe
@@ -1463,7 +1463,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "virodrobe"
req_access = list(access_virology)
req_access = list(ACCESS_VIROLOGY)
products = list(
/obj/item/clothing/under/rank/virologist = 5,
/obj/item/clothing/under/rank/virologist/skirt = 5,
@@ -1478,7 +1478,7 @@
/obj/item/storage/backpack/virology = 5,
/obj/item/storage/backpack/satchel/vir = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/scidrobe
@@ -1486,7 +1486,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "scidrobe"
req_access = list(access_research)
req_access = list(ACCESS_RESEARCH)
products = list(
/obj/item/clothing/under/rank/scientist = 5,
/obj/item/clothing/under/rank/scientist/skirt = 5,
@@ -1508,7 +1508,7 @@
/obj/item/storage/backpack/toxins = 5,
/obj/item/storage/backpack/satchel/tox = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/robodrobe
@@ -1516,7 +1516,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "robodrobe"
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
products = list(
/obj/item/clothing/under/rank/roboticist = 5,
/obj/item/clothing/suit/storage/toggle/labcoat/roboticist = 5,
@@ -1534,7 +1534,7 @@
contraband = list(
/obj/item/clothing/suit/storage/hooded/techpriest = 2
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/chapdrobe
@@ -1542,7 +1542,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "chapdrobe"
req_access = list(access_chapel_office)
req_access = list(ACCESS_CHAPEL_OFFICE)
products = list(
/obj/item/clothing/under/rank/chaplain = 5,
/obj/item/clothing/shoes/black = 5,
@@ -1561,7 +1561,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/ratvar = 1,
/obj/item/clothing/suit/storage/hooded/wintercoat/narsie = 1
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/engidrobe
@@ -1569,7 +1569,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "engidrobe"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
products = list(
/obj/item/clothing/under/rank/engineer = 5,
/obj/item/clothing/under/rank/engineer/skirt = 5,
@@ -1587,7 +1587,7 @@
/obj/item/clothing/shoes/boots/winter/engineering = 5,
/obj/item/clothing/shoes/boots/workboots = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/atmosdrobe
@@ -1595,7 +1595,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "atmosdrobe"
req_access = list(access_atmospherics)
req_access = list(ACCESS_ATMOSPHERICS)
products = list(
/obj/item/clothing/under/rank/atmospheric_technician = 5,
/obj/item/clothing/under/rank/atmospheric_technician/skirt = 5,
@@ -1609,7 +1609,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 5,
/obj/item/clothing/shoes/boots/winter/atmos = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/hydrobe
@@ -1617,7 +1617,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "hydrobe"
req_access = list(access_hydroponics)
req_access = list(ACCESS_HYDROPONICS)
products = list(
/obj/item/clothing/under/rank/hydroponics = 5,
/obj/item/analyzer/plant_analyzer = 5,
@@ -1629,7 +1629,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep = 5,
/obj/item/clothing/shoes/boots/winter/hydro = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/cargodrobe
@@ -1637,7 +1637,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "cargodrobe"
req_access = list(access_cargo)
req_access = list(ACCESS_CARGO)
products = list(
/obj/item/clothing/under/rank/cargotech = 5,
/obj/item/clothing/under/rank/cargotech/skirt = 5,
@@ -1664,7 +1664,7 @@
/obj/item/clothing/gloves/fingerless = 5,
/obj/item/clothing/head/soft = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/*
@@ -1675,7 +1675,7 @@
icon_state = "curadrobe"
req_access = list()
products = list()
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
*/
@@ -1685,7 +1685,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "janidrobe"
req_access = list(access_janitor)
req_access = list(ACCESS_JANITOR)
products = list(
/obj/item/clothing/head/soft/purple = 5,
/obj/item/clothing/head/beret/purple = 5,
@@ -1703,7 +1703,7 @@
/obj/item/clothing/glasses/hud/janitor = 5,
/obj/item/cartridge/janitor = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/lawdrobe
@@ -1711,7 +1711,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "lawdrobe"
req_access = list(access_lawyer)
req_access = list(ACCESS_LAWYER)
products = list(
/obj/item/clothing/under/lawyer/female = 5,
/obj/item/clothing/under/lawyer/black = 5,
@@ -1735,7 +1735,7 @@
/obj/item/clothing/under/lawyer/blue/skirt = 5,
/obj/item/rectape/random = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/detdrobe
@@ -1743,7 +1743,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "detdrobe"
req_access = list(access_forensics_lockers)
req_access = list(ACCESS_FORENSICS_LOCKERS)
products = list(
/obj/item/clothing/head/det = 5,
/obj/item/clothing/head/det/grey = 5,
@@ -1762,7 +1762,7 @@
/obj/item/clothing/suit/storage/forensics/blue = 5,
/obj/item/clothing/suit/storage/forensics/red = 5
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/mimedrobe
@@ -1770,7 +1770,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "..."
icon_state = "mimedrobe"
req_access = list(access_mime)
req_access = list(ACCESS_MIME)
products = list(
/obj/item/clothing/under/mime = 1,
/obj/item/clothing/under/sexymime = 1,
@@ -1782,7 +1782,7 @@
/obj/item/clothing/suit/suspenders = 1,
/obj/item/clothing/shoes/mime = 1
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/clowndrobe
@@ -1790,7 +1790,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Honk!"
icon_state = "clowndrobe"
req_access = list(access_clown)
req_access = list(ACCESS_CLOWN)
products = list(
/obj/item/clothing/under/rank/clown = 1,
/obj/item/clothing/under/sexyclown = 1,
@@ -1809,5 +1809,5 @@
contraband = list(
/obj/item/clothing/under/clown/rainbow = 1
)
req_log_access = access_hop
req_log_access = ACCESS_HOP
has_logs = 1
code/modules/economy/vending_machines_vr.dm
+3 -3
View File
@@ -221,13 +221,13 @@
icon_state = "blood"
vend_delay = 7
idle_power_usage = 211
req_access = list(access_medical)
req_access = list(ACCESS_MEDICAL)
products = list(/obj/item/reagent_containers/blood/prelabeled/APlus = 3,/obj/item/reagent_containers/blood/prelabeled/AMinus = 3,
/obj/item/reagent_containers/blood/prelabeled/BPlus = 3,/obj/item/reagent_containers/blood/prelabeled/BMinus = 3,
/obj/item/reagent_containers/blood/prelabeled/OPlus = 2,/obj/item/reagent_containers/blood/prelabeled/OMinus = 5,
/obj/item/reagent_containers/blood/empty = 5)
contraband = list(/obj/item/reagent_containers/glass/bottle/stoxin = 2)
req_log_access = access_cmo
req_log_access = ACCESS_CMO
has_logs = 1
//Airlock antitox vendor
@@ -238,7 +238,7 @@
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
products = list(/obj/item/reagent_containers/pill/airlock = 20)
contraband = list(/obj/item/reagent_containers/pill/tox = 2)
req_log_access = access_cmo
req_log_access = ACCESS_CMO
has_logs = 1
/obj/machinery/seed_storage/brig
code/modules/events/atmos_leak.dm
+40 -1
View File
@@ -14,7 +14,46 @@
/area/shuttle,
/area/crew_quarters,
/area/holodeck,
/area/engineering/engine_room
/area/engineering/engine_room,
// Groundbase
/area/groundbase/level1/centsquare,
/area/groundbase/level1/eastspur,
/area/groundbase/level1/northspur,
/area/groundbase/level1/southeastspur,
/area/groundbase/level1/southwestspur,
/area/groundbase/level1/westspur,
/area/maintenance/groundbase/level1/netunnel,
/area/maintenance/groundbase/level1/nwtunnel,
/area/maintenance/groundbase/level1/stunnel,
/area/maintenance/groundbase/level1/setunnel,
/area/maintenance/groundbase/level1/swtunnel,
/area/groundbase/level2/ne,
/area/groundbase/level2/nw,
/area/groundbase/level2/se,
/area/groundbase/level2/sw,
/area/groundbase/level3/ne,
/area/groundbase/level3/nw,
/area/groundbase/level3/se,
/area/groundbase/level3/sw,
/area/groundbase/level2/northspur,
/area/groundbase/level2/eastspur,
/area/groundbase/level2/westspur,
/area/groundbase/level2/southeastspur,
/area/groundbase/level2/southwestspur,
/area/groundbase/level3/ne/open,
/area/groundbase/level3/nw/open,
/area/groundbase/level3/se/open,
/area/groundbase/level3/sw/open,
/area/groundbase/level3/escapepad,
// Tether
/area/tether/surfacebase/tram,
/area/tether/surfacebase/surface_one_hall,
/area/tether/surfacebase/surface_two_hall,
/area/tether/surfacebase/surface_three_hall,
/area/teleporter/departing,
/area/hallway/station/upper,
)
// Decide which area will be targeted!
code/modules/food/kitchen/gibber.dm
+1 -1
View File
@@ -7,7 +7,7 @@
density = TRUE
anchored = TRUE
unacidable = TRUE
req_access = list(access_kitchen,access_morgue)
req_access = list(ACCESS_KITCHEN,ACCESS_MORGUE)
var/operating = 0 //Is it on?
var/dirty = 0 // Does it need cleaning?
code/modules/food/kitchen/smartfridge/medical.dm
+4 -4
View File
@@ -17,7 +17,7 @@
name = "\improper Refrigerated Medicine Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
icon_contents = "chem"
req_one_access = list(access_medical,access_chemistry)
req_one_access = list(ACCESS_MEDICAL,ACCESS_CHEMISTRY)
/obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
@@ -45,7 +45,7 @@
name = "\improper Refrigerated Virus Storage"
desc = "A refrigerated storage unit for securely storing viral material."
icon_contents = "viro"
req_access = list(access_virology)
req_access = list(ACCESS_VIROLOGY)
/obj/machinery/smartfridge/secure/virology/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
@@ -61,7 +61,7 @@
name = "\improper Smart Chemical Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
icon_contents = "chem"
req_one_access = list(access_chemistry)
req_one_access = list(ACCESS_CHEMISTRY)
/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
@@ -74,7 +74,7 @@
name = "\improper Smart Chemical Storage"
desc = "A refrigerated storage unit for securely storing medicine and chemicals."
icon_contents = "chem"
req_one_access = list(access_chemistry)
req_one_access = list(ACCESS_CHEMISTRY)
/obj/machinery/smartfridge/secure/chemistry/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
code/modules/food/kitchen/smartfridge/research.dm
+1 -1
View File
@@ -5,7 +5,7 @@
name = "\improper Biological Sample Storage"
desc = "A refrigerated storage unit for xenobiological samples."
icon_contents = "slime"
req_access = list(access_research)
req_access = list(ACCESS_RESEARCH)
/obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/slime_extract) || istype(O, /obj/item/slimepotion))
code/modules/integrated_electronics/subtypes/input.dm
+9 -9
View File
@@ -413,7 +413,7 @@
power_draw_idle = 5
power_draw_per_use = 40
var/frequency = 1457
var/frequency = RSD_FREQ
var/code = 30
var/datum/radio_frequency/radio_connection
@@ -426,7 +426,7 @@
/obj/item/integrated_circuit/input/signaler/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
frequency = 0
frequency = ZERO_FREQ
. = ..()
/obj/item/integrated_circuit/input/signaler/on_data_written()
@@ -810,13 +810,13 @@
complexity = 9
inputs = list()
outputs = list(
"pressure" = IC_PINTYPE_NUMBER,
"temperature" = IC_PINTYPE_NUMBER,
GAS_O2 = IC_PINTYPE_NUMBER,
GAS_N2 = IC_PINTYPE_NUMBER,
"carbon dioxide" = IC_PINTYPE_NUMBER,
GAS_PHORON = IC_PINTYPE_NUMBER,
"other" = IC_PINTYPE_NUMBER
"pressure" = IC_PINTYPE_NUMBER,
"temperature" = IC_PINTYPE_NUMBER,
GAS_O2 = IC_PINTYPE_NUMBER,
GAS_N2 = IC_PINTYPE_NUMBER,
GAS_CO2 = IC_PINTYPE_NUMBER,
GAS_PHORON = IC_PINTYPE_NUMBER,
"other" = IC_PINTYPE_NUMBER
)
activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
spawn_flags = IC_SPAWN_RESEARCH
code/modules/maint_recycler/code/vendor_datums/entries/bling_entries.dm
+6 -6
View File
@@ -9,7 +9,7 @@
per_round_cap = 3 //limited supply!
object_type_to_spawn = /obj/item/healthanalyzer/bling
icon_state = "scamalyzer"
required_access = list(access_medical)
required_access = list(ACCESS_MEDICAL)
vendor_category = MAINTVENDOR_SWAG
/datum/maint_recycler_vendor_entry/bling_wrench
@@ -17,7 +17,7 @@
ad_message = "Bust Nuts in Style!"
desc = "*a distinct CuZn of ACTUAL gold, this wrench is sure to at least look KIND of gold! Robotics & Engineering ONLY!"
object_type_to_spawn = /obj/item/tool/wrench/brass
required_access = list(access_engine,access_robotics)
required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
item_cost = 30 //not actual gold
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
@@ -32,7 +32,7 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldscrew"
required_access = list(access_engine,access_robotics)
required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
/datum/maint_recycler_vendor_entry/bling_crowbar
name = "Gold Crowbar"
@@ -43,7 +43,7 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldcrow"
required_access = list(access_engine,access_robotics,access_medical) //for paramedics
required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS,ACCESS_MEDICAL) //for paramedics
@@ -56,7 +56,7 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldcutters"
required_access = list(access_engine,access_robotics)
required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
/datum/maint_recycler_vendor_entry/bling_welder
name = "Golden Welder"
@@ -67,4 +67,4 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldweld"
required_access = list(access_engine,access_robotics)
required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
code/modules/maint_recycler/code/vendor_datums/entries/weapons_and_arms.dm
+1 -1
View File
@@ -7,7 +7,7 @@
tagline = "clean and effective as fuck! OnlySec!"
per_person_cap = 1
per_round_cap = 1 //limited supply!
required_access = list(access_security)
required_access = list(ACCESS_SECURITY)
vendor_category = MAINTVENDOR_WEAPONS
/datum/maint_recycler_vendor_entry/foamforce_ammo //fun!
code/modules/mining/machinery/machine_processing.dm
+1 -1
View File
@@ -124,7 +124,7 @@
. = TRUE
if("claim")
if(istype(inserted_id))
if(access_mining_station in inserted_id.GetAccess())
if(ACCESS_MINING_STATION in inserted_id.GetAccess())
inserted_id.adjust_mining_points(machine.points)
machine.points = 0
else
code/modules/mob/living/bot/SLed209bot.dm
+2 -2
View File
@@ -19,8 +19,8 @@
stun_strength = 10
xeno_harm_strength = 9
req_one_access = list(access_research, access_robotics)
botcard_access = list(access_research, access_robotics, access_xenobiology, access_xenoarch, access_tox, access_tox_storage, access_maint_tunnels)
req_one_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS)
botcard_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_MAINT_TUNNELS)
retaliates = FALSE
var/xeno_stun_strength = 6
code/modules/mob/living/bot/cleanbot.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "Cleanbot"
desc = "A little cleaning robot, it looks so excited!"
icon_state = "cleanbot0"
req_one_access = list(access_robotics, access_janitor)
botcard_access = list(access_janitor)
req_one_access = list(ACCESS_ROBOTICS, ACCESS_JANITOR)
botcard_access = list(ACCESS_JANITOR)
pass_flags = PASSTABLE
locked = 0 // Start unlocked so roboticist can set them to patrol.
code/modules/mob/living/bot/edCLNbot.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "ED-CLN Cleaning Robot"
desc = "A large cleaning robot. It looks rather efficient."
icon_state = "edCLN0"
req_one_access = list(access_robotics, access_janitor)
botcard_access = list(access_janitor)
req_one_access = list(ACCESS_ROBOTICS, ACCESS_JANITOR)
botcard_access = list(ACCESS_JANITOR)
locked = 0 // Start unlocked so roboticist can set them to patrol.
wait_if_pulled = 0 // One big boi.
code/modules/mob/living/bot/farmbot.dm
+1 -1
View File
@@ -10,7 +10,7 @@
icon_state = "farmbot0"
health = 50
maxHealth = 50
req_one_access = list(access_robotics, access_hydroponics, access_xenobiology)
req_one_access = list(ACCESS_ROBOTICS, ACCESS_HYDROPONICS, ACCESS_XENOBIOLOGY)
var/action = "" // Used to update icon
var/waters_trays = 1
code/modules/mob/living/bot/floorbot.dm
+1 -1
View File
@@ -8,7 +8,7 @@
name = "Floorbot"
desc = "A little floor repairing robot, it looks so excited!"
icon_state = "floorbot0"
req_one_access = list(access_robotics, access_construction)
req_one_access = list(ACCESS_ROBOTICS, ACCESS_CONSTRUCTION)
wait_if_pulled = 1
min_target_dist = 0
code/modules/mob/living/bot/medbot.dm
+2 -2
View File
@@ -17,8 +17,8 @@
name = "Medibot"
desc = "A little medical robot. He looks somewhat underwhelmed."
icon_state = "medibot0"
req_one_access = list(access_robotics, access_medical)
botcard_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
req_one_access = list(ACCESS_ROBOTICS, ACCESS_MEDICAL)
botcard_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
code/modules/mob/living/bot/mulebot.dm
+1 -1
View File
@@ -21,7 +21,7 @@
max_target_dist = 250
target_speed = 3
max_frustration = 5
botcard_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
botcard_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION)
var/atom/movable/load
code/modules/mob/living/bot/secbot.dm
+4 -4
View File
@@ -8,8 +8,8 @@
icon_state = "secbot0"
maxHealth = 100
health = 100
req_one_access = list(access_security, access_forensics_lockers)
botcard_access = list(access_security, access_sec_doors, access_forensics_lockers, access_maint_tunnels)
req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
botcard_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS)
patrol_speed = 2
target_speed = 3
@@ -68,8 +68,8 @@
xeno_harm_strength = 9 // Weaker than regular slimesky but they can stun.
baton_glow = "#33CCFF"
req_one_access = list(access_research, access_robotics)
botcard_access = list(access_research, access_robotics, access_xenobiology, access_xenoarch, access_tox, access_tox_storage, access_maint_tunnels)
req_one_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS)
botcard_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_MAINT_TUNNELS)
used_weapon = /obj/item/melee/baton/slime
var/xeno_stun_strength = 5 // How hard to slimebatoned()'d naughty slimes. 5 works out to 2 discipline and 5 weaken.
code/modules/mob/living/carbon/brain/MMI.dm
+2 -2
View File
@@ -9,7 +9,7 @@
can_speak = 1
origin_tech = list(TECH_BIO = 3)
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
@@ -180,7 +180,7 @@
/obj/item/mmi/digital
var/searching = 0
var/askDelay = 10 * 60 * 1
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
locked = 0
mecha = null//This does not appear to be used outside of reference in mecha.dm.
var/ghost_query_type = null
code/modules/mob/living/carbon/brain/posibrain.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/searching = 0
var/askDelay = 10 * 60 * 1
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
locked = 0
mecha = null//This does not appear to be used outside of reference in mecha.dm.
code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
+1 -1
View File
@@ -542,7 +542,7 @@
"dullahanmetal",
"dullahanmetal2"
)
if(mind.assigned_role in command_positions)
if(mind.assigned_role in GLOB.command_positions)
dullahanmetal_styles.Add("dullahancommand")
var/list/dullahaneyes_styles = list(
"dullahaneyes"
code/modules/mob/living/carbon/human/update_icons.dm
+3 -3
View File
@@ -1430,11 +1430,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
apply_layer(VORE_TAIL_LAYER)
/mob/living/carbon/human/proc/get_vore_tail_image()
if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant)
if(tail_style && istaurtail(tail_style) && tail_style.vore_tail_sprite_variant)
var/vs_fullness = vore_fullness_ex["taur belly"]
var/loaf_alt = lying && tail_style:belly_variant_when_loaf
var/loaf_alt = lying && tail_style.belly_variant_when_loaf
var/fullness_icons = min(tail_style.fullness_icons, vs_fullness)
var/icon/vorebelly_s = new/icon(icon = tail_style.bellies_icon_path, icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[fullness_icons][loaf_alt ? " loaf" : (struggle_anim_taur ? "" : " idle")]")
var/icon/vorebelly_s = new/icon(icon = tail_style.bellies_icon_path, icon_state = "Taur[tail_style.vore_tail_sprite_variant]-Belly-[fullness_icons][loaf_alt ? " loaf" : (struggle_anim_taur ? "" : " idle")]")
vorebelly_s.Blend(vore_sprite_color["taur belly"], vore_sprite_multiply["taur belly"] ? ICON_MULTIPLY : ICON_ADD)
var/image/working = image(vorebelly_s)
working.pixel_x = -16
code/modules/mob/living/silicon/robot/drone/drone.dm
+1 -1
View File
@@ -33,7 +33,7 @@ var/list/mob_hat_cache = list()
braintype = "Drone"
lawupdate = 0
density = TRUE
req_access = list(access_engine, access_robotics)
req_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
integrated_light_power = 3
local_transmit = 1
code/modules/mob/living/silicon/robot/drone/drone_console.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to monitor the station's drone population and the assembler that services them."
icon_keyboard = "power_key"
icon_screen = "generic" //VOREStation Edit
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
circuit = /obj/item/circuitboard/drone_control
//Used when pinging drones.
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -87,7 +87,7 @@
var/wiresexposed = 0
var/locked = 1
var/has_power = 1
var/list/req_access = list(access_robotics)
var/list/req_access = list(ACCESS_ROBOTICS)
var/ident = 0
//var/list/laws = list()
var/viewalerts = 0
code/modules/mob/living/silicon/robot/robot_items.dm
+2 -2
View File
@@ -24,11 +24,11 @@
dummy_card_type = /obj/item/card/id/syndicate/dummy_cyborg
/obj/item/card/id/science/roboticist/dummy_cyborg
access = list(access_robotics)
access = list(ACCESS_ROBOTICS)
/obj/item/card/id/syndicate/dummy_cyborg/Initialize(mapload)
. = ..()
access |= access_robotics
access |= ACCESS_ROBOTICS
//A harvest item for serviceborgs.
/obj/item/robot_harvester
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+9 -9
View File
@@ -488,7 +488,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/engislug)
holder_type = /obj/item/holder/catslug/custom/engislug
say_list_type = /datum/say_list/catslug/custom/engislug
myid_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_construction, access_atmospherics)
myid_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
siemens_coefficient = 0 //Noodly fella's gone and built up an immunity from many small shocks
minbodytemp = 200
@@ -603,7 +603,7 @@
"bio" = 0,
"rad" = 0
) //Similarly, \some\ armour values for a smidge more survivability compared to other catslugs.
myid_access = list(access_security, access_sec_doors, access_forensics_lockers, access_maint_tunnels)
myid_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS)
/datum/say_list/catslug/custom/gatslug
speak = list("Have any flashbangs?", "Valids!", "Heard spiders?", "What is that?", "Freeze!", "What are you doing?", "How did you get here?", "Red alert means big bangsticks.", "No being naughty now.", "WAOW!", "Who ate all the donuts?")
@@ -640,7 +640,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/medislug)
holder_type = /obj/item/holder/catslug/custom/medislug
say_list_type = /datum/say_list/catslug/custom/medislug
myid_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
myid_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
/datum/say_list/catslug/custom/medislug
speak = list("Have any osteodaxon?", "What is that?", "Suit sensors!", "What are you doing?", "How did you get here?", "Put a mask on!", "No smoking!", "WAOW!", "Stop getting blood everywhere!", "WHERE IN MAINT?")
@@ -676,7 +676,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/scienceslug)
holder_type = /obj/item/holder/catslug/custom/scienceslug
say_list_type = /datum/say_list/catslug/custom/scienceslug
myid_access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
myid_access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH)
/datum/say_list/catslug/custom/scienceslug
@@ -714,7 +714,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/cargoslug)
holder_type = /obj/item/holder/catslug/custom/cargoslug
say_list_type = /datum/say_list/catslug/custom/cargoslug
myid_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
myid_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
/datum/say_list/catslug/custom/cargoslug
speak = list("Disposals is not for slip and slide.", "What is that?", "Stamp those manifests!", "What are you doing?", "How did you get here?", "Can order pizza crate?", "WAOW!", "Where are all of our materials?", "Got glubbs?")
@@ -753,7 +753,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/capslug)
holder_type = /obj/item/holder/catslug/custom/capslug
say_list_type = /datum/say_list/catslug/custom/capslug
myid_access = list(access_heads, access_keycard_auth) //Same access as a bridge secretary.
myid_access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH) //Same access as a bridge secretary.
/datum/say_list/catslug/custom/capslug
speak = list("How open big glass box with shiny inside?.", "What is that?", "Respect my authority!", "What are you doing?", "How did you get here?", "Fax for yellow-shirts!", "WAOW!", "Why is that console blinking and clicking?", "Do we need to call for ERT?", "Have been called comdom before, not sure why they thought I was a balloon.")
@@ -784,7 +784,7 @@
icon_dead = "deathslug_dead"
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) //So they don't get the spaceslug's cataloguer entry
say_list_type = /datum/say_list/catslug //Similarly, so they don't get the spaceslug's speech lines.
myid_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
myid_access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
maxHealth = 100 //Tough noodles
health = 100
taser_kill = 0
@@ -822,7 +822,7 @@
icon_dead = "syndislug_dead"
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug)
say_list_type = /datum/say_list/catslug
myid_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
myid_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS)
faction = FACTION_SYNDICATE
maxHealth = 100 //Tough noodles
health = 100
@@ -867,7 +867,7 @@
icon_dead = "responseslug_dead"
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug)
say_list_type = /datum/say_list/catslug
myid_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
myid_access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
maxHealth = 100 //Tough noodles
health = 100
taser_kill = 0
code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/progress = 0
var/target_progress = 300
var/datum/access/target_access = null
var/list/restricted_access_codes = list(access_change_ids, access_network) // access codes that are not hackable due to balance reasons
var/list/restricted_access_codes = list(ACCESS_CHANGE_IDS, ACCESS_NETWORK) // access codes that are not hackable due to balance reasons
/datum/computer_file/program/access_decrypter/kill_program(var/forced)
reset()
code/modules/modular_computers/file_system/programs/command/card.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_key_state = "id_key"
program_menu_icon = "key"
extended_desc = "Program for programming crew ID cards."
required_access = access_change_ids
required_access = ACCESS_CHANGE_IDS
requires_ntnet = FALSE
size = 8
category = PROG_COMMAND
code/modules/modular_computers/file_system/programs/command/comm.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_menu_icon = "flag"
tguimodule_path = /datum/tgui_module/communications/ntos
extended_desc = "Used to command and control. Can relay long-range communications. This program can not be run on tablet computers."
required_access = access_heads
required_access = ACCESS_HEADS
requires_ntnet = TRUE
size = 12
usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
+1 -1
View File
@@ -7,7 +7,7 @@
program_key_state = "atmos_key"
program_menu_icon = "alert"
extended_desc = "This program provides visual interface for the engineering alarm system."
required_access = access_engine
required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "alarm monitoring network"
size = 5
code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_key_state = "atmos_key"
program_menu_icon = "shuffle"
extended_desc = "This program allows remote control of air alarms. This program can not be run on tablet computers."
required_access = access_atmospherics
required_access = ACCESS_ATMOSPHERICS
requires_ntnet = TRUE
network_destination = "atmospheric control system"
requires_ntnet_feature = NTNET_SYSTEMCONTROL
code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
+1 -1
View File
@@ -7,7 +7,7 @@
program_menu_icon = "battery-3"
extended_desc = "This program connects to sensors to provide information about electrical systems"
ui_header = "power_norm.gif"
required_access = access_engine
required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "power monitoring system"
size = 9
code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_key_state = "rd_key"
program_menu_icon = "power"
extended_desc = "This program allows remote control of power distribution systems. This program can not be run on tablet computers."
required_access = access_engine
required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "RCON remote control system"
requires_ntnet_feature = NTNET_SYSTEMCONTROL
code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_key_state = "atmos_key"
program_menu_icon = "wrench"
extended_desc = "This program allows for remote monitoring and control of emergency shutoff valves."
required_access = access_engine
required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "shutoff valve control computer"
size = 5
code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
+1 -1
View File
@@ -7,7 +7,7 @@
program_menu_icon = "notice"
extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines."
ui_header = "smmon_0.gif"
required_access = access_engine
required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "supermatter monitoring system"
size = 5
code/modules/modular_computers/file_system/programs/generic/camera.dm
+7 -7
View File
@@ -10,22 +10,22 @@
if(NETWORK_THUNDER)
return 0
if(NETWORK_ENGINE,NETWORK_ENGINEERING,NETWORK_ALARM_ATMOS,NETWORK_ALARM_FIRE,NETWORK_ALARM_POWER)
return access_engine
return ACCESS_ENGINE
if(NETWORK_CIRCUITS)
return access_research
return ACCESS_RESEARCH
if(NETWORK_MINE)
return access_qm
return ACCESS_QM
if(NETWORK_ERT)
return access_cent_specops
return ACCESS_CENT_SPECOPS
//VOREStation Add Start
if(NETWORK_TALON_SHIP)
return access_talon
return ACCESS_TALON
if(NETWORK_TALON_HELMETS)
return access_talon
return ACCESS_TALON
//VOREStation Add End
if(network in using_map.station_networks)
return access_security // Default for all other station networks
return ACCESS_SECURITY // Default for all other station networks
else
return 999 //Inaccessible if not a station network and not mentioned above
code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
+2 -2
View File
@@ -84,7 +84,7 @@
if(channel)
channel.remove_client(src) // We shouldn't be in channel's user list, but just in case...
return TRUE
if(isliving(ui.user) && can_run(ui.user, TRUE, access_network))
if(isliving(ui.user) && can_run(ui.user, TRUE, ACCESS_NETWORK))
for(var/datum/ntnet_conversation/chan as anything in ntnet_global.chat_channels)
chan.remove_client(src)
netadmin_mode = TRUE
@@ -169,7 +169,7 @@
/datum/computer_file/program/chatclient/tgui_static_data(mob/user)
var/list/data = list()
data["can_admin"] = can_run(user, FALSE, access_network)
data["can_admin"] = can_run(user, FALSE, ACCESS_NETWORK)
return data
/datum/computer_file/program/chatclient/tgui_data(mob/user)
code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_key_state = "med_key"
program_menu_icon = "heart"
extended_desc = "This program connects to life signs monitoring system to provide basic information on crew health."
required_access = access_medical
required_access = ACCESS_MEDICAL
requires_ntnet = TRUE
network_destination = "crew lifesigns monitoring system"
size = 11
code/modules/modular_computers/file_system/programs/research/email_administration.dm
+2 -2
View File
@@ -9,7 +9,7 @@
requires_ntnet = TRUE
available_on_ntnet = TRUE
tgui_id = "NtosEmailAdministration"
required_access = access_network
required_access = ACCESS_NETWORK
category = PROG_ADMIN
var/datum/computer_file/data/email_account/current_account = null
@@ -67,7 +67,7 @@
// High security - can only be operated when the user has an ID with access on them.
var/obj/item/card/id/I = ui.user.GetIdCard()
if(!istype(I) || !(access_network in I.GetAccess()))
if(!istype(I) || !(ACCESS_NETWORK in I.GetAccess()))
return TRUE
switch(action)
code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
+1 -1
View File
@@ -7,7 +7,7 @@
extended_desc = "This program monitors the local NTNet network, provides access to logging systems, and allows for configuration changes"
size = 12
requires_ntnet = TRUE
required_access = access_network
required_access = ACCESS_NETWORK
available_on_ntnet = TRUE
tgui_id = "NtosNetMonitor"
category = PROG_ADMIN
code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm
+1 -1
View File
@@ -3,4 +3,4 @@
filedesc = "Alarm Monitoring (Security)"
extended_desc = "This program provides visual interface for the security alarm system."
tguimodule_path = /datum/tgui_module/alarm_monitor/security/ntos
required_access = access_security
required_access = ACCESS_SECURITY
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+3 -3
View File
@@ -19,7 +19,7 @@ var/warrant_uid = 0
program_menu_icon = "star"
requires_ntnet = TRUE
available_on_ntnet = TRUE
required_access = access_security
required_access = ACCESS_SECURITY
usage_flags = PROGRAM_ALL
tgui_id = "NtosDigitalWarrant"
category = PROG_SEC
@@ -73,7 +73,7 @@ var/warrant_uid = 0
// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
// to someone who is to be arrested, which allows them to change the stuff there.
var/obj/item/card/id/I = ui.user.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess()))
if(!istype(I) || !I.registered_name || !(ACCESS_SECURITY in I.GetAccess()))
to_chat(ui.user, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return
@@ -136,7 +136,7 @@ var/warrant_uid = 0
if("editwarrantauth")
. = TRUE
if(!(access_hos in I.GetAccess())) // VOREStation edit begin
if(!(ACCESS_HOS in I.GetAccess())) // VOREStation edit begin
to_chat(ui.user, span_warning("You don't have the access to do this!"))
return // VOREStation edit end
activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
code/modules/nifsoft/software/01_vision.dm
+9 -9
View File
@@ -15,7 +15,7 @@
desc = "Like the civilian model, but provides medical records access and virus database lookup."
list_pos = NIF_MEDICAL_AR
cost = 375
access = access_medical
access = ACCESS_MEDICAL
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_MEDICAL)
@@ -26,7 +26,7 @@
desc = "Like the civilian model, but provides access to arrest status and security records."
list_pos = NIF_SECURITY_AR
cost = 375
access = access_security
access = ACCESS_SECURITY
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_SECURITY)
@@ -37,7 +37,7 @@
desc = "Like the civilian model, but provides ... well, nothing. For now."
list_pos = NIF_ENGINE_AR
cost = 250
access = access_engine
access = ACCESS_ENGINE
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_ENGINE)
@@ -48,7 +48,7 @@
desc = "Like the civilian model, but provides ... well, nothing. For now."
list_pos = NIF_SCIENCE_AR
cost = 250
access = access_research
access = ACCESS_RESEARCH
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_SCIENCE)
@@ -59,7 +59,7 @@
desc = "Like the civilian model, but provides most of the features of the medical and security overlays as well."
list_pos = NIF_OMNI_AR
cost = 375
access = access_captain
access = ACCESS_CAPTAIN
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_OMNI)
@@ -88,7 +88,7 @@
desc = "Enables a high-speed shielding response to intense light, such as flashes, to block them."
list_pos = NIF_FLASHPROT
cost = 300
access = access_security
access = ACCESS_SECURITY
a_drain = 0.05
vision_flags = (NIF_V_FLASHPROT)
@@ -100,7 +100,7 @@
list_pos = NIF_MESONS
cost = 500
a_drain = 0.1
access = access_engine
access = ACCESS_ENGINE
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT, VIS_MESONS)
vision_flags = (NIF_V_MESONS)
@@ -120,7 +120,7 @@
list_pos = NIF_MATERIAL
cost = 500
a_drain = 0.1
access = access_research
access = ACCESS_RESEARCH
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT)
vision_flags = (NIF_V_MATERIAL)
@@ -161,7 +161,7 @@
list_pos = NIF_NIGHTVIS
cost = 500
a_drain = 0.1
access = access_security
access = ACCESS_SECURITY
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT)
vision_flags = (NIF_V_NIGHTVIS)
code/modules/nifsoft/software/06_screens.dm
+2 -2
View File
@@ -2,7 +2,7 @@
name = "Crew Monitor"
desc = "A link to the local crew monitor sensors. Useful for finding people in trouble."
list_pos = NIF_MEDMONITOR
access = access_medical
access = ACCESS_MEDICAL
cost = 625
p_drain = 0.025
var/datum/tgui_module/crew_monitor/nif/arscreen
@@ -31,7 +31,7 @@
name = "Alarm Monitor"
desc = "A link to the local alarm monitors. Useful for detecting alarms in a pinch."
list_pos = NIF_ENGMONITOR
access = access_engine
access = ACCESS_ENGINE
cost = 625
p_drain = 0.025
var/datum/tgui_module/alarm_monitor/engineering/nif/tgarscreen
code/modules/overmap/ships/computers/helm.dm
+1 -1
View File
@@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
var/dy //coordinates
var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5
var/accellimit = 0.001 //manual limiter for acceleration
req_one_access = list(access_pilot) //VOREStation Edit
req_one_access = list(ACCESS_PILOT) //VOREStation Edit
ai_control = FALSE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help
// fancy sprite
code/modules/pda/radio.dm
+1 -1
View File
@@ -97,7 +97,7 @@
* Radio Cartridge, essentially a signaler.
*/
/obj/item/radio/integrated/signal
frequency = 1457
frequency = RSD_FREQ
var/code = 30.0
/obj/item/radio/integrated/signal/Destroy()
code/modules/power/apc.dm
+2 -2
View File
@@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(apcs)
pixel_y = (dir & 3) ? (dir == 1 ? 20 : -20) : 0
/obj/machinery/power/apc/hyper/graveyard
req_access = list(access_lost)
req_access = list(ACCESS_LOST)
alarms_hidden = TRUE
/obj/machinery/power/apc
@@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(apcs)
unacidable = TRUE
use_power = USE_POWER_OFF
clicksound = "switch"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
blocks_emissive = FALSE
vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature
var/area/area
code/modules/power/fusion/fuel_assembly/fuel_injector.dm
+1 -1
View File
@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
icon_state = "injector0"
density = TRUE
anchored = FALSE
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 500
code/modules/power/fusion/gyrotron/gyrotron.dm
+1 -1
View File
@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(gyrotrons)
icon = 'icons/obj/machines/power/fusion.dmi'
desc = "It is a heavy duty industrial gyrotron suited for powering fusion reactors."
icon_state = "emitter-off"
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
use_power = USE_POWER_IDLE
active_power_usage = 50000
code/modules/power/singularity/collector.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "ca"
anchored = FALSE
density = TRUE
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
// use_power = 0
var/obj/item/tank/phoron/P = null
var/last_power = 0
code/modules/power/singularity/emitter.dm
+1 -1
View File
@@ -6,7 +6,7 @@
anchored = FALSE
density = TRUE
unacidable = TRUE
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
var/id = null
use_power = USE_POWER_OFF //uses powernet power, not APC power
code/modules/projectiles/guns/energy/protector_vr.dm
+1 -1
View File
@@ -132,7 +132,7 @@
list(mode_name="electrode", projectile_type=/obj/item/projectile/energy/electrode/strong, modifystate="zap", charge_cost = 800),
)
req_access = list(access_armory) //for toggling safety
req_access = list(ACCESS_ARMORY) //for toggling safety
var/locked = 1
var/lockable = 1
code/modules/projectiles/guns/energy/pump.dm
+1 -1
View File
@@ -15,7 +15,7 @@
* Gun Locking Mechanism
*/
/obj/item/gun/energy/locked
req_access = list(access_armory) //for toggling safety
req_access = list(ACCESS_ARMORY) //for toggling safety
var/locked = 1
var/lockable = 1
code/modules/reagents/machinery/dispenser/supply.dm
+36 -36
View File
@@ -78,7 +78,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
containername = "chemical crate"
access = list(access_chemistry)
access = list(ACCESS_CHEMISTRY)
group = "Reagents"
/datum/supply_pack/alcohol_reagents
@@ -109,7 +109,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "alcoholic drinks crate"
access = list(access_bar)
access = list(ACCESS_BAR)
group = "Reagents"
/datum/supply_pack/softdrink_reagents
@@ -241,43 +241,43 @@
// Chemistry-restricted (raw reagents excluding sugar/water)
// Datum path Contents type Supply pack name Container name Cost Container access
SEC_PACK(hydrogen, /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, "Reagent refill - Hydrogen", "hydrogen reagent cartridge crate", 15, access_chemistry)
SEC_PACK(lithium, /obj/item/reagent_containers/chem_disp_cartridge/lithium, "Reagent refill - Lithium", "lithium reagent cartridge crate", 15, access_chemistry)
SEC_PACK(carbon, /obj/item/reagent_containers/chem_disp_cartridge/carbon, "Reagent refill - Carbon", "carbon reagent cartridge crate", 15, access_chemistry)
SEC_PACK(nitrogen, /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, "Reagent refill - Nitrogen", "nitrogen reagent cartridge crate", 15, access_chemistry)
SEC_PACK(oxygen, /obj/item/reagent_containers/chem_disp_cartridge/oxygen, "Reagent refill - Oxygen", "oxygen reagent cartridge crate", 15, access_chemistry)
SEC_PACK(fluorine, /obj/item/reagent_containers/chem_disp_cartridge/fluorine, "Reagent refill - Fluorine", "fluorine reagent cartridge crate", 15, access_chemistry)
SEC_PACK(sodium, /obj/item/reagent_containers/chem_disp_cartridge/sodium, "Reagent refill - Sodium", "sodium reagent cartridge crate", 15, access_chemistry)
SEC_PACK(aluminium, /obj/item/reagent_containers/chem_disp_cartridge/aluminum, "Reagent refill - Aluminum", "aluminum reagent cartridge crate", 15, access_chemistry)
SEC_PACK(silicon, /obj/item/reagent_containers/chem_disp_cartridge/silicon, "Reagent refill - Silicon", "silicon reagent cartridge crate", 15, access_chemistry)
SEC_PACK(phosphorus,/obj/item/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus", "phosphorus reagent cartridge crate", 15, access_chemistry)
SEC_PACK(sulfur, /obj/item/reagent_containers/chem_disp_cartridge/sulfur, "Reagent refill - Sulfur", "sulfur reagent cartridge crate", 15, access_chemistry)
SEC_PACK(chlorine, /obj/item/reagent_containers/chem_disp_cartridge/chlorine, "Reagent refill - Chlorine", "chlorine reagent cartridge crate", 15, access_chemistry)
SEC_PACK(potassium, /obj/item/reagent_containers/chem_disp_cartridge/potassium, "Reagent refill - Potassium", "potassium reagent cartridge crate", 15, access_chemistry)
SEC_PACK(iron, /obj/item/reagent_containers/chem_disp_cartridge/iron, "Reagent refill - Iron", "iron reagent cartridge crate", 15, access_chemistry)
SEC_PACK(copper, /obj/item/reagent_containers/chem_disp_cartridge/copper, "Reagent refill - Copper", "copper reagent cartridge crate", 15, access_chemistry)
SEC_PACK(mercury, /obj/item/reagent_containers/chem_disp_cartridge/mercury, "Reagent refill - Mercury", "mercury reagent cartridge crate", 15, access_chemistry)
SEC_PACK(radium, /obj/item/reagent_containers/chem_disp_cartridge/radium, "Reagent refill - Radium", "radium reagent cartridge crate", 15, access_chemistry)
SEC_PACK(ethanol, /obj/item/reagent_containers/chem_disp_cartridge/ethanol, "Reagent refill - Ethanol", "ethanol reagent cartridge crate", 15, access_chemistry)
SEC_PACK(sacid, /obj/item/reagent_containers/chem_disp_cartridge/sacid, "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, access_chemistry)
SEC_PACK(tungsten, /obj/item/reagent_containers/chem_disp_cartridge/tungsten, "Reagent refill - Tungsten", "tungsten reagent cartridge crate", 15, access_chemistry)
SEC_PACK(calcium, /obj/item/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, access_chemistry)
SEC_PACK(hydrogen, /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, "Reagent refill - Hydrogen", "hydrogen reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(lithium, /obj/item/reagent_containers/chem_disp_cartridge/lithium, "Reagent refill - Lithium", "lithium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(carbon, /obj/item/reagent_containers/chem_disp_cartridge/carbon, "Reagent refill - Carbon", "carbon reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(nitrogen, /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, "Reagent refill - Nitrogen", "nitrogen reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(oxygen, /obj/item/reagent_containers/chem_disp_cartridge/oxygen, "Reagent refill - Oxygen", "oxygen reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(fluorine, /obj/item/reagent_containers/chem_disp_cartridge/fluorine, "Reagent refill - Fluorine", "fluorine reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(sodium, /obj/item/reagent_containers/chem_disp_cartridge/sodium, "Reagent refill - Sodium", "sodium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(aluminium, /obj/item/reagent_containers/chem_disp_cartridge/aluminum, "Reagent refill - Aluminum", "aluminum reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(silicon, /obj/item/reagent_containers/chem_disp_cartridge/silicon, "Reagent refill - Silicon", "silicon reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(phosphorus,/obj/item/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus", "phosphorus reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(sulfur, /obj/item/reagent_containers/chem_disp_cartridge/sulfur, "Reagent refill - Sulfur", "sulfur reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(chlorine, /obj/item/reagent_containers/chem_disp_cartridge/chlorine, "Reagent refill - Chlorine", "chlorine reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(potassium, /obj/item/reagent_containers/chem_disp_cartridge/potassium, "Reagent refill - Potassium", "potassium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(iron, /obj/item/reagent_containers/chem_disp_cartridge/iron, "Reagent refill - Iron", "iron reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(copper, /obj/item/reagent_containers/chem_disp_cartridge/copper, "Reagent refill - Copper", "copper reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(mercury, /obj/item/reagent_containers/chem_disp_cartridge/mercury, "Reagent refill - Mercury", "mercury reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(radium, /obj/item/reagent_containers/chem_disp_cartridge/radium, "Reagent refill - Radium", "radium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(ethanol, /obj/item/reagent_containers/chem_disp_cartridge/ethanol, "Reagent refill - Ethanol", "ethanol reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(sacid, /obj/item/reagent_containers/chem_disp_cartridge/sacid, "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(tungsten, /obj/item/reagent_containers/chem_disp_cartridge/tungsten, "Reagent refill - Tungsten", "tungsten reagent cartridge crate", 15, ACCESS_CHEMISTRY)
SEC_PACK(calcium, /obj/item/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
// Bar-restricted (alcoholic drinks)
// Datum path Contents type Supply pack name Container name Cost Container access
SEC_PACK(beer, /obj/item/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar)
SEC_PACK(kahlua, /obj/item/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar)
SEC_PACK(whiskey, /obj/item/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar)
SEC_PACK(rwine, /obj/item/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, access_bar)
SEC_PACK(wwine, /obj/item/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, access_bar)
SEC_PACK(vodka, /obj/item/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar)
SEC_PACK(gin, /obj/item/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar)
SEC_PACK(rum, /obj/item/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar)
SEC_PACK(tequila, /obj/item/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar)
SEC_PACK(vermouth, /obj/item/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar)
SEC_PACK(cognac, /obj/item/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar)
SEC_PACK(ale, /obj/item/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar)
SEC_PACK(mead, /obj/item/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar)
SEC_PACK(beer, /obj/item/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(kahlua, /obj/item/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(whiskey, /obj/item/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(rwine, /obj/item/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(wwine, /obj/item/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(vodka, /obj/item/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(gin, /obj/item/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(rum, /obj/item/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(tequila, /obj/item/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(vermouth, /obj/item/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(cognac, /obj/item/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(ale, /obj/item/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, ACCESS_BAR)
SEC_PACK(mead, /obj/item/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, ACCESS_BAR)
// Unrestricted (water, sugar, non-alcoholic drinks)
// Datum path Contents type Supply pack name Container name Cost
code/modules/reagents/reactions/distilling/distilling.dm
+6 -6
View File
@@ -53,13 +53,13 @@
// Special distilling conditions must be met, each object has different vars to meet it though.
if(istype(holder.my_atom,/obj/distilling_tester))
// Unit test needs some special handholding
var/obj/distilling_tester/DD = holder.my_atom
if(DD.current_temp < temp_range[1] || DD.current_temp > temp_range[2])
var/obj/distilling_tester/distillery_tester = holder.my_atom
if(distillery_tester.current_temp < temp_range[1] || distillery_tester.current_temp > temp_range[2])
return FALSE
else if(istype(holder.my_atom,/obj/machinery/portable_atmospherics/powered/reagent_distillery))
// Super special temperature check.
var/obj/machinery/portable_atmospherics/powered/reagent_distillery/RD = holder.my_atom
if(RD.current_temp < temp_range[1] || RD.current_temp > temp_range[2])
var/obj/machinery/portable_atmospherics/powered/reagent_distillery/reagent_distillery = holder.my_atom
if(reagent_distillery.current_temp < temp_range[1] || reagent_distillery.current_temp > temp_range[2])
return FALSE
else if(istype(holder.my_atom, /obj/machinery/reagent_refinery/reactor))
// Check gas temp for refinery
@@ -80,8 +80,8 @@
return
// Special handling for this
if(istype(holder.my_atom,/obj/machinery/portable_atmospherics/powered/reagent_distillery))
var/obj/machinery/portable_atmospherics/powered/reagent_distillery/RD = holder.my_atom
RD.current_temp += temp_shift
var/obj/machinery/portable_atmospherics/powered/reagent_distillery/reagent_distillery = holder.my_atom
reagent_distillery.current_temp += temp_shift
return
// Change gas temps
if(!GM)
code/modules/research/tg/machinery/mech_fabricator.dm
+1 -1
View File
@@ -5,7 +5,7 @@
desc = "Nothing is being built."
anchored = TRUE
density = TRUE
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/mechfab
speed_process = TRUE
code/modules/research/tg/rdconsole.dm
+1 -1
View File
@@ -22,7 +22,7 @@ Nothing else in the console has ID requirements.
icon_screen = "rdcomp"
icon_keyboard = "rd_key"
circuit = /obj/item/circuitboard/rdconsole
req_access = list(access_research) // Locking and unlocking the console requires research access
req_access = list(ACCESS_RESEARCH) // Locking and unlocking the console requires research access
/// Reference to global science techweb
var/datum/techweb/stored_research
/// The stored technology disk, if present
code/modules/research/tg/server.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon_state = "RD-server-on"
var/base_icon_state = "RD-server"
circuit = /obj/item/circuitboard/machine/rdserver
req_access = list(access_rd)
req_access = list(ACCESS_RD)
/// if TRUE, we are currently operational and giving out research points.
var/working = TRUE
code/modules/research/tg/server_control.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_screen = "rdcomp"
icon_keyboard = "rd_key"
circuit = /obj/item/circuitboard/rdservercontrol
req_access = list(access_rd)
req_access = list(ACCESS_RD)
///Connected techweb node the server is connected to.
var/datum/techweb/stored_research
code/modules/research/tg/techwebs/_techweb.dm
+1 -1
View File
@@ -332,7 +332,7 @@
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/human_user = user
var/list/access = human_user.wear_id?.GetAccess()
if(access_rd in access)
if(ACCESS_RD in access)
queue_first = TRUE
if(id in research_queue_nodes)
code/modules/resleeving/computers.dm
+1 -1
View File
@@ -10,7 +10,7 @@
light_color = "#315ab4"
bubble_icon = "medical"
circuit = /obj/item/circuitboard/resleeving_control
req_access = list(access_heads) //Only used for record deletion right now.
req_access = list(ACCESS_HEADS) //Only used for record deletion right now.
var/list/pods = null //Linked grower pods.
var/list/spods = null
var/list/sleevers = null //Linked resleeving booths.
code/modules/resleeving/designer.dm
+1 -1
View File
@@ -13,7 +13,7 @@
icon_screen = "explosive"
light_color = "#315ab4"
circuit = /obj/item/circuitboard/body_designer
req_access = list(access_medical) // Used for loading people's designs
req_access = list(ACCESS_MEDICAL) // Used for loading people's designs
var/datum/tgui_module/appearance_changer/body_designer/designer_gui
var/obj/item/disk/body_record/disk = null
var/selected_record = FALSE
code/modules/security levels/keycard authentication.dm
+2 -2
View File
@@ -32,7 +32,7 @@
return
if(istype(W,/obj/item/card/id))
var/obj/item/card/id/ID = W
if(access_keycard_auth in ID.GetAccess())
if(ACCESS_KEYCARD_AUTH in ID.GetAccess())
if(active == 1)
//This is not the device that made the initial request. It is the device confirming the request.
if(event_source)
@@ -198,6 +198,6 @@ var/global/maint_all_access = 0
to_world(span_alert(span_red("The maintenance access requirement has been readded on all maintenance airlocks.")))
/obj/machinery/door/airlock/allowed(mob/M)
if(maint_all_access && src.check_access_list(list(access_maint_tunnels)))
if(maint_all_access && src.check_access_list(list(ACCESS_MAINT_TUNNELS)))
return 1
return ..(M)
code/modules/shieldgen/emergency_shield.dm
+1 -1
View File
@@ -124,7 +124,7 @@
opacity = 0
anchored = FALSE
pressure_resistance = 2*ONE_ATMOSPHERE
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
var/const/max_health = 100
var/health = max_health
var/active = 0
code/modules/shieldgen/sheldwallgen.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "Shield_Gen"
anchored = FALSE
density = TRUE
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
var/active = 0
var/power = 0
var/state = 0
code/modules/shieldgen/shield_capacitor.dm
+1 -1
View File
@@ -44,7 +44,7 @@
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess()))
if((ACCESS_CAPTAIN in C.GetAccess()) || (ACCESS_SECURITY in C.GetAccess()) || (ACCESS_ENGINE in C.GetAccess()))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
code/modules/shieldgen/shield_gen.dm
+1 -1
View File
@@ -61,7 +61,7 @@
/obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess()))
if((ACCESS_CAPTAIN in C.GetAccess()) || (ACCESS_SECURITY in C.GetAccess()) || (ACCESS_ENGINE in C.GetAccess()))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
code/modules/shuttles/antagonist.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/obj/machinery/computer/shuttle_control/multi/skipjack
name = "skipjack control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "mercenary shuttle control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Mercenary"
code/modules/shuttles/departmental.dm
+3 -3
View File
@@ -1,17 +1,17 @@
/obj/machinery/computer/shuttle_control/mining
name = "mining shuttle control console"
shuttle_tag = "Mining"
//req_access = list(access_mining)
//req_access = list(ACCESS_MINING)
circuit = /obj/item/circuitboard/mining_shuttle
/obj/machinery/computer/shuttle_control/engineering
name = "engineering shuttle control console"
shuttle_tag = "Engineering"
//req_one_access = list(access_engine_equip,access_atmospherics)
//req_one_access = list(ACCESS_ENGINE_EQUIP,ACCESS_ATMOSPHERICS)
circuit = /obj/item/circuitboard/engineering_shuttle
/obj/machinery/computer/shuttle_control/research
name = "research shuttle control console"
shuttle_tag = "Research"
//req_access = list(access_research)
//req_access = list(ACCESS_RESEARCH)
circuit = /obj/item/circuitboard/research_shuttle
code/modules/shuttles/shuttle_arrivals.dm
+1 -1
View File
@@ -17,7 +17,7 @@
// For debugging.
/obj/machinery/computer/shuttle_control/arrivals
name = "shuttle control console"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Arrivals"
// Unlike most shuttles, the arrivals shuttle is completely automated, so we need to put some additional code here.
code/modules/shuttles/shuttle_emergency.dm
+2 -2
View File
@@ -1,7 +1,7 @@
// Formerly /datum/shuttle/ferry/emergency
/datum/shuttle/autodock/ferry/emergency
category = /datum/shuttle/autodock/ferry/emergency
var/frequency = 1381 // Why this frequency? BECAUSE! Thats what someone decided once.
var/frequency = AUTODOCK_FREQ // Why this frequency? BECAUSE! Thats what someone decided once.
var/datum/radio_frequency/radio_connection
/datum/shuttle/autodock/ferry/emergency/New()
@@ -163,7 +163,7 @@
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
return 0
if (!(access_heads in access))
if (!(ACCESS_HEADS in access))
src.visible_message("\The [src] buzzes, rejecting [ident].")
playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0)
return 0
code/modules/shuttles/shuttle_specops.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle_control/specops
name = "special operations shuttle console"
shuttle_tag = "Special Operations"
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
/obj/machinery/computer/shuttle_control/specops/attack_ai(user as mob)
to_chat(user, span_warning("Access Denied."))
code/modules/shuttles/shuttles_vr.dm
+3 -3
View File
@@ -22,17 +22,17 @@
/obj/machinery/computer/shuttle_control/multi/admin
name = "centcom shuttle control console"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Administration"
/obj/machinery/computer/shuttle_control/multi/awaymission
name = "exploration shuttle control console"
req_access = list(access_gateway)
req_access = list(ACCESS_GATEWAY)
shuttle_tag = "AwayMission"
/obj/machinery/computer/shuttle_control/belter
name = "belter control console"
req_one_access = list(access_mining, access_medical_equip) //Allows xenoarch, miners AND doctors to use it.
req_one_access = list(ACCESS_MINING, ACCESS_MEDICAL_EQUIP) //Allows xenoarch, miners AND doctors to use it.
shuttle_tag = "Belter" //The scanning console needs to enable/disable this at will.
ai_control = TRUE
code/modules/tgui/modules/atmos_control.dm
+1 -1
View File
@@ -100,7 +100,7 @@
return STATUS_UPDATE
/datum/tgui_state/air_alarm_remote/proc/has_access(var/mob/user)
return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO) || (access_ce in user.GetAccess()))
return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO) || (ACCESS_CE in user.GetAccess()))
/datum/tgui_state/air_alarm_remote/Destroy()
atmos_control = null
code/modules/tgui/modules/camera.dm
+4 -4
View File
@@ -244,10 +244,10 @@
// Access Based
if(access_based)
for(var/network in using_map.station_networks)
if(can_access_network(user, get_camera_access(network), 1))
if(can_ACCESS_NETWORK(user, get_camera_access(network), 1))
all_networks.Add(network)
for(var/network in using_map.secondary_networks)
if(can_access_network(user, get_camera_access(network), 0))
if(can_ACCESS_NETWORK(user, get_camera_access(network), 0))
all_networks.Add(network)
// Network Based
else
@@ -269,13 +269,13 @@
D["[ckey(C.c_tag)]"] = C
return D
/datum/tgui_module/camera/proc/can_access_network(mob/user, network_access, station_network = 0)
/datum/tgui_module/camera/proc/can_ACCESS_NETWORK(mob/user, network_access, station_network = 0)
// No access passed, or 0 which is considered no access requirement. Allow it.
if(!network_access)
return 1
if(station_network)
return check_access(user, network_access) || check_access(user, access_security) || check_access(user, access_heads)
return check_access(user, network_access) || check_access(user, ACCESS_SECURITY) || check_access(user, ACCESS_HEADS)
else
return check_access(user, network_access)
code/modules/tgui/modules/communications.dm
+2 -2
View File
@@ -215,9 +215,9 @@
setMenuState(ui.user, COMM_SCREEN_MAIN)
return
// Login function.
if(check_access(ui.user, access_heads))
if(check_access(ui.user, ACCESS_HEADS))
authenticated = COMM_AUTHENTICATION_MIN
if(check_access(ui.user, access_captain))
if(check_access(ui.user, ACCESS_CAPTAIN))
authenticated = COMM_AUTHENTICATION_MAX
var/obj/item/card/id = ui.user.GetIdCard()
if(istype(id))
code/modules/turbolift/turbolift_console.dm
+3 -3
View File
@@ -54,7 +54,7 @@
desc = "A call button for an elevator. Be sure to hit it three hundred times."
icon_state = "button"
var/light_up = FALSE
req_access = list(access_eva)
req_access = list(ACCESS_EVA)
var/datum/turbolift_floor/floor
/obj/structure/lift/button/Destroy()
@@ -118,8 +118,8 @@
name = "elevator control panel"
desc = "A control panel for moving the elevator. There's a slot for swiping IDs to enable additional controls."
icon_state = "panel"
req_access = list(access_eva)
req_one_access = list(access_heads, access_atmospherics, access_medical)
req_access = list(ACCESS_EVA)
req_one_access = list(ACCESS_HEADS, ACCESS_ATMOSPHERICS, ACCESS_MEDICAL)
// Hit it with a PDA or ID to enable priority call mode
/obj/structure/lift/panel/attackby(obj/item/W as obj, mob/user as mob)
code/modules/turbolift/turbolift_door.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/door/airlock/lift
name = "Elevator Door"
desc = "Ding."
req_access = list(access_maint_tunnels)
req_access = list(ACCESS_MAINT_TUNNELS)
unacidable = TRUE
opacity = 0
autoclose = 0
code/modules/vore/fluffstuff/custom_items_vr.dm
+1 -1
View File
@@ -878,7 +878,7 @@
icon_state = "centcom"
registered_name = "Amy Lessen"
assignment = "Xenobiology Director"
access = list(access_cent_general,access_cent_thunder,access_cent_medical,access_cent_living,access_cent_storage,access_cent_teleporter,access_research,access_xenobiology,access_maint_tunnels,access_xenoarch,access_robotics,access_tox_storage,access_tox) //Yes, this looks awful. I tried calling both central and resarch access but it didn't work.
access = list(ACCESS_CENT_GENERAL,ACCESS_CENT_THUNDER,ACCESS_CENT_MEDICAL,ACCESS_CENT_LIVING,ACCESS_CENT_STORAGE,ACCESS_CENT_TELEPORTER,ACCESS_RESEARCH,ACCESS_XENOBIOLOGY,ACCESS_MAINT_TUNNELS,ACCESS_XENOARCH,ACCESS_ROBOTICS,ACCESS_TOX_STORAGE,ACCESS_TOX) //Yes, this looks awful. I tried calling both central and resarch access but it didn't work.
age = 39
blood_type = "O-"
sex = "Female"

Some files were not shown because too many files have changed in this diff Show More