From 24ab8d7b2425ebc5ba65d255c4ea6868694fcc0a Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 24 Jul 2024 02:15:34 +0200 Subject: [PATCH 01/48] ballin --- code/__DEFINES/access.dm | 691 ++++++++++++++++++++++++++++++--------- 1 file changed, 537 insertions(+), 154 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index fd42046c46a9..d302f11aaf4d 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -1,155 +1,538 @@ -// Security equipment, security records, gulag item storage, secbots -#define ACCESS_SECURITY 1 -/// Brig cells+timers, permabrig, gulag+gulag shuttle, prisoner management console -#define ACCESS_BRIG 2 - /// Armory, gulag teleporter, execution chamber -#define ACCESS_ARMORY 3 -///Detective's office, forensics lockers, security+medical records -#define ACCESS_FORENSICS_LOCKERS 4 -/// Medical general access -#define ACCESS_MEDICAL 5 -/// Morgue access -#define ACCESS_MORGUE 6 -/// R&D department, burn chamber on some maps -#define ACCESS_TOX 7 -/// Toxins storage, burn chamber on some maps -#define ACCESS_TOX_STORAGE 8 -/// Genetics access -#define ACCESS_GENETICS 9 -/// Engineering area, power monitor, power flow control console -#define ACCESS_ENGINE 10 -///APCs, EngiVend/YouTool, engineering equipment lockers -#define ACCESS_ENGINE_EQUIP 11 -#define ACCESS_MAINT_TUNNELS 12 -#define ACCESS_EXTERNAL_AIRLOCKS 13 -#define ACCESS_CHANGE_IDS 15 -#define ACCESS_AI_UPLOAD 16 -#define ACCESS_TELEPORTER 17 -#define ACCESS_EVA 18 -/// Bridge, EVA storage windoors, gateway shutters, AI integrity restorer, clone record deletion, comms console -#define ACCESS_HEADS 19 -#define ACCESS_CAPTAIN 20 -#define ACCESS_ALL_PERSONAL_LOCKERS 21 -#define ACCESS_CHAPEL_OFFICE 22 -#define ACCESS_TECH_STORAGE 23 -#define ACCESS_ATMOSPHERICS 24 -#define ACCESS_BAR 25 -#define ACCESS_JANITOR 26 -#define ACCESS_CREMATORIUM 27 -#define ACCESS_KITCHEN 28 -#define ACCESS_ROBO_CONTROL 29 -#define ACCESS_RD 30 -#define ACCESS_CARGO 31 -#define ACCESS_CONSTRUCTION 32 -#define ACCESS_CHEMISTRY 33 -#define ACCESS_HYDROPONICS 35 -#define ACCESS_MANUFACTURING 36 // used by clerk -#define ACCESS_LIBRARY 37 -#define ACCESS_LAWYER 38 -#define ACCESS_VIROLOGY 39 -#define ACCESS_CMO 40 -#define ACCESS_QM 41 -#define ACCESS_COURT 42 -#define ACCESS_SURGERY 45 -#define ACCESS_THEATRE 46 -#define ACCESS_RESEARCH 47 -#define ACCESS_MINING 48 -#define ACCESS_MAILSORTING 50 -#define ACCESS_VAULT 53 -#define ACCESS_MINING_STATION 54 -#define ACCESS_XENOBIOLOGY 55 -#define ACCESS_CE 56 -#define ACCESS_HOP 57 -#define ACCESS_HOS 58 -/// Request console announcements -#define ACCESS_RC_ANNOUNCE 59 -/// Used for events which require at least two people to confirm them -#define ACCESS_KEYCARD_AUTH 60 -/// has access to the entire telecomms satellite / machinery -#define ACCESS_TCOMSAT 61 -#define ACCESS_GATEWAY 62 -/// Outer brig doors, department security posts -#define ACCESS_SEC_DOORS 63 -/// For releasing minerals from the ORM -#define ACCESS_MINERAL_STOREROOM 64 -#define ACCESS_MINISAT 65 -/// Weapon authorization for secbots -#define ACCESS_WEAPONS 66 -/// NTnet diagnostics/monitoring software -#define ACCESS_NETWORK 67 -///Cloning room and clone pod ejection -#define ACCESS_CLONING 68 -///Paramedic Office -#define ACCESS_PARAMEDIC 69 -///Access to the Network admins monitoring room -#define ACCESS_TCOM_ADMIN 70 -#define ACCESS_FREEMINER 71 -#define ACCESS_FREEMINER_CAPTAIN 72 -#define ACCESS_FREEMINER_ENGINEER 73 -//Yogs: Brig Physician access, used for their locker and offices if one is added -#define ACCESS_BRIG_PHYS 74 -#define ACCESS_ROBOTICS 75 // Access to robotics airlocks & buttons only, old ACCESS_ROBOTICS renamed to ACCESS_ROBO_CONTROL -#define ACCESS_SECURE_TECH_STORAGE 76 // Creating this to cleanly fix door remote bug will be equivalent to ACCESS_AI_UPLOAD for Cap and RD -#define ACCESS_PSYCH 77 // For the psych's back office area with the flashes/chem machines -#define ACCESS_RND 78 //rnd console -#define ACCESS_SERVHALL 79 - - //BEGIN CENTCOM ACCESS - /*Should leave plenty of room if we need to add more access levels. - Mostly for admin fun times.*/ -/// General facilities. CentCom ferry. -#define ACCESS_CENT_GENERAL 101 -/// Thunderdome. -#define ACCESS_CENT_THUNDER 102 +/* READ BEFORE ADDING/REMOVING ACCESSES +* Access is broken down by department, department special functions/rooms, and departmental roles +* The first access for the department will always be its general access function +* Please try to make the strings for any new accesses as close to the name of the define as possible +* If you are going to add an access to the list, make sure to also add it to its respective region further below +* If you're varediting on the map, it uses the string. If you're editing the object directly, use the define name +* +* NOTE: Some of this documentation may be inaccurate, as it originates from /TG/ -Myriad +*/ + + +//--- COMMAND ---// + +/// Command General Access, typically used for accessing the doors to the bridge, as well as being the general access that Tablet/Computer Programs check for "heads". +#define ACCESS_COMMAND "command" +/// Access to the AI Upload Room Doors as well as the AI satellite. Also used for controlling the machinery in the AI Upload (turrets, foam dispensers) +#define ACCESS_AI_UPLOAD "ai_upload" +/// Access to the Teleporter Room, and some cargo crates. +#define ACCESS_TELEPORTER "teleporter" +/// Access to the EVA Storage Room, and some cargo crates. +#define ACCESS_EVA "eva" +/// Access to make an announcement through the Requests Console found in an office. +#define ACCESS_RC_ANNOUNCE "rc_announce" +/// Access used for events (Red Alert, BSA, Emergency Maintenance) which require at least two people to swipe at the same time to authorize it +#define ACCESS_KEYCARD_AUTH "keycard_auth" +/// Access for the "minisat", but is actually used for the small maintenance cubicle some AI satellites may have. +#define ACCESS_MINISAT "minisat" +/// Access used to run the NTNet Tablet Application WireCarp, which allows you to diagnose and view NTNet logging. +#define ACCESS_NETWORK "network" +/// Access used to override "personal control" on a personal locker, meaning you are able to open any of those lockers/wardrobes. +#define ACCESS_ALL_PERSONAL_LOCKERS "all_personal_lockers" +/// Access used for Access-Changing Programs, this one will unlock all options that can be ever given via that program. +#define ACCESS_CHANGE_IDS "change_ids" +/// Access used for the Captain's personal quarters in mapping, as well as what allows one to order emergency shuttles. +#define ACCESS_CAPTAIN "captain" +/// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. +#define ACCESS_HOP "hop" + + +//--- SECURITY ---// + +/// Security's General Access. In mapping, grants access to spaces such as to the "meeting room" or firing range, as well as being the general access that Tablet/Computer Programs check for "heads". Also unlocks other types of security equipment. +#define ACCESS_SECURITY "security" +/// Access that ONLY grants access to the front doors of the Brig. Never use this more for anything than that, please. +#define ACCESS_BRIG_ENTRANCE "brig_entrance" +/// Access to brig cells, brig timers, permabrig, gulag, gulag teleporter, gulag shuttle, prisoner management console, and some security cargo crates. +#define ACCESS_BRIG "brig" +/// Access to the armory, security incinerator (when present), and the execution/re-education chamber. +#define ACCESS_ARMORY "armory" +/// Access to the "secure" portion of the courtroom, like where the judge and everyone sits.. +#define ACCESS_COURT "court" +/// The "Weapons Permit" Access, or the one that lets you walk past secbots without them charging at you as you hold your weaponry. +#define ACCESS_WEAPONS "weapons" +/// Access used for the Head of Security's personal quarters in mapping, as well as other HoS-related things. +#define ACCESS_HOS "hos" +/// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. +#define ACCESS_DETECTIVE "detective" +/// Access granted to the brig physician, used for the brig medbay doors. +#define ACCESS_BRIG_PHYS + + +//--- ENGINEERING ---// + +/// Engineering General Access, grants access to the standard parts of engineering (as well as the Supermatter and related equipment). +#define ACCESS_ENGINEERING "engineering" +/// Access to Atmospherics Sections of the Engineering Department, as well as air alarms. +#define ACCESS_ATMOSPHERICS "atmospherics" +/// Access to all maintenance tunnels on the station. This overrides any "departmental maintenance" access, this has free roaming range everywhere. +#define ACCESS_MAINT_TUNNELS "maint_tunnels" +/// Access to get into APCs, engineering equipment lockers, typically mapped in for key power rooms across the station, engineering vending machines, emitters, and some other stuff. +#define ACCESS_ENGINE_EQUIP "engine_equip" +/// Access to "construction" areas of the station. However, in mapping, it's used to get access to the front door and lathe room of the engineering department. +#define ACCESS_CONSTRUCTION "construction" +/// Access to the technical storage room (contains all the boards and other miscellaneous engineering gear). +#define ACCESS_TECH_STORAGE "tech_storage" +/// Access to telecomms, machinery, and tablets. +#define ACCESS_TCOMMS "tcomms" +/// Access to the Auxiliary Base Room, as well as the ability over launching it. +#define ACCESS_AUX_BASE "aux_base" +/// Access to all external "space facing" airlocks on the station. Used such that people don't easily "jump ship", or restict free ingress/egress to only a few points on the station. +#define ACCESS_EXTERNAL_AIRLOCKS "external airlocks" +/// Access for the Chief Engineer's personal quarters in mapping, as well as some other CE-related things. +#define ACCESS_CE "ce" + + +//--- MEDICAL ---// + +/// General access to Medbay, like the front doors, the treatment center, the medical records console, defibrillator mounts, and more. +#define ACCESS_MEDICAL "medical" +/// Access to the Morgue. +#define ACCESS_MORGUE "morgue" +/// Access to the secure morgue area. +#define ACCESS_MORGUE_SECURE "morgue_secure" +/// Access to the chemistry lab, or the smaller room in medical with the multiple chem dispensers and pill pressers. The Chemist's main position. +#define ACCESS_CHEMISTRY "chemistry" +/// Access to the surgery rooms and privacy shutters there. +#define ACCESS_SURGERY "surgery" +/// Access to the cloning lab, usually adjacent to the genetics lab. Given to Medical Doctors so they can't also enter Genetics. +#define ACCESS_CLONING +/// Access to the Virology portion of the medical department, as well as the virology crate. +#define ACCESS_VIROLOGY "virology" +/// Access to the Psychologist's office. +#define ACCESS_PSYCHOLOGY "psychology" +/// Access for the Chief Medical Officer's personal quarters in mapping, as well as some other CMO-related things. +#define ACCESS_CMO "cmo" + + +//--- SUPPLY ---// + +/// General access for Cargo, allows for entry to Cargo Bay and Cargo's Office. +#define ACCESS_CARGO "cargo" +/// Access to the Shipping and Mailing Rooms on several maps. +#define ACCESS_MAIL "mail" +/// Access for a room where the ORM may be kept, or to release materials from the ORM. +#define ACCESS_MINERAL_STOREROOM "mineral_storeroom" +/// Access to the "on-station" Mining Portion of the Cargo Department. +#define ACCESS_MINING "mining" +/// Access to the "off-station" Mining Station, which contains gear dedicated for miners to do their job best, as well as seek shelter from the inhospitable elements. +#define ACCESS_MINING_STATION "mining_station" +/// Access to the vault on the station, for accessing the station's budget, the nuke core, or the Ore Silo. +#define ACCESS_VAULT "vault" +/// Access for the Quartermaster's personal quarters in mapping, as well as some other QM-related things. +#define ACCESS_QM "qm" + + +//--- SCIENCE ---// + +/// General access for Science, allows for entry to the general hallways of Science, as well as the main lathe room. +#define ACCESS_SCIENCE "science" +/// Access to the specialized research experimentation rooms within Science, as well as what gives access to lockers and access to TechWeb programs. +#define ACCESS_RESEARCH "research" +/// Access to the Ordnance Mixing Lab and the Ordnance Bomb Range. +#define ACCESS_ORDNANCE "ordnance" +/// Access to the Ordnance Storage Room, where all of the bomb-making gases are stored. +#define ACCESS_ORDNANCE_STORAGE "ordnance_storage" +/// Access to the Genetics division of Science. +#define ACCESS_GENETICS "genetics" +/// Access to the Robotics division of Science, as well as opening up silicon cyborgs and other simple robots. +#define ACCESS_ROBOTICS "robotics" +/// Access to the Xenobiology division of Science. +#define ACCESS_XENOBIOLOGY "xenobiology" +/// Access for the Research Director's personal quarters in mapping, as well as some other RD-related things. +#define ACCESS_RD "rd" + + +//--- SERVICE ---// + +/// General access for Service, allows for entry to the Service Hallway. +#define ACCESS_SERVICE "service" +/// Access to the Theatre, as well as other vending machines related to the theatre. Sometimes also used as the "clown's" access in code. +#define ACCESS_THEATRE "theatre" +/// Access to the Chaplain's office. +#define ACCESS_CHAPEL_OFFICE "chapel_office" +/// Access to the chapel's crematorium. +#define ACCESS_CREMATORIUM "crematorium" +/// Access to the curator's private rooms in the Library and the trophy display cases, as well as access both into and out of the Library via Maintenance. +#define ACCESS_LIBRARY "library" +/// Access to the Bar, the Bar's Backroom, the bar sign, the bar robot portal, and the bar's vending machines. Some other bar-things too. +#define ACCESS_BAR "bar" +/// Access to the Kitchen, the Kitchen's Coldroom, the kitchen's vending machines, and the food robot portal. Some other chef-things too. +#define ACCESS_KITCHEN "kitchen" +/// Access to the Botany Division of the station and some other Botanist things. +#define ACCESS_HYDROPONICS "hydroponics" +/// Access to the Janitor's room, and some tablet apps for control of the station's janitorial equipment. +#define ACCESS_JANITOR "janitor" +/// Access to the Lawyer's office. +#define ACCESS_LAWYER "lawyer" +/// Access to the Gift Shop's back doors. +#define ACCESS_CLERK "clerk" + + + +//--- AWAY MISSIONS ---// +// For generic away-mission/ruin access. Why would normal crew have access to a long-abandoned derelict or a 2000 year-old temple? + +#define ACCESS_AWAY_GENERAL "away_general" +#define ACCESS_AWAY_COMMAND "away_command" +#define ACCESS_AWAY_SEC "away_sec" +#define ACCESS_AWAY_ENGINEERING "away_engineering" +#define ACCESS_AWAY_MEDICAL "away_medical" +#define ACCESS_AWAY_SUPPLY "away_supply" +#define ACCESS_AWAY_SCIENCE "away_science" +#define ACCESS_AWAY_MAINTENANCE "away_maintenance" +#define ACCESS_AWAY_GENERIC1 "away_generic1" +#define ACCESS_AWAY_GENERIC2 "away_generic2" +#define ACCESS_AWAY_GENERIC3 "away_generic3" +#define ACCESS_AWAY_GENERIC4 "away_generic4" + + +//--- MECH ---// +// Mech Access, allows maintanenace of internal components and altering keycard requirements. + +#define ACCESS_MECH_MINING "mech_mining" +#define ACCESS_MECH_MEDICAL "mech_medical" +#define ACCESS_MECH_SECURITY "mech_security" +#define ACCESS_MECH_SCIENCE "mech_science" +#define ACCESS_MECH_ENGINE "mech_engine" + + +//--- ADMIN ---// +// Used for admin events and things of the like. Lots of extra space for more admin tools in the future + +/// General facilities. Centcom ferry. +#define ACCESS_CENT_GENERAL "cent_general" +#define ACCESS_CENT_THUNDER "cent_thunder" +#define ACCESS_CENT_MEDICAL "cent_medical" +#define ACCESS_CENT_LIVING "cent_living" +#define ACCESS_CENT_STORAGE "cent_storage" +#define ACCESS_CENT_TELEPORTER "cent_teleporter" +#define ACCESS_CENT_CAPTAIN "cent_captain" +#define ACCESS_CENT_BAR "cent_bar" /// Special Ops. Captain's display case, Marauder and Seraph mechs. -#define ACCESS_CENT_SPECOPS 103 -/// Medical/Research -#define ACCESS_CENT_MEDICAL 104 -/// Living quarters. -#define ACCESS_CENT_LIVING 105 -/// Generic storage areas. -#define ACCESS_CENT_STORAGE 106 -/// Teleporter. -#define ACCESS_CENT_TELEPORTER 107 -/// Captain's office/ID comp/AI. -#define ACCESS_CENT_CAPTAIN 109 -/// The non-existent CentCom Bar -#define ACCESS_CENT_BAR 110 - - //The Syndicate -/// General Syndicate Access. Includes Syndicate mechs and ruins. -#define ACCESS_SYNDICATE 150 -/// Nuke Op Leader Access -#define ACCESS_SYNDICATE_LEADER 151 - - //Away Missions or Ruins - /*For generic away-mission/ruin access. Why would normal crew have access to a long-abandoned derelict - or a 2000 year-old temple? */ -/// Away general facilities. -#define ACCESS_AWAY_GENERAL 200 -/// Away maintenance -#define ACCESS_AWAY_MAINT 201 -/// Away medical -#define ACCESS_AWAY_MED 202 -/// Away security -#define ACCESS_AWAY_SEC 203 -/// Away engineering -#define ACCESS_AWAY_ENGINE 204 -///Away generic access -#define ACCESS_AWAY_GENERIC1 205 -#define ACCESS_AWAY_GENERIC2 206 -#define ACCESS_AWAY_GENERIC3 207 -#define ACCESS_AWAY_GENERIC4 208 - - //Special, for anything that's basically internal -#define ACCESS_BLOODCULT 250 -#define ACCESS_CLOCKCULT 251 - - - // Mech Access, allows maintanenace of internal components and altering keycard requirements. -#define ACCESS_MECH_MINING 300 -#define ACCESS_MECH_MEDICAL 301 -#define ACCESS_MECH_SECURITY 302 -#define ACCESS_MECH_SCIENCE 303 -#define ACCESS_MECH_ENGINE 304 -#define ACCESS_MECH_FREEMINER 310 +#define ACCESS_CENT_SPECOPS "cent_specops" ///Remind me to separate to captain, centcom, and syndicate mech access later -SonofSpace + + +//--- ANTAGONISTS ---// + +/// SYNDICATE +#define ACCESS_SYNDICATE "syndicate" +#define ACCESS_SYNDICATE_LEADER "syndicate_leader" + +/// CULTS +#define ACCESS_BLOODCULT "bloodcult" +#define ACCESS_CLOCKCULT "clockcult" + +/// HUNTERS +#define ACCESS_HUNTER "hunter" + + +//--- MISCELLANEOUS ---// +/// For things that aren't ever supposed to be accessed +#define ACCESS_INACCESSIBLE "inaccessible" + +/// - - - END ACCESS IDS - - - /// + + + +/// A list of access levels that, when added to an ID card, will warn admins. +#define ACCESS_ALERT_ADMINS list(ACCESS_CHANGE_IDS) + +/// Logging define for ID card access changes +#define LOG_ID_ACCESS_CHANGE(user, id_card, change_description) \ + log_game("[key_name(user)] [change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]"); \ + user.investigate_log("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", INVESTIGATE_ACCESSCHANGES); \ + user.log_message("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", LOG_GAME); \ + + +/// Displayed name for Common ID card accesses. +#define ACCESS_FLAG_COMMON_NAME "Common" +/// Bitflag for Common ID card accesses. See COMMON_ACCESS. +#define ACCESS_FLAG_COMMON (1 << 0) + +/// Displayed name for Command ID card accesses. +#define ACCESS_FLAG_COMMAND_NAME "Command" +/// Bitflag for Command ID card accesses. See COMMAND_ACCESS. +#define ACCESS_FLAG_COMMAND (1 << 1) + +/// Displayed name for Private Command ID card accesses. +#define ACCESS_FLAG_PRV_COMMAND_NAME "Private Command" +/// Bitflag for Private Command ID card accesses. See PRIVATE_COMMAND_ACCESS. +#define ACCESS_FLAG_PRV_COMMAND (1 << 2) + +/// Displayed name for Captain ID card accesses. +#define ACCESS_FLAG_CAPTAIN_NAME "Captain" +/// Bitflag for Captain ID card accesses. See CAPTAIN_ACCESS. +#define ACCESS_FLAG_CAPTAIN (1 << 3) + +/// Displayed name for Centcom ID card accesses. +#define ACCESS_FLAG_CENTCOM_NAME "Centcom" +/// Bitflag for Centcom ID card accesses. See CENTCOM_ACCESS. +#define ACCESS_FLAG_CENTCOM (1 << 4) + +/// Displayed name for Syndicate ID card accesses. +#define ACCESS_FLAG_SYNDICATE_NAME "Syndicate" +/// Bitflag for Syndicate ID card accesses. See SYNDICATE_ACCESS. +#define ACCESS_FLAG_SYNDICATE (1 << 5) + +/// Displayed name for Offstation/Ruin/Away Mission ID card accesses. +#define ACCESS_FLAG_AWAY_NAME "Away" +/// Bitflag for Offstation/Ruin/Away Mission ID card accesses. See AWAY_ACCESS. +#define ACCESS_FLAG_AWAY (1 << 6) + +/// Displayed name for Special accesses that ordinarily shouldn't be on ID cards. +#define ACCESS_FLAG_SPECIAL_NAME "Special" +/// Bitflag for Special accesses that ordinaryily shouldn't be on ID cards. See CULT_ACCESS. +#define ACCESS_FLAG_SPECIAL (1 << 7) + + + +/// Departmental/general/common area accesses. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMON) +#define COMMON_ACCESS list( \ + ACCESS_ATMOSPHERICS, \ + ACCESS_AUX_BASE, \ + ACCESS_BAR, \ + ACCESS_BIT_DEN, \ + ACCESS_BRIG, \ + ACCESS_BRIG_ENTRANCE, \ + ACCESS_CARGO, \ + ACCESS_CHAPEL_OFFICE, \ + ACCESS_CONSTRUCTION, \ + ACCESS_COURT, \ + ACCESS_CREMATORIUM, \ + ACCESS_DETECTIVE, \ + ACCESS_ENGINE_EQUIP, \ + ACCESS_ENGINEERING, \ + ACCESS_EVA, \ + ACCESS_EXTERNAL_AIRLOCKS, \ + ACCESS_GATEWAY, \ + ACCESS_GENETICS, \ + ACCESS_HYDROPONICS, \ + ACCESS_JANITOR, \ + ACCESS_KITCHEN, \ + ACCESS_LAWYER, \ + ACCESS_LIBRARY, \ + ACCESS_MAINT_TUNNELS, \ + ACCESS_MECH_MINING, \ + ACCESS_MECH_MEDICAL, \ + ACCESS_MECH_SECURITY, \ + ACCESS_MECH_SCIENCE, \ + ACCESS_MECH_ENGINE, \ + ACCESS_MEDICAL, \ + ACCESS_MINERAL_STOREROOM, \ + ACCESS_MINING, \ + ACCESS_MINING_STATION, \ + ACCESS_MORGUE_SECURE, \ + ACCESS_MORGUE, \ + ACCESS_NETWORK, \ + ACCESS_ORDNANCE, \ + ACCESS_ORDNANCE_STORAGE, \ + ACCESS_PHARMACY, \ + ACCESS_PLUMBING, \ + ACCESS_PSYCHOLOGY, \ + ACCESS_QM, \ + ACCESS_RESEARCH, \ + ACCESS_ROBOTICS, \ + ACCESS_SCIENCE, \ + ACCESS_SECURITY, \ + ACCESS_SERVICE, \ + ACCESS_SHIPPING, \ + ACCESS_SURGERY, \ + ACCESS_THEATRE, \ + ACCESS_VIROLOGY, \ + ACCESS_WEAPONS, \ + ACCESS_XENOBIOLOGY, \ +) + +/// Command staff/secure accesses, think bridge/armoury, ai_upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND) +#define COMMAND_ACCESS list( \ + ACCESS_AI_UPLOAD, \ + ACCESS_ALL_PERSONAL_LOCKERS, \ + ACCESS_ARMORY, \ + ACCESS_CHANGE_IDS, \ + ACCESS_COMMAND, \ + ACCESS_EVA, \ + ACCESS_KEYCARD_AUTH, \ + ACCESS_MINISAT, \ + ACCESS_RC_ANNOUNCE, \ + ACCESS_TCOMMS, \ + ACCESS_TECH_STORAGE, \ + ACCESS_TELEPORTER, \ + ACCESS_VAULT, \ +) + +/// Private head of staff offices, usually only granted to most cards by trimming. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_PRV_COMMAND) +#define PRIVATE_COMMAND_ACCESS list( \ + ACCESS_CE, \ + ACCESS_CMO, \ + ACCESS_HOS, \ + ACCESS_HOP, \ + ACCESS_QM, \ + ACCESS_RD, \ +) + +/// Captains private rooms. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CAPTAIN) +#define CAPTAIN_ACCESS list( \ + ACCESS_CAPTAIN, \ +) +/// Centcom area stuff. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CENTCOM) +#define CENTCOM_ACCESS list( \ + ACCESS_CENT_BAR, \ + ACCESS_CENT_CAPTAIN, \ + ACCESS_CENT_GENERAL, \ + ACCESS_CENT_LIVING, \ + ACCESS_CENT_MEDICAL, \ + ACCESS_CENT_SPECOPS, \ + ACCESS_CENT_STORAGE, \ + ACCESS_CENT_TELEPORTER, \ + ACCESS_CENT_THUNDER, \ +) + +/// Syndicate areas off station. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_SYNDICATE) +#define SYNDICATE_ACCESS list( \ + ACCESS_SYNDICATE, \ + ACCESS_SYNDICATE_LEADER, \ +) + +/// Away missions/gateway/space ruins. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_AWAY) +#define AWAY_ACCESS list( \ + ACCESS_AWAY_COMMAND, \ + ACCESS_AWAY_ENGINEERING, \ + ACCESS_AWAY_GENERAL, \ + ACCESS_AWAY_GENERIC1, \ + ACCESS_AWAY_GENERIC2, \ + ACCESS_AWAY_GENERIC3, \ + ACCESS_AWAY_GENERIC4, \ + ACCESS_AWAY_MAINTENANCE, \ + ACCESS_AWAY_MEDICAL, \ + ACCESS_AWAY_SCIENCE, \ + ACCESS_AWAY_SEC, \ + ACCESS_AWAY_SUPPLY, \ +) + +/// Weird internal Cult access that prevents non-cult from using their doors. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_SPECIAL) +#define CULT_ACCESS list( \ + ACCESS_BLOODCULT, \ +) + +/// Name for the Global region. +#define REGION_ALL_GLOBAL "All" +/// Used to seed the accesses_by_region list in SSid_access. A list of every single access in the game. +#define REGION_ACCESS_ALL_GLOBAL REGION_ACCESS_ALL_STATION + CENTCOM_ACCESS + SYNDICATE_ACCESS + AWAY_ACCESS + CULT_ACCESS +/// Name for the Station All Access region. +#define REGION_ALL_STATION "Station" +/// Used to seed the accesses_by_region list in SSid_access. A list of all station accesses. +#define REGION_ACCESS_ALL_STATION COMMON_ACCESS + COMMAND_ACCESS + PRIVATE_COMMAND_ACCESS + CAPTAIN_ACCESS +/// Name for the General region. +#define REGION_GENERAL "General" +/// Used to seed the accesses_by_region list in SSid_access. A list of general service accesses that are overseen by the HoP. +#define REGION_ACCESS_GENERAL list( \ + ACCESS_BAR, \ + ACCESS_CHAPEL_OFFICE, \ + ACCESS_CREMATORIUM, \ + ACCESS_HYDROPONICS, \ + ACCESS_JANITOR, \ + ACCESS_KITCHEN, \ + ACCESS_LAWYER, \ + ACCESS_LIBRARY, \ + ACCESS_SERVICE, \ + ACCESS_THEATRE, \ +) +/// Name for the Security region. +#define REGION_SECURITY "Security" +/// Used to seed the accesses_by_region list in SSid_access. A list of all security regional accesses that are overseen by the HoS. +#define REGION_ACCESS_SECURITY list( \ + ACCESS_ARMORY, \ + ACCESS_BRIG, \ + ACCESS_BRIG_ENTRANCE, \ + ACCESS_COURT, \ + ACCESS_DETECTIVE, \ + ACCESS_HOS, \ + ACCESS_MECH_SECURITY, \ + ACCESS_SECURITY, \ + ACCESS_WEAPONS, \ +) +/// Name for the Medbay region. +#define REGION_MEDBAY "Medbay" +/// Used to seed the accesses_by_region list in SSid_access. A list of all medbay regional accesses that are overseen by the CMO. +#define REGION_ACCESS_MEDBAY list( \ + ACCESS_CMO, \ + ACCESS_MECH_MEDICAL, \ + ACCESS_MEDICAL, \ + ACCESS_MORGUE, \ + ACCESS_MORGUE_SECURE, \ + ACCESS_PHARMACY, \ + ACCESS_PLUMBING, \ + ACCESS_PSYCHOLOGY, \ + ACCESS_SURGERY, \ + ACCESS_VIROLOGY, \ +) +/// Name for the Research region. +#define REGION_RESEARCH "Research" +/// Used to seed the accesses_by_region list in SSid_access. A list of all research regional accesses that are overseen by the RD. +#define REGION_ACCESS_RESEARCH list( \ + ACCESS_AI_UPLOAD, \ + ACCESS_GENETICS, \ + ACCESS_MECH_SCIENCE, \ + ACCESS_MINISAT, \ + ACCESS_NETWORK, \ + ACCESS_ORDNANCE, \ + ACCESS_ORDNANCE_STORAGE, \ + ACCESS_RD, \ + ACCESS_RESEARCH, \ + ACCESS_ROBOTICS, \ + ACCESS_SCIENCE, \ + ACCESS_XENOBIOLOGY, \ +) +/// Name for the Engineering region. +#define REGION_ENGINEERING "Engineering" +/// Used to seed the accesses_by_region list in SSid_access. A list of all engineering regional accesses that are overseen by the CE. +#define REGION_ACCESS_ENGINEERING list( \ + ACCESS_ATMOSPHERICS, \ + ACCESS_AUX_BASE, \ + ACCESS_CE, \ + ACCESS_CONSTRUCTION, \ + ACCESS_ENGINEERING, \ + ACCESS_ENGINE_EQUIP, \ + ACCESS_EXTERNAL_AIRLOCKS, \ + ACCESS_MAINT_TUNNELS, \ + ACCESS_MECH_ENGINE, \ + ACCESS_MINISAT, \ + ACCESS_TCOMMS, \ + ACCESS_TECH_STORAGE, \ +) +/// Name for the Supply region. +#define REGION_SUPPLY "Supply" +/// Used to seed the accesses_by_region list in SSid_access. A list of all cargo regional accesses that are overseen by the HoP. +#define REGION_ACCESS_SUPPLY list( \ + ACCESS_BIT_DEN, \ + ACCESS_CARGO, \ + ACCESS_MECH_MINING, \ + ACCESS_MINERAL_STOREROOM, \ + ACCESS_MINING, \ + ACCESS_MINING_STATION, \ + ACCESS_QM, \ + ACCESS_SHIPPING, \ + ACCESS_VAULT, \ +) +/// Name for the Command region. +#define REGION_COMMAND "Command" +/// Used to seed the accesses_by_region list in SSid_access. A list of all command regional accesses that are overseen by the Captain. +#define REGION_ACCESS_COMMAND list( \ + ACCESS_AI_UPLOAD, \ + ACCESS_ALL_PERSONAL_LOCKERS, \ + ACCESS_CAPTAIN, \ + ACCESS_CHANGE_IDS, \ + ACCESS_COMMAND, \ + ACCESS_EVA, \ + ACCESS_GATEWAY, \ + ACCESS_HOP, \ + ACCESS_KEYCARD_AUTH, \ + ACCESS_RC_ANNOUNCE, \ + ACCESS_TELEPORTER, \ + ACCESS_VAULT, \ +) +/// Name for the Centcom region. +#define REGION_CENTCOM "Central Command" +/// Used to seed the accesses_by_region list in SSid_access. A list of all CENTCOM_ACCESS regional accesses. +#define REGION_ACCESS_CENTCOM CENTCOM_ACCESS From 6904f525c953a497b791fcba308fd902682a7233 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Thu, 25 Jul 2024 00:53:01 +0200 Subject: [PATCH 02/48] ballin --- code/__DEFINES/access.dm | 386 +++----------------- code/controllers/subsystem/id_access | 502 +++++++++++++++++++++++++++ 2 files changed, 550 insertions(+), 338 deletions(-) create mode 100644 code/controllers/subsystem/id_access diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index d302f11aaf4d..93f001b52e31 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -15,6 +15,8 @@ #define ACCESS_COMMAND "command" /// Access to the AI Upload Room Doors as well as the AI satellite. Also used for controlling the machinery in the AI Upload (turrets, foam dispensers) #define ACCESS_AI_UPLOAD "ai_upload" +/// Access to rooms in the mini-sat the AI usually resides in. Given to Network Admins to let them do maintenance on the AI. +#define ACCESS_AI_SAT "ai_sat" /// Access to the Teleporter Room, and some cargo crates. #define ACCESS_TELEPORTER "teleporter" /// Access to the EVA Storage Room, and some cargo crates. @@ -23,8 +25,6 @@ #define ACCESS_RC_ANNOUNCE "rc_announce" /// Access used for events (Red Alert, BSA, Emergency Maintenance) which require at least two people to swipe at the same time to authorize it #define ACCESS_KEYCARD_AUTH "keycard_auth" -/// Access for the "minisat", but is actually used for the small maintenance cubicle some AI satellites may have. -#define ACCESS_MINISAT "minisat" /// Access used to run the NTNet Tablet Application WireCarp, which allows you to diagnose and view NTNet logging. #define ACCESS_NETWORK "network" /// Access used to override "personal control" on a personal locker, meaning you are able to open any of those lockers/wardrobes. @@ -39,24 +39,24 @@ //--- SECURITY ---// -/// Security's General Access. In mapping, grants access to spaces such as to the "meeting room" or firing range, as well as being the general access that Tablet/Computer Programs check for "heads". Also unlocks other types of security equipment. +/// Security's General Access, armaments vendor, security lockers, and other secure gear. Basically things Officers or Wardens should access, but never Lawyers or Detectives. #define ACCESS_SECURITY "security" -/// Access that ONLY grants access to the front doors of the Brig. Never use this more for anything than that, please. -#define ACCESS_BRIG_ENTRANCE "brig_entrance" +/// Access to the front doors of the Brig, the "secure" portion of the Courtroom, and department outposts. Notably given to Lawyers, Heads of Staff, and Detectives. +#define ACCESS_SECURITY_ENTRANCE "security_entrance" /// Access to brig cells, brig timers, permabrig, gulag, gulag teleporter, gulag shuttle, prisoner management console, and some security cargo crates. #define ACCESS_BRIG "brig" /// Access to the armory, security incinerator (when present), and the execution/re-education chamber. #define ACCESS_ARMORY "armory" +/// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. +#define ACCESS_DETECTIVE "detective" +/// Access granted to the brig physician, used for the brig medbay doors. +#define ACCESS_BRIG_PHYS /// Access to the "secure" portion of the courtroom, like where the judge and everyone sits.. #define ACCESS_COURT "court" /// The "Weapons Permit" Access, or the one that lets you walk past secbots without them charging at you as you hold your weaponry. -#define ACCESS_WEAPONS "weapons" +#define ACCESS_WEAPONS_PERMIT "weapons_permit" /// Access used for the Head of Security's personal quarters in mapping, as well as other HoS-related things. #define ACCESS_HOS "hos" -/// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. -#define ACCESS_DETECTIVE "detective" -/// Access granted to the brig physician, used for the brig medbay doors. -#define ACCESS_BRIG_PHYS //--- ENGINEERING ---// @@ -67,19 +67,19 @@ #define ACCESS_ATMOSPHERICS "atmospherics" /// Access to all maintenance tunnels on the station. This overrides any "departmental maintenance" access, this has free roaming range everywhere. #define ACCESS_MAINT_TUNNELS "maint_tunnels" +/// Access to all external "space facing" airlocks on the station. Used such that people don't easily "jump ship", or restict free ingress/egress to only a few points on the station. +#define ACCESS_EXTERNAL_AIRLOCKS "external airlocks" /// Access to get into APCs, engineering equipment lockers, typically mapped in for key power rooms across the station, engineering vending machines, emitters, and some other stuff. #define ACCESS_ENGINE_EQUIP "engine_equip" -/// Access to "construction" areas of the station. However, in mapping, it's used to get access to the front door and lathe room of the engineering department. +/// Access to "construction" areas of the station. However, in mapping, it's also used to get access to the front door and lathe room of the engineering department. #define ACCESS_CONSTRUCTION "construction" /// Access to the technical storage room (contains all the boards and other miscellaneous engineering gear). #define ACCESS_TECH_STORAGE "tech_storage" -/// Access to telecomms, machinery, and tablets. +/// Access to the Telecomms Server Room, traffic control console, machinery, and tablets. #define ACCESS_TCOMMS "tcomms" /// Access to the Auxiliary Base Room, as well as the ability over launching it. #define ACCESS_AUX_BASE "aux_base" -/// Access to all external "space facing" airlocks on the station. Used such that people don't easily "jump ship", or restict free ingress/egress to only a few points on the station. -#define ACCESS_EXTERNAL_AIRLOCKS "external airlocks" -/// Access for the Chief Engineer's personal quarters in mapping, as well as some other CE-related things. +/// Access for the Chief Engineer's office, Secure Tech Storage, as well as some other CE-related things. #define ACCESS_CE "ce" @@ -87,14 +87,14 @@ /// General access to Medbay, like the front doors, the treatment center, the medical records console, defibrillator mounts, and more. #define ACCESS_MEDICAL "medical" +/// Access to the surgery rooms, as well as the equipment and buttons there. +#define ACCESS_SURGERY "surgery" +/// Access to the Paramedic Staging Area. +#define ACCESS_PARAMEDIC "paramedic" /// Access to the Morgue. #define ACCESS_MORGUE "morgue" -/// Access to the secure morgue area. -#define ACCESS_MORGUE_SECURE "morgue_secure" /// Access to the chemistry lab, or the smaller room in medical with the multiple chem dispensers and pill pressers. The Chemist's main position. #define ACCESS_CHEMISTRY "chemistry" -/// Access to the surgery rooms and privacy shutters there. -#define ACCESS_SURGERY "surgery" /// Access to the cloning lab, usually adjacent to the genetics lab. Given to Medical Doctors so they can't also enter Genetics. #define ACCESS_CLONING /// Access to the Virology portion of the medical department, as well as the virology crate. @@ -107,12 +107,12 @@ //--- SUPPLY ---// -/// General access for Cargo, allows for entry to Cargo Bay and Cargo's Office. +/// General access needed to enter Cargo, allows entry into the Cargo Office and Mail/Delivery Office. #define ACCESS_CARGO "cargo" -/// Access to the Shipping and Mailing Rooms on several maps. -#define ACCESS_MAIL "mail" -/// Access for a room where the ORM may be kept, or to release materials from the ORM. -#define ACCESS_MINERAL_STOREROOM "mineral_storeroom" +/// Access to the Cargo Bay and Warehouse. Separated from the above to prevent miners processing cargo. +#define ACCESS_CARGO_BAY "cargo_bay" +/// Access to release materials from the ORM. +#define ACCESS_ORM "orm" /// Access to the "on-station" Mining Portion of the Cargo Department. #define ACCESS_MINING "mining" /// Access to the "off-station" Mining Station, which contains gear dedicated for miners to do their job best, as well as seek shelter from the inhospitable elements. @@ -127,19 +127,21 @@ /// General access for Science, allows for entry to the general hallways of Science, as well as the main lathe room. #define ACCESS_SCIENCE "science" -/// Access to the specialized research experimentation rooms within Science, as well as what gives access to lockers and access to TechWeb programs. +/// Access to the specialized research experimentation rooms within Science. #define ACCESS_RESEARCH "research" -/// Access to the Ordnance Mixing Lab and the Ordnance Bomb Range. -#define ACCESS_ORDNANCE "ordnance" -/// Access to the Ordnance Storage Room, where all of the bomb-making gases are stored. -#define ACCESS_ORDNANCE_STORAGE "ordnance_storage" +/// Access to the Toxins Mixing Lab and Toxins Test Area equipment. +#define ACCESS_TOXINS "toxins" +/// Access to the Toxins Storage Room, where all of the bomb-making gases are stored. +#define ACCESS_TOXINS_STORAGE "toxins_storage" +/// Access to the Experimentation Lab, containing the E.X.P.E.R.I-MENTOR. Uses of this access is set to change in the future. +#define ACCESS_EXPERIMENTATION "experimentation" /// Access to the Genetics division of Science. #define ACCESS_GENETICS "genetics" /// Access to the Robotics division of Science, as well as opening up silicon cyborgs and other simple robots. #define ACCESS_ROBOTICS "robotics" /// Access to the Xenobiology division of Science. #define ACCESS_XENOBIOLOGY "xenobiology" -/// Access for the Research Director's personal quarters in mapping, as well as some other RD-related things. +/// Access for the Research Director's personal quarters in mapping, the R&D server room, as well as some other RD-related things. #define ACCESS_RD "rd" @@ -170,21 +172,21 @@ -//--- AWAY MISSIONS ---// -// For generic away-mission/ruin access. Why would normal crew have access to a long-abandoned derelict or a 2000 year-old temple? +//--- RUINS ---// +// For generic ruin access. Why would normal crew have access to a long-abandoned derelict or a 2000 year-old temple? -#define ACCESS_AWAY_GENERAL "away_general" -#define ACCESS_AWAY_COMMAND "away_command" -#define ACCESS_AWAY_SEC "away_sec" -#define ACCESS_AWAY_ENGINEERING "away_engineering" -#define ACCESS_AWAY_MEDICAL "away_medical" -#define ACCESS_AWAY_SUPPLY "away_supply" -#define ACCESS_AWAY_SCIENCE "away_science" -#define ACCESS_AWAY_MAINTENANCE "away_maintenance" -#define ACCESS_AWAY_GENERIC1 "away_generic1" -#define ACCESS_AWAY_GENERIC2 "away_generic2" -#define ACCESS_AWAY_GENERIC3 "away_generic3" -#define ACCESS_AWAY_GENERIC4 "away_generic4" +#define ACCESS_RUINS_GENERAL "ruins_general" +#define ACCESS_RUINS_COMMAND "ruins_command" +#define ACCESS_RUINS_SEC "ruins_sec" +#define ACCESS_RUINS_ENGINEERING "ruins_engineering" +#define ACCESS_RUINS_MEDICAL "ruins_medical" +#define ACCESS_RUINS_SUPPLY "ruins_supply" +#define ACCESS_RUINS_SCIENCE "ruins_science" +#define ACCESS_RUINS_MAINTENANCE "ruins_maintenance" +#define ACCESS_RUINS_GENERIC1 "ruins_generic1" +#define ACCESS_RUINS_GENERIC2 "ruins_generic2" +#define ACCESS_RUINS_GENERIC3 "ruins_generic3" +#define ACCESS_RUINS_GENERIC4 "ruins_generic4" //--- MECH ---// @@ -195,6 +197,7 @@ #define ACCESS_MECH_SECURITY "mech_security" #define ACCESS_MECH_SCIENCE "mech_science" #define ACCESS_MECH_ENGINE "mech_engine" +#define ACCESS_MECH_RUINS "mech_ruins" //--- ADMIN ---// @@ -209,7 +212,7 @@ #define ACCESS_CENT_TELEPORTER "cent_teleporter" #define ACCESS_CENT_CAPTAIN "cent_captain" #define ACCESS_CENT_BAR "cent_bar" -/// Special Ops. Captain's display case, Marauder and Seraph mechs. +/// Special Ops. Captain's display case, Marauder/Seraph mechs, . #define ACCESS_CENT_SPECOPS "cent_specops" ///Remind me to separate to captain, centcom, and syndicate mech access later -SonofSpace @@ -243,296 +246,3 @@ log_game("[key_name(user)] [change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]"); \ user.investigate_log("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", INVESTIGATE_ACCESSCHANGES); \ user.log_message("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", LOG_GAME); \ - - -/// Displayed name for Common ID card accesses. -#define ACCESS_FLAG_COMMON_NAME "Common" -/// Bitflag for Common ID card accesses. See COMMON_ACCESS. -#define ACCESS_FLAG_COMMON (1 << 0) - -/// Displayed name for Command ID card accesses. -#define ACCESS_FLAG_COMMAND_NAME "Command" -/// Bitflag for Command ID card accesses. See COMMAND_ACCESS. -#define ACCESS_FLAG_COMMAND (1 << 1) - -/// Displayed name for Private Command ID card accesses. -#define ACCESS_FLAG_PRV_COMMAND_NAME "Private Command" -/// Bitflag for Private Command ID card accesses. See PRIVATE_COMMAND_ACCESS. -#define ACCESS_FLAG_PRV_COMMAND (1 << 2) - -/// Displayed name for Captain ID card accesses. -#define ACCESS_FLAG_CAPTAIN_NAME "Captain" -/// Bitflag for Captain ID card accesses. See CAPTAIN_ACCESS. -#define ACCESS_FLAG_CAPTAIN (1 << 3) - -/// Displayed name for Centcom ID card accesses. -#define ACCESS_FLAG_CENTCOM_NAME "Centcom" -/// Bitflag for Centcom ID card accesses. See CENTCOM_ACCESS. -#define ACCESS_FLAG_CENTCOM (1 << 4) - -/// Displayed name for Syndicate ID card accesses. -#define ACCESS_FLAG_SYNDICATE_NAME "Syndicate" -/// Bitflag for Syndicate ID card accesses. See SYNDICATE_ACCESS. -#define ACCESS_FLAG_SYNDICATE (1 << 5) - -/// Displayed name for Offstation/Ruin/Away Mission ID card accesses. -#define ACCESS_FLAG_AWAY_NAME "Away" -/// Bitflag for Offstation/Ruin/Away Mission ID card accesses. See AWAY_ACCESS. -#define ACCESS_FLAG_AWAY (1 << 6) - -/// Displayed name for Special accesses that ordinarily shouldn't be on ID cards. -#define ACCESS_FLAG_SPECIAL_NAME "Special" -/// Bitflag for Special accesses that ordinaryily shouldn't be on ID cards. See CULT_ACCESS. -#define ACCESS_FLAG_SPECIAL (1 << 7) - - - -/// Departmental/general/common area accesses. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMON) -#define COMMON_ACCESS list( \ - ACCESS_ATMOSPHERICS, \ - ACCESS_AUX_BASE, \ - ACCESS_BAR, \ - ACCESS_BIT_DEN, \ - ACCESS_BRIG, \ - ACCESS_BRIG_ENTRANCE, \ - ACCESS_CARGO, \ - ACCESS_CHAPEL_OFFICE, \ - ACCESS_CONSTRUCTION, \ - ACCESS_COURT, \ - ACCESS_CREMATORIUM, \ - ACCESS_DETECTIVE, \ - ACCESS_ENGINE_EQUIP, \ - ACCESS_ENGINEERING, \ - ACCESS_EVA, \ - ACCESS_EXTERNAL_AIRLOCKS, \ - ACCESS_GATEWAY, \ - ACCESS_GENETICS, \ - ACCESS_HYDROPONICS, \ - ACCESS_JANITOR, \ - ACCESS_KITCHEN, \ - ACCESS_LAWYER, \ - ACCESS_LIBRARY, \ - ACCESS_MAINT_TUNNELS, \ - ACCESS_MECH_MINING, \ - ACCESS_MECH_MEDICAL, \ - ACCESS_MECH_SECURITY, \ - ACCESS_MECH_SCIENCE, \ - ACCESS_MECH_ENGINE, \ - ACCESS_MEDICAL, \ - ACCESS_MINERAL_STOREROOM, \ - ACCESS_MINING, \ - ACCESS_MINING_STATION, \ - ACCESS_MORGUE_SECURE, \ - ACCESS_MORGUE, \ - ACCESS_NETWORK, \ - ACCESS_ORDNANCE, \ - ACCESS_ORDNANCE_STORAGE, \ - ACCESS_PHARMACY, \ - ACCESS_PLUMBING, \ - ACCESS_PSYCHOLOGY, \ - ACCESS_QM, \ - ACCESS_RESEARCH, \ - ACCESS_ROBOTICS, \ - ACCESS_SCIENCE, \ - ACCESS_SECURITY, \ - ACCESS_SERVICE, \ - ACCESS_SHIPPING, \ - ACCESS_SURGERY, \ - ACCESS_THEATRE, \ - ACCESS_VIROLOGY, \ - ACCESS_WEAPONS, \ - ACCESS_XENOBIOLOGY, \ -) - -/// Command staff/secure accesses, think bridge/armoury, ai_upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND) -#define COMMAND_ACCESS list( \ - ACCESS_AI_UPLOAD, \ - ACCESS_ALL_PERSONAL_LOCKERS, \ - ACCESS_ARMORY, \ - ACCESS_CHANGE_IDS, \ - ACCESS_COMMAND, \ - ACCESS_EVA, \ - ACCESS_KEYCARD_AUTH, \ - ACCESS_MINISAT, \ - ACCESS_RC_ANNOUNCE, \ - ACCESS_TCOMMS, \ - ACCESS_TECH_STORAGE, \ - ACCESS_TELEPORTER, \ - ACCESS_VAULT, \ -) - -/// Private head of staff offices, usually only granted to most cards by trimming. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_PRV_COMMAND) -#define PRIVATE_COMMAND_ACCESS list( \ - ACCESS_CE, \ - ACCESS_CMO, \ - ACCESS_HOS, \ - ACCESS_HOP, \ - ACCESS_QM, \ - ACCESS_RD, \ -) - -/// Captains private rooms. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CAPTAIN) -#define CAPTAIN_ACCESS list( \ - ACCESS_CAPTAIN, \ -) -/// Centcom area stuff. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CENTCOM) -#define CENTCOM_ACCESS list( \ - ACCESS_CENT_BAR, \ - ACCESS_CENT_CAPTAIN, \ - ACCESS_CENT_GENERAL, \ - ACCESS_CENT_LIVING, \ - ACCESS_CENT_MEDICAL, \ - ACCESS_CENT_SPECOPS, \ - ACCESS_CENT_STORAGE, \ - ACCESS_CENT_TELEPORTER, \ - ACCESS_CENT_THUNDER, \ -) - -/// Syndicate areas off station. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_SYNDICATE) -#define SYNDICATE_ACCESS list( \ - ACCESS_SYNDICATE, \ - ACCESS_SYNDICATE_LEADER, \ -) - -/// Away missions/gateway/space ruins. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_AWAY) -#define AWAY_ACCESS list( \ - ACCESS_AWAY_COMMAND, \ - ACCESS_AWAY_ENGINEERING, \ - ACCESS_AWAY_GENERAL, \ - ACCESS_AWAY_GENERIC1, \ - ACCESS_AWAY_GENERIC2, \ - ACCESS_AWAY_GENERIC3, \ - ACCESS_AWAY_GENERIC4, \ - ACCESS_AWAY_MAINTENANCE, \ - ACCESS_AWAY_MEDICAL, \ - ACCESS_AWAY_SCIENCE, \ - ACCESS_AWAY_SEC, \ - ACCESS_AWAY_SUPPLY, \ -) - -/// Weird internal Cult access that prevents non-cult from using their doors. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_SPECIAL) -#define CULT_ACCESS list( \ - ACCESS_BLOODCULT, \ -) - -/// Name for the Global region. -#define REGION_ALL_GLOBAL "All" -/// Used to seed the accesses_by_region list in SSid_access. A list of every single access in the game. -#define REGION_ACCESS_ALL_GLOBAL REGION_ACCESS_ALL_STATION + CENTCOM_ACCESS + SYNDICATE_ACCESS + AWAY_ACCESS + CULT_ACCESS -/// Name for the Station All Access region. -#define REGION_ALL_STATION "Station" -/// Used to seed the accesses_by_region list in SSid_access. A list of all station accesses. -#define REGION_ACCESS_ALL_STATION COMMON_ACCESS + COMMAND_ACCESS + PRIVATE_COMMAND_ACCESS + CAPTAIN_ACCESS -/// Name for the General region. -#define REGION_GENERAL "General" -/// Used to seed the accesses_by_region list in SSid_access. A list of general service accesses that are overseen by the HoP. -#define REGION_ACCESS_GENERAL list( \ - ACCESS_BAR, \ - ACCESS_CHAPEL_OFFICE, \ - ACCESS_CREMATORIUM, \ - ACCESS_HYDROPONICS, \ - ACCESS_JANITOR, \ - ACCESS_KITCHEN, \ - ACCESS_LAWYER, \ - ACCESS_LIBRARY, \ - ACCESS_SERVICE, \ - ACCESS_THEATRE, \ -) -/// Name for the Security region. -#define REGION_SECURITY "Security" -/// Used to seed the accesses_by_region list in SSid_access. A list of all security regional accesses that are overseen by the HoS. -#define REGION_ACCESS_SECURITY list( \ - ACCESS_ARMORY, \ - ACCESS_BRIG, \ - ACCESS_BRIG_ENTRANCE, \ - ACCESS_COURT, \ - ACCESS_DETECTIVE, \ - ACCESS_HOS, \ - ACCESS_MECH_SECURITY, \ - ACCESS_SECURITY, \ - ACCESS_WEAPONS, \ -) -/// Name for the Medbay region. -#define REGION_MEDBAY "Medbay" -/// Used to seed the accesses_by_region list in SSid_access. A list of all medbay regional accesses that are overseen by the CMO. -#define REGION_ACCESS_MEDBAY list( \ - ACCESS_CMO, \ - ACCESS_MECH_MEDICAL, \ - ACCESS_MEDICAL, \ - ACCESS_MORGUE, \ - ACCESS_MORGUE_SECURE, \ - ACCESS_PHARMACY, \ - ACCESS_PLUMBING, \ - ACCESS_PSYCHOLOGY, \ - ACCESS_SURGERY, \ - ACCESS_VIROLOGY, \ -) -/// Name for the Research region. -#define REGION_RESEARCH "Research" -/// Used to seed the accesses_by_region list in SSid_access. A list of all research regional accesses that are overseen by the RD. -#define REGION_ACCESS_RESEARCH list( \ - ACCESS_AI_UPLOAD, \ - ACCESS_GENETICS, \ - ACCESS_MECH_SCIENCE, \ - ACCESS_MINISAT, \ - ACCESS_NETWORK, \ - ACCESS_ORDNANCE, \ - ACCESS_ORDNANCE_STORAGE, \ - ACCESS_RD, \ - ACCESS_RESEARCH, \ - ACCESS_ROBOTICS, \ - ACCESS_SCIENCE, \ - ACCESS_XENOBIOLOGY, \ -) -/// Name for the Engineering region. -#define REGION_ENGINEERING "Engineering" -/// Used to seed the accesses_by_region list in SSid_access. A list of all engineering regional accesses that are overseen by the CE. -#define REGION_ACCESS_ENGINEERING list( \ - ACCESS_ATMOSPHERICS, \ - ACCESS_AUX_BASE, \ - ACCESS_CE, \ - ACCESS_CONSTRUCTION, \ - ACCESS_ENGINEERING, \ - ACCESS_ENGINE_EQUIP, \ - ACCESS_EXTERNAL_AIRLOCKS, \ - ACCESS_MAINT_TUNNELS, \ - ACCESS_MECH_ENGINE, \ - ACCESS_MINISAT, \ - ACCESS_TCOMMS, \ - ACCESS_TECH_STORAGE, \ -) -/// Name for the Supply region. -#define REGION_SUPPLY "Supply" -/// Used to seed the accesses_by_region list in SSid_access. A list of all cargo regional accesses that are overseen by the HoP. -#define REGION_ACCESS_SUPPLY list( \ - ACCESS_BIT_DEN, \ - ACCESS_CARGO, \ - ACCESS_MECH_MINING, \ - ACCESS_MINERAL_STOREROOM, \ - ACCESS_MINING, \ - ACCESS_MINING_STATION, \ - ACCESS_QM, \ - ACCESS_SHIPPING, \ - ACCESS_VAULT, \ -) -/// Name for the Command region. -#define REGION_COMMAND "Command" -/// Used to seed the accesses_by_region list in SSid_access. A list of all command regional accesses that are overseen by the Captain. -#define REGION_ACCESS_COMMAND list( \ - ACCESS_AI_UPLOAD, \ - ACCESS_ALL_PERSONAL_LOCKERS, \ - ACCESS_CAPTAIN, \ - ACCESS_CHANGE_IDS, \ - ACCESS_COMMAND, \ - ACCESS_EVA, \ - ACCESS_GATEWAY, \ - ACCESS_HOP, \ - ACCESS_KEYCARD_AUTH, \ - ACCESS_RC_ANNOUNCE, \ - ACCESS_TELEPORTER, \ - ACCESS_VAULT, \ -) -/// Name for the Centcom region. -#define REGION_CENTCOM "Central Command" -/// Used to seed the accesses_by_region list in SSid_access. A list of all CENTCOM_ACCESS regional accesses. -#define REGION_ACCESS_CENTCOM CENTCOM_ACCESS diff --git a/code/controllers/subsystem/id_access b/code/controllers/subsystem/id_access new file mode 100644 index 000000000000..38bf3b568a1f --- /dev/null +++ b/code/controllers/subsystem/id_access @@ -0,0 +1,502 @@ +/** + * Non-processing subsystem that holds various procs and data structures to manage ID cards, trims and access. + */ +SUBSYSTEM_DEF(id_access) + name = "IDs and Access" + init_order = INIT_ORDER_IDACCESS + flags = SS_NO_FIRE + + /// Dictionary of access flags. Keys are accesses. Values are their associated bitflags. + var/list/flags_by_access = list() + /// Dictionary of access lists. Keys are access flag names. Values are lists of all accesses as part of that access. + var/list/accesses_by_flag = list() + /// Dictionary of access flag string representations. Keys are bitflags. Values are their associated names. + var/list/access_flag_string_by_flag = list() + /// Dictionary of trim singletons. Keys are paths. Values are their associated singletons. + var/list/trim_singletons_by_path = list() + /// Dictionary of wildcard compatibility flags. Keys are strings for the wildcards. Values are their associated flags. + var/list/wildcard_flags_by_wildcard = list() + /// Dictionary of accesses based on station region. Keys are region strings. Values are lists of accesses. + var/list/accesses_by_region = list() + /// Specially formatted list for sending access levels to tgui interfaces. + var/list/all_region_access_tgui = list() + /// Dictionary of access names. Keys are access levels. Values are their associated names. + var/list/desc_by_access = list() + /// List of accesses for the Heads of each sub-department alongside the regions they control and their job name. + var/list/sub_department_managers_tgui = list() + /// Helper list containing all trim paths that can be used as job templates. Intended to be used alongside logic for ACCESS_CHANGE_IDS. Grab templates from sub_department_managers_tgui for Head of Staff restrictions. + var/list/station_job_templates = list() + /// Helper list containing all trim paths that can be used as Centcom templates. + var/list/centcom_job_templates = list() + /// Helper list containing all PDA paths that can be painted by station machines. Intended to be used alongside logic for ACCESS_CHANGE_IDS. Grab templates from sub_department_managers_tgui for Head of Staff restrictions. + var/list/station_pda_templates = list() + /// Helper list containing all station regions. + var/list/station_regions = list() + + /// The roundstart generated code for the spare ID safe. This is given to the Captain on shift start. If there's no Captain, it's given to the HoP. If there's no HoP + var/spare_id_safe_code = "" + +/datum/controller/subsystem/id_access/Initialize() + // We use this because creating the trim singletons requires the config to be loaded. + setup_access_flags() + setup_region_lists() + setup_trim_singletons() + setup_wildcard_dict() + setup_access_descriptions() + setup_tgui_lists() + + spare_id_safe_code = "[rand(0,9)][rand(0,9)][rand(0,9)][rand(0,9)][rand(0,9)]" + + return SS_INIT_SUCCESS + +/** + * Called by [/datum/controller/subsystem/ticker/proc/setup] + * + * This runs through every /datum/id_trim/job singleton and ensures that its access is setup according to + * appropriate config entries. + */ +/datum/controller/subsystem/id_access/proc/refresh_job_trim_singletons() + for(var/trim in typesof(/datum/id_trim/job)) + var/datum/id_trim/job/job_trim = trim_singletons_by_path[trim] + + if(QDELETED(job_trim)) + stack_trace("Trim \[[trim]\] missing from trim singleton list. Reinitialising this trim.") + trim_singletons_by_path[trim] = new trim() + continue + + job_trim.refresh_trim_access() + +/// Build access flag lists. +/datum/controller/subsystem/id_access/proc/setup_access_flags() + accesses_by_flag["[ACCESS_FLAG_COMMON]"] = COMMON_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_COMMON]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_COMMON) + + accesses_by_flag["[ACCESS_FLAG_COMMAND]"] = COMMAND_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_COMMAND]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_COMMAND) + + accesses_by_flag["[ACCESS_FLAG_PRV_COMMAND]"] = PRIVATE_COMMAND_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_PRV_COMMAND]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_PRV_COMMAND) + + accesses_by_flag["[ACCESS_FLAG_CAPTAIN]"] = CAPTAIN_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_CAPTAIN]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_CAPTAIN) + + accesses_by_flag["[ACCESS_FLAG_CENTCOM]"] = CENTCOM_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_CENTCOM]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_CENTCOM) + + accesses_by_flag["[ACCESS_FLAG_SYNDICATE]"] = SYNDICATE_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_SYNDICATE]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_SYNDICATE) + + accesses_by_flag["[ACCESS_FLAG_AWAY]"] = AWAY_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_AWAY]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_AWAY) + + accesses_by_flag["[ACCESS_FLAG_SPECIAL]"] = CULT_ACCESS + for(var/access in accesses_by_flag["[ACCESS_FLAG_SPECIAL]"]) + flags_by_access |= list("[access]" = ACCESS_FLAG_SPECIAL) + + access_flag_string_by_flag["[ACCESS_FLAG_COMMON]"] = ACCESS_FLAG_COMMON_NAME + access_flag_string_by_flag["[ACCESS_FLAG_COMMAND]"] = ACCESS_FLAG_COMMAND_NAME + access_flag_string_by_flag["[ACCESS_FLAG_PRV_COMMAND]"] = ACCESS_FLAG_PRV_COMMAND_NAME + access_flag_string_by_flag["[ACCESS_FLAG_CAPTAIN]"] = ACCESS_FLAG_CAPTAIN_NAME + access_flag_string_by_flag["[ACCESS_FLAG_CENTCOM]"] = ACCESS_FLAG_CENTCOM_NAME + access_flag_string_by_flag["[ACCESS_FLAG_SYNDICATE]"] = ACCESS_FLAG_SYNDICATE_NAME + access_flag_string_by_flag["[ACCESS_FLAG_AWAY]"] = ACCESS_FLAG_AWAY_NAME + access_flag_string_by_flag["[ACCESS_FLAG_SPECIAL]"] = ACCESS_FLAG_SPECIAL_NAME + +/// Populates the region lists with data about which accesses correspond to which regions. +/datum/controller/subsystem/id_access/proc/setup_region_lists() + accesses_by_region[REGION_ALL_STATION] = REGION_ACCESS_ALL_STATION + accesses_by_region[REGION_ALL_GLOBAL] = REGION_ACCESS_ALL_GLOBAL + accesses_by_region[REGION_GENERAL] = REGION_ACCESS_GENERAL + accesses_by_region[REGION_SECURITY] = REGION_ACCESS_SECURITY + accesses_by_region[REGION_MEDBAY] = REGION_ACCESS_MEDBAY + accesses_by_region[REGION_RESEARCH] = REGION_ACCESS_RESEARCH + accesses_by_region[REGION_ENGINEERING] = REGION_ACCESS_ENGINEERING + accesses_by_region[REGION_SUPPLY] = REGION_ACCESS_SUPPLY + accesses_by_region[REGION_COMMAND] = REGION_ACCESS_COMMAND + accesses_by_region[REGION_CENTCOM] = REGION_ACCESS_CENTCOM + + station_regions = REGION_AREA_STATION + +/// Instantiate trim singletons and add them to a list. +/datum/controller/subsystem/id_access/proc/setup_trim_singletons() + for(var/trim in typesof(/datum/id_trim)) + trim_singletons_by_path[trim] = new trim() + +/// Creates various data structures that primarily get fed to tgui interfaces, although these lists are used in other places. +/datum/controller/subsystem/id_access/proc/setup_tgui_lists() + for(var/region in accesses_by_region) + var/list/region_access = accesses_by_region[region] + + var/parsed_accesses = list() + + for(var/access in region_access) + var/access_desc = get_access_desc(access) + if(!access_desc) + continue + + parsed_accesses += list(list( + "desc" = replacetext(access_desc, " ", " "), + "ref" = access, + )) + + all_region_access_tgui[region] = list(list( + "name" = region, + "accesses" = parsed_accesses, + )) + + sub_department_managers_tgui = list( + "[ACCESS_CAPTAIN]" = list( + "regions" = list(REGION_COMMAND), + "head" = JOB_CAPTAIN, + "templates" = list(), + "pdas" = list(), + ), + "[ACCESS_HOP]" = list( + "regions" = list(REGION_GENERAL), + "head" = JOB_HEAD_OF_PERSONNEL, + "templates" = list(), + "pdas" = list(), + ), + "[ACCESS_HOS]" = list( + "regions" = list(REGION_SECURITY), + "head" = JOB_HEAD_OF_SECURITY, + "templates" = list(), + "pdas" = list(), + ), + "[ACCESS_CMO]" = list( + "regions" = list(REGION_MEDBAY), + "head" = JOB_CHIEF_MEDICAL_OFFICER, + "templates" = list(), + "pdas" = list(), + ), + "[ACCESS_RD]" = list( + "regions" = list(REGION_RESEARCH), + "head" = JOB_RESEARCH_DIRECTOR, + "templates" = list(), + "pdas" = list(), + ), + "[ACCESS_CE]" = list( + "regions" = list(REGION_ENGINEERING), + "head" = JOB_CHIEF_ENGINEER, + "templates" = list(), + "pdas" = list(), + ), + "[ACCESS_QM]" = list( + "regions" = list(REGION_SUPPLY), + "head" = JOB_QUARTERMASTER, + "templates" = list(), + "pdas" = list(), + ), + ) + + var/list/station_job_trims = subtypesof(/datum/id_trim/job) + for(var/trim_path in station_job_trims) + var/datum/id_trim/job/trim = trim_singletons_by_path[trim_path] + if(!length(trim.template_access)) + continue + + station_job_templates[trim_path] = trim.assignment + for(var/access in trim.template_access) + var/list/manager = sub_department_managers_tgui["[access]"] + if(!manager) + if(access != ACCESS_CHANGE_IDS) + WARNING("Invalid template access access \[[access]\] registered with [trim_path]. Template added to global list anyway.") + continue + var/list/templates = manager["templates"] + templates[trim_path] = trim.assignment + + var/list/centcom_job_trims = typesof(/datum/id_trim/centcom) - typesof(/datum/id_trim/centcom/corpse) + for(var/trim_path in centcom_job_trims) + var/datum/id_trim/trim = trim_singletons_by_path[trim_path] + centcom_job_templates[trim_path] = trim.assignment + + var/list/all_pda_paths = typesof(/obj/item/modular_computer/pda) + var/list/pda_regions = PDA_PAINTING_REGIONS + for(var/pda_path in all_pda_paths) + if(!(pda_path in pda_regions)) + continue + + var/list/region_whitelist = pda_regions[pda_path] + for(var/access_txt in sub_department_managers_tgui) + var/list/manager_info = sub_department_managers_tgui[access_txt] + var/list/manager_regions = manager_info["regions"] + for(var/whitelisted_region in region_whitelist) + if(!(whitelisted_region in manager_regions)) + continue + var/list/manager_pdas = manager_info["pdas"] + var/obj/item/modular_computer/pda/fake_pda = pda_path + manager_pdas[pda_path] = initial(fake_pda.name) + station_pda_templates[pda_path] = initial(fake_pda.name) + +/// Set up dictionary to convert wildcard names to flags. +/datum/controller/subsystem/id_access/proc/setup_wildcard_dict() + wildcard_flags_by_wildcard[WILDCARD_NAME_ALL] = WILDCARD_FLAG_ALL + wildcard_flags_by_wildcard[WILDCARD_NAME_COMMON] = WILDCARD_FLAG_COMMON + wildcard_flags_by_wildcard[WILDCARD_NAME_COMMAND] = WILDCARD_FLAG_COMMAND + wildcard_flags_by_wildcard[WILDCARD_NAME_PRV_COMMAND] = WILDCARD_FLAG_PRV_COMMAND + wildcard_flags_by_wildcard[WILDCARD_NAME_CAPTAIN] = WILDCARD_FLAG_CAPTAIN + wildcard_flags_by_wildcard[WILDCARD_NAME_CENTCOM] = WILDCARD_FLAG_CENTCOM + wildcard_flags_by_wildcard[WILDCARD_NAME_SYNDICATE] = WILDCARD_FLAG_SYNDICATE + wildcard_flags_by_wildcard[WILDCARD_NAME_AWAY] = WILDCARD_FLAG_AWAY + wildcard_flags_by_wildcard[WILDCARD_NAME_SPECIAL] = WILDCARD_FLAG_SPECIAL + wildcard_flags_by_wildcard[WILDCARD_NAME_FORCED] = WILDCARD_FLAG_FORCED + +/// Setup dictionary that converts access levels to text descriptions. +/datum/controller/subsystem/id_access/proc/setup_access_descriptions() + desc_by_access["[ACCESS_CARGO]"] = "Cargo Bay" + desc_by_access["[ACCESS_SECURITY]"] = "Security" + desc_by_access["[ACCESS_BRIG]"] = "Holding Cells" + desc_by_access["[ACCESS_COURT]"] = "Courtroom" + desc_by_access["[ACCESS_DETECTIVE]"] = "Detective Office" + desc_by_access["[ACCESS_MEDICAL]"] = "Medical" + desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab" + desc_by_access["[ACCESS_MORGUE]"] = "Morgue" + desc_by_access["[ACCESS_MORGUE_SECURE]"] = "Coroner" + desc_by_access["[ACCESS_SCIENCE]"] = "R&D Lab" + desc_by_access["[ACCESS_ORDNANCE]"] = "Ordnance Lab" + desc_by_access["[ACCESS_ORDNANCE_STORAGE]"] = "Ordnance Storage" + desc_by_access["[ACCESS_PLUMBING]"] = "Chemistry Lab" + desc_by_access["[ACCESS_RD]"] = "RD Office" + desc_by_access["[ACCESS_BAR]"] = "Bar" + desc_by_access["[ACCESS_JANITOR]"] = "Custodial Closet" + desc_by_access["[ACCESS_ENGINEERING]"] = "Engineering" + desc_by_access["[ACCESS_ENGINE_EQUIP]"] = "Power and Engineering Equipment" + desc_by_access["[ACCESS_MAINT_TUNNELS]"] = "Maintenance" + desc_by_access["[ACCESS_EXTERNAL_AIRLOCKS]"] = "External Airlocks" + desc_by_access["[ACCESS_CHANGE_IDS]"] = "ID Console" + desc_by_access["[ACCESS_AI_UPLOAD]"] = "AI Chambers" + desc_by_access["[ACCESS_TELEPORTER]"] = "Teleporter" + desc_by_access["[ACCESS_EVA]"] = "EVA" + desc_by_access["[ACCESS_COMMAND]"] = "Command" + desc_by_access["[ACCESS_CAPTAIN]"] = "Captain" + desc_by_access["[ACCESS_ALL_PERSONAL_LOCKERS]"] = "Personal Lockers" + desc_by_access["[ACCESS_CHAPEL_OFFICE]"] = "Chapel Office" + desc_by_access["[ACCESS_TECH_STORAGE]"] = "Technical Storage" + desc_by_access["[ACCESS_ATMOSPHERICS]"] = "Atmospherics" + desc_by_access["[ACCESS_CREMATORIUM]"] = "Crematorium" + desc_by_access["[ACCESS_ARMORY]"] = "Armory" + desc_by_access["[ACCESS_CONSTRUCTION]"] = "Construction" + desc_by_access["[ACCESS_KITCHEN]"] = "Kitchen" + desc_by_access["[ACCESS_HYDROPONICS]"] = "Hydroponics" + desc_by_access["[ACCESS_LIBRARY]"] = "Library" + desc_by_access["[ACCESS_LAWYER]"] = "Law Office" + desc_by_access["[ACCESS_ROBOTICS]"] = "Robotics" + desc_by_access["[ACCESS_VIROLOGY]"] = "Virology" + desc_by_access["[ACCESS_PSYCHOLOGY]"] = "Psychology" + desc_by_access["[ACCESS_CMO]"] = "CMO Office" + desc_by_access["[ACCESS_QM]"] = "Quartermaster" + desc_by_access["[ACCESS_SURGERY]"] = "Surgery" + desc_by_access["[ACCESS_THEATRE]"] = "Theatre" + desc_by_access["[ACCESS_RESEARCH]"] = "Science" + desc_by_access["[ACCESS_MINING]"] = "Mining Dock" + desc_by_access["[ACCESS_SHIPPING]"] = "Cargo Shipping" + desc_by_access["[ACCESS_VAULT]"] = "Main Vault" + desc_by_access["[ACCESS_MINING_STATION]"] = "Mining Outpost" + desc_by_access["[ACCESS_XENOBIOLOGY]"] = "Xenobiology Lab" + desc_by_access["[ACCESS_HOP]"] = "HoP Office" + desc_by_access["[ACCESS_HOS]"] = "HoS Office" + desc_by_access["[ACCESS_CE]"] = "CE Office" + desc_by_access["[ACCESS_PHARMACY]"] = "Pharmacy" + desc_by_access["[ACCESS_RC_ANNOUNCE]"] = "RC Announcements" + desc_by_access["[ACCESS_KEYCARD_AUTH]"] = "Keycode Auth." + desc_by_access["[ACCESS_TCOMMS]"] = "Telecommunications" + desc_by_access["[ACCESS_GATEWAY]"] = "Gateway" + desc_by_access["[ACCESS_BRIG_ENTRANCE]"] = "Brig" + desc_by_access["[ACCESS_MINERAL_STOREROOM]"] = "Mineral Storage" + desc_by_access["[ACCESS_MINISAT]"] = "AI Satellite" + desc_by_access["[ACCESS_WEAPONS]"] = "Weapon Permit" + desc_by_access["[ACCESS_NETWORK]"] = "Network Access" + desc_by_access["[ACCESS_MECH_MINING]"] = "Mining Mech Access" + desc_by_access["[ACCESS_MECH_MEDICAL]"] = "Medical Mech Access" + desc_by_access["[ACCESS_MECH_SECURITY]"] = "Security Mech Access" + desc_by_access["[ACCESS_MECH_SCIENCE]"] = "Science Mech Access" + desc_by_access["[ACCESS_MECH_ENGINE]"] = "Engineering Mech Access" + desc_by_access["[ACCESS_AUX_BASE]"] = "Auxiliary Base" + desc_by_access["[ACCESS_SERVICE]"] = "Service Hallway" + desc_by_access["[ACCESS_CENT_GENERAL]"] = "Code Grey" + desc_by_access["[ACCESS_CENT_THUNDER]"] = "Code Yellow" + desc_by_access["[ACCESS_CENT_STORAGE]"] = "Code Orange" + desc_by_access["[ACCESS_CENT_LIVING]"] = "Code Green" + desc_by_access["[ACCESS_CENT_MEDICAL]"] = "Code White" + desc_by_access["[ACCESS_CENT_TELEPORTER]"] = "Code Blue" + desc_by_access["[ACCESS_CENT_SPECOPS]"] = "Code Black" + desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold" + desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch" + desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den" + +/** + * Returns the access bitflags associated with any given access level. + * + * In proc form due to accesses being stored in the list as text instead of numbers. + * Arguments: + * * access - Access as either pure number or as a string representation of the number. + */ +/datum/controller/subsystem/id_access/proc/get_access_flag(access) + var/flag = flags_by_access["[access]"] + return flag + +/** + * Returns the access description associated with any given access level. + * + * In proc form due to accesses being stored in the list as text instead of numbers. + * Arguments: + * * access - Access as either pure number or as a string representation of the number. + */ +/datum/controller/subsystem/id_access/proc/get_access_desc(access) + return desc_by_access["[access]"] + +/** + * Builds and returns a list of accesses from a list of regions. + * + * Arguments: + * * regions - A list of region defines. + */ +/datum/controller/subsystem/id_access/proc/get_region_access_list(list/regions) + if(!length(regions)) + return + + var/list/built_region_list = list() + + for(var/region in regions) + built_region_list |= accesses_by_region[region] + + return built_region_list + +/** + * Returns the list of all accesses associated with any given access flag. + * + * In proc form due to accesses being stored in the list as text instead of numbers. + * Arguments: + * * flag - The flag to get access for as either a pure number of string representation of the flag. + */ +/datum/controller/subsystem/id_access/proc/get_flag_access_list(flag) + return accesses_by_flag["[flag]"] + +/** + * Applies a trim singleton to a card. + * + * Returns FALSE if the trim could not be applied due to being incompatible with the card. + * Incompatibility is defined as a card not being able to hold all the trim's required wildcards. + * Returns TRUE otherwise. + * Arguments: + * * id_card - ID card to apply the trim_path to. + * * trim_path - A trim path to apply to the card. Grabs the trim's associated singleton and applies it. + * * copy_access - Boolean value. If true, the trim's access is also copied to the card. + */ +/datum/controller/subsystem/id_access/proc/apply_trim_to_card(obj/item/card/id/id_card, trim_path, copy_access = TRUE) + var/datum/id_trim/trim = trim_singletons_by_path[trim_path] + + if(!id_card.can_add_wildcards(trim.wildcard_access)) + return FALSE + + id_card.clear_access() + id_card.trim = trim + + if(copy_access) + id_card.access = trim.access.Copy() + id_card.add_wildcards(trim.wildcard_access) + + + if(trim.assignment) + id_card.assignment = trim.assignment + + id_card.update_label() + id_card.update_icon() + + return TRUE + +/** + * Removes a trim from an ID card. Also removes all accesses from it too. + * + * Arguments: + * * id_card - The ID card to remove the trim from. + */ +/datum/controller/subsystem/id_access/proc/remove_trim_from_card(obj/item/card/id/id_card) + id_card.trim = null + id_card.clear_access() + id_card.update_label() + id_card.update_icon() + +/** + * Applies a trim to a chameleon card. This is purely visual, utilising the card's override vars. + * + * Arguments: + * * id_card - The chameleon card to apply the trim visuals to. +* * trim_path - A trim path to apply to the card. Grabs the trim's associated singleton and applies it. + * * check_forged - Boolean value. If TRUE, will not overwrite the card's assignment if the card has been forged. + */ +/datum/controller/subsystem/id_access/proc/apply_trim_to_chameleon_card(obj/item/card/id/advanced/chameleon/id_card, trim_path, check_forged = TRUE) + var/datum/id_trim/trim = trim_singletons_by_path[trim_path] + id_card.trim_icon_override = trim.trim_icon + id_card.trim_state_override = trim.trim_state + id_card.trim_assignment_override = trim.assignment + id_card.sechud_icon_state_override = trim.sechud_icon_state + id_card.department_color_override = trim.department_color + id_card.department_state_override = trim.department_state + id_card.subdepartment_color_override = trim.subdepartment_color + + if(!check_forged || !id_card.forged) + id_card.assignment = trim.assignment + + // We'll let the chameleon action update the card's label as necessary instead of doing it here. + +/** + * Removes a trim from a chameleon ID card. + * + * Arguments: + * * id_card - The ID card to remove the trim from. + */ +/datum/controller/subsystem/id_access/proc/remove_trim_from_chameleon_card(obj/item/card/id/advanced/chameleon/id_card) + id_card.trim_icon_override = null + id_card.trim_state_override = null + id_card.trim_assignment_override = null + id_card.sechud_icon_state_override = null + id_card.department_color_override = null + id_card.department_state_override = null + id_card.subdepartment_color_override = null + +/** + * Adds the accesses associated with a trim to an ID card. + * + * Clears the card's existing access levels first. + * Primarily intended for applying trim templates to cards. Will attempt to add as many ordinary access + * levels as it can, without consuming any wildcards. Will then attempt to apply the trim-specific wildcards after. + * + * Arguments: + * * id_card - The ID card to remove the trim from. + */ +/datum/controller/subsystem/id_access/proc/add_trim_access_to_card(obj/item/card/id/id_card, trim_path) + var/datum/id_trim/trim = trim_singletons_by_path[trim_path] + + id_card.clear_access() + + id_card.add_access(trim.access, mode = TRY_ADD_ALL_NO_WILDCARD) + id_card.add_wildcards(trim.wildcard_access, mode = TRY_ADD_ALL) + if(istype(trim, /datum/id_trim/job)) + var/datum/id_trim/job/job_trim = trim // Here is where we update a player's paycheck department for the purposes of discounts/paychecks. + id_card.registered_account.account_job.paycheck_department = job_trim.job.paycheck_department + +/** + * Tallies up all accesses the card has that have flags greater than or equal to the access_flag supplied. + * + * Returns the number of accesses that have flags matching access_flag or a higher tier access. + * Arguments: + * * id_card - The ID card to tally up access for. + * * access_flag - The minimum access flag required for an access to be tallied up. + */ +/datum/controller/subsystem/id_access/proc/tally_access(obj/item/card/id/id_card, access_flag = NONE) + var/tally = 0 + + var/list/id_card_access = id_card.access + for(var/access in id_card_access) + if(flags_by_access["[access]"] >= access_flag) + tally++ + + return tally From 86d806ea86d3561e03a9efee8c50739ea6bea746 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 00:31:19 +0200 Subject: [PATCH 03/48] ballin --- code/__DEFINES/access.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 93f001b52e31..a07471e8b9d0 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -50,7 +50,7 @@ /// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. #define ACCESS_DETECTIVE "detective" /// Access granted to the brig physician, used for the brig medbay doors. -#define ACCESS_BRIG_PHYS +#define ACCESS_BRIG_PHYS /// Access to the "secure" portion of the courtroom, like where the judge and everyone sits.. #define ACCESS_COURT "court" /// The "Weapons Permit" Access, or the one that lets you walk past secbots without them charging at you as you hold your weaponry. @@ -73,8 +73,10 @@ #define ACCESS_ENGINE_EQUIP "engine_equip" /// Access to "construction" areas of the station. However, in mapping, it's also used to get access to the front door and lathe room of the engineering department. #define ACCESS_CONSTRUCTION "construction" -/// Access to the technical storage room (contains all the boards and other miscellaneous engineering gear). +/// Access to the Tech Storage room, containing lots of machine boards and other miscellaneous engineering gear. #define ACCESS_TECH_STORAGE "tech_storage" +/// Access to the Secure Tech Storage room, containing unreplaceable high-value machine boards. +#define ACCESS_SECURE_TECH "secure_tech" /// Access to the Telecomms Server Room, traffic control console, machinery, and tablets. #define ACCESS_TCOMMS "tcomms" /// Access to the Auxiliary Base Room, as well as the ability over launching it. From 423d30b4615e0f375f71c9e16ccbe0ca6dc8290e Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 01:47:50 +0200 Subject: [PATCH 04/48] ballin --- code/__DEFINES/access.dm | 18 +- code/modules/mapping/access_helpers.dm | 596 ++++++++++++++++++++++++ code/modules/mapping/mapping_helpers.dm | 5 + 3 files changed, 610 insertions(+), 9 deletions(-) create mode 100644 code/modules/mapping/access_helpers.dm diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index a07471e8b9d0..e61e6127a39e 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -21,6 +21,8 @@ #define ACCESS_TELEPORTER "teleporter" /// Access to the EVA Storage Room, and some cargo crates. #define ACCESS_EVA "eva" +/// Access to the vault on the station, for accessing the station's budget, the nuke core, or the Ore Silo. +#define ACCESS_VAULT "vault" /// Access to make an announcement through the Requests Console found in an office. #define ACCESS_RC_ANNOUNCE "rc_announce" /// Access used for events (Red Alert, BSA, Emergency Maintenance) which require at least two people to swipe at the same time to authorize it @@ -39,10 +41,10 @@ //--- SECURITY ---// -/// Security's General Access, armaments vendor, security lockers, and other secure gear. Basically things Officers or Wardens should access, but never Lawyers or Detectives. +/// Security's General Access, armaments vendor, security lockers, and other secure gear. Applied to things to Officers and Wardens should access, but never Lawyers or Detectives. #define ACCESS_SECURITY "security" /// Access to the front doors of the Brig, the "secure" portion of the Courtroom, and department outposts. Notably given to Lawyers, Heads of Staff, and Detectives. -#define ACCESS_SECURITY_ENTRANCE "security_entrance" +#define ACCESS_SEC_BASIC "sec_basic" /// Access to brig cells, brig timers, permabrig, gulag, gulag teleporter, gulag shuttle, prisoner management console, and some security cargo crates. #define ACCESS_BRIG "brig" /// Access to the armory, security incinerator (when present), and the execution/re-education chamber. @@ -50,9 +52,7 @@ /// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. #define ACCESS_DETECTIVE "detective" /// Access granted to the brig physician, used for the brig medbay doors. -#define ACCESS_BRIG_PHYS -/// Access to the "secure" portion of the courtroom, like where the judge and everyone sits.. -#define ACCESS_COURT "court" +#define ACCESS_BRIG_PHYS "brig_phys" /// The "Weapons Permit" Access, or the one that lets you walk past secbots without them charging at you as you hold your weaponry. #define ACCESS_WEAPONS_PERMIT "weapons_permit" /// Access used for the Head of Security's personal quarters in mapping, as well as other HoS-related things. @@ -113,14 +113,12 @@ #define ACCESS_CARGO "cargo" /// Access to the Cargo Bay and Warehouse. Separated from the above to prevent miners processing cargo. #define ACCESS_CARGO_BAY "cargo_bay" -/// Access to release materials from the ORM. -#define ACCESS_ORM "orm" /// Access to the "on-station" Mining Portion of the Cargo Department. #define ACCESS_MINING "mining" /// Access to the "off-station" Mining Station, which contains gear dedicated for miners to do their job best, as well as seek shelter from the inhospitable elements. #define ACCESS_MINING_STATION "mining_station" -/// Access to the vault on the station, for accessing the station's budget, the nuke core, or the Ore Silo. -#define ACCESS_VAULT "vault" +/// Access to release materials from the ORM. +#define ACCESS_MATERIALS "materials" /// Access for the Quartermaster's personal quarters in mapping, as well as some other QM-related things. #define ACCESS_QM "qm" @@ -143,6 +141,8 @@ #define ACCESS_ROBOTICS "robotics" /// Access to the Xenobiology division of Science. #define ACCESS_XENOBIOLOGY "xenobiology" +/// Access to the research Server Room, containing the important R&D research servers and AI networking machines. +#define ACCESS_RND_SERVERS "rnd_servers" /// Access for the Research Director's personal quarters in mapping, the R&D server room, as well as some other RD-related things. #define ACCESS_RD "rd" diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm new file mode 100644 index 000000000000..fd3ede7b629d --- /dev/null +++ b/code/modules/mapping/access_helpers.dm @@ -0,0 +1,596 @@ +/obj/effect/mapping_helpers/airlock/access + layer = DOOR_HELPER_LAYER + icon_state = "access_helper" + +// These are mutually exclusive; can't have req_any and req_all +/obj/effect/mapping_helpers/airlock/access/any/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + airlock.req_one_access += access_list + +/obj/effect/mapping_helpers/airlock/access/all/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_one_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + airlock.req_access += access_list + + +//// HELPERS START - PLEASE KEEP THESE IN THE SAME ORDER AS IN ACCESS.DM THANKS +/// REQ ANY /// +// Applies onto req_one_access_txt (only requires ONE of the given accesses to open) + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/airlock/access/any/command + icon_state = "access_helper_com" + +/obj/effect/mapping_helpers/airlock/access/any/command/general/Initialize() + . = ..() + access_list += ACCESS_COMMAND + +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload/Initialize() + . = ..() + access_list += ACCESS_AI_UPLOAD + +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat/Initialize() + . = ..() + access_list += ACCESS_AI_SAT + +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter/Initialize() + . = ..() + access_list += ACCESS_TELEPORTER + +/obj/effect/mapping_helpers/airlock/access/any/command/eva/Initialize() + . = ..() + access_list += ACCESS_EVA + +/obj/effect/mapping_helpers/airlock/access/any/command/vault/Initialize() + . = ..() + access_list += ACCESS_VAULT + +/obj/effect/mapping_helpers/airlock/access/any/command/hop/Initialize() + . = ..() + access_list += ACCESS_HOP + +/obj/effect/mapping_helpers/airlock/access/any/command/captain/Initialize() + . = ..() + access_list += ACCESS_CAPTAIN + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/airlock/access/any/security + icon_state = "access_helper_sec" + +/obj/effect/mapping_helpers/airlock/access/any/security/general/Initialize() + . = ..() + access_list += ACCESS_SECURITY + +/obj/effect/mapping_helpers/airlock/access/any/security/entrance/Initialize() + . = ..() + access_list += ACCESS_SEC_BASIC + +/obj/effect/mapping_helpers/airlock/access/any/security/brig/Initialize() + . = ..() + access_list += ACCESS_BRIG + +/obj/effect/mapping_helpers/airlock/access/any/security/armory/Initialize() + . = ..() + access_list += ACCESS_ARMORY + +/obj/effect/mapping_helpers/airlock/access/any/security/court/Initialize() + . = ..() + access_list += ACCESS_DETECTIVE + +/obj/effect/mapping_helpers/airlock/access/any/security/court/Initialize() + . = ..() + access_list += ACCESS_BRIG_PHYS + +/obj/effect/mapping_helpers/airlock/access/any/security/hos/Initialize() + . = ..() + access_list += ACCESS_HOS + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/airlock/access/any/engineering + icon_state = "access_helper_eng" + +/obj/effect/mapping_helpers/airlock/access/any/engineering/general/Initialize() + . = ..() + access_list += ACCESS_ENGINEERING + +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos/Initialize() + . = ..() + access_list += ACCESS_ATMOSPHERICS + +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/Initialize() + . = ..() + access_list += ACCESS_MAINT_TUNNELS + +/obj/effect/mapping_helpers/airlock/access/any/engineering/external/Initialize() + . = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + +/obj/effect/mapping_helpers/airlock/access/any/engineering/equipment/Initialize() + . = ..() + access_list += ACCESS_ENGINE_EQUIP + +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction/Initialize() + . = ..() + access_list += ACCESS_CONSTRUCTION + +/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage/Initialize() + . = ..() + access_list += ACCESS_TECH_STORAGE + +/obj/effect/mapping_helpers/airlock/access/any/engineering/secure_tech/Initialize() + . = ..() + access_list += ACCESS_SECURE_TECH + +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms/Initialize() + . = ..() + access_list += ACCESS_TCOMMS + +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base/Initialize() + . = ..() + access_list += ACCESS_AUX_BASE + +/obj/effect/mapping_helpers/airlock/access/any/engineering/ce/Initialize() + . = ..() + access_list += ACCESS_CE + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/airlock/access/any/medical + icon_state = "access_helper_med" + +/obj/effect/mapping_helpers/airlock/access/any/medical/general/Initialize() + . = ..() + access_list += ACCESS_MEDICAL + +/obj/effect/mapping_helpers/airlock/access/any/medical/surgery/Initialize() + . = ..() + access_list += ACCESS_SURGERY + +/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic/Initialize() + . = ..() + access_list += ACCESS_PARAMEDIC + +/obj/effect/mapping_helpers/airlock/access/any/medical/morgue/Initialize() + . = ..() + access_list += ACCESS_MORGUE + +/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry/Initialize() + . = ..() + access_list += ACCESS_CHEMISTRY + +/obj/effect/mapping_helpers/airlock/access/any/medical/cloning/Initialize() + . = ..() + access_list += ACCESS_CLONING + +/obj/effect/mapping_helpers/airlock/access/any/medical/virology/Initialize() + . = ..() + access_list += ACCESS_VIROLOGY + +/obj/effect/mapping_helpers/airlock/access/any/medical/psychology/Initialize() + . = ..() + access_list += ACCESS_PSYCHOLOGY + +/obj/effect/mapping_helpers/airlock/access/any/medical/cmo/Initialize() + . = ..() + access_list += ACCESS_CMO + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/airlock/access/any/supply + icon_state = "access_helper_sup" + +/obj/effect/mapping_helpers/airlock/access/any/supply/general/Initialize() + . = ..() + access_list += ACCESS_CARGO + +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay/Initialize() + . = ..() + access_list += ACCESS_CARGO_BAY + +/obj/effect/mapping_helpers/airlock/access/any/supply/mining/Initialize() + . = ..() + access_list += ACCESS_MINING + +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station/Initialize() + . = ..() + access_list += ACCESS_MINING_STATION + +/obj/effect/mapping_helpers/airlock/access/any/supply/materials/Initialize() + . = ..() + access_list += ACCESS_MATERIALS + +/obj/effect/mapping_helpers/airlock/access/any/supply/qm/Initialize() + . = ..() + access_list += ACCESS_QM + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/airlock/access/any/science + icon_state = "access_helper_sci" + +/obj/effect/mapping_helpers/airlock/access/any/science/general/Initialize() + . = ..() + access_list += ACCESS_SCIENCE + +/obj/effect/mapping_helpers/airlock/access/any/science/research/Initialize() + . = ..() + access_list += ACCESS_RESEARCH + +/obj/effect/mapping_helpers/airlock/access/any/science/toxins/Initialize() + . = ..() + access_list += ACCESS_TOXINS + +/obj/effect/mapping_helpers/airlock/access/any/science/toxins_storage/Initialize() + . = ..() + access_list += ACCESS_TOXINS_STORAGE + +/obj/effect/mapping_helpers/airlock/access/any/science/experimentation/Initialize() + . = ..() + access_list += ACCESS_EXPERIMENTATION + +/obj/effect/mapping_helpers/airlock/access/any/science/genetics/Initialize() + . = ..() + access_list += ACCESS_GENETICS + +/obj/effect/mapping_helpers/airlock/access/any/science/robotics/Initialize() + . = ..() + access_list += ACCESS_ROBOTICS + +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio/Initialize() + . = ..() + access_list += ACCESS_XENOBIOLOGY + +/obj/effect/mapping_helpers/airlock/access/any/science/rnd_servers/Initialize() + . = ..() + access_list += ACCESS_RND_SERVERS + +/obj/effect/mapping_helpers/airlock/access/any/science/rd/Initialize() + . = ..() + access_list += ACCESS_RD + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/airlock/access/any/service + icon_state = "access_helper_serv" + +/obj/effect/mapping_helpers/airlock/access/any/service/general/Initialize() + . = ..() + access_list += ACCESS_SERVICE + +/obj/effect/mapping_helpers/airlock/access/any/service/theatre/Initialize() + . = ..() + access_list += ACCESS_THEATRE + +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office/Initialize() + . = ..() + access_list += ACCESS_CHAPEL_OFFICE + +/obj/effect/mapping_helpers/airlock/access/any/service/crematorium/Initialize() + . = ..() + access_list += ACCESS_CREMATORIUM + +/obj/effect/mapping_helpers/airlock/access/any/service/library/Initialize() + . = ..() + access_list += ACCESS_LIBRARY + +/obj/effect/mapping_helpers/airlock/access/any/service/bar/Initialize() + . = ..() + access_list += ACCESS_BAR + +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen/Initialize() + . = ..() + access_list += ACCESS_KITCHEN + +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics/Initialize() + . = ..() + access_list += ACCESS_HYDROPONICS + +/obj/effect/mapping_helpers/airlock/access/any/service/janitor/Initialize() + . = ..() + access_list += ACCESS_JANITOR + +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer/Initialize() + . = ..() + access_list += ACCESS_LAWYER + + + +/// REQ ALL /// +// Applies onto req_access_txt (requires ALL of the given accesses to open) + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/airlock/access/all/command + icon_state = "access_helper_com" + +/obj/effect/mapping_helpers/airlock/access/all/command/general/Initialize() + . = ..() + access_list += ACCESS_COMMAND + +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload/Initialize() + . = ..() + access_list += ACCESS_AI_UPLOAD + +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat/Initialize() + . = ..() + access_list += ACCESS_AI_SAT + +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter/Initialize() + . = ..() + access_list += ACCESS_TELEPORTER + +/obj/effect/mapping_helpers/airlock/access/all/command/eva/Initialize() + . = ..() + access_list += ACCESS_EVA + +/obj/effect/mapping_helpers/airlock/access/all/command/vault/Initialize() + . = ..() + access_list += ACCESS_VAULT + +/obj/effect/mapping_helpers/airlock/access/all/command/hop/Initialize() + . = ..() + access_list += ACCESS_HOP + +/obj/effect/mapping_helpers/airlock/access/all/command/captain/Initialize() + . = ..() + access_list += ACCESS_CAPTAIN + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/airlock/access/all/security + icon_state = "access_helper_sec" + +/obj/effect/mapping_helpers/airlock/access/all/security/general/Initialize() + . = ..() + access_list += ACCESS_SECURITY + +/obj/effect/mapping_helpers/airlock/access/all/security/entrance/Initialize() + . = ..() + access_list += ACCESS_SEC_BASIC + +/obj/effect/mapping_helpers/airlock/access/all/security/brig/Initialize() + . = ..() + access_list += ACCESS_BRIG + +/obj/effect/mapping_helpers/airlock/access/all/security/armory/Initialize() + . = ..() + access_list += ACCESS_ARMORY + +/obj/effect/mapping_helpers/airlock/access/all/security/court/Initialize() + . = ..() + access_list += ACCESS_DETECTIVE + +/obj/effect/mapping_helpers/airlock/access/all/security/court/Initialize() + . = ..() + access_list += ACCESS_BRIG_PHYS + +/obj/effect/mapping_helpers/airlock/access/all/security/hos/Initialize() + . = ..() + access_list += ACCESS_HOS + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/airlock/access/all/engineering + icon_state = "access_helper_eng" + +/obj/effect/mapping_helpers/airlock/access/all/engineering/general/Initialize() + . = ..() + access_list += ACCESS_ENGINEERING + +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos/Initialize() + . = ..() + access_list += ACCESS_ATMOSPHERICS + +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance/Initialize() + . = ..() + access_list += ACCESS_MAINT_TUNNELS + +/obj/effect/mapping_helpers/airlock/access/all/engineering/external/Initialize() + . = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment/Initialize() + . = ..() + access_list += ACCESS_ENGINE_EQUIP + +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction/Initialize() + . = ..() + access_list += ACCESS_CONSTRUCTION + +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage/Initialize() + . = ..() + access_list += ACCESS_TECH_STORAGE + +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech/Initialize() + . = ..() + access_list += ACCESS_SECURE_TECH + +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms/Initialize() + . = ..() + access_list += ACCESS_TCOMMS + +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base/Initialize() + . = ..() + access_list += ACCESS_AUX_BASE + +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce/Initialize() + . = ..() + access_list += ACCESS_CE + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/airlock/access/all/medical + icon_state = "access_helper_med" + +/obj/effect/mapping_helpers/airlock/access/all/medical/general/Initialize() + . = ..() + access_list += ACCESS_MEDICAL + +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery/Initialize() + . = ..() + access_list += ACCESS_SURGERY + +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic/Initialize() + . = ..() + access_list += ACCESS_PARAMEDIC + +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue/Initialize() + . = ..() + access_list += ACCESS_MORGUE + +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry/Initialize() + . = ..() + access_list += ACCESS_CHEMISTRY + +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning/Initialize() + . = ..() + access_list += ACCESS_CLONING + +/obj/effect/mapping_helpers/airlock/access/all/medical/virology/Initialize() + . = ..() + access_list += ACCESS_VIROLOGY + +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology/Initialize() + . = ..() + access_list += ACCESS_PSYCHOLOGY + +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo/Initialize() + . = ..() + access_list += ACCESS_CMO + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/airlock/access/all/supply + icon_state = "access_helper_sup" + +/obj/effect/mapping_helpers/airlock/access/all/supply/general/Initialize() + . = ..() + access_list += ACCESS_CARGO + +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay/Initialize() + . = ..() + access_list += ACCESS_CARGO_BAY + +/obj/effect/mapping_helpers/airlock/access/all/supply/mining/Initialize() + . = ..() + access_list += ACCESS_MINING + +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station/Initialize() + . = ..() + access_list += ACCESS_MINING_STATION + +/obj/effect/mapping_helpers/airlock/access/all/supply/materials/Initialize() + . = ..() + access_list += ACCESS_MATERIALS + +/obj/effect/mapping_helpers/airlock/access/all/supply/qm/Initialize() + . = ..() + access_list += ACCESS_QM + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/airlock/access/all/science + icon_state = "access_helper_sci" + +/obj/effect/mapping_helpers/airlock/access/all/science/general/Initialize() + . = ..() + access_list += ACCESS_SCIENCE + +/obj/effect/mapping_helpers/airlock/access/all/science/research/Initialize() + . = ..() + access_list += ACCESS_RESEARCH + +/obj/effect/mapping_helpers/airlock/access/all/science/toxins/Initialize() + . = ..() + access_list += ACCESS_TOXINS + +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage/Initialize() + . = ..() + access_list += ACCESS_TOXINS_STORAGE + +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation/Initialize() + . = ..() + access_list += ACCESS_EXPERIMENTATION + +/obj/effect/mapping_helpers/airlock/access/all/science/genetics/Initialize() + . = ..() + access_list += ACCESS_GENETICS + +/obj/effect/mapping_helpers/airlock/access/all/science/robotics/Initialize() + . = ..() + access_list += ACCESS_ROBOTICS + +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio/Initialize() + . = ..() + access_list += ACCESS_XENOBIOLOGY + +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers/Initialize() + . = ..() + access_list += ACCESS_RND_SERVERS + +/obj/effect/mapping_helpers/airlock/access/all/science/rd/Initialize() + . = ..() + access_list += ACCESS_RD + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/airlock/access/all/service + icon_state = "access_helper_serv" + +/obj/effect/mapping_helpers/airlock/access/all/service/general/Initialize() + . = ..() + access_list += ACCESS_SERVICE + +/obj/effect/mapping_helpers/airlock/access/all/service/theatre/Initialize() + . = ..() + access_list += ACCESS_THEATRE + +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office/Initialize() + . = ..() + access_list += ACCESS_CHAPEL_OFFICE + +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium/Initialize() + . = ..() + access_list += ACCESS_CREMATORIUM + +/obj/effect/mapping_helpers/airlock/access/all/service/library/Initialize() + . = ..() + access_list += ACCESS_LIBRARY + +/obj/effect/mapping_helpers/airlock/access/all/service/bar/Initialize() + . = ..() + access_list += ACCESS_BAR + +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen/Initialize() + . = ..() + access_list += ACCESS_KITCHEN + +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics/Initialize() + . = ..() + access_list += ACCESS_HYDROPONICS + +/obj/effect/mapping_helpers/airlock/access/all/service/janitor/Initialize() + . = ..() + access_list += ACCESS_JANITOR + +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer/Initialize() + . = ..() + access_list += ACCESS_LAWYER diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index d7c0a5eef927..b91a05505a0e 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -98,17 +98,22 @@ //airlock helpers /obj/effect/mapping_helpers/airlock layer = DOOR_HELPER_LAYER + late = TRUE /obj/effect/mapping_helpers/airlock/Initialize(mapload) . = ..() if(!mapload) log_mapping("[src] spawned outside of mapload!") return + +/obj/effect/mapping_helpers/airlock/LateInitialize() + . = ..() var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc if(!airlock) log_mapping("[src] failed to find an airlock at [AREACOORD(src)]") else payload(airlock) + qdel(src) /obj/effect/mapping_helpers/airlock/proc/payload(obj/machinery/door/airlock/payload) return From 0ea41b7f084be0236ada8e024c783a915aa15da9 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 02:57:57 +0200 Subject: [PATCH 05/48] ballin --- code/__DEFINES/access.dm | 4 +- code/game/machinery/airlock_control.dm | 8 +- code/game/machinery/doors/airlock.dm | 32 - code/modules/mapping/access_helpers.dm | 745 ++++++++++++++++-------- code/modules/mapping/mapping_helpers.dm | 50 +- icons/effects/mapping_helpers.dmi | Bin 9517 -> 11583 bytes yogstation.dme | 1 + 7 files changed, 553 insertions(+), 287 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index e61e6127a39e..0ecae8a783ef 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -49,9 +49,9 @@ #define ACCESS_BRIG "brig" /// Access to the armory, security incinerator (when present), and the execution/re-education chamber. #define ACCESS_ARMORY "armory" -/// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. +/// Access for the Detective to get into their office, the medical data console, and some other detective-related stuff. #define ACCESS_DETECTIVE "detective" -/// Access granted to the brig physician, used for the brig medbay doors. +/// Access for the Brig Physician and their locker, also used for the Brig Infirmary doors. #define ACCESS_BRIG_PHYS "brig_phys" /// The "Weapons Permit" Access, or the one that lets you walk past secbots without them charging at you as you hold your weaponry. #define ACCESS_WEAPONS_PERMIT "weapons_permit" diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index dd8ebae5617c..4ca2c14ebfd8 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -19,10 +19,10 @@ switch(signal.data["command"]) if("open") - open(1) + open(TRUE) if("close") - close(1) + close(TRUE) if("unlock") locked = FALSE @@ -37,14 +37,14 @@ update_appearance() sleep(0.2 SECONDS) - open(1) + open(TRUE) locked = TRUE update_appearance() if("secure_close") locked = FALSE - close(1) + close(TRUE) locked = TRUE sleep(0.2 SECONDS) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 444e9d64a047..a2d3faf9ae2e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -198,38 +198,6 @@ if(cut_wires_on_break) wires.cut_all() -/obj/machinery/door/airlock/LateInitialize() - . = ..() - if(cyclelinkedx || cyclelinkedy) //yogs start - cyclelinkairlock_target() - else - if(cyclelinkeddir) - cyclelinkairlock() //yogs end - if(abandoned) - var/outcome = rand(1,100) - switch(outcome) - if(1 to 9) - var/turf/here = get_turf(src) - for(var/obj/machinery/door/firedoor/FD in here) - qdel(FD) - for(var/turf/closed/T in range(2, src)) - here.place_on_top(T.type) - qdel(src) - return - here.place_on_top(/turf/closed/wall) - qdel(src) - return - if(10 to 11) - lights = FALSE - locked = TRUE - if(12 to 15) - locked = TRUE - if(16 to 23) - welded = TRUE - if(24 to 30) - panel_open = TRUE - update_appearance(UPDATE_ICON) - /obj/machinery/door/airlock/proc/rebuild_parts() if(part_overlays) vis_contents -= part_overlays diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index fd3ede7b629d..aaf89234fd85 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -17,8 +17,12 @@ var/list/access_list = get_access() airlock.req_access += access_list +/obj/effect/mapping_helpers/airlock/access/proc/get_access() + var/list/access = list() + return access -//// HELPERS START - PLEASE KEEP THESE IN THE SAME ORDER AS IN ACCESS.DM THANKS + +//// HELPERS START - PLEASE KEEP EVERYTHING IN THE SAME ORDER AS IN ACCESS.DM THANKS /// REQ ANY /// // Applies onto req_one_access_txt (only requires ONE of the given accesses to open) @@ -27,37 +31,45 @@ /obj/effect/mapping_helpers/airlock/access/any/command icon_state = "access_helper_com" -/obj/effect/mapping_helpers/airlock/access/any/command/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/general/get_access() + var/list/access_list = ..() access_list += ACCESS_COMMAND + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload/get_access() + var/list/access_list = ..() access_list += ACCESS_AI_UPLOAD + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat/get_access() + var/list/access_list = ..() access_list += ACCESS_AI_SAT + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/teleporter/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter/get_access() + var/list/access_list = ..() access_list += ACCESS_TELEPORTER + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/eva/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/eva/get_access() + var/list/access_list = ..() access_list += ACCESS_EVA + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/vault/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/vault/get_access() + var/list/access_list = ..() access_list += ACCESS_VAULT + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/hop/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/hop/get_access() + var/list/access_list = ..() access_list += ACCESS_HOP + return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/captain/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/command/captain/get_access() + var/list/access_list = ..() access_list += ACCESS_CAPTAIN + return access_list //--- SECURITY ---// @@ -65,33 +77,40 @@ /obj/effect/mapping_helpers/airlock/access/any/security icon_state = "access_helper_sec" -/obj/effect/mapping_helpers/airlock/access/any/security/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/general/get_access() + var/list/access_list = ..() access_list += ACCESS_SECURITY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/entrance/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/entrance/get_access() + var/list/access_list = ..() access_list += ACCESS_SEC_BASIC + return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/brig/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/brig/get_access() + var/list/access_list = ..() access_list += ACCESS_BRIG + return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/armory/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/armory/get_access() + var/list/access_list = ..() access_list += ACCESS_ARMORY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/court/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/court/get_access() + var/list/access_list = ..() access_list += ACCESS_DETECTIVE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/court/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/court/get_access() + var/list/access_list = ..() access_list += ACCESS_BRIG_PHYS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/hos/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/security/hos/get_access() + var/list/access_list = ..() access_list += ACCESS_HOS + return access_list //--- ENGINEERING ---// @@ -99,49 +118,60 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering icon_state = "access_helper_eng" -/obj/effect/mapping_helpers/airlock/access/any/engineering/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/general/get_access() + var/list/access_list = ..() access_list += ACCESS_ENGINEERING + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos/get_access() + var/list/access_list = ..() access_list += ACCESS_ATMOSPHERICS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/get_access() + var/list/access_list = ..() access_list += ACCESS_MAINT_TUNNELS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/external/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/external/get_access() + var/list/access_list = ..() access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/equipment/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/equipment/get_access() + var/list/access_list = ..() access_list += ACCESS_ENGINE_EQUIP + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction/get_access() + var/list/access_list = ..() access_list += ACCESS_CONSTRUCTION + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage/get_access() + var/list/access_list = ..() access_list += ACCESS_TECH_STORAGE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/secure_tech/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/secure_tech/get_access() + var/list/access_list = ..() access_list += ACCESS_SECURE_TECH + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms/get_access() + var/list/access_list = ..() access_list += ACCESS_TCOMMS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base/get_access() + var/list/access_list = ..() access_list += ACCESS_AUX_BASE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/engineering/ce/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/engineering/ce/get_access() + var/list/access_list = ..() access_list += ACCESS_CE + return access_list //--- MEDICAL ---// @@ -149,41 +179,49 @@ /obj/effect/mapping_helpers/airlock/access/any/medical icon_state = "access_helper_med" -/obj/effect/mapping_helpers/airlock/access/any/medical/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/general/get_access() + var/list/access_list = ..() access_list += ACCESS_MEDICAL + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/surgery/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/surgery/get_access() + var/list/access_list = ..() access_list += ACCESS_SURGERY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic/get_access() + var/list/access_list = ..() access_list += ACCESS_PARAMEDIC + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/morgue/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/morgue/get_access() + var/list/access_list = ..() access_list += ACCESS_MORGUE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry/get_access() + var/list/access_list = ..() access_list += ACCESS_CHEMISTRY -/obj/effect/mapping_helpers/airlock/access/any/medical/cloning/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/cloning/get_access() + var/list/access_list = ..() access_list += ACCESS_CLONING + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/virology/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/virology/get_access() + var/list/access_list = ..() access_list += ACCESS_VIROLOGY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/psychology/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/psychology/get_access() + var/list/access_list = ..() access_list += ACCESS_PSYCHOLOGY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/medical/cmo/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/medical/cmo/get_access() + var/list/access_list = ..() access_list += ACCESS_CMO + return access_list //--- SUPPLY ---// @@ -191,29 +229,35 @@ /obj/effect/mapping_helpers/airlock/access/any/supply icon_state = "access_helper_sup" -/obj/effect/mapping_helpers/airlock/access/any/supply/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/supply/general/get_access() + var/list/access_list = ..() access_list += ACCESS_CARGO + return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay/get_access() + var/list/access_list = ..() access_list += ACCESS_CARGO_BAY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/mining/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/supply/mining/get_access() + var/list/access_list = ..() access_list += ACCESS_MINING + return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station/get_access() + var/list/access_list = ..() access_list += ACCESS_MINING_STATION + return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/materials/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/supply/materials/get_access() + var/list/access_list = ..() access_list += ACCESS_MATERIALS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/qm/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/supply/qm/get_access() + var/list/access_list = ..() access_list += ACCESS_QM + return access_list //--- SCIENCE ---// @@ -221,91 +265,110 @@ /obj/effect/mapping_helpers/airlock/access/any/science icon_state = "access_helper_sci" -/obj/effect/mapping_helpers/airlock/access/any/science/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/general/get_access() + var/list/access_list = ..() access_list += ACCESS_SCIENCE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/research/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/research/get_access() + var/list/access_list = ..() access_list += ACCESS_RESEARCH + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/toxins/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/toxins/get_access() + var/list/access_list = ..() access_list += ACCESS_TOXINS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/toxins_storage/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/toxins_storage/get_access() + var/list/access_list = ..() access_list += ACCESS_TOXINS_STORAGE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/experimentation/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/experimentation/get_access() + var/list/access_list = ..() access_list += ACCESS_EXPERIMENTATION + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/genetics/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/genetics/get_access() + var/list/access_list = ..() access_list += ACCESS_GENETICS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/robotics/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/robotics/get_access() + var/list/access_list = ..() access_list += ACCESS_ROBOTICS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio/get_access() + var/list/access_list = ..() access_list += ACCESS_XENOBIOLOGY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/rnd_servers/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/rnd_servers/get_access() + var/list/access_list = ..() access_list += ACCESS_RND_SERVERS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/science/rd/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/science/rd/get_access() + var/list/access_list = ..() access_list += ACCESS_RD + return access_list //--- SERVICE ---// /obj/effect/mapping_helpers/airlock/access/any/service icon_state = "access_helper_serv" -/obj/effect/mapping_helpers/airlock/access/any/service/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/general/get_access() + var/list/access_list = ..() access_list += ACCESS_SERVICE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/theatre/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/theatre/get_access() + var/list/access_list = ..() access_list += ACCESS_THEATRE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office/get_access() + var/list/access_list = ..() access_list += ACCESS_CHAPEL_OFFICE + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/crematorium/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/crematorium/get_access() + var/list/access_list = ..() access_list += ACCESS_CREMATORIUM + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/library/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/library/get_access() + var/list/access_list = ..() access_list += ACCESS_LIBRARY + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/bar/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/bar/get_access() + var/list/access_list = ..() access_list += ACCESS_BAR + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/kitchen/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen/get_access() + var/list/access_list = ..() access_list += ACCESS_KITCHEN + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics/get_access() + var/list/access_list = ..() access_list += ACCESS_HYDROPONICS + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/janitor/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/janitor/get_access() + var/list/access_list = ..() access_list += ACCESS_JANITOR + return access_list -/obj/effect/mapping_helpers/airlock/access/any/service/lawyer/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer/get_access() + var/list/access_list = ..() access_list += ACCESS_LAWYER - + return access_list /// REQ ALL /// @@ -316,37 +379,45 @@ /obj/effect/mapping_helpers/airlock/access/all/command icon_state = "access_helper_com" -/obj/effect/mapping_helpers/airlock/access/all/command/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/general/get_access() + var/list/access_list = ..() access_list += ACCESS_COMMAND + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload/get_access() + var/list/access_list = ..() access_list += ACCESS_AI_UPLOAD + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat/get_access() + var/list/access_list = ..() access_list += ACCESS_AI_SAT + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/teleporter/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter/get_access() + var/list/access_list = ..() access_list += ACCESS_TELEPORTER + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/eva/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/eva/get_access() + var/list/access_list = ..() access_list += ACCESS_EVA + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/vault/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/vault/get_access() + var/list/access_list = ..() access_list += ACCESS_VAULT + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/hop/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/hop/get_access() + var/list/access_list = ..() access_list += ACCESS_HOP + return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/captain/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/command/captain/get_access() + var/list/access_list = ..() access_list += ACCESS_CAPTAIN + return access_list //--- SECURITY ---// @@ -354,33 +425,40 @@ /obj/effect/mapping_helpers/airlock/access/all/security icon_state = "access_helper_sec" -/obj/effect/mapping_helpers/airlock/access/all/security/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/general/get_access() + var/list/access_list = ..() access_list += ACCESS_SECURITY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/entrance/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/entrance/get_access() + var/list/access_list = ..() access_list += ACCESS_SEC_BASIC + return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/brig/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/brig/get_access() + var/list/access_list = ..() access_list += ACCESS_BRIG + return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/armory/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/armory/get_access() + var/list/access_list = ..() access_list += ACCESS_ARMORY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/court/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/court/get_access() + var/list/access_list = ..() access_list += ACCESS_DETECTIVE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/court/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/court/get_access() + var/list/access_list = ..() access_list += ACCESS_BRIG_PHYS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/hos/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/security/hos/get_access() + var/list/access_list = ..() access_list += ACCESS_HOS + return access_list //--- ENGINEERING ---// @@ -388,49 +466,60 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering icon_state = "access_helper_eng" -/obj/effect/mapping_helpers/airlock/access/all/engineering/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/general/get_access() + var/list/access_list = ..() access_list += ACCESS_ENGINEERING + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos/get_access() + var/list/access_list = ..() access_list += ACCESS_ATMOSPHERICS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance/get_access() + var/list/access_list = ..() access_list += ACCESS_MAINT_TUNNELS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/external/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/external/get_access() + var/list/access_list = ..() access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment/get_access() + var/list/access_list = ..() access_list += ACCESS_ENGINE_EQUIP + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction/get_access() + var/list/access_list = ..() access_list += ACCESS_CONSTRUCTION + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage/get_access() + var/list/access_list = ..() access_list += ACCESS_TECH_STORAGE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech/get_access() + var/list/access_list = ..() access_list += ACCESS_SECURE_TECH + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms/get_access() + var/list/access_list = ..() access_list += ACCESS_TCOMMS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base/get_access() + var/list/access_list = ..() access_list += ACCESS_AUX_BASE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/engineering/ce/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce/get_access() + var/list/access_list = ..() access_list += ACCESS_CE + return access_list //--- MEDICAL ---// @@ -438,41 +527,50 @@ /obj/effect/mapping_helpers/airlock/access/all/medical icon_state = "access_helper_med" -/obj/effect/mapping_helpers/airlock/access/all/medical/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/general/get_access() + var/list/access_list = ..() access_list += ACCESS_MEDICAL + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery/get_access() + var/list/access_list = ..() access_list += ACCESS_SURGERY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic/get_access() + var/list/access_list = ..() access_list += ACCESS_PARAMEDIC + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/morgue/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue/get_access() + var/list/access_list = ..() access_list += ACCESS_MORGUE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry/get_access() + var/list/access_list = ..() access_list += ACCESS_CHEMISTRY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/cloning/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning/get_access() + var/list/access_list = ..() access_list += ACCESS_CLONING + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/virology/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/virology/get_access() + var/list/access_list = ..() access_list += ACCESS_VIROLOGY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/psychology/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology/get_access() + var/list/access_list = ..() access_list += ACCESS_PSYCHOLOGY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo/get_access() + var/list/access_list = ..() access_list += ACCESS_CMO + return access_list //--- SUPPLY ---// @@ -480,29 +578,35 @@ /obj/effect/mapping_helpers/airlock/access/all/supply icon_state = "access_helper_sup" -/obj/effect/mapping_helpers/airlock/access/all/supply/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/supply/general/get_access() + var/list/access_list = ..() access_list += ACCESS_CARGO + return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay/get_access() + var/list/access_list = ..() access_list += ACCESS_CARGO_BAY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/mining/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/supply/mining/get_access() + var/list/access_list = ..() access_list += ACCESS_MINING + return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station/get_access() + var/list/access_list = ..() access_list += ACCESS_MINING_STATION + return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/materials/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/supply/materials/get_access() + var/list/access_list = ..() access_list += ACCESS_MATERIALS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/qm/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/supply/qm/get_access() + var/list/access_list = ..() access_list += ACCESS_QM + return access_list //--- SCIENCE ---// @@ -510,87 +614,236 @@ /obj/effect/mapping_helpers/airlock/access/all/science icon_state = "access_helper_sci" -/obj/effect/mapping_helpers/airlock/access/all/science/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/general/get_access() + var/list/access_list = ..() access_list += ACCESS_SCIENCE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/research/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/research/get_access() + var/list/access_list = ..() access_list += ACCESS_RESEARCH + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/toxins/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/toxins/get_access() + var/list/access_list = ..() access_list += ACCESS_TOXINS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage/get_access() + var/list/access_list = ..() access_list += ACCESS_TOXINS_STORAGE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/experimentation/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation/get_access() + var/list/access_list = ..() access_list += ACCESS_EXPERIMENTATION + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/genetics/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/genetics/get_access() + var/list/access_list = ..() access_list += ACCESS_GENETICS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/robotics/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/robotics/get_access() + var/list/access_list = ..() access_list += ACCESS_ROBOTICS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio/get_access() + var/list/access_list = ..() access_list += ACCESS_XENOBIOLOGY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers/get_access() + var/list/access_list = ..() access_list += ACCESS_RND_SERVERS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/science/rd/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/science/rd/get_access() + var/list/access_list = ..() access_list += ACCESS_RD + return access_list //--- SERVICE ---// /obj/effect/mapping_helpers/airlock/access/all/service icon_state = "access_helper_serv" -/obj/effect/mapping_helpers/airlock/access/all/service/general/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/general/get_access() + var/list/access_list = ..() access_list += ACCESS_SERVICE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/theatre/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/theatre/get_access() + var/list/access_list = ..() access_list += ACCESS_THEATRE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office/get_access() + var/list/access_list = ..() access_list += ACCESS_CHAPEL_OFFICE + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/crematorium/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium/get_access() + var/list/access_list = ..() access_list += ACCESS_CREMATORIUM + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/library/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/library/get_access() + var/list/access_list = ..() access_list += ACCESS_LIBRARY + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/bar/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/bar/get_access() + var/list/access_list = ..() access_list += ACCESS_BAR + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen/get_access() + var/list/access_list = ..() access_list += ACCESS_KITCHEN + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics/get_access() + var/list/access_list = ..() access_list += ACCESS_HYDROPONICS + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/janitor/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/janitor/get_access() + var/list/access_list = ..() access_list += ACCESS_JANITOR + return access_list -/obj/effect/mapping_helpers/airlock/access/all/service/lawyer/Initialize() - . = ..() +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer/get_access() + var/list/access_list = ..() access_list += ACCESS_LAWYER + return access_list + + +//--- RUINS ---// +// Only giving req all to non-station helpers to cut down on bloat, feel free to add req any in the future if needed + +/obj/effect/mapping_helpers/airlock/access/all/ruins + icon_state = "access_helper_ruin" + +/obj/effect/mapping_helpers/airlock/access/all/ruins/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/command/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_COMMAND) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/security/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SEC) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_ENGINEERING) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/supply/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SUPPLY) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/science/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SCIENCE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MAINTENANCE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic1/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC1) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic2/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC2) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic3/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC3) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic4/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC4) + return access_list + + +//--- ADMIN ---// + +/obj/effect/mapping_helpers/airlock/access/all/admin + icon_state = "access_helper_adm" + +/obj/effect/mapping_helpers/airlock/access/all/admin/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_GENERAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_THUNDER) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/living/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_LIVING) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/storage/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_STORAGE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/teleporter/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_TELEPORTER) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/captain/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_CAPTAIN) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/bar/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_BAR) + return access_list + + +//--- SYNDICATE ---// + +/obj/effect/mapping_helpers/airlock/access/all/syndicate + icon_state = "access_helper_syn" + +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE_LEADER) + return access_list diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index b91a05505a0e..d30b243c1748 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -105,14 +105,50 @@ if(!mapload) log_mapping("[src] spawned outside of mapload!") return + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc + if(!airlock) + log_mapping("[src] failed to find an airlock at [AREACOORD(src)]") + else + payload(airlock) + qdel(src) /obj/effect/mapping_helpers/airlock/LateInitialize() . = ..() var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc if(!airlock) - log_mapping("[src] failed to find an airlock at [AREACOORD(src)]") + qdel(src) + return + if(cyclelinkedx || cyclelinkedy) //yogs start + cyclelinkairlock_target() else - payload(airlock) + if(cyclelinkeddir) + cyclelinkairlock() //yogs end + if(airlock.closeOtherId) + airlock.update_other_id() + if(airlock.abandoned) + var/outcome = rand(1,100) + switch(outcome) + if(1 to 9) + var/turf/here = get_turf(src) + for(var/obj/machinery/door/firedoor/FD in here) + qdel(FD) + for(var/turf/closed/T in range(2, src)) + here.place_on_top(T.type) + qdel(src) + return + here.place_on_top(/turf/closed/wall) + qdel(src) + return + if(10 to 11) + airlock.lights = FALSE + airlock.locked = TRUE + if(12 to 15) + airlock.locked = TRUE + if(16 to 23) + airlock.welded = TRUE + if(24 to 30) + airlock.panel_open = TRUE + update_appearance() qdel(src) /obj/effect/mapping_helpers/airlock/proc/payload(obj/machinery/door/airlock/payload) @@ -155,7 +191,6 @@ else airlock.locked = TRUE - /obj/effect/mapping_helpers/airlock/unres name = "airlock unresctricted side helper" icon_state = "airlock_unres_helper" @@ -173,6 +208,15 @@ else airlock.abandoned = TRUE +/obj/effect/mapping_helpers/airlock/inaccessible + name = "airlock inaccessible helper" + icon_state = "airlock_inaccessible" + +/obj/effect/mapping_helpers/airlock/inaccessible/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_one_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_access, but req__one_access was already set!") + else + airlock.req_access += list(ACCESS_INACCESSIBLE) //needs to do its thing before spawn_rivers() is called INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 1bc499aaaf1454cda3aa833df8ded95971a17b4c..be1c58592c09aafe6e7092aeef90328d1b3f4930 100644 GIT binary patch literal 11583 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 CAmwQQ literal 9517 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 Date: Sat, 27 Jul 2024 02:58:33 +0200 Subject: [PATCH 06/48] ballin --- code/controllers/subsystem/id_access | 502 --------------------------- 1 file changed, 502 deletions(-) delete mode 100644 code/controllers/subsystem/id_access diff --git a/code/controllers/subsystem/id_access b/code/controllers/subsystem/id_access deleted file mode 100644 index 38bf3b568a1f..000000000000 --- a/code/controllers/subsystem/id_access +++ /dev/null @@ -1,502 +0,0 @@ -/** - * Non-processing subsystem that holds various procs and data structures to manage ID cards, trims and access. - */ -SUBSYSTEM_DEF(id_access) - name = "IDs and Access" - init_order = INIT_ORDER_IDACCESS - flags = SS_NO_FIRE - - /// Dictionary of access flags. Keys are accesses. Values are their associated bitflags. - var/list/flags_by_access = list() - /// Dictionary of access lists. Keys are access flag names. Values are lists of all accesses as part of that access. - var/list/accesses_by_flag = list() - /// Dictionary of access flag string representations. Keys are bitflags. Values are their associated names. - var/list/access_flag_string_by_flag = list() - /// Dictionary of trim singletons. Keys are paths. Values are their associated singletons. - var/list/trim_singletons_by_path = list() - /// Dictionary of wildcard compatibility flags. Keys are strings for the wildcards. Values are their associated flags. - var/list/wildcard_flags_by_wildcard = list() - /// Dictionary of accesses based on station region. Keys are region strings. Values are lists of accesses. - var/list/accesses_by_region = list() - /// Specially formatted list for sending access levels to tgui interfaces. - var/list/all_region_access_tgui = list() - /// Dictionary of access names. Keys are access levels. Values are their associated names. - var/list/desc_by_access = list() - /// List of accesses for the Heads of each sub-department alongside the regions they control and their job name. - var/list/sub_department_managers_tgui = list() - /// Helper list containing all trim paths that can be used as job templates. Intended to be used alongside logic for ACCESS_CHANGE_IDS. Grab templates from sub_department_managers_tgui for Head of Staff restrictions. - var/list/station_job_templates = list() - /// Helper list containing all trim paths that can be used as Centcom templates. - var/list/centcom_job_templates = list() - /// Helper list containing all PDA paths that can be painted by station machines. Intended to be used alongside logic for ACCESS_CHANGE_IDS. Grab templates from sub_department_managers_tgui for Head of Staff restrictions. - var/list/station_pda_templates = list() - /// Helper list containing all station regions. - var/list/station_regions = list() - - /// The roundstart generated code for the spare ID safe. This is given to the Captain on shift start. If there's no Captain, it's given to the HoP. If there's no HoP - var/spare_id_safe_code = "" - -/datum/controller/subsystem/id_access/Initialize() - // We use this because creating the trim singletons requires the config to be loaded. - setup_access_flags() - setup_region_lists() - setup_trim_singletons() - setup_wildcard_dict() - setup_access_descriptions() - setup_tgui_lists() - - spare_id_safe_code = "[rand(0,9)][rand(0,9)][rand(0,9)][rand(0,9)][rand(0,9)]" - - return SS_INIT_SUCCESS - -/** - * Called by [/datum/controller/subsystem/ticker/proc/setup] - * - * This runs through every /datum/id_trim/job singleton and ensures that its access is setup according to - * appropriate config entries. - */ -/datum/controller/subsystem/id_access/proc/refresh_job_trim_singletons() - for(var/trim in typesof(/datum/id_trim/job)) - var/datum/id_trim/job/job_trim = trim_singletons_by_path[trim] - - if(QDELETED(job_trim)) - stack_trace("Trim \[[trim]\] missing from trim singleton list. Reinitialising this trim.") - trim_singletons_by_path[trim] = new trim() - continue - - job_trim.refresh_trim_access() - -/// Build access flag lists. -/datum/controller/subsystem/id_access/proc/setup_access_flags() - accesses_by_flag["[ACCESS_FLAG_COMMON]"] = COMMON_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_COMMON]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_COMMON) - - accesses_by_flag["[ACCESS_FLAG_COMMAND]"] = COMMAND_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_COMMAND]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_COMMAND) - - accesses_by_flag["[ACCESS_FLAG_PRV_COMMAND]"] = PRIVATE_COMMAND_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_PRV_COMMAND]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_PRV_COMMAND) - - accesses_by_flag["[ACCESS_FLAG_CAPTAIN]"] = CAPTAIN_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_CAPTAIN]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_CAPTAIN) - - accesses_by_flag["[ACCESS_FLAG_CENTCOM]"] = CENTCOM_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_CENTCOM]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_CENTCOM) - - accesses_by_flag["[ACCESS_FLAG_SYNDICATE]"] = SYNDICATE_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_SYNDICATE]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_SYNDICATE) - - accesses_by_flag["[ACCESS_FLAG_AWAY]"] = AWAY_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_AWAY]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_AWAY) - - accesses_by_flag["[ACCESS_FLAG_SPECIAL]"] = CULT_ACCESS - for(var/access in accesses_by_flag["[ACCESS_FLAG_SPECIAL]"]) - flags_by_access |= list("[access]" = ACCESS_FLAG_SPECIAL) - - access_flag_string_by_flag["[ACCESS_FLAG_COMMON]"] = ACCESS_FLAG_COMMON_NAME - access_flag_string_by_flag["[ACCESS_FLAG_COMMAND]"] = ACCESS_FLAG_COMMAND_NAME - access_flag_string_by_flag["[ACCESS_FLAG_PRV_COMMAND]"] = ACCESS_FLAG_PRV_COMMAND_NAME - access_flag_string_by_flag["[ACCESS_FLAG_CAPTAIN]"] = ACCESS_FLAG_CAPTAIN_NAME - access_flag_string_by_flag["[ACCESS_FLAG_CENTCOM]"] = ACCESS_FLAG_CENTCOM_NAME - access_flag_string_by_flag["[ACCESS_FLAG_SYNDICATE]"] = ACCESS_FLAG_SYNDICATE_NAME - access_flag_string_by_flag["[ACCESS_FLAG_AWAY]"] = ACCESS_FLAG_AWAY_NAME - access_flag_string_by_flag["[ACCESS_FLAG_SPECIAL]"] = ACCESS_FLAG_SPECIAL_NAME - -/// Populates the region lists with data about which accesses correspond to which regions. -/datum/controller/subsystem/id_access/proc/setup_region_lists() - accesses_by_region[REGION_ALL_STATION] = REGION_ACCESS_ALL_STATION - accesses_by_region[REGION_ALL_GLOBAL] = REGION_ACCESS_ALL_GLOBAL - accesses_by_region[REGION_GENERAL] = REGION_ACCESS_GENERAL - accesses_by_region[REGION_SECURITY] = REGION_ACCESS_SECURITY - accesses_by_region[REGION_MEDBAY] = REGION_ACCESS_MEDBAY - accesses_by_region[REGION_RESEARCH] = REGION_ACCESS_RESEARCH - accesses_by_region[REGION_ENGINEERING] = REGION_ACCESS_ENGINEERING - accesses_by_region[REGION_SUPPLY] = REGION_ACCESS_SUPPLY - accesses_by_region[REGION_COMMAND] = REGION_ACCESS_COMMAND - accesses_by_region[REGION_CENTCOM] = REGION_ACCESS_CENTCOM - - station_regions = REGION_AREA_STATION - -/// Instantiate trim singletons and add them to a list. -/datum/controller/subsystem/id_access/proc/setup_trim_singletons() - for(var/trim in typesof(/datum/id_trim)) - trim_singletons_by_path[trim] = new trim() - -/// Creates various data structures that primarily get fed to tgui interfaces, although these lists are used in other places. -/datum/controller/subsystem/id_access/proc/setup_tgui_lists() - for(var/region in accesses_by_region) - var/list/region_access = accesses_by_region[region] - - var/parsed_accesses = list() - - for(var/access in region_access) - var/access_desc = get_access_desc(access) - if(!access_desc) - continue - - parsed_accesses += list(list( - "desc" = replacetext(access_desc, " ", " "), - "ref" = access, - )) - - all_region_access_tgui[region] = list(list( - "name" = region, - "accesses" = parsed_accesses, - )) - - sub_department_managers_tgui = list( - "[ACCESS_CAPTAIN]" = list( - "regions" = list(REGION_COMMAND), - "head" = JOB_CAPTAIN, - "templates" = list(), - "pdas" = list(), - ), - "[ACCESS_HOP]" = list( - "regions" = list(REGION_GENERAL), - "head" = JOB_HEAD_OF_PERSONNEL, - "templates" = list(), - "pdas" = list(), - ), - "[ACCESS_HOS]" = list( - "regions" = list(REGION_SECURITY), - "head" = JOB_HEAD_OF_SECURITY, - "templates" = list(), - "pdas" = list(), - ), - "[ACCESS_CMO]" = list( - "regions" = list(REGION_MEDBAY), - "head" = JOB_CHIEF_MEDICAL_OFFICER, - "templates" = list(), - "pdas" = list(), - ), - "[ACCESS_RD]" = list( - "regions" = list(REGION_RESEARCH), - "head" = JOB_RESEARCH_DIRECTOR, - "templates" = list(), - "pdas" = list(), - ), - "[ACCESS_CE]" = list( - "regions" = list(REGION_ENGINEERING), - "head" = JOB_CHIEF_ENGINEER, - "templates" = list(), - "pdas" = list(), - ), - "[ACCESS_QM]" = list( - "regions" = list(REGION_SUPPLY), - "head" = JOB_QUARTERMASTER, - "templates" = list(), - "pdas" = list(), - ), - ) - - var/list/station_job_trims = subtypesof(/datum/id_trim/job) - for(var/trim_path in station_job_trims) - var/datum/id_trim/job/trim = trim_singletons_by_path[trim_path] - if(!length(trim.template_access)) - continue - - station_job_templates[trim_path] = trim.assignment - for(var/access in trim.template_access) - var/list/manager = sub_department_managers_tgui["[access]"] - if(!manager) - if(access != ACCESS_CHANGE_IDS) - WARNING("Invalid template access access \[[access]\] registered with [trim_path]. Template added to global list anyway.") - continue - var/list/templates = manager["templates"] - templates[trim_path] = trim.assignment - - var/list/centcom_job_trims = typesof(/datum/id_trim/centcom) - typesof(/datum/id_trim/centcom/corpse) - for(var/trim_path in centcom_job_trims) - var/datum/id_trim/trim = trim_singletons_by_path[trim_path] - centcom_job_templates[trim_path] = trim.assignment - - var/list/all_pda_paths = typesof(/obj/item/modular_computer/pda) - var/list/pda_regions = PDA_PAINTING_REGIONS - for(var/pda_path in all_pda_paths) - if(!(pda_path in pda_regions)) - continue - - var/list/region_whitelist = pda_regions[pda_path] - for(var/access_txt in sub_department_managers_tgui) - var/list/manager_info = sub_department_managers_tgui[access_txt] - var/list/manager_regions = manager_info["regions"] - for(var/whitelisted_region in region_whitelist) - if(!(whitelisted_region in manager_regions)) - continue - var/list/manager_pdas = manager_info["pdas"] - var/obj/item/modular_computer/pda/fake_pda = pda_path - manager_pdas[pda_path] = initial(fake_pda.name) - station_pda_templates[pda_path] = initial(fake_pda.name) - -/// Set up dictionary to convert wildcard names to flags. -/datum/controller/subsystem/id_access/proc/setup_wildcard_dict() - wildcard_flags_by_wildcard[WILDCARD_NAME_ALL] = WILDCARD_FLAG_ALL - wildcard_flags_by_wildcard[WILDCARD_NAME_COMMON] = WILDCARD_FLAG_COMMON - wildcard_flags_by_wildcard[WILDCARD_NAME_COMMAND] = WILDCARD_FLAG_COMMAND - wildcard_flags_by_wildcard[WILDCARD_NAME_PRV_COMMAND] = WILDCARD_FLAG_PRV_COMMAND - wildcard_flags_by_wildcard[WILDCARD_NAME_CAPTAIN] = WILDCARD_FLAG_CAPTAIN - wildcard_flags_by_wildcard[WILDCARD_NAME_CENTCOM] = WILDCARD_FLAG_CENTCOM - wildcard_flags_by_wildcard[WILDCARD_NAME_SYNDICATE] = WILDCARD_FLAG_SYNDICATE - wildcard_flags_by_wildcard[WILDCARD_NAME_AWAY] = WILDCARD_FLAG_AWAY - wildcard_flags_by_wildcard[WILDCARD_NAME_SPECIAL] = WILDCARD_FLAG_SPECIAL - wildcard_flags_by_wildcard[WILDCARD_NAME_FORCED] = WILDCARD_FLAG_FORCED - -/// Setup dictionary that converts access levels to text descriptions. -/datum/controller/subsystem/id_access/proc/setup_access_descriptions() - desc_by_access["[ACCESS_CARGO]"] = "Cargo Bay" - desc_by_access["[ACCESS_SECURITY]"] = "Security" - desc_by_access["[ACCESS_BRIG]"] = "Holding Cells" - desc_by_access["[ACCESS_COURT]"] = "Courtroom" - desc_by_access["[ACCESS_DETECTIVE]"] = "Detective Office" - desc_by_access["[ACCESS_MEDICAL]"] = "Medical" - desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab" - desc_by_access["[ACCESS_MORGUE]"] = "Morgue" - desc_by_access["[ACCESS_MORGUE_SECURE]"] = "Coroner" - desc_by_access["[ACCESS_SCIENCE]"] = "R&D Lab" - desc_by_access["[ACCESS_ORDNANCE]"] = "Ordnance Lab" - desc_by_access["[ACCESS_ORDNANCE_STORAGE]"] = "Ordnance Storage" - desc_by_access["[ACCESS_PLUMBING]"] = "Chemistry Lab" - desc_by_access["[ACCESS_RD]"] = "RD Office" - desc_by_access["[ACCESS_BAR]"] = "Bar" - desc_by_access["[ACCESS_JANITOR]"] = "Custodial Closet" - desc_by_access["[ACCESS_ENGINEERING]"] = "Engineering" - desc_by_access["[ACCESS_ENGINE_EQUIP]"] = "Power and Engineering Equipment" - desc_by_access["[ACCESS_MAINT_TUNNELS]"] = "Maintenance" - desc_by_access["[ACCESS_EXTERNAL_AIRLOCKS]"] = "External Airlocks" - desc_by_access["[ACCESS_CHANGE_IDS]"] = "ID Console" - desc_by_access["[ACCESS_AI_UPLOAD]"] = "AI Chambers" - desc_by_access["[ACCESS_TELEPORTER]"] = "Teleporter" - desc_by_access["[ACCESS_EVA]"] = "EVA" - desc_by_access["[ACCESS_COMMAND]"] = "Command" - desc_by_access["[ACCESS_CAPTAIN]"] = "Captain" - desc_by_access["[ACCESS_ALL_PERSONAL_LOCKERS]"] = "Personal Lockers" - desc_by_access["[ACCESS_CHAPEL_OFFICE]"] = "Chapel Office" - desc_by_access["[ACCESS_TECH_STORAGE]"] = "Technical Storage" - desc_by_access["[ACCESS_ATMOSPHERICS]"] = "Atmospherics" - desc_by_access["[ACCESS_CREMATORIUM]"] = "Crematorium" - desc_by_access["[ACCESS_ARMORY]"] = "Armory" - desc_by_access["[ACCESS_CONSTRUCTION]"] = "Construction" - desc_by_access["[ACCESS_KITCHEN]"] = "Kitchen" - desc_by_access["[ACCESS_HYDROPONICS]"] = "Hydroponics" - desc_by_access["[ACCESS_LIBRARY]"] = "Library" - desc_by_access["[ACCESS_LAWYER]"] = "Law Office" - desc_by_access["[ACCESS_ROBOTICS]"] = "Robotics" - desc_by_access["[ACCESS_VIROLOGY]"] = "Virology" - desc_by_access["[ACCESS_PSYCHOLOGY]"] = "Psychology" - desc_by_access["[ACCESS_CMO]"] = "CMO Office" - desc_by_access["[ACCESS_QM]"] = "Quartermaster" - desc_by_access["[ACCESS_SURGERY]"] = "Surgery" - desc_by_access["[ACCESS_THEATRE]"] = "Theatre" - desc_by_access["[ACCESS_RESEARCH]"] = "Science" - desc_by_access["[ACCESS_MINING]"] = "Mining Dock" - desc_by_access["[ACCESS_SHIPPING]"] = "Cargo Shipping" - desc_by_access["[ACCESS_VAULT]"] = "Main Vault" - desc_by_access["[ACCESS_MINING_STATION]"] = "Mining Outpost" - desc_by_access["[ACCESS_XENOBIOLOGY]"] = "Xenobiology Lab" - desc_by_access["[ACCESS_HOP]"] = "HoP Office" - desc_by_access["[ACCESS_HOS]"] = "HoS Office" - desc_by_access["[ACCESS_CE]"] = "CE Office" - desc_by_access["[ACCESS_PHARMACY]"] = "Pharmacy" - desc_by_access["[ACCESS_RC_ANNOUNCE]"] = "RC Announcements" - desc_by_access["[ACCESS_KEYCARD_AUTH]"] = "Keycode Auth." - desc_by_access["[ACCESS_TCOMMS]"] = "Telecommunications" - desc_by_access["[ACCESS_GATEWAY]"] = "Gateway" - desc_by_access["[ACCESS_BRIG_ENTRANCE]"] = "Brig" - desc_by_access["[ACCESS_MINERAL_STOREROOM]"] = "Mineral Storage" - desc_by_access["[ACCESS_MINISAT]"] = "AI Satellite" - desc_by_access["[ACCESS_WEAPONS]"] = "Weapon Permit" - desc_by_access["[ACCESS_NETWORK]"] = "Network Access" - desc_by_access["[ACCESS_MECH_MINING]"] = "Mining Mech Access" - desc_by_access["[ACCESS_MECH_MEDICAL]"] = "Medical Mech Access" - desc_by_access["[ACCESS_MECH_SECURITY]"] = "Security Mech Access" - desc_by_access["[ACCESS_MECH_SCIENCE]"] = "Science Mech Access" - desc_by_access["[ACCESS_MECH_ENGINE]"] = "Engineering Mech Access" - desc_by_access["[ACCESS_AUX_BASE]"] = "Auxiliary Base" - desc_by_access["[ACCESS_SERVICE]"] = "Service Hallway" - desc_by_access["[ACCESS_CENT_GENERAL]"] = "Code Grey" - desc_by_access["[ACCESS_CENT_THUNDER]"] = "Code Yellow" - desc_by_access["[ACCESS_CENT_STORAGE]"] = "Code Orange" - desc_by_access["[ACCESS_CENT_LIVING]"] = "Code Green" - desc_by_access["[ACCESS_CENT_MEDICAL]"] = "Code White" - desc_by_access["[ACCESS_CENT_TELEPORTER]"] = "Code Blue" - desc_by_access["[ACCESS_CENT_SPECOPS]"] = "Code Black" - desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold" - desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch" - desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den" - -/** - * Returns the access bitflags associated with any given access level. - * - * In proc form due to accesses being stored in the list as text instead of numbers. - * Arguments: - * * access - Access as either pure number or as a string representation of the number. - */ -/datum/controller/subsystem/id_access/proc/get_access_flag(access) - var/flag = flags_by_access["[access]"] - return flag - -/** - * Returns the access description associated with any given access level. - * - * In proc form due to accesses being stored in the list as text instead of numbers. - * Arguments: - * * access - Access as either pure number or as a string representation of the number. - */ -/datum/controller/subsystem/id_access/proc/get_access_desc(access) - return desc_by_access["[access]"] - -/** - * Builds and returns a list of accesses from a list of regions. - * - * Arguments: - * * regions - A list of region defines. - */ -/datum/controller/subsystem/id_access/proc/get_region_access_list(list/regions) - if(!length(regions)) - return - - var/list/built_region_list = list() - - for(var/region in regions) - built_region_list |= accesses_by_region[region] - - return built_region_list - -/** - * Returns the list of all accesses associated with any given access flag. - * - * In proc form due to accesses being stored in the list as text instead of numbers. - * Arguments: - * * flag - The flag to get access for as either a pure number of string representation of the flag. - */ -/datum/controller/subsystem/id_access/proc/get_flag_access_list(flag) - return accesses_by_flag["[flag]"] - -/** - * Applies a trim singleton to a card. - * - * Returns FALSE if the trim could not be applied due to being incompatible with the card. - * Incompatibility is defined as a card not being able to hold all the trim's required wildcards. - * Returns TRUE otherwise. - * Arguments: - * * id_card - ID card to apply the trim_path to. - * * trim_path - A trim path to apply to the card. Grabs the trim's associated singleton and applies it. - * * copy_access - Boolean value. If true, the trim's access is also copied to the card. - */ -/datum/controller/subsystem/id_access/proc/apply_trim_to_card(obj/item/card/id/id_card, trim_path, copy_access = TRUE) - var/datum/id_trim/trim = trim_singletons_by_path[trim_path] - - if(!id_card.can_add_wildcards(trim.wildcard_access)) - return FALSE - - id_card.clear_access() - id_card.trim = trim - - if(copy_access) - id_card.access = trim.access.Copy() - id_card.add_wildcards(trim.wildcard_access) - - - if(trim.assignment) - id_card.assignment = trim.assignment - - id_card.update_label() - id_card.update_icon() - - return TRUE - -/** - * Removes a trim from an ID card. Also removes all accesses from it too. - * - * Arguments: - * * id_card - The ID card to remove the trim from. - */ -/datum/controller/subsystem/id_access/proc/remove_trim_from_card(obj/item/card/id/id_card) - id_card.trim = null - id_card.clear_access() - id_card.update_label() - id_card.update_icon() - -/** - * Applies a trim to a chameleon card. This is purely visual, utilising the card's override vars. - * - * Arguments: - * * id_card - The chameleon card to apply the trim visuals to. -* * trim_path - A trim path to apply to the card. Grabs the trim's associated singleton and applies it. - * * check_forged - Boolean value. If TRUE, will not overwrite the card's assignment if the card has been forged. - */ -/datum/controller/subsystem/id_access/proc/apply_trim_to_chameleon_card(obj/item/card/id/advanced/chameleon/id_card, trim_path, check_forged = TRUE) - var/datum/id_trim/trim = trim_singletons_by_path[trim_path] - id_card.trim_icon_override = trim.trim_icon - id_card.trim_state_override = trim.trim_state - id_card.trim_assignment_override = trim.assignment - id_card.sechud_icon_state_override = trim.sechud_icon_state - id_card.department_color_override = trim.department_color - id_card.department_state_override = trim.department_state - id_card.subdepartment_color_override = trim.subdepartment_color - - if(!check_forged || !id_card.forged) - id_card.assignment = trim.assignment - - // We'll let the chameleon action update the card's label as necessary instead of doing it here. - -/** - * Removes a trim from a chameleon ID card. - * - * Arguments: - * * id_card - The ID card to remove the trim from. - */ -/datum/controller/subsystem/id_access/proc/remove_trim_from_chameleon_card(obj/item/card/id/advanced/chameleon/id_card) - id_card.trim_icon_override = null - id_card.trim_state_override = null - id_card.trim_assignment_override = null - id_card.sechud_icon_state_override = null - id_card.department_color_override = null - id_card.department_state_override = null - id_card.subdepartment_color_override = null - -/** - * Adds the accesses associated with a trim to an ID card. - * - * Clears the card's existing access levels first. - * Primarily intended for applying trim templates to cards. Will attempt to add as many ordinary access - * levels as it can, without consuming any wildcards. Will then attempt to apply the trim-specific wildcards after. - * - * Arguments: - * * id_card - The ID card to remove the trim from. - */ -/datum/controller/subsystem/id_access/proc/add_trim_access_to_card(obj/item/card/id/id_card, trim_path) - var/datum/id_trim/trim = trim_singletons_by_path[trim_path] - - id_card.clear_access() - - id_card.add_access(trim.access, mode = TRY_ADD_ALL_NO_WILDCARD) - id_card.add_wildcards(trim.wildcard_access, mode = TRY_ADD_ALL) - if(istype(trim, /datum/id_trim/job)) - var/datum/id_trim/job/job_trim = trim // Here is where we update a player's paycheck department for the purposes of discounts/paychecks. - id_card.registered_account.account_job.paycheck_department = job_trim.job.paycheck_department - -/** - * Tallies up all accesses the card has that have flags greater than or equal to the access_flag supplied. - * - * Returns the number of accesses that have flags matching access_flag or a higher tier access. - * Arguments: - * * id_card - The ID card to tally up access for. - * * access_flag - The minimum access flag required for an access to be tallied up. - */ -/datum/controller/subsystem/id_access/proc/tally_access(obj/item/card/id/id_card, access_flag = NONE) - var/tally = 0 - - var/list/id_card_access = id_card.access - for(var/access in id_card_access) - if(flags_by_access["[access]"] >= access_flag) - tally++ - - return tally From ff3fe6331ab8ee9b150e02f58ebe1690794f6ddc Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 03:49:48 +0200 Subject: [PATCH 07/48] ballin --- code/__DEFINES/access.dm | 16 +-- code/modules/jobs/access.dm | 258 +++++++++++++++++------------------- 2 files changed, 131 insertions(+), 143 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 0ecae8a783ef..492b5f71f89b 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -29,14 +29,12 @@ #define ACCESS_KEYCARD_AUTH "keycard_auth" /// Access used to run the NTNet Tablet Application WireCarp, which allows you to diagnose and view NTNet logging. #define ACCESS_NETWORK "network" -/// Access used to override "personal control" on a personal locker, meaning you are able to open any of those lockers/wardrobes. -#define ACCESS_ALL_PERSONAL_LOCKERS "all_personal_lockers" +/// Access used to override "personal control" on all personal lockers, meaning you are able to open any of those lockers/wardrobes. +#define ACCESS_PERSONAL_LOCKERS "personal_lockers" /// Access used for Access-Changing Programs, this one will unlock all options that can be ever given via that program. #define ACCESS_CHANGE_IDS "change_ids" /// Access used for the Captain's personal quarters in mapping, as well as what allows one to order emergency shuttles. #define ACCESS_CAPTAIN "captain" -/// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. -#define ACCESS_HOP "hop" //--- SECURITY ---// @@ -98,7 +96,7 @@ /// Access to the chemistry lab, or the smaller room in medical with the multiple chem dispensers and pill pressers. The Chemist's main position. #define ACCESS_CHEMISTRY "chemistry" /// Access to the cloning lab, usually adjacent to the genetics lab. Given to Medical Doctors so they can't also enter Genetics. -#define ACCESS_CLONING +#define ACCESS_CLONING "cloning" /// Access to the Virology portion of the medical department, as well as the virology crate. #define ACCESS_VIROLOGY "virology" /// Access to the Psychologist's office. @@ -171,6 +169,8 @@ #define ACCESS_LAWYER "lawyer" /// Access to the Gift Shop's back doors. #define ACCESS_CLERK "clerk" +/// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. +#define ACCESS_HOP "hop" @@ -194,11 +194,11 @@ //--- MECH ---// // Mech Access, allows maintanenace of internal components and altering keycard requirements. -#define ACCESS_MECH_MINING "mech_mining" -#define ACCESS_MECH_MEDICAL "mech_medical" #define ACCESS_MECH_SECURITY "mech_security" -#define ACCESS_MECH_SCIENCE "mech_science" #define ACCESS_MECH_ENGINE "mech_engine" +#define ACCESS_MECH_MEDICAL "mech_medical" +#define ACCESS_MECH_MINING "mech_mining" +#define ACCESS_MECH_SCIENCE "mech_science" #define ACCESS_MECH_RUINS "mech_ruins" diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 235b2ecfb3f8..b3d4f1cc1812 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -218,164 +218,152 @@ /// Gets teh description for an access /proc/get_access_desc(A) switch(A) - if(ACCESS_CARGO) - return "Cargo Bay" + if(ACCESS_COMMAND) + return "Command General" + if(ACCESS_AI_UPLOAD) + return "AI Upload" + if(ACCESS_AI_SAT) + return "AI Satellite" + if(ACCESS_TELEPORTER) + return "Teleporter" + if(ACCESS_EVA) + return "EVA" + if(ACCESS_VAULT) + return "Vault" + if(ACCESS_RC_ANNOUNCE) + return "RC Announcements" + if(ACCESS_KEYCARD_AUTH) + return "Keycode Auth." + if(ACCESS_NETWORK) + return "Network Access" + if(ACCESS_PERSONAL_LOCKERS) + return "Personal Lockers" + if(ACCESS_CHANGE_IDS) + return "ID Console" + if(ACCESS_CAPTAIN) + return "Captain's Quarters" + if(ACCESS_HOP) + return "HoP Office" if(ACCESS_SECURITY) - return "Security" + return "Security General" + if(ACCESS_SEC_BASIC) + return "Security Basic" if(ACCESS_BRIG) - return "Holding Cells" - if(ACCESS_COURT) - return "Courtroom" - if(ACCESS_FORENSICS_LOCKERS) - return "Forensics" + return "Brig" + if(ACCESS_ARMORY) + return "Armory" + if(ACCESS_DETECTIVE) + return "Detective's Office" + if(ACCESS_BRIG_PHYS) // Yog + return "Brig Infirmary" + if(ACCESS_WEAPONS_PERMIT) + return "Weapons Permit" + if(ACCESS_HOS) + return "HoS Office" + if(ACCESS_ENGINEERING) + return "Engineering General" + if(ACCESS_ATMOSPHERICS) + return "Atmospherics" + if(ACCESS_MAINT_TUNNELS) + return "Maintenance Tunnels" + if(ACCESS_EXTERNAL_AIRLOCKS) + return "External Airlocks" + if(ACCESS_ENGINE_EQUIP) + return "Power & Engineering Equipment" + if(ACCESS_CONSTRUCTION) + return "Construction" + if(ACCESS_TECH_STORAGE) + return "Tech Storage" + if(ACCESS_SECURE_TECH) + return "Secure Tech Storage" + if(ACCESS_TCOMMS) + return "Telecommunications" + if(ACCESS_AUX_BASE) + return "Aux. Base Construction" + if(ACCESS_CE) + return "CE Office" if(ACCESS_MEDICAL) - return "Medical" - if(ACCESS_GENETICS) - return "Genetics Lab" + return "Medbay General" + if(ACCESS_SURGERY) + return "Surgery" + if(ACCESS_PARAMEDIC) // Yog + return "Paramedic Staging" if(ACCESS_MORGUE) return "Morgue" - if(ACCESS_RND) - return "R&D Lab and Console" - if(ACCESS_TOX) - return "Toxins Lab" - if(ACCESS_TOX_STORAGE) - return "Toxins Lab Storage" if(ACCESS_CHEMISTRY) return "Chemistry Lab" + if(ACCESS_CLONING) + return "Cloning Lab" + if(ACCESS_VIROLOGY) + return "Virology Lab" + if(ACCESS_PSYCHOLOGY) + return "Psychiatrist's Office" + if(ACCESS_CMO) + return "CMO Office" + if(ACCESS_CARGO) + return "Cargo General" + if(ACCESS_CARGO_BAY) + return "Cargo Bay" + if(ACCESS_MINING) + return "Mining" + if(ACCESS_MINING_STATION) + return "Mining Station" + if(ACCESS_MATERIALS) + return "Materials Auth." + if(ACCESS_QM) + return "QM Office" + if(ACCESS_SCIENCE) + return "Science General" + if(ACCESS_RESEARCH) + return "Research Console" + if(ACCESS_TOXINS) + return "Toxins Lab" + if(ACCESS_TOXINS_STORAGE) + return "Toxins Storage" + if(ACCESS_EXPERIMENTATION) + return "Experimentation Lab" + if(ACCESS_GENETICS) + return "Genetics Lab" + if(ACCESS_ROBOTICS) + return "Robotics Lab" + if(ACCESS_XENOBIOLOGY) + return "Xenobiology Lab" + if(ACCESS_RND_SERVERS) + return "R&D Server Room" if(ACCESS_RD) return "RD Office" - if(ACCESS_BAR) - return "Bar" - if(ACCESS_JANITOR) - return "Custodial Closet" - if(ACCESS_ENGINE) - return "Engineering" - if(ACCESS_ENGINE_EQUIP) - return "Power and Engineering Equipment" - if(ACCESS_MAINT_TUNNELS) - return "Maintenance" - if(ACCESS_EXTERNAL_AIRLOCKS) - return "External Airlocks" - if(ACCESS_CHANGE_IDS) - return "ID Console" - if(ACCESS_AI_UPLOAD) - return "AI Chambers" - if(ACCESS_TELEPORTER) - return "Teleporter" - if(ACCESS_EVA) - return "EVA" - if(ACCESS_HEADS) - return "Bridge" - if(ACCESS_CAPTAIN) - return "Captain" - if(ACCESS_ALL_PERSONAL_LOCKERS) - return "Personal Lockers" + if(ACCESS_SERVICE) + return "Service General" + if(ACCESS_THEATRE) + return "Theatre Backstage" if(ACCESS_CHAPEL_OFFICE) return "Chapel Office" - if(ACCESS_TECH_STORAGE) - return "Technical Storage" - if(ACCESS_SECURE_TECH_STORAGE) - return "Secure Tech Storage" - if(ACCESS_ATMOSPHERICS) - return "Atmospherics" if(ACCESS_CREMATORIUM) return "Crematorium" - if(ACCESS_ARMORY) - return "Armory" - if(ACCESS_CONSTRUCTION) - return "Construction" + if(ACCESS_LIBRARY) + return "Library" + if(ACCESS_BAR) + return "Bar" if(ACCESS_KITCHEN) return "Kitchen" if(ACCESS_HYDROPONICS) return "Hydroponics" - if(ACCESS_LIBRARY) - return "Library" + if(ACCESS_JANITOR) + return "Janitor's Closet" if(ACCESS_LAWYER) return "Law Office" - if(ACCESS_ROBO_CONTROL) - return "Robotics Control" - if(ACCESS_ROBOTICS) - return "Robotics" - if(ACCESS_VIROLOGY) - return "Virology" - if(ACCESS_CMO) - return "CMO Office" - if(ACCESS_QM) - return "Quartermaster" - if(ACCESS_SURGERY) - return "Surgery" - if(ACCESS_THEATRE) - return "Theatre" - if(ACCESS_RESEARCH) - return "Science" - if(ACCESS_MINING) - return "Mining" - if(ACCESS_MAILSORTING) - return "Cargo Office" - if(ACCESS_VAULT) - return "Main Vault" - if(ACCESS_MINING_STATION) - return "Mining EVA" - if(ACCESS_XENOBIOLOGY) - return "Xenobiology Lab" - if(ACCESS_HOP) - return "HoP Office" - if(ACCESS_HOS) - return "HoS Office" - if(ACCESS_CE) - return "CE Office" - if(ACCESS_RC_ANNOUNCE) - return "RC Announcements" - if(ACCESS_KEYCARD_AUTH) - return "Keycode Auth." - if(ACCESS_TCOMSAT) - return "Telecommunications" - if(ACCESS_GATEWAY) - return "Gateway" - if(ACCESS_SEC_DOORS) - return "Brig" - if(ACCESS_MINERAL_STOREROOM) - return "Mineral Storage" - if(ACCESS_MINISAT) - return "AI Satellite" - if(ACCESS_WEAPONS) - return "Weapon Permit" - if(ACCESS_NETWORK) - return "Network Access" - if(ACCESS_CLONING) - return "Cloning Room" - if(ACCESS_MECH_MINING) - return "Mining Mech Access" + if(ACCESS_CLERK) + return "Gift Shop" + if(ACCESS_MECH_SECURITY) + return "Security Mech Access" + if(ACCESS_MECH_ENGINE) + return "Engineering Mech Access" if(ACCESS_MECH_MEDICAL) return "Medical Mech Access" - if(ACCESS_MECH_SECURITY) - return "Security Mech Access" + if(ACCESS_MECH_MINING) + return "Mining Mech Access" if(ACCESS_MECH_SCIENCE) return "Science Mech Access" - if(ACCESS_MECH_ENGINE) - return "Engineering Mech Access" - // yogs start - Yog jobs - if(ACCESS_PARAMEDIC) - return "Paramedic" - if(ACCESS_TCOM_ADMIN) - return "Tcomms Admin" - if(ACCESS_PSYCH) - return "Psychiatrist's Office" - if(ACCESS_MANUFACTURING) - return "Clerk" - if(ACCESS_BRIG_PHYS) - return "Brig Physician" - if(ACCESS_MECH_FREEMINER) - return "Freeminer Mech" - if(ACCESS_FREEMINER) - return "Freeminer" - if(ACCESS_FREEMINER_ENGINEER) - return "Freeminer Engineer" - if(ACCESS_FREEMINER_CAPTAIN) - return "Freeminer Captain" - if(ACCESS_SERVHALL) - return "Service Hall" - // yogs end /// Get descriptions for centcom accesses /proc/get_centcom_access_desc(A) From f697a5c2ec323ddf0834e8cdb072a52dff4054d7 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 03:55:06 +0200 Subject: [PATCH 08/48] ballin --- code/modules/jobs/access.dm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index b3d4f1cc1812..955fadf4706a 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -192,8 +192,22 @@ return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MECH_ENGINE, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_CE, ACCESS_TCOM_ADMIN, ACCESS_RC_ANNOUNCE) // yogs - Yog jobs if(6) //supply return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_VAULT) - if(7) //command - return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_SECURE_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_VAULT) + if(7) // Command + return list(ACCESS_COMMAND, + ACCESS_AI_UPLOAD, + ACCESS_AI_SAT, + ACCESS_TELEPORTER, + ACCESS_EVA, + ACCESS_VAULT, + ACCESS_SECURE_TECH, + ACCESS_RND_SERVERS, + ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH, + ACCESS_NETWORK, + ACCESS_PERSONAL_LOCKERS, + ACCESS_CHANGE_IDS, + ACCESS_CAPTAIN) + /// Gets the name from region ID /proc/get_region_accesses_name(code) @@ -242,8 +256,6 @@ return "ID Console" if(ACCESS_CAPTAIN) return "Captain's Quarters" - if(ACCESS_HOP) - return "HoP Office" if(ACCESS_SECURITY) return "Security General" if(ACCESS_SEC_BASIC) @@ -354,6 +366,8 @@ return "Law Office" if(ACCESS_CLERK) return "Gift Shop" + if(ACCESS_HOP) + return "HoP Office" if(ACCESS_MECH_SECURITY) return "Security Mech Access" if(ACCESS_MECH_ENGINE) From c053884746060df736686e6a3ddbc6bd28167950 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 04:50:12 +0200 Subject: [PATCH 09/48] ballin --- code/__DEFINES/access.dm | 6 +- code/modules/jobs/access.dm | 113 +++++++++++++++++++++++++----------- 2 files changed, 82 insertions(+), 37 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 492b5f71f89b..7f9f320a0bea 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -27,8 +27,6 @@ #define ACCESS_RC_ANNOUNCE "rc_announce" /// Access used for events (Red Alert, BSA, Emergency Maintenance) which require at least two people to swipe at the same time to authorize it #define ACCESS_KEYCARD_AUTH "keycard_auth" -/// Access used to run the NTNet Tablet Application WireCarp, which allows you to diagnose and view NTNet logging. -#define ACCESS_NETWORK "network" /// Access used to override "personal control" on all personal lockers, meaning you are able to open any of those lockers/wardrobes. #define ACCESS_PERSONAL_LOCKERS "personal_lockers" /// Access used for Access-Changing Programs, this one will unlock all options that can be ever given via that program. @@ -77,6 +75,8 @@ #define ACCESS_SECURE_TECH "secure_tech" /// Access to the Telecomms Server Room, traffic control console, machinery, and tablets. #define ACCESS_TCOMMS "tcomms" +/// Access needed to view message logs recorded on the message monitor console in Telecomms. +#define ACCESS_TCOMMS_ADMIN "tcomms_admin" /// Access to the Auxiliary Base Room, as well as the ability over launching it. #define ACCESS_AUX_BASE "aux_base" /// Access for the Chief Engineer's office, Secure Tech Storage, as well as some other CE-related things. @@ -137,6 +137,8 @@ #define ACCESS_GENETICS "genetics" /// Access to the Robotics division of Science, as well as opening up silicon cyborgs and other simple robots. #define ACCESS_ROBOTICS "robotics" +/// Access to the Robotics division of Science, as well as opening up silicon cyborgs and other simple robots. +#define ACCESS_ROBO_CONTROL "robo_control" /// Access to the Xenobiology division of Science. #define ACCESS_XENOBIOLOGY "xenobiology" /// Access to the research Server Room, containing the important R&D research servers and AI networking machines. diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 955fadf4706a..50b5401fd476 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -180,18 +180,80 @@ switch(code) if(0) return get_all_accesses() - if(1) //station general - return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MANUFACTURING, ACCESS_SERVHALL) - if(2) //security - return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) - if(3) //medbay - return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PARAMEDIC, ACCESS_BRIG_PHYS, ACCESS_PSYCH) // yogs - Yog jobs - if(4) //research - return list(ACCESS_RESEARCH, ACCESS_RND, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK, ACCESS_AI_UPLOAD) - if(5) //engineering and maintenance - return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MECH_ENGINE, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_CE, ACCESS_TCOM_ADMIN, ACCESS_RC_ANNOUNCE) // yogs - Yog jobs - if(6) //supply - return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_VAULT) + if(1) // Service + return list(ACCESS_SERVICE, + ACCESS_THEATRE, + ACCESS_CHAPEL_OFFICE, + ACCESS_CREMATORIUM, + ACCESS_LIBRARY, + ACCESS_BAR, + ACCESS_KITCHEN, + ACCESS_HYDROPONICS, + ACCESS_JANITOR, + ACCESS_LAWYER + ACCESS_CLERK, + ACCESS_HOP) + if(2) // Security + return list(ACCESS_SECURITY, + ACCESS_SEC_BASIC, + ACCESS_BRIG, + ACCESS_ARMORY, + ACCESS_DETECTIVE, + ACCESS_BRIG_PHYS, + ACCESS_WEAPONS_PERMIT, + ACCESS_LAWYER, + ACCESS_MECH_SECURITY, + ACCESS_HOS) + if(3) // Medical + return list(ACCESS_MEDICAL, + ACCESS_SURGERY, + ACCESS_PARAMEDIC, + ACCESS_MORGUE, + ACCESS_CHEMISTRY, + ACCESS_VIROLOGY, + ACCESS_PSYCHOLOGY, + ACCESS_GENETICS, + ACCESS_BRIG_PHYS, + ACCESS_MECH_MEDICAL, + ACCESS_CMO) + if(4) // Science + return list(ACCESS_SCIENCE, + ACCESS_RESEARCH, + ACCESS_TOXINS, + ACCESS_TOXINS_STORAGE, + ACCESS_EXPERIMENTATION, + ACCESS_GENETICS, + ACCESS_ROBOTICS, + ACCESS_ROBO_CONTROL, + ACCESS_XENOBIOLOGY, + ACCESS_RND_SERVERS, + ACCESS_AI_UPLOAD, + ACCESS_AI_SAT, + ACCESS_MECH_SCIENCE, + ACCESS_RD) + if(5) // Engineering + return list(ACCESS_ENGINEERING, + ACCESS_ATMOSPHERICS, + ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, + ACCESS_ENGINE_EQUIP, + ACCESS_CONSTRUCTION, + ACCESS_TECH_STORAGE, + ACCESS_SECURE_TECH, + ACCESS_TCOMMS, + ACCESS_TCOMMS_ADMIN, + ACCESS_AUX_BASE, + ACCESS_MECH_ENGINE, + ACCESS_CE) + if(6) // Supply + return list(ACCESS_CARGO, + ACCESS_CARGO_BAY, + ACCESS_MINING, + ACCESS_MINING_STATION, + ACCESS_MATERIALS, + ACCESS_VAULT, + ACCESS_MECH_MINING, + ACCESS_QM) if(7) // Command return list(ACCESS_COMMAND, ACCESS_AI_UPLOAD, @@ -208,27 +270,6 @@ ACCESS_CHANGE_IDS, ACCESS_CAPTAIN) - -/// Gets the name from region ID -/proc/get_region_accesses_name(code) - switch(code) - if(0) - return "All" - if(1) //station general - return "General" - if(2) //security - return "Security" - if(3) //medbay - return "Medbay" - if(4) //research - return "Research" - if(5) //engineering and maintenance - return "Engineering" - if(6) //supply - return "Supply" - if(7) //command - return "Command" - /// Gets teh description for an access /proc/get_access_desc(A) switch(A) @@ -248,8 +289,6 @@ return "RC Announcements" if(ACCESS_KEYCARD_AUTH) return "Keycode Auth." - if(ACCESS_NETWORK) - return "Network Access" if(ACCESS_PERSONAL_LOCKERS) return "Personal Lockers" if(ACCESS_CHANGE_IDS) @@ -290,6 +329,8 @@ return "Secure Tech Storage" if(ACCESS_TCOMMS) return "Telecommunications" + if(ACCESS_TCOMS_ADMIN) + return "Telecommunication Logs Auth." if(ACCESS_AUX_BASE) return "Aux. Base Construction" if(ACCESS_CE) @@ -338,6 +379,8 @@ return "Genetics Lab" if(ACCESS_ROBOTICS) return "Robotics Lab" + if(ACCESS_ROBO_CONTROL) + return "Robotics and Bot Control" if(ACCESS_XENOBIOLOGY) return "Xenobiology Lab" if(ACCESS_RND_SERVERS) From 60affeb0c83774d15409fbb117edb4465727425f Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 04:54:22 +0200 Subject: [PATCH 10/48] ballin --- code/modules/mapping/access_helpers.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index aaf89234fd85..9869536a90d7 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -61,11 +61,6 @@ access_list += ACCESS_VAULT return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/hop/get_access() - var/list/access_list = ..() - access_list += ACCESS_HOP - return access_list - /obj/effect/mapping_helpers/airlock/access/any/command/captain/get_access() var/list/access_list = ..() access_list += ACCESS_CAPTAIN @@ -370,6 +365,11 @@ access_list += ACCESS_LAWYER return access_list +/obj/effect/mapping_helpers/airlock/access/any/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + /// REQ ALL /// // Applies onto req_access_txt (requires ALL of the given accesses to open) @@ -409,11 +409,6 @@ access_list += ACCESS_VAULT return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/hop/get_access() - var/list/access_list = ..() - access_list += ACCESS_HOP - return access_list - /obj/effect/mapping_helpers/airlock/access/all/command/captain/get_access() var/list/access_list = ..() access_list += ACCESS_CAPTAIN @@ -719,6 +714,11 @@ access_list += ACCESS_LAWYER return access_list +/obj/effect/mapping_helpers/airlock/access/all/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + //--- RUINS ---// // Only giving req all to non-station helpers to cut down on bloat, feel free to add req any in the future if needed From ed6ca7f9bd74836ff4cbe86d7e88787600e4e2cd Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 06:20:42 +0200 Subject: [PATCH 11/48] ballin I'm so sorry for this guys --- code/__DEFINES/access.dm | 5 ++-- code/game/machinery/ai_slipper.dm | 2 +- code/game/machinery/buttons.dm | 2 +- code/game/machinery/computer/aifixer.dm | 2 +- code/game/machinery/computer/card.dm | 2 +- .../game/machinery/computer/communications.dm | 6 ++-- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/cryopod.dm | 2 +- code/game/machinery/defibrillator_mount.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 2 +- code/game/machinery/doors/ministile.dm | 2 +- code/game/machinery/doors/turnstile.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/navbeacon.dm | 2 +- .../machinery/porta_turret/portable_turret.dm | 2 +- code/game/machinery/shieldgen.dm | 2 +- .../telecomms/computers/logbrowser.dm | 2 +- code/game/mecha/mech_fabricator.dm | 4 +-- code/game/mecha/working/ripley.dm | 2 +- code/game/objects/items/cards_ids.dm | 20 ++++++------- .../objects/items/robot/robot_upgrades.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 8 +++--- code/game/objects/structures/noticeboard.dm | 2 +- code/modules/admin/secrets.dm | 2 +- .../atmospherics/machinery/airalarm.dm | 6 ++-- .../machinery/portable/canister.dm | 2 +- code/modules/cargo/packs.dm | 28 +++++++++---------- code/modules/jobs/access.dm | 16 +++++------ code/modules/jobs/job_types/artist.dm | 2 +- .../jobs/job_types/atmospheric_technician.dm | 2 +- code/modules/jobs/job_types/bartender.dm | 2 +- code/modules/jobs/job_types/botanist.dm | 2 +- .../jobs/job_types/cargo_technician.dm | 2 +- code/modules/jobs/job_types/centcom.dm | 2 +- code/modules/jobs/job_types/chaplain.dm | 2 +- code/modules/jobs/job_types/chemist.dm | 2 +- code/modules/jobs/job_types/chief_engineer.dm | 6 ++-- .../jobs/job_types/chief_medical_officer.dm | 4 +-- code/modules/jobs/job_types/clown.dm | 2 +- code/modules/jobs/job_types/cook.dm | 2 +- code/modules/jobs/job_types/curator.dm | 2 +- code/modules/jobs/job_types/detective.dm | 2 +- code/modules/jobs/job_types/geneticist.dm | 4 +-- .../jobs/job_types/head_of_personnel.dm | 10 +++---- .../jobs/job_types/head_of_security.dm | 8 +++--- code/modules/jobs/job_types/janitor.dm | 2 +- code/modules/jobs/job_types/lawyer.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/mime.dm | 2 +- code/modules/jobs/job_types/quartermaster.dm | 2 +- .../jobs/job_types/research_director.dm | 10 +++---- code/modules/jobs/job_types/roboticist.dm | 4 +-- code/modules/jobs/job_types/scientist.dm | 2 +- .../jobs/job_types/security_officer.dm | 14 +++++----- code/modules/jobs/job_types/shaft_miner.dm | 4 +-- .../jobs/job_types/station_engineer.dm | 14 +++++----- code/modules/jobs/job_types/synthetic.dm | 14 +++++----- code/modules/jobs/job_types/virologist.dm | 2 +- code/modules/jobs/job_types/warden.dm | 4 +-- code/modules/mapping/access_helpers.dm | 2 +- code/modules/mining/aux_base.dm | 2 +- code/modules/mining/machine_redemption.dm | 2 +- code/modules/mining/machine_vending.dm | 4 +-- code/modules/mob/living/carbon/human/human.dm | 4 +-- .../mob/living/simple_animal/corpse.dm | 2 +- .../modular_computers/documentation.md | 2 +- .../ai_network/_ai_network_program.dm | 2 +- .../programs/antagonist/bomberman.dm | 2 +- .../programs/command/budgetviewer.dm | 2 +- .../file_system/programs/command/card.dm | 2 +- .../programs/command/jobmanagement.dm | 2 +- .../programs/command/synth_requester.dm | 14 +++++----- .../programs/engineering/ntmonitor.dm | 2 +- .../programs/engineering/powermonitor.dm | 2 +- .../programs/engineering/reactor_monitor.dm | 2 +- .../programs/engineering/sm_monitor.dm | 2 +- .../file_system/programs/ntnrc_client.dm | 4 +-- .../programs/science/airestorer.dm | 2 +- .../programs/supply/budgetordering.dm | 2 +- code/modules/paperwork/faxmachine.dm | 2 +- code/modules/power/apc.dm | 2 +- .../modules/research/nanites/nanite_remote.dm | 2 +- code/modules/research/rdconsole.dm | 2 +- .../ruins/spaceruin_code/hilbertshotel.dm | 4 +-- code/modules/shuttle/emergency.dm | 2 +- code/modules/vending/security_armaments.dm | 4 +-- yogstation/code/datums/ruins/free_miners.dm | 8 +++--- .../code/game/objects/items/cards_ids.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 6 ++-- .../modules/jobs/job_types/brig_physician.dm | 2 +- .../code/modules/jobs/job_types/clerk.dm | 2 +- .../modules/jobs/job_types/mining_medic.dm | 4 +-- .../modules/jobs/job_types/network_admin.dm | 4 +-- .../modules/jobs/job_types/psychiatrist.dm | 2 +- yogstation/code/modules/vending/gift.dm | 2 +- 98 files changed, 191 insertions(+), 190 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 7f9f320a0bea..fa7b5af55bca 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -125,7 +125,7 @@ /// General access for Science, allows for entry to the general hallways of Science, as well as the main lathe room. #define ACCESS_SCIENCE "science" -/// Access to the specialized research experimentation rooms within Science. +/// Access needed to research tech nodes at R&D consoles. May also be needed to access some scientific equipment. #define ACCESS_RESEARCH "research" /// Access to the Toxins Mixing Lab and Toxins Test Area equipment. #define ACCESS_TOXINS "toxins" @@ -181,12 +181,13 @@ #define ACCESS_RUINS_GENERAL "ruins_general" #define ACCESS_RUINS_COMMAND "ruins_command" -#define ACCESS_RUINS_SEC "ruins_sec" +#define ACCESS_RUINS_SECURITY "ruins_security" #define ACCESS_RUINS_ENGINEERING "ruins_engineering" #define ACCESS_RUINS_MEDICAL "ruins_medical" #define ACCESS_RUINS_SUPPLY "ruins_supply" #define ACCESS_RUINS_SCIENCE "ruins_science" #define ACCESS_RUINS_MAINTENANCE "ruins_maintenance" +#define ACCESS_RUINS_MATERIALS "ruins_materials" #define ACCESS_RUINS_GENERIC1 "ruins_generic1" #define ACCESS_RUINS_GENERIC2 "ruins_generic2" #define ACCESS_RUINS_GENERIC3 "ruins_generic3" diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index dfd10fbb7fb0..62ac20d95d38 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -11,7 +11,7 @@ var/uses = 20 var/cooldown = 0 var/cooldown_time = 100 - req_access = list(ACCESS_AI_UPLOAD) + req_access = list(ACCESS_AI_SAT) /obj/machinery/ai_slipper/examine(mob/user) . = ..() diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index cf671b652e6d..83e0b197e38a 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -251,7 +251,7 @@ /obj/machinery/button/door/incinerator_vent_toxmix name = "combustion chamber vent control" id = INCINERATOR_TOXMIX_VENT - req_access = list(ACCESS_TOX) + req_access = list(ACCESS_TOXINS) /obj/machinery/button/door/incinerator_vent_atmos_main name = "turbine vent control" diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 1fb7888d3264..bd36396c5be6 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/aifixer name = "\improper AI system integrity restorer" desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order." - req_access = list(ACCESS_CAPTAIN, ACCESS_ROBO_CONTROL, ACCESS_HEADS) + req_access = list(ACCESS_CAPTAIN, ACCESS_ROBO_CONTROL, ACCESS_COMMAND) circuit = /obj/item/circuitboard/computer/aifixer icon_keyboard = "tech_key" icon_screen = "ai-fixer" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 483c1a64e708..cdf8c0e17c73 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -14,7 +14,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) desc = "You can use this to manage jobs and ID access." icon_screen = "id" icon_keyboard = "id_key" - req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS) + req_one_access = list(ACCESS_COMMAND, ACCESS_CHANGE_IDS) circuit = /obj/item/circuitboard/computer/card var/obj/item/card/id/modify = null var/mode = 0 diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 6bf547992542..f53bbc8af519 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -12,7 +12,7 @@ desc = "A console used for high-priority announcements and emergencies." icon_screen = "comm" icon_keyboard = "tech_key" - req_access = list(ACCESS_HEADS) + req_access = list(ACCESS_COMMAND) circuit = /obj/item/circuitboard/computer/communications light_color = LIGHT_COLOR_BLUE @@ -72,7 +72,7 @@ /obj/machinery/computer/communications/proc/authenticated_as_non_silicon_head(mob/user) if(issilicon(user)) return FALSE - return ACCESS_HEADS in authorize_access + return ACCESS_COMMAND in authorize_access /// Are we a silicon, OR logged in? /obj/machinery/computer/communications/proc/authenticated(mob/user) @@ -154,7 +154,7 @@ to_chat(usr, span_warning("You need to swipe your ID!")) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return - if (!(ACCESS_HEADS in id_card.access)) + if (!(ACCESS_COMMAND in id_card.access)) to_chat(usr, span_warning("You are not authorized to do this!")) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 6445ec5627f3..3ea09ec25ee3 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -5,7 +5,7 @@ desc = "This can be used to check medical records." icon_screen = "medcomp" icon_keyboard = "med_key" - req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_MEDICAL, ACCESS_DETECTIVE) circuit = /obj/item/circuitboard/computer/med_data var/obj/item/card/id/scan = null var/rank = null diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 89a6cb203103..8c650a44566a 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -7,7 +7,7 @@ desc = "Used to view and edit personnel's security records." icon_screen = "security" icon_keyboard = "security_key" - req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_SECURITY, ACCESS_DETECTIVE) circuit = /obj/item/circuitboard/computer/secure_data var/screen = MAIN_SCREEN diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index ec4850157003..f813a0e5a397 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) icon_state = "cellconsole_1" density = FALSE interaction_flags_machine = INTERACT_MACHINE_OFFLINE - req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. + req_one_access = list(ACCESS_COMMAND, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. var/mode = null //Used for logging people entering cryosleep and important items they are carrying. diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 079a930be5f2..6b45ca93237b 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -10,7 +10,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 1 power_channel = AREA_USAGE_EQUIP - req_one_access = list(ACCESS_MEDICAL, ACCESS_HEADS, ACCESS_SECURITY) //used to control clamps + req_one_access = list(ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_SECURITY) //used to control clamps var/obj/item/defibrillator/defib //this mount's defibrillator var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index eaa6c55bb6b3..6ad06eeccf2f 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -110,7 +110,7 @@ autoclose = FALSE frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE - req_access = list(ACCESS_TOX) + req_access = list(ACCESS_TOXINS) /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior name = "Mixing Room Interior Airlock" diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 80aff50254f2..718910547ff0 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -16,7 +16,7 @@ /obj/machinery/ministile/hop name = "HOP line turnstile" - req_one_access = list(ACCESS_HEADS) + req_one_access = list(ACCESS_COMMAND) /obj/machinery/ministile/Initialize(mapload) . = ..() diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index 8908e968d730..4e8ccb755614 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -17,7 +17,7 @@ /obj/machinery/turnstile/brig name = "Brig turnstile" //Seccies and brig phys may always pass, either way. - req_one_access = list(ACCESS_SEC_DOORS) + req_one_access = list(ACCESS_SEC_BASIC) max_integrity = 400 /// Made of damn good steel damage_deflection = 21 /// Same as airlocks! diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 67b9b531dbef..5e8b06172bd5 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -392,7 +392,7 @@ /obj/machinery/door/window/brigdoor/security/holding name = "holding cell door" - req_one_access = list(ACCESS_SEC_DOORS, ACCESS_LAWYER) //love for the lawyer + req_one_access = list(ACCESS_SEC_BASIC, ACCESS_LAWYER) //love for the lawyer /obj/machinery/door/window/clockwork name = "brass windoor" diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index fc797c63c39b..f39d22fc2792 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -18,7 +18,7 @@ var/list/codes // assoc. list of transponder codes var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" - req_one_access = list(ACCESS_ENGINE, ACCESS_ROBO_CONTROL) + req_one_access = list(ACCESS_ENGINEERING, ACCESS_ROBO_CONTROL) /obj/machinery/navbeacon/Initialize(mapload) . = ..() diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index fb03a4eb3e7d..d4fcb58b545d 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -17,7 +17,7 @@ use_power = IDLE_POWER_USE //this turret uses and requires power idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power - req_access = list(ACCESS_SEC_DOORS) + req_access = list(ACCESS_SEC_BASIC) power_channel = AREA_USAGE_EQUIP //drains power from the EQUIPMENT channel var/scan_range = 7 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 1c04a95992a0..1b40f28b1b84 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -76,7 +76,7 @@ opacity = FALSE anchored = FALSE pressure_resistance = 2*ONE_ATMOSPHERE - req_access = list(ACCESS_ENGINE) + req_access = list(ACCESS_ENGINEERING) max_integrity = 100 var/active = FALSE var/list/deployed_shields diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 8a13d9716913..3fc95dac5a2c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -14,7 +14,7 @@ var/universal_translate = FALSE // set to TRUE if it can translate nonhuman speech - req_access = list(ACCESS_TCOMSAT) + req_access = list(ACCESS_TCOMMS) circuit = /obj/item/circuitboard/computer/comm_server tgui_id = "LogBrowser" diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d0b15b6428eb..75d11b4379e9 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -129,7 +129,7 @@ do_sparks(1, FALSE, src) authorization_override = TRUE //just in case it wasn't already for some reason. keycard reader is busted. return - if(ACCESS_HEADS in C.access) + if(ACCESS_COMMAND in C.access) if(!authorization_override) authorization_override = TRUE to_chat(user, span_warning("You override the safety protocols on the [src], removing access restrictions from this terminal.")) @@ -625,7 +625,7 @@ if(issilicon(user)) return TRUE id_card = user.get_idcard(hand_first = TRUE) - return ACCESS_HEADS in id_card?.access + return ACCESS_COMMAND in id_card?.access /obj/machinery/mecha_part_fabricator/ui_act(action, list/params) . = ..() diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 188555453b57..95301637cda3 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -10,7 +10,7 @@ armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 0, BOMB = 40, BIO = 0, RAD = 20, FIRE = 100, ACID = 100) max_equip = 6 wreckage = /obj/structure/mecha_wreckage/ripley - internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING, ACCESS_MECH_FREEMINER) + internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING, ACCESS_MECH_RUINS) var/list/cargo = new var/cargo_capacity = 15 var/hides = 0 diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index cc0346f3d7e1..cb2a4da9a64f 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -608,7 +608,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/syndicate name = "agent card" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_MATERIALS) var/anyone = FALSE //Can anyone forge the ID or just syndicate? var/forged = FALSE //have we set a custom name and job assignment, or will we use what we're given when we chameleon change? @@ -804,7 +804,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/captains_spare/temporary/Initialize(mapload) . = ..() access -= ACCESS_CHANGE_IDS - access -= ACCESS_HEADS + access -= ACCESS_COMMAND addtimer(CALLBACK(src, PROC_REF(wipe_id)), 50 SECONDS) /obj/item/card/id/captains_spare/temporary/proc/wipe_id() @@ -921,7 +921,7 @@ update_label("John Doe", "Clowny") originalassignment = "Occupying Officer" /obj/item/card/id/ert/occupying/Initialize(mapload) - access = list(ACCESS_SECURITY,ACCESS_BRIG,ACCESS_WEAPONS,ACCESS_SEC_DOORS,ACCESS_MAINT_TUNNELS)+get_ert_access("sec") + access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT ,ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS)+get_ert_access("sec") . = ..() /obj/item/card/id/ert/Initialize(mapload) @@ -1029,22 +1029,22 @@ update_label("John Doe", "Clowny") /obj/item/card/id/mining name = "mining ID" - access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_CARGO, ACCESS_MATERIALS) /obj/item/card/id/away name = "a perfectly generic identification card" desc = "A perfectly generic identification card. Looks like it could use some flavor." - access = list(ACCESS_AWAY_GENERAL) + access = list(ACCESS_RUINS_GENERAL) registered_age = null /obj/item/card/id/away/hotel name = "Staff ID" desc = "A staff ID used to access the hotel's doors." - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_MAINTENANCE) /obj/item/card/id/away/hotel/securty name = "Officer ID" - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_SEC) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_MAINTENANCE, ACCESS_RUINS_SECURITY) /obj/item/card/id/away/old name = "a perfectly generic identification card" @@ -1056,21 +1056,21 @@ update_label("John Doe", "Clowny") desc = "A faded Charlie Station ID card. You can make out the rank \"Security Officer\"." assignment = "Charlie Station Security Officer" originalassignment = "Security Officer" - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_SEC) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_SECURITY) /obj/item/card/id/away/old/sci name = "Charlie Station Scientist's ID card" desc = "A faded Charlie Station ID card. You can make out the rank \"Scientist\"." assignment = "Charlie Station Scientist" originalassignment = "Scientist" - access = list(ACCESS_AWAY_GENERAL) + access = list(ACCESS_RUINS_GENERAL) /obj/item/card/id/away/old/eng name = "Charlie Station Engineer's ID card" desc = "A faded Charlie Station ID card. You can make out the rank \"Station Engineer\"." assignment = "Charlie Station Engineer" originalassignment = "Engineer" - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINE) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_ENGINEERING) /obj/item/card/id/away/old/apc name = "APC Access ID" diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 0145954ef3a7..3391a2e15743 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -149,7 +149,7 @@ /// Changes the access requirements to a cyborg's cover to need freeminer engineer access. /obj/item/borg/upgrade/panel_access_remover/freeminer/action(mob/living/silicon/robot/R, user = usr) - R.req_access = list(ACCESS_FREEMINER_ENGINEER) + R.req_access = list(ACCESS_RUINS_ENGINEERING) new /obj/item/borg/upgrade/panel_access_remover/freeminer(R.drop_location()) // Makes this upgrade "re-usable" by creating a new one while using all the functionality of `one_use`. return TRUE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1da5d6788361..031c717e2957 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -149,7 +149,7 @@ /obj/structure/closet/secure_closet/psych name = "psychiatrist's cabinet" desc = "Packed with a psychiatrist's tools of the trade" - req_access = list(ACCESS_PSYCH) + req_access = list(ACCESS_PSYCHOLOGY) icon_state = "cabinet" /obj/structure/closet/secure_closet/psych/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index e2fc4320778c..19c2a818d043 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -1,7 +1,7 @@ /obj/structure/closet/secure_closet/personal desc = "It's a secure locker for personnel. The first card swiped gains control." name = "personal closet" - req_access = list(ACCESS_ALL_PERSONAL_LOCKERS) + req_access = list(ACCESS_PERSONAL_LOCKERS) var/registered_name = null /obj/structure/closet/secure_closet/personal/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index e69c3f2f8911..2ca728fbc28d 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -158,7 +158,7 @@ /obj/structure/closet/secure_closet/detective name = "\improper detective's cabinet" - req_access = list(ACCESS_FORENSICS_LOCKERS) + req_access = list(ACCESS_DETECTIVE) icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 @@ -198,7 +198,7 @@ anchored = TRUE name = "Secure Evidence Closet" req_access_txt = "0" - req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS) + req_one_access_txt = list(ACCESS_ARMORY, ACCESS_DETECTIVE) /obj/structure/closet/secure_closet/brig/PopulateContents() ..() @@ -211,7 +211,7 @@ /obj/structure/closet/secure_closet/courtroom name = "courtroom locker" - req_access = list(ACCESS_COURT) + req_access = list(ACCESS_SEC_BASIC) /obj/structure/closet/secure_closet/courtroom/PopulateContents() ..() @@ -231,7 +231,7 @@ /obj/structure/closet/secure_closet/contraband/heads anchored = TRUE name = "Contraband Locker" - req_access = list(ACCESS_HEADS) + req_access = list(ACCESS_COMMAND) /obj/structure/closet/secure_closet/armory1 name = "armory armor locker" diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index bc3050dfb0d6..29952732a6b5 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -129,4 +129,4 @@ /obj/structure/noticeboard/staff name = "Staff Notice Board" desc = "Important notices from the heads of staff." - req_access = list(ACCESS_HEADS) + req_access = list(ACCESS_COMMAND) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index a7c12f562874..94c2b1fd8274 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -523,7 +523,7 @@ M.check_access() if (ACCESS_MAINT_TUNNELS in M.req_access) M.req_access = list() - M.req_one_access = list(ACCESS_BRIG,ACCESS_ENGINE) + M.req_one_access = list(ACCESS_BRIG,ACCESS_ENGINEERING) message_admins("[key_name_admin(mob_user)] made all maint doors engineering and brig access-only.") if("infinite_sec") if(!check_rights_for(rights, R_DEBUG)) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 4502ee44bf61..fc2b55cf00d7 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -182,13 +182,13 @@ name = "engine air alarm" locked = FALSE req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINEERING) /obj/machinery/airalarm/mixingchamber name = "chamber air alarm" locked = FALSE req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOX, ACCESS_TOX_STORAGE) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE) /obj/machinery/airalarm/all_access name = "all-access air alarm" @@ -201,7 +201,7 @@ req_access = list(ACCESS_SYNDICATE) /obj/machinery/airalarm/away //general away mission access - req_access = list(ACCESS_AWAY_GENERAL) + req_access = list(ACCESS_RUINS_GENERAL) /obj/machinery/airalarm/directional/north //Pixel offsets get overwritten on New() dir = SOUTH diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 8c47f56b93ec..7ea0c3396c75 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -534,7 +534,7 @@ if("restricted") restricted = !restricted if(restricted) - req_access = list(ACCESS_ENGINE) + req_access = list(ACCESS_ENGINEERING) else req_access = list() . = TRUE diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8e1c8ede005e..cd5874369db8 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -716,7 +716,7 @@ name = "Incendiary Weapons Crate" desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Armory access to open." cost = 1500 - access = ACCESS_HEADS + access = ACCESS_COMMAND contains = list(/obj/item/gun/flamethrower/full, /obj/item/tank/internals/plasma, /obj/item/tank/internals/plasma, @@ -918,7 +918,7 @@ name = "Engineering Gear Crate" desc = "Gear up with three toolbelts, high-visibility vests, welding goggles, hardhats, and two pairs of meson goggles!" cost = 1300 - access_view = ACCESS_ENGINE + access_view = ACCESS_ENGINEERING contains = list(/obj/item/storage/belt/utility, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, @@ -969,7 +969,7 @@ name = "P.A.C.M.A.N Generator Crate" desc = "Engineers can't set up the engine? Not an issue for you, once you get your hands on this P.A.C.M.A.N. Generator! Takes in plasma and spits out sweet sweet energy." cost = 2500 - access_view = ACCESS_ENGINE + access_view = ACCESS_ENGINEERING contains = list(/obj/machinery/power/port_gen/pacman) crate_name = "PACMAN generator crate" crate_type = /obj/structure/closet/crate/engineering/electrical @@ -1031,7 +1031,7 @@ desc = "The pride of Nanotrasen Naval Command. The legendary Bluespace Artillery Cannon is a devastating feat of human engineering and testament to wartime determination. Highly advanced research is required for proper construction. " cost = 15000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list(/obj/item/circuitboard/machine/bsa/front, /obj/item/circuitboard/machine/bsa/middle, /obj/item/circuitboard/machine/bsa/back, @@ -1044,7 +1044,7 @@ desc = "Secure the longevity of the current state of humanity within this massive library of scientific knowledge, capable of granting superhuman powers and abilities. Highly advanced research is required for proper construction. Also contains five DNA probes." cost = 12000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list( /obj/item/circuitboard/machine/dna_vault, /obj/item/dna_probe, @@ -1060,7 +1060,7 @@ desc = "Contains five DNA probes for use in the DNA vault." cost = 3000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list(/obj/item/dna_probe, /obj/item/dna_probe, /obj/item/dna_probe, @@ -1075,7 +1075,7 @@ desc = "Protect the very existence of this station with these Anti-Meteor defenses. Contains three Shield Generator Satellites." cost = 3000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list( /obj/machinery/satellite/meteor_shield, /obj/machinery/satellite/meteor_shield, @@ -1089,7 +1089,7 @@ desc = "A control system for the Shield Generator Satellite system." cost = 5000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list(/obj/item/circuitboard/computer/sat_control) crate_name= "shield control board crate" @@ -1100,7 +1100,7 @@ /datum/supply_pack/engine group = "Engine Construction" - access_view = ACCESS_ENGINE + access_view = ACCESS_ENGINEERING crate_type = /obj/structure/closet/crate/engineering /datum/supply_pack/engine/emitter @@ -1279,7 +1279,7 @@ name = "50 Empty License Plates" desc = "'Put those prisoners to work' - Jedi Yoda probably" cost = 1000 // 50 * 25 - 1000 = 250 credits profit - access_view = ACCESS_SEC_DOORS + access_view = ACCESS_SEC_BASIC contains = list(/obj/item/stack/license_plates/empty/fifty) crate_name = "empty license plate crate" @@ -1336,7 +1336,7 @@ name = "BZ Canister Crate" desc = "Contains a canister of BZ. Requires Toxins access to open." cost = 8000 - access = ACCESS_TOX_STORAGE + access = ACCESS_TOXINS_STORAGE access_view = ACCESS_ATMOSPHERICS contains = list(/obj/machinery/portable_atmospherics/canister/bz) crate_name = "BZ canister crate" @@ -1731,15 +1731,15 @@ /datum/supply_pack/science group = "Science" - access_view = ACCESS_RESEARCH + access_view = ACCESS_SCIENCE crate_type = /obj/structure/closet/crate/science /datum/supply_pack/science/plasma name = "Plasma Assembly Crate" desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open." cost = 1000 - access = ACCESS_TOX_STORAGE - access_view = ACCESS_TOX_STORAGE + access = ACCESS_TOXINS_STORAGE + access_view = ACCESS_TOXINS_STORAGE contains = list(/obj/item/tank/internals/plasma, /obj/item/tank/internals/plasma, /obj/item/tank/internals/plasma, diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 50b5401fd476..928af1c64abf 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -136,18 +136,18 @@ /// Gets all station access /proc/get_all_accesses() - return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, + return list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_SEC_BASIC, ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, - ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, + ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD + ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, + ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, - ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, + ACCESS_THEATRE, ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH, ACCESS_SERVHALL) //YOGS - yogs jobs + ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) //YOGS - yogs jobs /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -265,7 +265,7 @@ ACCESS_RND_SERVERS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, - ACCESS_NETWORK, + ACCESS_TCOMMS_ADMIN, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_CAPTAIN) diff --git a/code/modules/jobs/job_types/artist.dm b/code/modules/jobs/job_types/artist.dm index 72640a4efd7a..a641b47c8d3e 100644 --- a/code/modules/jobs/job_types/artist.dm +++ b/code/modules/jobs/job_types/artist.dm @@ -11,7 +11,7 @@ outfit = /datum/outfit/job/artist alt_titles = list("Painter", "Composer", "Artisan") added_access = list() - base_access = list(ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE) paycheck = PAYCHECK_ASSISTANT paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 292d92e020e1..d200cb630096 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/atmos added_access = list(ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE) - base_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_MINERAL_STOREROOM, ACCESS_ENGINE, ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_MATERIALS, ACCESS_ENGINEERING, ACCESS_EXTERNAL_AIRLOCKS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 84cfa3dd6686..334408626d54 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/bartender added_access = list(ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_MORGUE) - base_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS, ACCESS_SERVHALL) + base_access = list(ACCESS_BAR, ACCESS_MATERIALS, ACCESS_WEAPONS_PERMIT, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BARTENDER diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 48a0552745e0..d0a88c027fe3 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -13,7 +13,7 @@ alt_titles = list("Ecologist", "Agriculturist", "Botany Greenhorn", "Hydroponicist", "Gardener") added_access = list(ACCESS_BAR, ACCESS_KITCHEN) - base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) + base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MATERIALS, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BOTANIST diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 5179809e55af..ec32ae7b6f7a 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -15,7 +15,7 @@ alt_titles = list("Deliveryperson", "Mail Service", "Exports Handler", "Cargo Trainee", "Crate Pusher", "Courier") added_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION) - base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_CARGO, ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_MATERIALS) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/centcom.dm b/code/modules/jobs/job_types/centcom.dm index 3a8907261a69..04dad777aeb1 100644 --- a/code/modules/jobs/job_types/centcom.dm +++ b/code/modules/jobs/job_types/centcom.dm @@ -37,7 +37,7 @@ W.icon = 'icons/obj/card.dmi' //Bypasses modularisation. W.icon_state = "centcom" W.access = get_centcom_access("CentCom Official") - W.access += ACCESS_WEAPONS + W.access += ACCESS_WEAPONS_PERMIT W.assignment = "CentCom Official" W.originalassignment = "CentCom Official" W.registered_name = H.real_name diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index ca69cc105367..b4b3d364cfde 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -14,7 +14,7 @@ alt_titles = list("Priest", "Preacher", "Cleric", "Exorcist", "Vicar") added_access = list() - base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE, ACCESS_SERVHALL) + base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index f15b5a5dd66a..7378c2759679 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -17,7 +17,7 @@ outfit = /datum/outfit/job/chemist added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 1d974c89c824..bb2efd8733a1 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -20,10 +20,10 @@ outfit = /datum/outfit/job/ce added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_MAINT_TUNNELS, + base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_TCOM_ADMIN, - ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_MINISAT, ACCESS_MECH_ENGINE, - ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM) + ACCESS_COMMAND, ACCESS_CONSTRUCTION, ACCESS_SEC_BASIC, ACCESS_AI_SAT, ACCESS_MECH_ENGINE, + ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_MATERIALS) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_ENG diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 70ecfd847e23..49f7d99294ba 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -20,9 +20,9 @@ outfit = /datum/outfit/job/cmo added_access = list(ACCESS_CAPTAIN) //Yogs: Gives CMO access to the brig physicians locker - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_COMMAND, ACCESS_MATERIALS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL, - ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS, ACCESS_PARAMEDIC, ACCESS_PSYCH) //Yogs: Gives CMO access to the brig physicians locker + ACCESS_KEYCARD_AUTH, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS, ACCESS_PARAMEDIC, ACCESS_PSYCHOLOGY) //Yogs: Gives CMO access to the brig physicians locker paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 912acbdfc686..c9d9e7f0a6f3 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -13,7 +13,7 @@ alt_titles = list("Entertainer", "Comedian", "Jester", "Improv Artist") added_access = list() - base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) + base_access = list(ACCESS_THEATRE, ACCESS_SERVICE) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index b1f7c3440cdf..bce9ee2c44e7 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -14,7 +14,7 @@ alt_titles = list("Chef", "Hash Slinger", "Sous-chef", "Culinary Artist", "Culinarian") added_access = list(ACCESS_HYDROPONICS, ACCESS_BAR) - base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) + base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MATERIALS, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index c3bfe90965cc..06efecc8b9bd 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -14,7 +14,7 @@ alt_titles = list("Librarian", "Journalist", "Archivist", "Cartographer", "Space Archaeologist") added_access = list() - base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION, ACCESS_SERVHALL) + base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_BLOODSUCKER_HUNTER) diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 89def9e56e1b..4563bc4e0021 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -18,7 +18,7 @@ alt_titles = list("Forensic Analyst", "Private Eye") added_access = list() - base_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_SEC_BASIC, ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 48c91a4329b4..5f7e0b9826cb 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -13,8 +13,8 @@ outfit = /datum/outfit/job/geneticist - added_access = list(ACCESS_CHEMISTRY, ACCESS_XENOBIOLOGY, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_RND) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_CHEMISTRY, ACCESS_XENOBIOLOGY, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_RESEARCH) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_SCIENCE, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 9d429aee2402..b49d21dd84f9 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -20,13 +20,13 @@ outfit = /datum/outfit/job/hop added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_WEAPONS_PERMIT, + ACCESS_MEDICAL, ACCESS_ENGINEERING, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_COMMAND, + ACCESS_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MANUFACTURING, ACCESS_SERVHALL) //yogs - added ACCESS_MANUFACTURING as it's the clerk's + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS, ACCESS_CLERK, ACCESS_SERVICE) //yogs - added ACCESS_CLERK as it's the clerk's paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index f3e3820d7a46..b0243567be6e 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -21,10 +21,10 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, - ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband - ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, - ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, + ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband + ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_ENGINEERING, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_CARGO, + ACCESS_COMMAND, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_MATERIALS, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 1f1230523a4b..80d92046d9b2 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -13,7 +13,7 @@ alt_titles = list("Custodian", "Sanitation Worker", "Cleaner", "Caretaker", "Maid") added_access = list() - base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_SERVHALL) + base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MATERIALS, ACCESS_CARGO, ACCESS_SCIENCE, ACCESS_MEDICAL, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index c02350bfb5ee..a890bedbdbab 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/lawyer added_access = list() - base_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_SERVHALL) + base_access = list(ACCESS_LAWYER, ACCESS_SEC_BASIC, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index e2a782ececef..68ab4270ed98 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -15,7 +15,7 @@ outfit = /datum/outfit/job/doctor added_access = list(ACCESS_CHEMISTRY, ACCESS_GENETICS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 8819aed7e85d..144a3a734eef 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -13,7 +13,7 @@ alt_titles = list("Mute Entertainer", "Silent Jokester", "Pantomimist") added_access = list() - base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) + base_access = list(ACCESS_THEATRE, ACCESS_SERVICE) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index ca92acfb1dea..01696e3e1315 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -11,7 +11,7 @@ outfit = /datum/outfit/job/quartermaster alt_titles = list("Stock Controller", "Cargo Coordinator", "Shipping Overseer", "Postmaster General") added_access = list() - base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_RC_ANNOUNCE) + base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MATERIALS, ACCESS_VAULT, ACCESS_RC_ANNOUNCE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_QUARTERMASTER diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 4504449a16e7..535a890e20ae 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -22,11 +22,11 @@ outfit = /datum/outfit/job/rd added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, - ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, - ACCESS_RESEARCH, ACCESS_RND, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, - ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK) + base_access = list(ACCESS_RD, ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_GENETICS, ACCESS_MORGUE, + ACCESS_TOXINS_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_BASIC, ACCESS_MECH_SCIENCE, + ACCESS_RESEARCH, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS, + ACCESS_TECH_STORAGE, ACCESS_AI_SAT, ACCESS_MAINT_TUNNELS) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 24a090244dc9..49a3d3be04d9 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -13,8 +13,8 @@ outfit = /datum/outfit/job/roboticist - added_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RND) - base_access = list(ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RND) + base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index cdb4bce39e17..42898daee6a8 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -13,7 +13,7 @@ outfit = /datum/outfit/job/scientist added_access = list(ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_GENETICS) - base_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index eb7df690e7c3..e0f78feef418 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -17,8 +17,8 @@ alt_titles = list("Threat Response Officer", "Civilian Protection Officer", "Corporate Officer", "Peacekeeper") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_FORENSICS_LOCKERS) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM) // See /datum/job/officer/get_access() + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE) + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_MATERIALS) // See /datum/job/officer/get_access() paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) @@ -70,35 +70,35 @@ GLOBAL_LIST_INIT(available_depts_sec, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICA switch(department) if(SEC_DEPT_SUPPLY) ears = /obj/item/radio/headset/headset_sec/alt/department/supply - dep_access = list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO) + dep_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION) destination = /area/security/checkpoint/supply spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/cargo minimal_lightup_areas |= GLOB.supply_lightup_areas if(SEC_DEPT_ENGINEERING) ears = /obj/item/radio/headset/headset_sec/alt/department/engi - dep_access = list(ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_ATMOSPHERICS) + dep_access = list(ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_TCOMMS) destination = /area/security/checkpoint/engineering spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/engine minimal_lightup_areas |= GLOB.engineering_lightup_areas if(SEC_DEPT_MEDICAL) ears = /obj/item/radio/headset/headset_sec/alt/department/med - dep_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING) + dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY ACCESS_PSYCHOLOGY, ACCESS_GENETICS) destination = /area/security/checkpoint/medical spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/medblue minimal_lightup_areas |= GLOB.medical_lightup_areas if(SEC_DEPT_SCIENCE) ears = /obj/item/radio/headset/headset_sec/alt/department/sci - dep_access = list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY) + dep_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY) destination = /area/security/checkpoint/science spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/science minimal_lightup_areas |= GLOB.science_lightup_areas if(SEC_DEPT_SERVICE) ears = /obj/item/radio/headset/headset_sec/alt/department/service - dep_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_MANUFACTURING ) + dep_access = list(ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLERK) destination = /area/security/checkpoint/service spawn_point = locate(/obj/effect/landmark/start/depsec/service) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/service diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 63ba452eadea..a9121a343938 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -12,8 +12,8 @@ outfit = /datum/outfit/job/miner - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_QM, ACCESS_RESEARCH, ACCESS_RND) - base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_QM, ACCESS_SCIENCE, ACCESS_RESEARCH) + base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_CARGO, ACCESS_MATERIALS) paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 7cea11c4e731..526e4d597967 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -14,9 +14,9 @@ outfit = /datum/outfit/job/engineer - added_access = list(ACCESS_ATMOSPHERICS, ACCESS_RESEARCH, ACCESS_RND) - base_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_ATMOSPHERICS, ACCESS_SCIENCE, ACCESS_RESEARCH) + base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG @@ -61,19 +61,19 @@ GLOBAL_LIST_INIT(available_depts_eng, list(ENG_DEPT_MEDICAL, ENG_DEPT_SCIENCE, E switch(department) if(ENG_DEPT_SUPPLY) ears = /obj/item/radio/headset/headset_eng/department/supply - dep_access = list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO) + dep_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION) accessory = /obj/item/clothing/accessory/armband/cargo if(ENG_DEPT_MEDICAL) ears = /obj/item/radio/headset/headset_eng/department/med - dep_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_GENETICS) + dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_GENETICS) accessory = /obj/item/clothing/accessory/armband/medblue if(ENG_DEPT_SCIENCE) ears = /obj/item/radio/headset/headset_eng/department/sci - dep_access = list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_XENOBIOLOGY, ACCESS_TOX_STORAGE) + dep_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_XENOBIOLOGY) accessory = /obj/item/clothing/accessory/armband/science if(ENG_DEPT_SERVICE) ears = /obj/item/radio/headset/headset_eng/department/service - dep_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_MANUFACTURING, ACCESS_SERVHALL) + dep_access = list(ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLERK) accessory = /obj/item/clothing/accessory/armband/service if(accessory) diff --git a/code/modules/jobs/job_types/synthetic.dm b/code/modules/jobs/job_types/synthetic.dm index c850d2c54171..8277cc6218c3 100644 --- a/code/modules/jobs/job_types/synthetic.dm +++ b/code/modules/jobs/job_types/synthetic.dm @@ -1,16 +1,16 @@ GLOBAL_LIST_INIT(synthetic_base_access, list( - ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, - ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, - ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, + ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_SCIENCE, + ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, + ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCES_PERSONAL_LOCKERS, + ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, - ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, + ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH, ACCESS_SERVHALL)) + ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_TCOMMS_ADMIN, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE)) GLOBAL_LIST_EMPTY(synthetic_added_access) diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 9a64807262db..57bbe3b5772e 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -18,7 +18,7 @@ alt_titles = list("Microbiologist", "Pathologist", "Junior Disease Researcher", "Epidemiologist", "Disease Control Expert") added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 3bf719b03290..f9b85ae1e5d5 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -19,8 +19,8 @@ alt_titles = list("Brig Watchman", "Brig Superintendent", "Security Dispatcher", "Prison Supervisor") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_FORENSICS_LOCKERS, ACCESS_BRIG_PHYS, ACCESS_MEDICAL) //they get medical access because apparently the windoors AREN'T BRIG PHYS ACCESS - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) // See /datum/job/warden/get_access() + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_MEDICAL) //they get medical access because apparently the windoors AREN'T BRIG PHYS ACCESS + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_WEAPONS_PERMIT, ACCESS_MATERIALS) // See /datum/job/warden/get_access() paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 9869536a90d7..1244b87fc62d 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -738,7 +738,7 @@ /obj/effect/mapping_helpers/airlock/access/all/ruins/security/get_access() var/list/access_list = ..() - access_list += list(ACCESS_RUINS_SEC) + access_list += list(ACCESS_RUINS_SECURITY) return access_list /obj/effect/mapping_helpers/airlock/access/all/ruins/engineering/get_access() diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index a620f93d200e..f9e662d8c108 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -19,7 +19,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also deployed." icon = 'icons/obj/terminals.dmi' icon_state = "dorm_available" - req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HEADS, ACCESS_RESEARCH) + req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_RESEARCH) /// Shuttle ID of the base var/shuttleId = "colony_drop" /// If we give warnings before base is launched diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 0d1a714d2c28..a5bc866483f3 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -9,7 +9,7 @@ density = TRUE input_dir = NORTH output_dir = SOUTH - req_access = list(ACCESS_MINERAL_STOREROOM) + req_access = list(ACCESS_MATERIALS) speed_process = TRUE circuit = /obj/item/circuitboard/machine/ore_redemption layer = BELOW_OBJ_LAYER diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 065700dbdea7..618e7070fccb 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -455,9 +455,9 @@ I.access |= ACCESS_MINING I.access |= ACCESS_MINING_STATION I.access |= ACCESS_MECH_MINING - I.access |= ACCESS_MINERAL_STOREROOM + I.access |= ACCESS_MATERIALS + I.access |= ACCESS_CARGO I.access |= ACCESS_CARGO - I.access |= ACCESS_MAILSORTING to_chat(user, "You upgrade [I] with mining access.") qdel(src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 701d58fd3b19..d9a9932d6ce8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -297,7 +297,7 @@ else //Implant and standard glasses check access if(H.wear_id) var/list/access = H.wear_id.GetAccess() - if(ACCESS_SEC_DOORS in access) + if(ACCESS_SEC_BASIC in access) allowed_access = H.get_authentification_name() if(!allowed_access) @@ -462,7 +462,7 @@ //Check for weapons if( (judgement_criteria & JUDGE_WEAPONCHECK) && weaponcheck) - if(!idcard || !(ACCESS_WEAPONS in idcard.access)) + if(!idcard || !(ACCESS_WEAPONS_PERMIT in idcard.access)) for(var/obj/item/I in held_items) //if they're holding a gun if(weaponcheck.Invoke(I)) threatcount += 4 diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index de3bfe9f2acf..55bea3d7df7d 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -187,7 +187,7 @@ /obj/effect/mob_spawn/human/corpse/cat_butcher name = "The Cat Surgeon" id_job = "Cat Surgeon" - id_access_list = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT) + id_access_list = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_MAINTENANCE) hair_style = "Cut Hair" facial_hair_style = "Watson Mustache" skin_tone = "caucasian1" diff --git a/code/modules/modular_computers/documentation.md b/code/modules/modular_computers/documentation.md index 88d059da7a6e..dca53c6e40a3 100644 --- a/code/modules/modular_computers/documentation.md +++ b/code/modules/modular_computers/documentation.md @@ -33,7 +33,7 @@ This is how the base program is setup. the rest is mostly tgui stuff. I'll use t /// This is access required to run the program itself. ONLY SET THIS FOR /// SUPER SECURE SHIT. This also acts as transfer_access as well. - required_access = access_network + required_access = access_engine_equip /// This is the access needed to download from ntnet or host on the ptp /// program. This is what you want to use most of the time. diff --git a/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm b/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm index 3da2fb2f16e8..8d38f55ed637 100644 --- a/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm +++ b/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm @@ -5,7 +5,7 @@ program_icon_state = "power_monitor" extended_desc = "This program connects to a local AI network to allow for administrative access" ui_header = "power_norm.gif" - transfer_access = ACCESS_NETWORK + transfer_access = ACCESS_ROBO_CONTROL usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET requires_ntnet = FALSE size = 8 diff --git a/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm b/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm index 61289df19d5a..1c81832ee3a9 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm @@ -85,7 +85,7 @@ GLOBAL_LIST_EMPTY(PDABombCodes) targetid = card_slot.GetID() if(targetid) // Adjust difficulty based on target's access - difficulty += BitCount(text2num(targetid.access_txt) & (ACCESS_MEDICAL | ACCESS_SECURITY | ACCESS_ENGINE | ACCESS_THEATRE | ACCESS_JANITOR | ACCESS_HEADS)) + difficulty += BitCount(text2num(targetid.access_txt) & (ACCESS_MEDICAL | ACCESS_SECURITY | ACCESS_ENGINEERING | ACCESS_THEATRE | ACCESS_JANITOR | ACCESS_COMMAND)) if(SEND_SIGNAL(target_computer, COMSIG_TABLET_CHECK_DETONATE) & COMPONENT_TABLET_NO_DETONATE || prob(difficulty * 15)) computer.visible_message(span_notice("Detonation failed. [bomb.uses] charges remaining."), null, null, 1) diff --git a/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm b/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm index e9e6706cf69f..1b5dfe5bad87 100644 --- a/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm +++ b/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm @@ -4,7 +4,7 @@ category = PROGRAM_CATEGORY_SUPPLY program_icon_state = "id" extended_desc = "This program will allow you to view the financial status of your department(s)." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_ALL requires_ntnet = 1 size = 3 diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index d791fe59a495..2ece8de0ae6f 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -12,7 +12,7 @@ category = PROGRAM_CATEGORY_EQUIPMENT program_icon_state = "id" extended_desc = "Program for programming employee ID cards to access parts of the station." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA size = 8 tgui_id = "NtosCard" diff --git a/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm index 44d1bda46bc5..ae0985223039 100644 --- a/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm @@ -4,7 +4,7 @@ category = PROGRAM_CATEGORY_EQUIPMENT program_icon_state = "id" extended_desc = "Program for viewing and changing job slot availability." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA size = 4 tgui_id = "NtosJobManager" diff --git a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm index 8fd5ac50b755..e5d6d38d4a08 100644 --- a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm +++ b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) category = PROGRAM_CATEGORY_EQUIPMENT program_icon_state = "id" extended_desc = "Program for requesting synthetic assistance and granting departmental access." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA size = 4 tgui_id = "NtosSynthManager" @@ -26,14 +26,14 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) var/obj/item/card/id/user_id = user.get_idcard() computer.play_interact_sound() if(user_id) - if(!(ACCESS_HEADS in user_id.access)) + if(!(ACCESS_COMMAND in user_id.access)) return switch(action) if("grant_science") if(ACCESS_RD in user_id.access) - var/relevant_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_ROBO_CONTROL, ACCESS_TELEPORTER, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS) + var/relevant_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_ROBO_CONTROL, ACCESS_TELEPORTER, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS) if(GLOB.granted_synthetic_access[SCIENCE]) GLOB.granted_synthetic_access[SCIENCE] = FALSE binary_talk("Synthetic assistance no longer required in the Science department", "Synthetic Access Requester") @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_supply") if(ACCESS_HOP in user_id.access) - var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_CARGO, ACCESS_MINING_STATION, ACCESS_MATERIALS) if(GLOB.granted_synthetic_access[SUPPLY]) GLOB.granted_synthetic_access[SUPPLY] = FALSE binary_talk("Synthetic assistance no longer required in the Supply department", "Synthetic Access Requester") @@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_engi") if(ACCESS_CE in user_id.access) - var/relevant_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_SECURE_TECH_STORAGE) + var/relevant_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_SECURE_TECH) if(GLOB.granted_synthetic_access[ENGINEERING]) GLOB.granted_synthetic_access[ENGINEERING] = FALSE binary_talk("Synthetic assistance no longer required in the Engineering department", "Synthetic Access Requester") @@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_security") if(ACCESS_HOS in user_id.access) - var/relevant_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_BRIG_PHYS) + var/relevant_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_LAWYER, ACCESS_SEC_BASIC, ACCESS_BRIG_PHYS) if(GLOB.granted_synthetic_access[SECURITY]) GLOB.granted_synthetic_access[SECURITY] = FALSE binary_talk("Synthetic assistance no longer required in the Security department", "Synthetic Access Requester") @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_medical") if(ACCESS_CMO in user_id.access) - var/relevant_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_PSYCH) + var/relevant_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_PSYCHOLOGY) if(GLOB.granted_synthetic_access[MEDICAL]) GLOB.granted_synthetic_access[MEDICAL] = FALSE binary_talk("Synthetic assistance no longer required in the Medical department", "Synthetic Access Requester") diff --git a/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm index b1f386031dc3..5a310a1f7282 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm @@ -7,7 +7,7 @@ size = 12 requires_ntnet = TRUE usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_TELESCREEN | PROGRAM_PDA - required_access = ACCESS_NETWORK //NETWORK CONTROL IS A MORE SECURE PROGRAM. + required_access = ACCESS_ENGINE_EQUIP //NETWORK CONTROL IS A MORE SECURE PROGRAM. available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" program_icon = "network-wired" diff --git a/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm b/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm index 9cec4ec6067b..551cbc399e0a 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm @@ -7,7 +7,7 @@ program_icon_state = "power_monitor" extended_desc = "This program connects to sensors around the station to provide information about electrical systems." ui_header = "power_norm.gif" - transfer_access = ACCESS_ENGINE + transfer_access = ACCESS_ENGINEERING usage_flags = PROGRAM_ALL requires_ntnet = 0 network_destination = "power monitoring system" diff --git a/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm index e0cc8bc198d9..d3b9eeb67756 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm @@ -7,7 +7,7 @@ program_icon_state = "smmon_0" extended_desc = "This program connects to specially calibrated sensors to provide information on the status of nuclear reactors." requires_ntnet = TRUE - transfer_access = ACCESS_ENGINE + transfer_access = ACCESS_ENGINEERING program_icon = "radiation" // duh //network_destination = "reactor monitoring system" dont need anymore? size = 2 diff --git a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm index ace9b19eff09..6d029f38803e 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm @@ -6,7 +6,7 @@ program_icon_state = "smmon_0" extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines." requires_ntnet = TRUE - transfer_access = ACCESS_ENGINE + transfer_access = ACCESS_ENGINEERING network_destination = "supermatter monitoring system" size = 5 tgui_id = "NtosSupermatterMonitor" diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index 703bd45168af..5a5531f95ade 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -106,7 +106,7 @@ channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... return TRUE var/mob/living/user = usr - if(can_run(user, TRUE, ACCESS_NETWORK)) + if(can_run(user, TRUE, ACCESS_TCOMMS_ADMIN)) for(var/C in SSmodular_computers.chat_channels) var/datum/ntnet_conversation/chan = C chan.remove_client(src) @@ -228,7 +228,7 @@ /datum/computer_file/program/chatclient/ui_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_TCOMMS_ADMIN) return data /datum/computer_file/program/chatclient/ui_data(mob/user) diff --git a/code/modules/modular_computers/file_system/programs/science/airestorer.dm b/code/modules/modular_computers/file_system/programs/science/airestorer.dm index 93e07b556016..c9f55f32f96d 100644 --- a/code/modules/modular_computers/file_system/programs/science/airestorer.dm +++ b/code/modules/modular_computers/file_system/programs/science/airestorer.dm @@ -7,7 +7,7 @@ size = 12 requires_ntnet = FALSE usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND available_on_ntnet = TRUE tgui_id = "NtosAiRestorer" program_icon = "laptop-code" diff --git a/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm b/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm index 75f5201f26a1..145115f57d34 100644 --- a/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm @@ -80,7 +80,7 @@ unlock_budget = FALSE //cargo tech is already using the same budget. if(id_card?.registered_account?.account_job?.paycheck_department && budget_order) buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department) - if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access) || (ACCESS_CARGO in id_card.access)) + if((ACCESS_COMMAND in id_card.access) || (ACCESS_QM in id_card.access) || (ACCESS_CARGO in id_card.access)) requestonly = FALSE can_approve_requests = TRUE can_send = TRUE diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 06ff4ace427d..f946b5c85909 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) icon = 'icons/obj/library.dmi' icon_state = "fax" insert_anim = "faxsend" - req_one_access = list(ACCESS_LAWYER, ACCESS_HEADS, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_QM) + req_one_access = list(ACCESS_LAWYER, ACCESS_COMMAND, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_QM) use_power = 1 idle_power_usage = 30 active_power_usage = 200 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 47ad5aaac7d4..3553882f1523 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -122,7 +122,7 @@ req_access = list(ACCESS_SYNDICATE) /obj/machinery/power/apc/away //general away mission access - req_access = list(ACCESS_AWAY_GENERAL) + req_access = list(ACCESS_RUINS_GENERAL) /obj/machinery/power/apc/highcap/five_k cell_type = /obj/item/stock_parts/cell/upgraded/plus diff --git a/code/modules/research/nanites/nanite_remote.dm b/code/modules/research/nanites/nanite_remote.dm index aedea6529693..ce782cd673cc 100644 --- a/code/modules/research/nanites/nanite_remote.dm +++ b/code/modules/research/nanites/nanite_remote.dm @@ -8,7 +8,7 @@ name = "nanite remote control" desc = "A device that can remotely control active nanites through wireless signals." w_class = WEIGHT_CLASS_SMALL - req_access = list(ACCESS_RESEARCH) + req_access = list(ACCESS_SCIENCE) icon = 'icons/obj/device.dmi' icon_state = "nanite_remote" item_flags = NOBLUDGEON diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b8a84264bd06..83ec3cd4069a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -28,7 +28,7 @@ Nothing else in the console has ID requirements. var/obj/machinery/rnd/production/protolathe/linked_lathe //Linked Protolathe var/obj/machinery/rnd/production/circuit_imprinter/linked_imprinter //Linked Circuit Imprinter - req_access = list(ACCESS_RND) //lA AND SETTING MANIPULATION REQUIRES SCIENTIST ACCESS. + req_access = list(ACCESS_RESEARCH) //lA AND SETTING MANIPULATION REQUIRES SCIENTIST ACCESS. //UI VARS var/screen = RDSCREEN_MENU diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 1840f5e0c24d..309fb968d31e 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -461,8 +461,8 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) oxy_damage = 500 mob_species = /datum/species/skeleton id_job = "Head Researcher" - id_access = ACCESS_RESEARCH - id_access_list = list(ACCESS_AWAY_GENERIC3, ACCESS_RESEARCH) + id_access = ACCESS_RUINS_SCIENCE + id_access_list = list(ACCESS_RUINS_GENERIC3, ACCESS_RUINS_SCIENCE) instant = TRUE id = /obj/item/card/id/silver uniform = /obj/item/clothing/under/rank/rnd/research_director diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index ea0583694272..2cc8cfb88596 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -70,7 +70,7 @@ to_chat(user, span_warning("You don't have an ID.")) return - if(!(ACCESS_HEADS in ID.access)) + if(!(ACCESS_COMMAND in ID.access)) to_chat(user, span_warning("The access level of your card is not high enough.")) return diff --git a/code/modules/vending/security_armaments.dm b/code/modules/vending/security_armaments.dm index c47f2bdea4ab..6889d8eb2c3d 100644 --- a/code/modules/vending/security_armaments.dm +++ b/code/modules/vending/security_armaments.dm @@ -32,7 +32,7 @@ var/can_claim = FALSE var/obj/item/card/id/C = usr?.get_idcard() // Security officers and wardens - if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS in C.access) && !(ACCESS_HOS in C.access)) + if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS_PERMIT in C.access) && !(ACCESS_HOS in C.access)) allowed = TRUE // Hasn't claimed a weapon yet if(C?.registered_account && !C.registered_account.sec_weapon_claimed) @@ -123,7 +123,7 @@ var/can_claim = FALSE var/obj/item/card/id/C = user?.get_idcard() // Security officers and wardens - if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS in C.access) && !(ACCESS_HOS in C.access)) + if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS_PERMIT in C.access) && !(ACCESS_HOS in C.access)) allowed = TRUE // Hasn't claimed a weapon yet if(C?.registered_account && !C.registered_account.sec_weapon_claimed) diff --git a/yogstation/code/datums/ruins/free_miners.dm b/yogstation/code/datums/ruins/free_miners.dm index b5b6b4fce50b..13c6ebd837c2 100644 --- a/yogstation/code/datums/ruins/free_miners.dm +++ b/yogstation/code/datums/ruins/free_miners.dm @@ -21,7 +21,7 @@ circuit = /obj/item/circuitboard/computer/white_ship/miner shuttleId = "whiteship" possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_mining0;whiteship_mining1;whiteship_mining2;whiteship_custom" - req_access = list(ACCESS_FREEMINER_CAPTAIN) + req_access = list(ACCESS_RUINS_COMMAND) /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/miner name = "Free Miner Navigation Computer" @@ -118,15 +118,15 @@ /obj/item/card/id/freeminer name = "Free Miner Crewman ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER) + access = list(ACCESS_RUINS_MATERIALS, ACCESS_MECH_RUINS) /obj/item/card/id/freeminer/engi name = "Free Miner Engineer ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER) + access = list(ACCESS_RUINS_MATERIALS, ACCESS_MECH_RUINS, ACCESS_RUINS_ENGINEERING) /obj/item/card/id/freeminer/captain name = "Free Miner Ship Pilot ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER, ACCESS_FREEMINER_CAPTAIN) + access = list(ACCESS_RUINS_MATERIALS, ACCESS_MECH_RUINS, ACCESS_RUINS_COMMAND) /obj/item/storage/box/ids/free_miners name = "box of spare IDs" diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index 7885e1d7ed13..9815d948c57d 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -92,7 +92,7 @@ /obj/item/card/id/gasclerk name = "Clerk" desc = "An employee ID used to access areas around the gas station." - access = list(ACCESS_MANUFACTURING) + access = list(ACCESS_CLERK) /obj/item/card/id/gasclerk/New() ..() diff --git a/yogstation/code/game/objects/structures/ghost_role_spawners.dm b/yogstation/code/game/objects/structures/ghost_role_spawners.dm index 81c29821c7be..175369ec12c6 100644 --- a/yogstation/code/game/objects/structures/ghost_role_spawners.dm +++ b/yogstation/code/game/objects/structures/ghost_role_spawners.dm @@ -208,7 +208,7 @@ /obj/item/card/id/bus/crewmember/captain name = "Captain" desc = "An employee ID used to access areas around the ship." - access = list(ACCESS_CAPTAIN, ACCESS_SECURITY, ACCESS_RESEARCH) + access = list(ACCESS_CAPTAIN, ACCESS_SECURITY, ACCESS_SCIENCE) /obj/item/card/id/bus/crewmember/captain/New() ..() @@ -217,7 +217,7 @@ /obj/item/card/id/bus/crewmember/sec name = "Security Officer" desc = "An employee ID used to access areas around the ship." - access = list(ACCESS_SECURITY, ACCESS_RESEARCH) + access = list(ACCESS_SECURITY, ACCESS_SCIENCE) /obj/item/card/id/bus/crewmember/sec/New() ..() @@ -226,7 +226,7 @@ /obj/item/card/id/bus/crewmember name = "Crew member" desc = "An employee ID used to access areas around the ship." - access = list(ACCESS_RESEARCH) + access = list(ACCESS_SCIENCE) /obj/item/card/id/bus/crewmember/New() ..() diff --git a/yogstation/code/modules/jobs/job_types/brig_physician.dm b/yogstation/code/modules/jobs/job_types/brig_physician.dm index 21b06511b92c..82f98c037b7e 100644 --- a/yogstation/code/modules/jobs/job_types/brig_physician.dm +++ b/yogstation/code/modules/jobs/job_types/brig_physician.dm @@ -23,7 +23,7 @@ ) added_access = list(ACCESS_SURGERY, ACCESS_CLONING, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_BRIG, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, ACCESS_BRIG_PHYS) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_BRIG, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, ACCESS_BRIG_PHYS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN diff --git a/yogstation/code/modules/jobs/job_types/clerk.dm b/yogstation/code/modules/jobs/job_types/clerk.dm index 08b85661c24d..f9d302ad2a26 100644 --- a/yogstation/code/modules/jobs/job_types/clerk.dm +++ b/yogstation/code/modules/jobs/job_types/clerk.dm @@ -8,7 +8,7 @@ spawn_positions = 1 supervisors = "the head of personnel" added_access = list() - base_access = list(ACCESS_MANUFACTURING, ACCESS_SERVHALL) + base_access = list(ACCESS_ SERVICE, ACCESS_CLERK) alt_titles = list("Salesman", "Gift Shop Attendent", "Retail Worker") outfit = /datum/outfit/job/clerk paycheck = PAYCHECK_EASY diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm index 292a5babb944..34cf6017ded7 100644 --- a/yogstation/code/modules/jobs/job_types/mining_medic.dm +++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm @@ -28,8 +28,8 @@ ) //if it's skeleton there's probably no paramedic to save spaced miners that jaunted away from danger - added_access = list(ACCESS_SURGERY, ACCESS_CARGO, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) + added_access = list(ACCESS_SURGERY, ACCESS_CARGO_BAY, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO, ACCESS_MATERIALS, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_MINING_MEDIC diff --git a/yogstation/code/modules/jobs/job_types/network_admin.dm b/yogstation/code/modules/jobs/job_types/network_admin.dm index d6bc0919d314..f83e6829d863 100644 --- a/yogstation/code/modules/jobs/job_types/network_admin.dm +++ b/yogstation/code/modules/jobs/job_types/network_admin.dm @@ -13,8 +13,8 @@ outfit = /datum/outfit/job/network_admin - added_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS) - base_access = list(ACCESS_TCOMSAT, ACCESS_TCOM_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_NETWORK, ACCESS_RESEARCH, ACCESS_MINISAT, ACCESS_RND, ACCESS_TOX) + added_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_RESEARCH, ACCESS_AI_SAT, ACCESS_RESEARCH, ACCESS_SCIENCE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_NETWORK_ADMIN diff --git a/yogstation/code/modules/jobs/job_types/psychiatrist.dm b/yogstation/code/modules/jobs/job_types/psychiatrist.dm index a1090059d42b..3b61c2a5aa5d 100644 --- a/yogstation/code/modules/jobs/job_types/psychiatrist.dm +++ b/yogstation/code/modules/jobs/job_types/psychiatrist.dm @@ -13,7 +13,7 @@ outfit = /datum/outfit/job/psych added_access = list(ACCESS_CHEMISTRY) - base_access = list(ACCESS_MEDICAL, ACCESS_PSYCH) + base_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED mind_traits = list(TRAIT_PSYCH) diff --git a/yogstation/code/modules/vending/gift.dm b/yogstation/code/modules/vending/gift.dm index b7edf63050ef..4f68877106ff 100644 --- a/yogstation/code/modules/vending/gift.dm +++ b/yogstation/code/modules/vending/gift.dm @@ -5,7 +5,7 @@ icon_state = "gifts" icon_deny = "gifts-deny" panel_type = "panel-gift" - req_access = list(ACCESS_MANUFACTURING) + req_access = list(ACCESS_CLERK) product_slogans = "Toys For All!;Oh its a Gift!;A Gift for Your Loved ones!;Purchase more Gifts, Now!" vend_reply = "Thank you for using Gift Vendor!" products = list(/obj/item/toy/heartballoon = 3, From f608295783ee103968ac316feb7c81c8d6b1fb04 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 06:21:12 +0200 Subject: [PATCH 12/48] ballin --- code/__DEFINES/access.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index fa7b5af55bca..2e1b5f33d2f8 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -231,9 +231,6 @@ #define ACCESS_BLOODCULT "bloodcult" #define ACCESS_CLOCKCULT "clockcult" -/// HUNTERS -#define ACCESS_HUNTER "hunter" - //--- MISCELLANEOUS ---// /// For things that aren't ever supposed to be accessed From 87d6db0e4f7dd7bd39c1c71718bcb8aa465f8ee9 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 06:31:55 +0200 Subject: [PATCH 13/48] ballin --- code/modules/jobs/access.dm | 8 ++++---- code/modules/jobs/job_types/chief_engineer.dm | 4 ++-- code/modules/jobs/job_types/roboticist.dm | 4 ++-- code/modules/jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/station_engineer.dm | 6 +++++- code/modules/jobs/job_types/synthetic.dm | 4 ++-- code/modules/mapping/mapping_helpers.dm | 2 +- .../game/machinery/telecomms/computers/traffic_control.dm | 2 +- yogstation/code/modules/atmospherics/airalarm.dm | 2 +- yogstation/code/modules/jobs/job_types/clerk.dm | 2 +- yogstation/code/modules/power/apc.dm | 4 ++-- 11 files changed, 22 insertions(+), 18 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 928af1c64abf..2126ab87f8f6 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -139,7 +139,7 @@ return list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_SEC_BASIC, ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, @@ -147,7 +147,7 @@ ACCESS_THEATRE, ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) //YOGS - yogs jobs + ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -190,7 +190,7 @@ ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, - ACCESS_LAWYER + ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP) if(2) // Security @@ -329,7 +329,7 @@ return "Secure Tech Storage" if(ACCESS_TCOMMS) return "Telecommunications" - if(ACCESS_TCOMS_ADMIN) + if(ACCESS_TCOMMS_ADMIN) return "Telecommunication Logs Auth." if(ACCESS_AUX_BASE) return "Aux. Base Construction" diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index bb2efd8733a1..e5fc171f905b 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -21,9 +21,9 @@ added_access = list(ACCESS_CAPTAIN) base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_TCOM_ADMIN, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_COMMAND, ACCESS_CONSTRUCTION, ACCESS_SEC_BASIC, ACCESS_AI_SAT, ACCESS_MECH_ENGINE, - ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_MATERIALS) + ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_ENG diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 49a3d3be04d9..a0599ccdc136 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -13,8 +13,8 @@ outfit = /datum/outfit/job/roboticist - added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RND) - base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MATERIALS) + added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RESEARCH) + base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index e0f78feef418..e173bfb4598d 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(available_depts_sec, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICA minimal_lightup_areas |= GLOB.engineering_lightup_areas if(SEC_DEPT_MEDICAL) ears = /obj/item/radio/headset/headset_sec/alt/department/med - dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY ACCESS_PSYCHOLOGY, ACCESS_GENETICS) + dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS) destination = /area/security/checkpoint/medical spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/medblue diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 526e4d597967..683d571d4281 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -16,7 +16,7 @@ added_access = list(ACCESS_ATMOSPHERICS, ACCESS_SCIENCE, ACCESS_RESEARCH) base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MATERIALS) + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MATERIALS) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG @@ -63,18 +63,22 @@ GLOBAL_LIST_INIT(available_depts_eng, list(ENG_DEPT_MEDICAL, ENG_DEPT_SCIENCE, E ears = /obj/item/radio/headset/headset_eng/department/supply dep_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION) accessory = /obj/item/clothing/accessory/armband/cargo + minimal_lightup_areas |= GLOB.supply_lightup_areas if(ENG_DEPT_MEDICAL) ears = /obj/item/radio/headset/headset_eng/department/med dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_GENETICS) accessory = /obj/item/clothing/accessory/armband/medblue + minimal_lightup_areas |= GLOB.medical_lightup_areas if(ENG_DEPT_SCIENCE) ears = /obj/item/radio/headset/headset_eng/department/sci dep_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_XENOBIOLOGY) accessory = /obj/item/clothing/accessory/armband/science + minimal_lightup_areas |= GLOB.science_lightup_areas if(ENG_DEPT_SERVICE) ears = /obj/item/radio/headset/headset_eng/department/service dep_access = list(ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLERK) accessory = /obj/item/clothing/accessory/armband/service + if(accessory) var/obj/item/clothing/under/U = H.w_uniform diff --git a/code/modules/jobs/job_types/synthetic.dm b/code/modules/jobs/job_types/synthetic.dm index 8277cc6218c3..26fa1687d79b 100644 --- a/code/modules/jobs/job_types/synthetic.dm +++ b/code/modules/jobs/job_types/synthetic.dm @@ -3,14 +3,14 @@ GLOBAL_LIST_INIT(synthetic_base_access, list( ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCES_PERSONAL_LOCKERS, + ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_TCOMMS_ADMIN, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE)) + ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_TCOMMS_ADMIN, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE)) GLOBAL_LIST_EMPTY(synthetic_added_access) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index d30b243c1748..5c71c5bc33e5 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -118,7 +118,7 @@ if(!airlock) qdel(src) return - if(cyclelinkedx || cyclelinkedy) //yogs start + if(airlock.cyclelinkedx || airlock.cyclelinkedy) //yogs start cyclelinkairlock_target() else if(cyclelinkeddir) diff --git a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm index c1ad4605fe15..5f4d743909c9 100644 --- a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm @@ -20,7 +20,7 @@ var/process = 0 circuit = /obj/item/circuitboard/computer/telecomms/comm_traffic - req_access = list(ACCESS_TCOM_ADMIN) + req_access = list(ACCESS_TCOMMS) var/unlimited_range = FALSE /obj/machinery/computer/telecomms/traffic/Initialize(mapload) diff --git a/yogstation/code/modules/atmospherics/airalarm.dm b/yogstation/code/modules/atmospherics/airalarm.dm index 4eb975e54ef0..7e0c1b2b7a7f 100644 --- a/yogstation/code/modules/atmospherics/airalarm.dm +++ b/yogstation/code/modules/atmospherics/airalarm.dm @@ -1,7 +1,7 @@ /obj/machinery/airalarm/tcomms name = "telecomms air alarm" req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TCOM_ADMIN) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TCOMMS_ADMIN) TLV = list( // This is the list provided by obj machinery airalarm server. No checks, apparently. "pressure" = new/datum/tlv/no_checks, "temperature" = new/datum/tlv/no_checks, diff --git a/yogstation/code/modules/jobs/job_types/clerk.dm b/yogstation/code/modules/jobs/job_types/clerk.dm index f9d302ad2a26..cd9932722f94 100644 --- a/yogstation/code/modules/jobs/job_types/clerk.dm +++ b/yogstation/code/modules/jobs/job_types/clerk.dm @@ -8,7 +8,7 @@ spawn_positions = 1 supervisors = "the head of personnel" added_access = list() - base_access = list(ACCESS_ SERVICE, ACCESS_CLERK) + base_access = list(ACCESS_SERVICE, ACCESS_CLERK) alt_titles = list("Salesman", "Gift Shop Attendent", "Retail Worker") outfit = /datum/outfit/job/clerk paycheck = PAYCHECK_EASY diff --git a/yogstation/code/modules/power/apc.dm b/yogstation/code/modules/power/apc.dm index 7f4a6c2735d5..0ec31d4e2058 100644 --- a/yogstation/code/modules/power/apc.dm +++ b/yogstation/code/modules/power/apc.dm @@ -1,4 +1,4 @@ /obj/machinery/power/apc/tcomms req_access = null - req_one_access = list(ACCESS_TCOM_ADMIN, ACCESS_ENGINE_EQUIP) - cell_type = /obj/item/stock_parts/cell/upgraded/plus // Apparently it's always been this? *shrug \ No newline at end of file + req_one_access = list(ACCESS_TCOMMS_ADMIN, ACCESS_ENGINE_EQUIP) + cell_type = /obj/item/stock_parts/cell/upgraded/plus // Apparently it's always been this? *shrug From 6ebd0db1ed642ffab63fcf141393dd7f7a3e18fa Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 06:45:59 +0200 Subject: [PATCH 14/48] ballin --- code/modules/jobs/access.dm | 22 +++++++++++++++++++++- code/modules/mapping/mapping_helpers.dm | 7 ++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 2126ab87f8f6..5df9b76f8f78 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -180,7 +180,7 @@ switch(code) if(0) return get_all_accesses() - if(1) // Service + if(1) // Service/Civilian return list(ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, @@ -270,6 +270,26 @@ ACCESS_CHANGE_IDS, ACCESS_CAPTAIN) +/// Gets the name from region ID +/proc/get_region_accesses_name(code) + switch(code) + if(0) + return "All" + if(1) // Service/Civilian + return "Service" + if(2) // Security + return "Security" + if(3) // Medical + return "Medbay" + if(4) // Science + return "Science" + if(5) // Engineering + return "Engineering" + if(6) // Supply + return "Supply" + if(7) // Command + return "Command" + /// Gets teh description for an access /proc/get_access_desc(A) switch(A) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 5c71c5bc33e5..c63681caa002 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -118,11 +118,8 @@ if(!airlock) qdel(src) return - if(airlock.cyclelinkedx || airlock.cyclelinkedy) //yogs start - cyclelinkairlock_target() - else - if(cyclelinkeddir) - cyclelinkairlock() //yogs end + if(airlock.cyclelinkeddir) + airlock.cyclelinkairlock() if(airlock.closeOtherId) airlock.update_other_id() if(airlock.abandoned) From c3284f0c734b566b2b839421ddd003a7e222b81c Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sat, 27 Jul 2024 09:03:10 +0200 Subject: [PATCH 15/48] ballin --- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 2 +- .../StationRuins/BoxStation/chapel1.dmm | 26 +- .../StationRuins/BoxStation/chapel2.dmm | 26 +- .../StationRuins/BoxStation/clerk_box.dmm | 10 +- .../StationRuins/BoxStation/clerk_gamble.dmm | 8 +- .../StationRuins/BoxStation/clerk_meta.dmm | 12 +- .../StationRuins/BoxStation/clerk_pod.dmm | 9 +- _maps/RandomZLevels/VR/netmin_hub.dmm | 4 +- _maps/RandomZLevels/VR/snowdin_VR.dmm | 166 ++++++------ _maps/RandomZLevels/VR/syndicate_trainer.dmm | 28 +- _maps/RandomZLevels/VR/vrhub.dmm | 46 ++-- _maps/RandomZLevels/undergroundoutpost45.dmm | 243 +++++++++--------- .../AsteroidStation/AsteroidStation.dmm | 28 +- _maps/map_files/DonutStation/DonutStation.dmm | 10 +- _maps/map_files/GaxStation/GaxStation.dmm | 20 +- _maps/map_files/IceMeta/IceMeta.dmm | 56 ++-- _maps/map_files/YogStation/YogStation.dmm | 20 +- _maps/shuttles/assault_pod_default.dmm | 12 +- _maps/shuttles/cargo_birdboat.dmm | 14 +- _maps/shuttles/cargo_box.dmm | 14 +- _maps/shuttles/cargo_delta.dmm | 14 +- _maps/shuttles/cargo_gax.dmm | 14 +- _maps/shuttles/cargo_kilo.dmm | 12 +- _maps/shuttles/emergency_48641.dmm | 49 +++- _maps/shuttles/emergency_asteroid.dmm | 23 +- _maps/shuttles/emergency_bar.dmm | 12 +- _maps/shuttles/emergency_birdboat.dmm | 12 +- _maps/shuttles/emergency_box.dmm | 12 +- _maps/shuttles/emergency_cargo.dmm | 16 +- _maps/shuttles/emergency_cere.dmm | 16 +- _maps/shuttles/emergency_clown.dmm | 8 +- _maps/shuttles/emergency_cozy.dmm | 12 +- _maps/shuttles/emergency_cramped.dmm | 4 +- _maps/shuttles/emergency_delta.dmm | 20 +- _maps/shuttles/emergency_discoinferno.dmm | 5 +- _maps/shuttles/emergency_donut.dmm | 16 +- _maps/shuttles/emergency_goon.dmm | 8 +- _maps/shuttles/emergency_kilo.dmm | 21 +- _maps/shuttles/emergency_luxury.dmm | 11 +- _maps/shuttles/emergency_meta.dmm | 12 +- _maps/shuttles/emergency_mini.dmm | 8 +- _maps/shuttles/emergency_octa.dmm | 14 +- _maps/shuttles/emergency_omega.dmm | 16 +- _maps/shuttles/emergency_pool.dmm | 12 +- _maps/shuttles/emergency_pubby.dmm | 14 +- _maps/shuttles/emergency_raven.dmm | 23 +- _maps/shuttles/emergency_rollerdome.dmm | 5 +- _maps/shuttles/emergency_russiafightpit.dmm | 16 +- _maps/shuttles/emergency_scrapheap.dmm | 20 +- _maps/shuttles/emergency_supermatter.dmm | 5 +- _maps/shuttles/emergency_transtar.dmm | 8 +- _maps/shuttles/emergency_triage.dmm | 16 +- _maps/shuttles/emergency_wabbajack.dmm | 8 +- _maps/shuttles/ferry_meat.dmm | 4 +- _maps/shuttles/infiltrator_basic.dmm | 37 ++- _maps/shuttles/infiltrator_cutter.dmm | 81 +++--- _maps/shuttles/labour_box.dmm | 10 +- _maps/shuttles/labour_delta.dmm | 10 +- _maps/shuttles/labour_gax.dmm | 10 +- _maps/shuttles/labour_kilo.dmm | 10 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 28 +- .../shuttles/ruin_syndicate_fighter_shiv.dmm | 12 +- _maps/shuttles/whiteship_miner.dmm | 2 +- _maps/templates/infiltrator_base.dmm | 64 +++-- _maps/templates/lazy_templates/chapel1.dmm | 28 +- _maps/templates/lazy_templates/chapel2.dmm | 28 +- _maps/templates/lazy_templates/clerk_box.dmm | 10 +- .../templates/lazy_templates/clerk_gamble.dmm | 8 +- _maps/templates/lazy_templates/clerk_meta.dmm | 12 +- _maps/templates/lazy_templates/clerk_pod.dmm | 9 +- _maps/templates/shelter_2.dmm | 2 +- _maps/templates/shipbreaker/old_repair.dmm | 5 +- _maps/templates/shipbreaker/old_syndicate.dmm | 13 +- code/game/machinery/doors/windowdoor.dm | 2 +- code/modules/mapping/access_helpers.dm | 22 +- 75 files changed, 821 insertions(+), 802 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 8b2b1af62a6e..3050febc5afc 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -1413,7 +1413,7 @@ "eB" = ( /obj/machinery/door/window/eastleft{ name = "Heads of Staff"; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm index 4a0b85973bbf..4242110c4049 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm @@ -50,7 +50,7 @@ /obj/machinery/door/window{ dir = 8; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -140,13 +140,13 @@ /area/chapel/main) "gS" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "hp" = ( @@ -241,8 +241,7 @@ /area/chapel/main) "mP" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -259,6 +258,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "nb" = ( @@ -493,7 +493,7 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -563,8 +563,7 @@ /area/chapel/main) "ML" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -575,12 +574,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "Ny" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -588,6 +587,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "NG" = ( @@ -628,8 +628,7 @@ /area/chapel/main) "PO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -649,6 +648,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "Qh" = ( @@ -656,7 +656,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm index 10cbe925b764..575b5313fe09 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm @@ -154,8 +154,7 @@ /area/chapel/main) "gJ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -166,6 +165,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "gL" = ( @@ -238,7 +238,7 @@ /obj/machinery/door/window{ dir = 8; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -276,9 +276,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "mq" = ( @@ -508,13 +508,13 @@ /area/chapel/main) "Dj" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "Dq" = ( @@ -717,9 +717,9 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "Kc" = ( @@ -738,7 +738,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -869,7 +869,7 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -1075,8 +1075,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/structure/cable{ icon_state = "1-2" @@ -1087,6 +1086,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "Zw" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm index c5a532e712eb..7219fef11622 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm @@ -22,7 +22,7 @@ /area/clerk) "c" = ( /obj/machinery/door/window/southleft{ - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -330,8 +330,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -349,6 +348,7 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "B" = ( @@ -531,8 +531,7 @@ /area/clerk) "Q" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -547,6 +546,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "R" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm index b91ff372dca7..dd32626a0a13 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm @@ -267,8 +267,7 @@ /area/clerk) "R" = ( /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -279,6 +278,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "S" = ( @@ -294,11 +294,11 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "U" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm index 57f8bd2beadc..f131a69a7c3e 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm @@ -198,8 +198,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -217,6 +216,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "B" = ( @@ -313,8 +313,7 @@ /area/clerk) "O" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -328,6 +327,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "P" = ( @@ -368,14 +368,14 @@ }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "T" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm index c442cdade155..fc85b217db80 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm @@ -245,8 +245,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 @@ -409,8 +408,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 @@ -442,8 +440,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 diff --git a/_maps/RandomZLevels/VR/netmin_hub.dmm b/_maps/RandomZLevels/VR/netmin_hub.dmm index c07991846b99..097f54da8ffe 100644 --- a/_maps/RandomZLevels/VR/netmin_hub.dmm +++ b/_maps/RandomZLevels/VR/netmin_hub.dmm @@ -5111,9 +5111,9 @@ /area/awaymission/vr/abandoned_mine) "PN" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Armory"; - req_access_txt = "200" + name = "Armory" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/awaymission/vr/combat_robot_factory) "PO" = ( diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index 8a7547f10ea6..5a2b130e3f02 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -845,9 +845,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "cp" = ( @@ -1631,9 +1630,8 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "dM" = ( @@ -1651,10 +1649,10 @@ /area/awaymission/snowdin/post/messhall) "dQ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "dR" = ( @@ -1913,9 +1911,7 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/messhall) "et" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -2287,11 +2283,11 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/machinery/door/firedoor, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "fk" = ( @@ -2500,7 +2496,6 @@ /area/awaymission/snowdin/post) "fF" = ( /obj/structure/closet, -/obj/item/clothing/under/assistantformal, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/effect/turf_decal/bot, @@ -3127,9 +3122,9 @@ pixel_y = 5 }, /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "hc" = ( @@ -3479,7 +3474,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; - req_access_txt = "45" + req_access_txt = "surgery" }, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -3499,9 +3494,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "hQ" = ( @@ -3598,9 +3592,8 @@ /turf/closed/wall, /area/awaymission/snowdin/post/garage) "if" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "ig" = ( @@ -5369,10 +5362,10 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "lF" = ( @@ -5768,10 +5761,10 @@ /area/awaymission/snowdin/post/messhall) "mq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mr" = ( @@ -5943,10 +5936,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mQ" = ( @@ -6336,7 +6329,7 @@ /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; req_access = null; - req_access_txt = "1" + req_access_txt = "security" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6477,9 +6470,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/hydro) "nY" = ( @@ -6515,7 +6508,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access_txt = "security" }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7226,9 +7219,9 @@ /area/awaymission/snowdin/post/secpost) "pJ" = ( /obj/machinery/door/airlock/vault{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/post/secpost) "pK" = ( @@ -7583,9 +7576,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) "qD" = ( @@ -7749,7 +7741,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access_txt = "32" + req_access_txt = "construction" }, /obj/machinery/button/ignition/indestructible{ id = "snowdin_turbine_ignitor"; @@ -7953,10 +7945,10 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_exterior"; - name = "Turbine Exterior Airlock"; - req_access_txt = "32" + name = "Turbine Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "rr" = ( @@ -8245,12 +8237,12 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_interior"; - name = "Turbine Interior Airlock"; - req_access_txt = "32" + name = "Turbine Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "si" = ( @@ -8319,12 +8311,12 @@ /area/awaymission/snowdin/post/cavern2) "su" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sv" = ( @@ -8523,9 +8515,9 @@ /area/awaymission/snowdin/cave/cavern) "sQ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sR" = ( @@ -8966,12 +8958,12 @@ /area/awaymission/snowdin/post/cavern1) "us" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "ut" = ( @@ -9052,9 +9044,9 @@ /area/awaymission/snowdin/outside) "uD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "uE" = ( @@ -9934,12 +9926,12 @@ /area/awaymission/snowdin/cave/mountain) "wR" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "wS" = ( @@ -10255,8 +10247,7 @@ /area/awaymission/snowdin/post/mining_dock) "xH" = ( /obj/machinery/door/airlock/vault{ - name = "Relic Storage"; - req_access_txt = "3" + name = "Relic Storage" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -10268,6 +10259,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "xI" = ( @@ -11618,9 +11610,8 @@ /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) "Bj" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "Bk" = ( @@ -12614,8 +12605,7 @@ /area/awaymission/snowdin/cave) "DG" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -12627,6 +12617,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "DH" = ( @@ -12639,9 +12630,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/cave) "DJ" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/awaymission/snowdin/cave) "DK" = ( @@ -14083,9 +14073,9 @@ /area/awaymission/snowdin/post/mining_dock) "Hy" = ( /obj/machinery/door/airlock/research/glass{ - name = "Mech Lab"; - req_access_txt = "29" + name = "Mech Lab" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main/mechbay) "Hz" = ( @@ -14288,12 +14278,12 @@ /area/awaymission/snowdin/post/mining_main/robotics) "Ic" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post/mining_main/robotics) "Id" = ( @@ -14481,9 +14471,8 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "IE" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) "IF" = ( @@ -14550,12 +14539,11 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IN" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IO" = ( @@ -14676,12 +14664,12 @@ /area/awaymission/snowdin/post/mining_dock) "Jb" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Jc" = ( @@ -14739,9 +14727,9 @@ /area/awaymission/snowdin/cave/cavern) "Jj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Jk" = ( @@ -14753,8 +14741,7 @@ /area/awaymission/snowdin/post/mining_dock) "Jl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14766,6 +14753,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "Jm" = ( @@ -14805,8 +14793,7 @@ /area/awaymission/snowdin/cave/cavern) "Jr" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14818,6 +14805,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main) "Js" = ( @@ -15098,9 +15086,9 @@ /area/awaymission/snowdin/post/mining_dock) "JZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Ka" = ( @@ -15410,9 +15398,9 @@ /area/awaymission/snowdin/post/mining_main) "KK" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "KL" = ( @@ -15580,8 +15568,7 @@ /area/awaymission/snowdin/post/garage) "OF" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -15596,12 +15583,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "PR" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/neutral{ @@ -15614,6 +15601,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "Qd" = ( diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm index 0bb1e92c6c5c..ffbe4ff434a4 100644 --- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm +++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm @@ -542,7 +542,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access_txt = "103" + req_access_txt = "cent_specops" }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) @@ -696,7 +696,7 @@ "et" = ( /obj/machinery/door/airlock/hatch{ name = "Cockpit"; - req_access_txt = "109" + req_access_txt = "cent_captain" }, /turf/open/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) @@ -793,9 +793,9 @@ /area/awaymission/centcomAway/general) "eT" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/indestructible, /area/awaymission/centcomAway/general) "eU" = ( @@ -940,9 +940,9 @@ /area/awaymission/centcomAway/courtroom) "fG" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/indestructible, /area/awaymission/centcomAway/general) "fH" = ( @@ -1006,9 +1006,9 @@ /area/awaymission/centcomAway/courtroom) "fU" = ( /obj/machinery/door/airlock/public/glass{ - name = "Med-Sci"; - req_access_txt = "9" + name = "Med-Sci" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/indestructible, /area/awaymission/centcomAway/general) "fV" = ( @@ -1126,9 +1126,9 @@ /area/awaymission/centcomAway/hangar) "gF" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/indestructible, /area/awaymission/centcomAway/general) "gG" = ( @@ -1307,7 +1307,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1715,7 +1715,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2092,9 +2092,7 @@ /turf/open/indestructible, /area/awaymission/centcomAway/thunderdome) "me" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "" - }, +/obj/machinery/vending/boozeomat, /turf/closed/indestructible/riveted, /area/awaymission/centcomAway/cafe) "mg" = ( diff --git a/_maps/RandomZLevels/VR/vrhub.dmm b/_maps/RandomZLevels/VR/vrhub.dmm index 66a9cfb6b0c4..9fcac7bd34dd 100644 --- a/_maps/RandomZLevels/VR/vrhub.dmm +++ b/_maps/RandomZLevels/VR/vrhub.dmm @@ -1454,9 +1454,7 @@ /turf/open/floor/plasteel, /area/awaymission/vr/syndicate) "sy" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "" - }, +/obj/machinery/vending/boozeomat, /turf/closed/indestructible/riveted, /area/awaymission/vr/syndicate) "sG" = ( @@ -1600,9 +1598,9 @@ /area/awaymission/vr/hub) "vs" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/indestructible, /area/awaymission/vr/hub) "vE" = ( @@ -1967,9 +1965,9 @@ /area/awaymission/vr/hub) "BL" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/indestructible, /area/awaymission/vr/syndicate) "BO" = ( @@ -2193,7 +2191,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2398,7 +2396,7 @@ "Jb" = ( /obj/machinery/door/airlock/hatch{ name = "Cockpit"; - req_access_txt = "109" + req_access_txt = "cent_captain" }, /turf/open/floor/mineral/titanium, /area/awaymission/vr/syndicate) @@ -2540,9 +2538,7 @@ /turf/open/indestructible/necropolis, /area/awaymission/vr/megafauna_arena/arena) "Mi" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/indestructible, /area/awaymission/vr/hub) "Mu" = ( @@ -2550,6 +2546,10 @@ /obj/structure/chair, /turf/open/indestructible, /area/awaymission/vr/syndicate) +"My" = ( +/obj/machinery/vending/boozeomat, +/turf/closed/indestructible/riveted, +/area/awaymission/vr/syndicate) "MG" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/stripes/line{ @@ -2903,7 +2903,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3008,9 +3008,9 @@ /area/awaymission/vr/syndicate) "To" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/indestructible, /area/awaymission/vr/syndicate) "Tx" = ( @@ -3034,9 +3034,9 @@ /area/awaymission/vr/hub) "TD" = ( /obj/machinery/door/airlock/public/glass{ - name = "Med-Sci"; - req_access_txt = "9" + name = "Med-Sci" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/indestructible, /area/awaymission/vr/syndicate) "TF" = ( @@ -3140,7 +3140,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access_txt = "103" + req_access_txt = "cent_specops" }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/vr/syndicate) @@ -3222,9 +3222,9 @@ /area/awaymission/vr/syndicate) "XE" = ( /obj/machinery/door/airlock{ - name = "Bar Access"; - req_access_txt = "25" + name = "Bar Access" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/indestructible, /area/awaymission/vr/hub) "XG" = ( @@ -3253,9 +3253,9 @@ /area/awaymission/vr/syndicate) "XP" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/indestructible, /area/awaymission/vr/syndicate) "XQ" = ( @@ -56848,7 +56848,7 @@ yY yx xA xA -sy +My xA gz gz diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index b352a8cc4672..2336d8e5d9c9 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -298,9 +298,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, -/obj/item/clothing/under/pj/blue, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -345,7 +344,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/clothing/under/suit/female, /turf/open/floor/carpet{ @@ -382,7 +381,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -410,7 +409,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -1022,7 +1021,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/clothing/suit/apron, /obj/item/storage/bag/plants/portaseeder, @@ -1758,7 +1757,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 @@ -1781,7 +1780,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -1823,9 +1822,9 @@ /area/awaymission/undergroundoutpost45/central) "dR" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "201" + name = "Security Checkpoint" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1897,9 +1896,9 @@ dir = 4 }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "201" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1941,9 +1940,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Gateway Chamber"; - req_access_txt = "201" + name = "Gateway Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1961,9 +1960,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Security Checkpoint Maintenance"; - req_access_txt = "201" + name = "Security Checkpoint Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2045,9 +2044,9 @@ "eo" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "201" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -2111,10 +2110,9 @@ }, /area/awaymission/undergroundoutpost45/caves) "ev" = ( -/obj/item/clothing/under/pj/red, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -2143,7 +2141,7 @@ dir = 8; icon_state = "right"; name = "Security Checkpoint"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2286,7 +2284,7 @@ dir = 8; icon_state = "left"; name = "Security Checkpoint"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2327,7 +2325,7 @@ dir = 4; icon_state = "left"; name = "Hydroponics Desk"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2490,7 +2488,7 @@ dir = 4; icon_state = "right"; name = "Hydroponics Desk"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2725,9 +2723,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "201" + name = "Hydroponics Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2872,7 +2870,7 @@ /obj/machinery/door/window/eastleft{ dir = 1; name = "Hydroponics Desk"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 @@ -3051,9 +3049,9 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "gi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "201" + name = "Kitchen Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -3082,7 +3080,6 @@ name = "Kitchen Crate" }, /obj/item/storage/box/mousetraps, -/obj/item/clothing/under/waiter, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 @@ -3149,9 +3146,9 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "gu" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "201" + name = "Kitchen Cold Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 }, @@ -3474,7 +3471,7 @@ dir = 8 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -3855,8 +3852,7 @@ "hP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "201" + name = "Kitchen" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -3865,6 +3861,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -4128,7 +4125,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "ip" = ( /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -4176,7 +4173,7 @@ }, /obj/machinery/door/window{ name = "Gateway Chamber"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 @@ -4578,7 +4575,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -4669,9 +4666,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Gateway Observation"; - req_access_txt = "201" + name = "Gateway Observation" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -4767,7 +4764,7 @@ "jy" = ( /obj/machinery/door/window/southright{ name = "Bar Door"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, @@ -4800,13 +4797,13 @@ dir = 8 }, /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "201" + name = "Kitchen" }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -4909,9 +4906,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/research{ - name = "Research Lab"; - req_access_txt = "201" + name = "Research Lab" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5120,7 +5117,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -5204,9 +5201,9 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Gateway EVA"; - req_access_txt = "201" + name = "Gateway EVA" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -5215,7 +5212,7 @@ /obj/item/clothing/under/suit/navy, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -5429,9 +5426,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5505,12 +5502,12 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5919,7 +5916,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -5961,9 +5958,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -6058,12 +6055,12 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, /obj/effect/turf_decal/tile/purple{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -6225,9 +6222,9 @@ /area/awaymission/undergroundoutpost45/research) "lO" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -6439,9 +6436,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ - name = "Research Director's Office"; - req_access_txt = "201" + name = "Research Director's Office" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -6603,7 +6600,7 @@ /obj/item/clothing/glasses/meson, /obj/structure/closet/secure_closet/engineering_personal{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -6758,9 +6755,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_access_txt = "201" + name = "Research Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -7943,14 +7940,14 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = 8; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/machinery/button/door{ desc = "A remote control-switch that controls the privacy shutters."; id = "UO45_rdprivacy"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -8007,9 +8004,9 @@ /area/awaymission/undergroundoutpost45/research) "oE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "201" + name = "Security Office" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -8380,7 +8377,7 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = -24; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -8651,9 +8648,9 @@ /area/awaymission/undergroundoutpost45/research) "pI" = ( /obj/machinery/door/airlock/command{ - name = "Server Room"; - req_access_txt = "201" + name = "Server Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -8662,6 +8659,7 @@ /obj/machinery/door/airlock{ name = "Private Restroom" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/freezer{ heat_capacity = 1e+006 }, @@ -8676,9 +8674,9 @@ /area/awaymission/undergroundoutpost45/research) "pM" = ( /obj/machinery/door/airlock/research/glass{ - name = "Research Storage"; - req_access_txt = "201" + name = "Research Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -8840,9 +8838,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Room"; - req_access_txt = "201" + name = "SMES Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -8972,7 +8970,7 @@ /area/awaymission/undergroundoutpost45/research) "qq" = ( /obj/machinery/vending/medical{ - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/white/side{ dir = 6; @@ -9167,7 +9165,7 @@ }, /obj/structure/closet/secure_closet/engineering_personal{ req_access = null; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ @@ -9299,9 +9297,9 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "201" + name = "Server Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -9588,7 +9586,7 @@ name = "UO45 Engineering APC"; pixel_x = -25; req_access = null; - req_access_txt = "201"; + req_access_txt = "ruins_general"; start_charge = 100 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -9618,7 +9616,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 6; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, @@ -9626,7 +9624,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -9642,9 +9640,8 @@ "rs" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, -/obj/item/clothing/under/pj/red, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -9772,9 +9769,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_access_txt = "201" + name = "Research Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -10108,7 +10105,7 @@ dir = 4; icon_state = "left"; name = "Engineering Reception"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/paper_bin{ pixel_x = 1; @@ -10185,7 +10182,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -10210,7 +10207,7 @@ locked = 0; name = "miner's equipment"; req_access = null; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/gloves/fingerless, @@ -10560,7 +10557,7 @@ dir = 4; icon_state = "right"; name = "Engineering Reception"; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/item/folder/red, /turf/open/floor/plasteel{ @@ -10962,7 +10959,7 @@ name = "Privacy Shutters"; pixel_x = -24; pixel_y = 6; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -11088,10 +11085,10 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engineering Maintenance"; - req_access_txt = "201" + name = "Engineering Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -11301,9 +11298,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_access_txt = "201" + name = "Engineering Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -11589,10 +11586,10 @@ /area/awaymission/undergroundoutpost45/engineering) "uF" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "201" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -11603,9 +11600,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "201" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12095,9 +12092,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "201" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12175,9 +12172,9 @@ /area/awaymission/undergroundoutpost45/mining) "vM" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "201" + name = "Mining Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -12186,9 +12183,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/mining/glass{ - name = "Mining Foyer"; - req_access_txt = "201" + name = "Mining Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12200,9 +12197,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/mining/glass{ - name = "Mining Foyer"; - req_access_txt = "201" + name = "Mining Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12489,8 +12486,7 @@ icon_state = "1-8" }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "201" + name = "Chief Engineer" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -12503,6 +12499,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12968,7 +12965,7 @@ }, /obj/structure/closet/secure_closet/miner{ req_access = null; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ @@ -13108,9 +13105,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/mining{ - name = "Processing Area"; - req_access_txt = "201" + name = "Processing Area" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13119,13 +13116,13 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/mining{ - name = "Processing Area"; - req_access_txt = "201" + name = "Processing Area" }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13159,7 +13156,7 @@ name = "Engineering Lockdown"; pixel_x = -6; pixel_y = -24; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -13167,7 +13164,7 @@ name = "Engineering Secure Storage"; pixel_x = 6; pixel_y = -24; - req_access_txt = "201" + req_access_txt = "ruins_general" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -13443,12 +13440,12 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Mining EVA"; - req_access_txt = "201" + name = "Mining EVA" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13589,11 +13586,11 @@ "xX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/external{ - name = "Mining External Airlock"; - req_access_txt = "201" + name = "Mining External Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13664,10 +13661,10 @@ /area/awaymission/undergroundoutpost45/mining) "yf" = ( /obj/machinery/door/airlock/external{ - name = "Mining External Airlock"; - req_access_txt = "201" + name = "Mining External Airlock" }, /obj/effect/turf_decal/sand, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/awaymission/undergroundoutpost45/mining) "yg" = ( diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index df0b0f6b43c5..1f1933e8016c 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -9370,7 +9370,7 @@ "ciE" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -20753,7 +20753,7 @@ "fJm" = ( /obj/machinery/door/airlock/command{ name = "Conference Room"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -26547,7 +26547,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -30945,7 +30945,7 @@ "iSZ" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -47083,7 +47083,7 @@ "nRQ" = ( /obj/machinery/door/airlock/command{ name = "Bridge Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -47230,7 +47230,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Bridge Delivery"; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel, /area/maintenance/central) @@ -47263,7 +47263,7 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/cable{ icon_state = "1-2" @@ -48295,7 +48295,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -51881,7 +51881,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ name = "Emergency Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/item/flashlight, /obj/item/storage/toolbox/emergency{ @@ -52000,7 +52000,7 @@ "prI" = ( /obj/machinery/door/airlock/command{ name = "Command Tool Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/cable{ icon_state = "1-2" @@ -59712,7 +59712,7 @@ "rKI" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -61953,7 +61953,7 @@ /obj/machinery/suit_storage_unit/command, /obj/machinery/door/window/northright{ name = "Emergency Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/window/reinforced{ dir = 8 @@ -62438,7 +62438,7 @@ }, /obj/machinery/door/window/northleft{ name = "Emergency Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/window/reinforced{ dir = 4 @@ -73104,7 +73104,7 @@ /obj/machinery/suit_storage_unit/command, /obj/machinery/door/window/northleft{ name = "Emergency Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/window/reinforced{ dir = 4 diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 428b725bc800..774c2c0cf55e 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -7982,7 +7982,7 @@ "dgh" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -8108,7 +8108,7 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/carpet, /area/bridge) @@ -14182,7 +14182,7 @@ "fLH" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -19718,7 +19718,7 @@ "iiD" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -29363,7 +29363,7 @@ "mnx" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index bf67d74263d1..d5b6235b3d5e 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -112,7 +112,7 @@ "add" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -7341,7 +7341,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 24; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -10367,7 +10367,7 @@ }, /obj/machinery/door/airlock/command{ name = "Command Tool Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -14507,7 +14507,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/command{ name = "Conference Room"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15183,7 +15183,7 @@ /obj/machinery/button/door{ id = "teleshutter"; name = "Teleporter Shutter Control"; - req_access_txt = "19" + req_access_txt = "command" }, /turf/closed/wall/r_wall, /area/teleporter) @@ -17487,7 +17487,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ name = "Command Tool Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; @@ -21341,7 +21341,7 @@ name = "Bridge Blast Door Control"; pixel_x = -7; pixel_y = -34; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/chair/comfy/black{ dir = 4; @@ -31887,7 +31887,7 @@ name = "E.V.A. Storage Shutter Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/light_switch{ pixel_x = -24; @@ -33020,7 +33020,7 @@ "pYt" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -40915,7 +40915,7 @@ "tUy" = ( /obj/machinery/door/airlock/maintenance{ name = "Conference Room Maintenance"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index c858aaa01b93..16aea1a92cdb 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -667,7 +667,7 @@ "ajG" = ( /obj/machinery/door/airlock/command{ name = "Council Chamber"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6200,7 +6200,7 @@ "bPr" = ( /obj/machinery/door/airlock/command{ name = "Council Chamber"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -14672,7 +14672,7 @@ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -28; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel/dark, /area/bridge) @@ -15955,7 +15955,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = -24; pixel_y = -24; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -17664,7 +17664,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = -24; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -18550,7 +18550,7 @@ "fzp" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -18727,7 +18727,7 @@ }, /obj/machinery/door/window/brigdoor{ name = "Command Desk"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -32085,7 +32085,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -33996,7 +33996,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 30; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -34469,7 +34469,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = 24; pixel_y = -24; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 @@ -34721,7 +34721,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -35204,7 +35204,7 @@ name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -38312,7 +38312,7 @@ dir = 4; name = "RCD Storage"; pixel_x = 1; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -38968,7 +38968,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40223,7 +40223,7 @@ "lLf" = ( /obj/machinery/door/airlock/command{ name = "Corporate Showroom"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40704,7 +40704,7 @@ }, /obj/machinery/door/airlock/command{ name = "Corporate Showroom"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41262,7 +41262,7 @@ "lYQ" = ( /obj/machinery/door/airlock/command{ name = "Command Desk"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -42853,7 +42853,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -43599,7 +43599,7 @@ dir = 8; name = "Magboot Storage"; pixel_x = -1; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/window/reinforced{ dir = 1; @@ -43982,14 +43982,14 @@ name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/button/door{ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; @@ -45822,7 +45822,7 @@ dir = 8; name = "Jetpack Storage"; pixel_x = -1; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/window/reinforced, /obj/structure/rack, @@ -46356,7 +46356,7 @@ name = "Teleporter Shutter Control"; pixel_x = 30; pixel_y = 5; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -46868,7 +46868,7 @@ "nAM" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -61615,7 +61615,7 @@ "rQJ" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Network Access"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -70109,7 +70109,7 @@ "uiY" = ( /obj/machinery/door/airlock/command{ name = "Corporate Showroom"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -80232,7 +80232,7 @@ id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; - req_access_txt = "19" + req_access_txt = "command" }, /obj/item/poster/random_official, /obj/item/poster/random_official, @@ -83579,7 +83579,7 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Bridge Deliveries"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 3876e3420fe6..2eba50e94aa5 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -4131,7 +4131,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/command{ name = "Command Tool Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7681,7 +7681,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Bridge Delivery"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -11789,7 +11789,7 @@ "bPg" = ( /obj/machinery/door/airlock/command{ name = "Command Tool Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11925,7 +11925,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -15101,7 +15101,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -17169,7 +17169,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -24161,7 +24161,7 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/button/door{ id = "tcomms_bridge"; @@ -33218,7 +33218,7 @@ }, /obj/machinery/door/airlock/command{ name = "Command Tool Storage"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38358,7 +38358,7 @@ "kNX" = ( /obj/machinery/door/airlock/command{ name = "Conference Room"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -43486,7 +43486,7 @@ }, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 diff --git a/_maps/shuttles/assault_pod_default.dmm b/_maps/shuttles/assault_pod_default.dmm index c6c9ed88b52d..dd75aa44e35c 100644 --- a/_maps/shuttles/assault_pod_default.dmm +++ b/_maps/shuttles/assault_pod_default.dmm @@ -2,10 +2,10 @@ "a" = ( /obj/machinery/door/airlock/centcom{ name = "Assault Pod"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/assault_pod) "b" = ( @@ -25,18 +25,17 @@ /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; name = "Assault Pod"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/assault_pod) "f" = ( /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; name = "Assault Pod"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/docking_port/mobile/assault_pod{ dwidth = 3; @@ -45,6 +44,7 @@ preferred_direction = 4 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/assault_pod) "h" = ( diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo_birdboat.dmm index 0418aeb4c24a..000f8fa8bba0 100644 --- a/_maps/shuttles/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo_birdboat.dmm @@ -81,8 +81,7 @@ /area/shuttle/supply) "o" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -90,6 +89,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "p" = ( @@ -98,13 +98,15 @@ id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "cargo_bay" }, /obj/machinery/conveyor_switch/oneway{ id = "cargoshuttle" @@ -116,8 +118,7 @@ /area/shuttle/supply) "q" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/docking_port/mobile/supply{ dwidth = 3; @@ -129,6 +130,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "r" = ( diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo_box.dmm index 111dc784b5bf..38a103d77c56 100644 --- a/_maps/shuttles/cargo_box.dmm +++ b/_maps/shuttles/cargo_box.dmm @@ -24,8 +24,7 @@ /area/shuttle/supply) "g" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -33,6 +32,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "h" = ( @@ -41,13 +41,15 @@ id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "cargo_bay" }, /obj/machinery/light{ dir = 4 @@ -56,8 +58,7 @@ /area/shuttle/supply) "i" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/docking_port/mobile/supply{ dwidth = 5; @@ -69,6 +70,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "j" = ( diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm index 4950c207c133..361090d6b735 100644 --- a/_maps/shuttles/cargo_delta.dmm +++ b/_maps/shuttles/cargo_delta.dmm @@ -91,8 +91,7 @@ /area/shuttle/supply) "n" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile/supply{ @@ -106,6 +105,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "o" = ( @@ -120,13 +120,15 @@ id = "cargounload"; name = "Loading Doors"; pixel_x = -24; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "cargoload"; name = "Loading Doors"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "cargo_bay" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -147,8 +149,7 @@ /area/shuttle/supply) "r" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -157,6 +158,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "s" = ( diff --git a/_maps/shuttles/cargo_gax.dmm b/_maps/shuttles/cargo_gax.dmm index ef250cb6000c..e6fd965096ef 100644 --- a/_maps/shuttles/cargo_gax.dmm +++ b/_maps/shuttles/cargo_gax.dmm @@ -34,8 +34,7 @@ /area/shuttle/supply) "g" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -43,12 +42,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "i" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/docking_port/mobile/supply{ dwidth = 5; @@ -60,6 +59,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "j" = ( @@ -110,13 +110,15 @@ id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "cargo_bay" }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm index e7e1259b8017..37f5ba0fcee0 100644 --- a/_maps/shuttles/cargo_kilo.dmm +++ b/_maps/shuttles/cargo_kilo.dmm @@ -138,7 +138,7 @@ name = "Off Ramp Toggle"; pixel_x = -24; pixel_y = 6; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -146,7 +146,7 @@ name = "On Ramp Toggle"; pixel_x = -24; pixel_y = -6; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/supply) @@ -258,8 +258,7 @@ /area/shuttle/supply) "K" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile/supply{ @@ -272,12 +271,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/mineral/plastitanium, /area/shuttle/supply) "V" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -286,6 +285,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/mineral/plastitanium, /area/shuttle/supply) "W" = ( diff --git a/_maps/shuttles/emergency_48641.dmm b/_maps/shuttles/emergency_48641.dmm index 4b5d3d4ff384..d8913cec76d0 100644 --- a/_maps/shuttles/emergency_48641.dmm +++ b/_maps/shuttles/emergency_48641.dmm @@ -63,6 +63,12 @@ }, /turf/open/floor/wood, /area/shuttle/escape) +"cg" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/wood, +/area/shuttle/escape) "cY" = ( /obj/structure/window{ dir = 8 @@ -97,6 +103,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, /turf/open/floor/wood, /area/shuttle/escape) "dy" = ( @@ -403,12 +412,12 @@ dir = 8 }, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/shuttle/escape) "pc" = ( @@ -419,6 +428,9 @@ /area/shuttle/escape) "pe" = ( /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/light/colour_cycle/dancefloor_a, /area/shuttle/escape) "ph" = ( @@ -466,6 +478,9 @@ /area/shuttle/escape) "qU" = ( /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/shuttle/escape) "qW" = ( @@ -476,8 +491,7 @@ /area/shuttle/escape) "ri" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -488,6 +502,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "rN" = ( @@ -496,7 +511,7 @@ name = "Table Privacy Shutters"; pixel_x = -28; pixel_y = -5; - req_access_txt = "40" + req_access_txt = "cmo" }, /turf/open/floor/wood, /area/shuttle/escape) @@ -561,6 +576,9 @@ id = "4861tableshutters"; name = "Privacy Shutters" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/wood, /area/shuttle/escape) "tA" = ( @@ -587,6 +605,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/shuttle/escape) "vD" = ( @@ -651,7 +672,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -668,7 +689,7 @@ "wB" = ( /obj/machinery/door/window/westleft{ name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -730,6 +751,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/light/colour_cycle/dancefloor_a, /area/shuttle/escape) "zB" = ( @@ -785,7 +807,7 @@ id = "48641ragecageexit"; name = "Rage Cage Exit Doors"; pixel_x = 24; - req_access_txt = "40" + req_access_txt = "cmo" }, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -980,6 +1002,12 @@ dir = 8 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/light/colour_cycle/dancefloor_a, /area/shuttle/escape) "HT" = ( @@ -1022,7 +1050,7 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Bridge"; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1215,6 +1243,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs, /area/shuttle/escape) "Vm" = ( @@ -1523,7 +1552,7 @@ Xo (9,1,1) = {" gO eo -dn +cg Vl bV yS diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 137add43adba..c37cc7b6622b 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -17,8 +17,7 @@ /area/shuttle/escape) "ad" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26,6 +25,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ae" = ( @@ -383,8 +383,7 @@ /area/shuttle/escape) "bg" = ( /obj/machinery/door/airlock/command/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -392,6 +391,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bi" = ( @@ -570,6 +570,19 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"fo" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Emergency Shuttle Brig" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "lb" = ( /obj/machinery/light, /obj/machinery/door/firedoor/border_only{ @@ -999,7 +1012,7 @@ ac ac ac ah -ad +fo ah bi ah diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 115288d1d00b..c14ed7ef4c5f 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -152,13 +152,13 @@ /area/shuttle/escape) "az" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/carpet, /area/shuttle/escape) "aA" = ( @@ -233,8 +233,7 @@ /area/shuttle/escape) "aJ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -246,12 +245,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/shuttle/escape) "aK" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -259,6 +258,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aL" = ( diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index a9ad698be4be..6987f2fe58d6 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -265,24 +265,24 @@ /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/command/glass{ - name = "bridge door"; - req_access_txt = "19" + name = "bridge door" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aM" = ( /obj/machinery/door/airlock/security/glass{ - name = "security airlock"; - req_access_txt = "63" + name = "security airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aN" = ( @@ -327,8 +327,7 @@ /area/shuttle/escape) "aU" = ( /obj/machinery/door/airlock/command/glass{ - name = "bridge door"; - req_access_txt = "19" + name = "bridge door" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -336,6 +335,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aV" = ( diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index 4bff7e58417b..1e65948e6d37 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -109,13 +109,13 @@ /area/shuttle/escape) "ay" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "az" = ( @@ -176,8 +176,7 @@ /area/shuttle/escape) "aH" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -185,12 +184,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -198,6 +197,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aJ" = ( diff --git a/_maps/shuttles/emergency_cargo.dmm b/_maps/shuttles/emergency_cargo.dmm index 2f377b118a5a..ef817efca6ab 100644 --- a/_maps/shuttles/emergency_cargo.dmm +++ b/_maps/shuttles/emergency_cargo.dmm @@ -265,13 +265,13 @@ /area/shuttle/escape) "rz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) "rM" = ( @@ -338,9 +338,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) "vg" = ( @@ -766,8 +766,7 @@ /area/shuttle/escape) "QE" = ( /obj/machinery/door/airlock/external{ - name = "Emegency Shuttle External Airlock"; - req_access_txt = "2" + name = "Emegency Shuttle External Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -775,6 +774,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "Rh" = ( @@ -825,14 +825,14 @@ name = "Cockpit Window Blast Doors"; pixel_x = 26; pixel_y = 32; - req_access_txt = "19" + req_access_txt = "command" }, /obj/machinery/button/door{ id = "ock_cargo_door"; name = "Cargo Airlock Blast Doors"; pixel_x = 39; pixel_y = 32; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 3b4513efaa7b..f40915bbd0ff 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -478,13 +478,13 @@ /area/shuttle/escape) "aR" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aS" = ( @@ -603,8 +603,7 @@ /area/shuttle/escape) "bn" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -612,6 +611,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bo" = ( @@ -631,8 +631,7 @@ /area/shuttle/escape) "bq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -640,6 +639,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bs" = ( @@ -683,8 +683,7 @@ /area/shuttle/escape) "bv" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -692,6 +691,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "bw" = ( diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index 3a4bb392cb11..a00be9dfb5b9 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -149,8 +149,7 @@ /area/shuttle/escape) "aA" = ( /obj/machinery/door/airlock/bananium/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -158,6 +157,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/bluespace, /area/shuttle/escape) "aB" = ( @@ -507,8 +507,7 @@ /area/shuttle/escape) "IP" = ( /obj/machinery/door/airlock/bananium/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -516,6 +515,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "Jj" = ( diff --git a/_maps/shuttles/emergency_cozy.dmm b/_maps/shuttles/emergency_cozy.dmm index da1000162dd3..8a2fc3b9b789 100644 --- a/_maps/shuttles/emergency_cozy.dmm +++ b/_maps/shuttles/emergency_cozy.dmm @@ -126,9 +126,9 @@ dir = 1 }, /obj/machinery/door/airlock/wood/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ot" = ( @@ -349,9 +349,9 @@ dir = 8 }, /obj/machinery/door/airlock/wood{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/carpet/red, /area/shuttle/escape) "Hi" = ( @@ -373,8 +373,7 @@ /area/shuttle/escape) "Ib" = ( /obj/machinery/door/airlock/wood/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -382,6 +381,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/carpet/red, /area/shuttle/escape) "Iu" = ( diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm index 629a20ca4738..2e4c5e9cfc6f 100644 --- a/_maps/shuttles/emergency_cramped.dmm +++ b/_maps/shuttles/emergency_cramped.dmm @@ -11,8 +11,7 @@ /area/shuttle/escape) "c" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -20,6 +19,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "d" = ( diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index d35fd379e0c9..af7af108eb85 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -785,19 +785,18 @@ /area/shuttle/escape) "bt" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bu" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -806,12 +805,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "bv" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -822,6 +821,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/shuttle/escape) "bw" = ( @@ -1024,8 +1024,7 @@ /area/shuttle/escape) "bY" = ( /obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" + name = "Emergency Recovery Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1036,6 +1035,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "bZ" = ( @@ -1621,8 +1621,7 @@ /area/shuttle/escape) "Ru" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1630,6 +1629,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Rx" = ( diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm index 3ce2293de3f2..620cd07cddc3 100644 --- a/_maps/shuttles/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency_discoinferno.dmm @@ -80,13 +80,12 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "p" = ( -/obj/machinery/door/airlock/gold{ - req_access_txt = "19" - }, +/obj/machinery/door/airlock/gold, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/gold, /area/shuttle/escape) "q" = ( diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index 506ba56e6d9f..9cd4c795e775 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -107,13 +107,13 @@ /area/shuttle/escape) "au" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "av" = ( @@ -164,8 +164,7 @@ /area/shuttle/escape) "aD" = ( /obj/machinery/door/airlock/public/glass{ - name = "Containment Cell"; - req_access_txt = "2" + name = "Containment Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -173,6 +172,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aE" = ( @@ -221,8 +221,7 @@ /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -230,6 +229,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aM" = ( @@ -253,8 +253,7 @@ /area/shuttle/escape) "aP" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -262,6 +261,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aQ" = ( diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 7a17941c7721..569c26f2e5dc 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -200,8 +200,7 @@ /area/shuttle/escape) "E" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -209,6 +208,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "F" = ( @@ -235,8 +235,7 @@ /area/shuttle/escape) "K" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -244,6 +243,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "L" = ( diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index 6fe1f99f8ddb..cf295697c945 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -344,16 +344,16 @@ /area/shuttle/escape) "aJ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_one_access_txt = "19" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/command{ + name = "Shuttle Control" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aK" = ( @@ -401,8 +401,7 @@ "aN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/command{ - name = "Shuttle Control"; - req_one_access_txt = "19" + name = "Shuttle Control" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -410,6 +409,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aO" = ( @@ -598,6 +598,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bc" = ( @@ -699,13 +700,13 @@ "bm" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bn" = ( @@ -1816,13 +1817,13 @@ "qS" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/command{ - name = "Shuttle Control"; - req_one_access_txt = "19" + name = "Shuttle Control" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "qX" = ( diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 499db62f610f..44aef294a736 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -298,8 +298,7 @@ /area/shuttle/escape/luxury) "pP" = ( /obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" + name = "Escape Shuttle Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -307,6 +306,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "rj" = ( @@ -632,8 +632,7 @@ layer = 2.6 }, /obj/machinery/door/airlock/security/glass{ - name = "Undesirables"; - req_access_txt = "2" + name = "Undesirables" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -641,6 +640,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "NE" = ( @@ -798,8 +798,7 @@ id = "ohnopoors"; name = "window shutters"; pixel_x = -23; - pixel_y = -9; - req_access_txt = "0" + pixel_y = -9 }, /obj/machinery/door/firedoor/border_only{ dir = 1 diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 3a27d3376aeb..8775f4ad61b8 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -308,8 +308,7 @@ /area/shuttle/escape) "aH" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -317,6 +316,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( @@ -409,25 +409,25 @@ /area/shuttle/escape) "aW" = ( /obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" + name = "Emergency Recovery Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "aY" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig"; - req_access_txt = "2" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aZ" = ( diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index 2542dc3587fb..36099a07dac1 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -125,13 +125,13 @@ /area/shuttle/escape) "gP" = ( /obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" + name = "Escape Shuttle Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "jx" = ( @@ -212,8 +212,7 @@ /area/shuttle/escape) "mf" = ( /obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "19" + name = "Escape Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -229,6 +228,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "mK" = ( diff --git a/_maps/shuttles/emergency_octa.dmm b/_maps/shuttles/emergency_octa.dmm index 2832cf45285c..2d15fea47a75 100644 --- a/_maps/shuttles/emergency_octa.dmm +++ b/_maps/shuttles/emergency_octa.dmm @@ -316,13 +316,13 @@ /area/shuttle/escape) "zj" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "zJ" = ( @@ -488,8 +488,7 @@ /area/shuttle/escape) "Qz" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -497,6 +496,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "QA" = ( @@ -544,13 +544,13 @@ /area/shuttle/escape) "SM" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "TQ" = ( @@ -598,7 +598,7 @@ name = "Cockpit Window Blast Doors"; pixel_x = -7; pixel_y = 32; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index 6080c7f1374d..fe589b93bb90 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -114,8 +114,7 @@ /area/shuttle/escape) "am" = ( /obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" + name = "Emergency Recovery Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -127,6 +126,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "an" = ( @@ -179,8 +179,7 @@ /area/shuttle/escape) "aq" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -194,6 +193,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/shuttle/escape) "ar" = ( @@ -257,13 +257,13 @@ /area/shuttle/escape) "av" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aw" = ( @@ -272,8 +272,7 @@ /area/shuttle/escape) "ax" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -285,6 +284,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "ay" = ( diff --git a/_maps/shuttles/emergency_pool.dmm b/_maps/shuttles/emergency_pool.dmm index 867ae0b50968..8a55a13430e6 100644 --- a/_maps/shuttles/emergency_pool.dmm +++ b/_maps/shuttles/emergency_pool.dmm @@ -109,13 +109,13 @@ /area/shuttle/escape) "ay" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "az" = ( @@ -176,8 +176,7 @@ /area/shuttle/escape) "aH" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -185,12 +184,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -198,6 +197,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aJ" = ( diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index 220dbaf4a64f..cb1f47651529 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -562,7 +562,6 @@ /obj/structure/window/reinforced, /obj/structure/table, /obj/item/storage/bag/tray, -/obj/item/clothing/under/waiter, /turf/open/floor/plasteel/cafeteria, /area/shuttle/escape) "bg" = ( @@ -701,13 +700,12 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bA" = ( -/obj/machinery/door/airlock/public/glass{ - req_access_txt = "2" - }, +/obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bB" = ( @@ -780,13 +778,13 @@ /area/shuttle/escape) "bO" = ( /obj/machinery/door/airlock/public/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/shuttle/escape) "bQ" = ( @@ -801,13 +799,13 @@ /area/shuttle/escape) "bT" = ( /obj/machinery/door/airlock/public/glass{ - name = "Brig"; - req_access_txt = "2" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "cM" = ( diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 14415c1a5ba0..e8831ac64623 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -39,7 +39,7 @@ id = "escape_cockpit_windows"; name = "Cockpit Window Blast Doors"; pixel_x = -7; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) @@ -267,7 +267,7 @@ id = "escape_cockpit_blast"; name = "Cockpit Airlock Blast Doors"; pixel_y = -26; - req_access_txt = "19" + req_access_txt = "command" }, /obj/effect/turf_decal/raven/two, /turf/open/floor/plasteel/dark, @@ -331,12 +331,12 @@ /area/shuttle/escape) "aS" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aT" = ( @@ -504,8 +504,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -513,6 +512,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "bl" = ( @@ -664,13 +664,14 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_one_access_txt = "2;19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "by" = ( @@ -2289,7 +2290,7 @@ pixel_x = 5; pixel_y = 32; req_access = null; - req_access_txt = "19" + req_access_txt = "command" }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) @@ -2345,13 +2346,13 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "ew" = ( diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency_rollerdome.dmm index c82af014fd83..a680eac441d9 100644 --- a/_maps/shuttles/emergency_rollerdome.dmm +++ b/_maps/shuttles/emergency_rollerdome.dmm @@ -141,14 +141,13 @@ /turf/open/floor/plating, /area/shuttle/escape) "uS" = ( -/obj/machinery/door/airlock/gold/glass{ - req_access_txt = "19" - }, +/obj/machinery/door/airlock/gold/glass, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/shuttle/escape) "vq" = ( diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index ad60ced7dbbb..6a6165b09ffd 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -100,7 +100,7 @@ name = "window shutters"; pixel_x = 26; pixel_y = -6; - req_access_txt = "19" + req_access_txt = "command" }, /obj/structure/chair/comfy/shuttle, /obj/machinery/button/door{ @@ -108,7 +108,7 @@ name = "release bears"; pixel_x = 26; pixel_y = 6; - req_access_txt = "20" + req_access_txt = "captain" }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -118,13 +118,13 @@ /area/shuttle/escape) "at" = ( /obj/machinery/door/airlock/public/glass{ - name = "Glorious Leaders"; - req_access_txt = "19" + name = "Glorious Leaders" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "au" = ( @@ -206,8 +206,7 @@ /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -215,6 +214,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aJ" = ( @@ -252,8 +252,7 @@ /area/shuttle/escape) "aO" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -261,6 +260,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aP" = ( diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm index 3a1105fc48d1..25c1935efd12 100644 --- a/_maps/shuttles/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -100,35 +100,35 @@ /area/shuttle/escape) "aq" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ar" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/carpet, /area/shuttle/escape) "as" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "at" = ( @@ -180,8 +180,7 @@ "az" = ( /obj/structure/grille, /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -189,6 +188,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aA" = ( @@ -201,8 +201,7 @@ /area/shuttle/escape) "aC" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -210,6 +209,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aD" = ( diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index a0a5bdc750db..eb195219ff9d 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -200,13 +200,14 @@ /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/external{ - name = "Emergency Launch Catwalk"; - req_access_txt = "10;13" + name = "Emergency Launch Catwalk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/shuttle/escape) "aM" = ( diff --git a/_maps/shuttles/emergency_transtar.dmm b/_maps/shuttles/emergency_transtar.dmm index d81ff9873254..ec0d19b20c1d 100644 --- a/_maps/shuttles/emergency_transtar.dmm +++ b/_maps/shuttles/emergency_transtar.dmm @@ -541,8 +541,7 @@ /area/shuttle/escape) "GG" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -550,6 +549,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "GX" = ( @@ -713,13 +713,13 @@ /area/shuttle/escape) "Rr" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "RX" = ( diff --git a/_maps/shuttles/emergency_triage.dmm b/_maps/shuttles/emergency_triage.dmm index d7a35a893b74..fcc8971f06e3 100644 --- a/_maps/shuttles/emergency_triage.dmm +++ b/_maps/shuttles/emergency_triage.dmm @@ -290,8 +290,7 @@ /area/shuttle/escape) "ma" = ( /obj/machinery/door/airlock/public/glass{ - name = "Triage Shuttle Brig"; - req_access_txt = "2" + name = "Triage Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -299,6 +298,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "mz" = ( @@ -330,13 +330,13 @@ /area/shuttle/escape) "oA" = ( /obj/machinery/door/airlock/public/glass{ - name = "Triage Shuttle Cockpit"; - req_access_txt = "19" + name = "Triage Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "qa" = ( @@ -390,8 +390,7 @@ /area/shuttle/escape) "uf" = ( /obj/machinery/door/airlock/shuttle{ - name = "Triage Brig Airlock"; - req_access_txt = "2" + name = "Triage Brig Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -399,6 +398,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "uJ" = ( @@ -522,7 +522,7 @@ pixel_y = 10 }, /obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "2" + req_access_txt = "security" }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -790,7 +790,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/closet/secure_closet{ name = "Plasmaman Supplies Locker"; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/plasmaman, diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index d83fa3c43a08..fe5e196d9aab 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -169,8 +169,7 @@ /area/shuttle/escape) "ax" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -178,6 +177,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "ay" = ( @@ -202,13 +202,13 @@ /area/shuttle/escape) "aB" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aC" = ( diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index 56eb6ac34b5f..34d636f003cd 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -13,8 +13,7 @@ /area/shuttle/transport) "d" = ( /obj/machinery/door/airlock/freezer{ - name = "Meat Tradeship Backroom"; - req_access_txt = "28" + name = "Meat Tradeship Backroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -22,6 +21,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/freezer, /area/shuttle/transport) "e" = ( diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 722d9d907760..26a405a8afd6 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -110,7 +110,7 @@ name = "Cockpit View Control"; pixel_x = 32; pixel_y = 32; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) @@ -155,8 +155,7 @@ /area/shuttle/syndicate/bridge) "av" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "150" + name = "Cockpit" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -172,6 +171,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) "aw" = ( @@ -400,8 +400,7 @@ /area/shuttle/syndicate/eva) "aV" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -417,12 +416,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/hallway) "aW" = ( /obj/machinery/door/airlock/external{ - name = "E.V.A. Gear Storage"; - req_access_txt = "150" + name = "E.V.A. Gear Storage" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -440,6 +439,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) "aX" = ( @@ -462,7 +462,7 @@ id = "smindicate"; name = "external door control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/docking_port/mobile{ dheight = 1; @@ -489,9 +489,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) "ba" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -508,6 +506,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) "bb" = ( @@ -564,9 +563,7 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/medical) "bl" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -576,6 +573,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/medical) "bm" = ( @@ -595,9 +593,7 @@ /turf/open/floor/circuit/red, /area/shuttle/syndicate/hallway) "bp" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -607,6 +603,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/armory) "bq" = ( @@ -937,7 +934,7 @@ /obj/machinery/door/window{ dir = 1; name = "Surgery"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1041,7 +1038,7 @@ /obj/machinery/door/window{ dir = 1; name = "Technological Storage"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1347,7 +1344,7 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Mass Driver"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/computer/pod/old{ density = 0; diff --git a/_maps/shuttles/infiltrator_cutter.dmm b/_maps/shuttles/infiltrator_cutter.dmm index 121e92899a85..31e12fcfcf25 100644 --- a/_maps/shuttles/infiltrator_cutter.dmm +++ b/_maps/shuttles/infiltrator_cutter.dmm @@ -7,8 +7,7 @@ dir = 2 }, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_port"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_port" }, /obj/docking_port/mobile{ callTime = 150; @@ -22,6 +21,7 @@ preferred_direction = 4; width = 22 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "ac" = ( @@ -69,9 +69,9 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_port"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_port" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "aj" = ( @@ -143,7 +143,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = 25; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -349,7 +349,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark/side{ @@ -477,9 +477,8 @@ "bn" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/landmark/start/infiltrator_objective, /turf/open/floor/mineral/plastitanium, @@ -500,7 +499,7 @@ }, /obj/machinery/door/window/southleft{ name = "Weapon Storage"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -521,7 +520,7 @@ base_state = "right"; icon_state = "right"; name = "Weapon Storage"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -542,11 +541,9 @@ name = "tactical chair" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; - icon_state = "alarm0"; - pixel_x = -24; - req_access = list(150) + pixel_x = -24 }, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -697,7 +694,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -25; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -760,9 +757,9 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_starboard"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_starboard" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "bS" = ( @@ -783,9 +780,9 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_starboard"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_starboard" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "bW" = ( @@ -842,8 +839,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -851,6 +847,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) "qo" = ( @@ -865,11 +862,10 @@ /area/shuttle/yogs/stealthcruiser) "rY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; icon_state = "alarm0"; - pixel_x = -24; - req_access = list(150) + pixel_x = -24 }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) @@ -878,8 +874,7 @@ dir = 4 }, /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "150" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -887,6 +882,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) "xE" = ( @@ -922,7 +918,8 @@ locked = 1; pixel_x = 30; pixel_y = -33; - req_access = 150 + req_access = null; + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) @@ -985,15 +982,13 @@ /area/shuttle/yogs/stealthcruiser) "JT" = ( /obj/machinery/recharge_station/fullupgrade, -/obj/machinery/power/apc{ - dir = 8; - name = "Syndicate Cutter APC"; - pixel_x = -25; - req_access = 150 - }, /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/apc/syndicate{ + name = "Syndicate Cutter APC"; + pixel_x = -25 + }, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "Lb" = ( @@ -1001,8 +996,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1010,6 +1004,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "Pz" = ( @@ -1022,7 +1017,7 @@ name = "Bridge Blast Door Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -1032,21 +1027,17 @@ "SN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - dir = 8; - icon_state = "alarm0"; +/obj/machinery/airalarm/syndicate{ pixel_x = 24; - req_access = 150 + dir = 8 }, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "Vb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 1; - pixel_y = -24; - req_access = null; - req_access_txt = "150" + pixel_y = -24 }, /obj/machinery/sleeper/syndie/fullupgrade{ dir = 1 diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 07fb01ece3cc..0e27f6417d1c 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -38,7 +38,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, @@ -53,8 +53,7 @@ /area/shuttle/labor) "i" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -62,17 +61,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/shuttle/labor) "j" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) "k" = ( diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index b716eaa6a5a2..1f4d4a0e3f09 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -45,7 +45,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, @@ -60,8 +60,7 @@ /area/shuttle/labor) "j" = ( /obj/machinery/door/airlock/shuttle{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -75,12 +74,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/shuttle/labor) "k" = ( /obj/machinery/door/airlock/shuttle{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -89,6 +88,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/white, /area/shuttle/labor) "l" = ( diff --git a/_maps/shuttles/labour_gax.dmm b/_maps/shuttles/labour_gax.dmm index ca30244c7d31..7f26b98936bd 100644 --- a/_maps/shuttles/labour_gax.dmm +++ b/_maps/shuttles/labour_gax.dmm @@ -20,7 +20,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, @@ -53,8 +53,7 @@ dir = 8 }, /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -68,6 +67,7 @@ port_direction = 4; width = 9 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/shuttle/labor) "p" = ( @@ -133,13 +133,13 @@ /area/shuttle/labor) "U" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) "X" = ( diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index bd52a4808cc9..e91bb3f18d77 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -40,7 +40,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral, @@ -249,8 +249,7 @@ /area/shuttle/labor) "M" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -264,12 +263,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "P" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -279,6 +278,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index af55602c4901..65134beadd7f 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -102,7 +102,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = -6; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -142,8 +142,7 @@ /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate3_bolt_port"; name = "External Airlock"; - normalspeed = 0; - req_access_txt = "150" + normalspeed = 0 }, /obj/docking_port/mobile{ dir = 2; @@ -160,6 +159,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "ha" = ( @@ -213,7 +213,7 @@ name = "Bridge Blast Door Control"; pixel_x = -16; pixel_y = 5; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/button/door{ id = "caravansyndicate3_bolt_bridge"; @@ -221,7 +221,7 @@ normaldoorcontrol = 1; pixel_x = -16; pixel_y = -5; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, @@ -347,7 +347,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -462,8 +462,8 @@ lethal = 1; name = "Shuttle turret control"; pixel_y = 34; - req_access = null; - req_access_txt = "150" + req_access_txt = "syndicate"; + req_access = null }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -477,8 +477,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate3_bolt_bridge"; - name = "Bridge"; - req_access_txt = "150" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -499,6 +498,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) "Jv" = ( @@ -508,8 +508,7 @@ /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate3_bolt_starboard"; name = "External Airlock"; - normalspeed = 0; - req_access_txt = "150" + normalspeed = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -518,6 +517,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "Lq" = ( @@ -635,8 +635,7 @@ /area/shuttle/caravan/syndicate3) "Vf" = ( /obj/machinery/door/airlock/hatch{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -657,6 +656,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) "Wr" = ( diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 91766c07c474..805343bf7892 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -27,8 +27,8 @@ dir = 8; name = "Syndicate Fighter APC"; pixel_x = -25; - req_access = null; - req_access_txt = "150" + req_access_txt = "syndicate"; + req_access = list("syndicate") }, /obj/machinery/computer/security{ dir = 1; @@ -42,8 +42,7 @@ /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate1_bolt"; name = "External Airlock"; - normalspeed = 0; - req_access_txt = "150" + normalspeed = 0 }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile{ @@ -67,6 +66,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate1) "h" = ( @@ -83,7 +83,7 @@ pixel_x = 32; pixel_y = -28; req_access = null; - req_access_txt = "150" + req_access_txt = "syndicate" }, /mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{ environment_smash = 0 @@ -116,7 +116,7 @@ name = "External Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/whiteship_miner.dmm b/_maps/shuttles/whiteship_miner.dmm index 02a05cc6a6f1..3856f3655387 100644 --- a/_maps/shuttles/whiteship_miner.dmm +++ b/_maps/shuttles/whiteship_miner.dmm @@ -1129,7 +1129,7 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -28; - req_access_txt = "0" + req_access_txt = null }, /turf/open/floor/plasteel/showroomfloor, /area/shuttle/abandoned) diff --git a/_maps/templates/infiltrator_base.dmm b/_maps/templates/infiltrator_base.dmm index 4624825e6751..f42ff2fe8f64 100644 --- a/_maps/templates/infiltrator_base.dmm +++ b/_maps/templates/infiltrator_base.dmm @@ -170,7 +170,7 @@ }, /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -292,7 +292,7 @@ /obj/structure/chair/stool, /obj/machinery/airalarm{ pixel_y = 24; - req_access = list(150) + req_access = list("syndicate") }, /obj/effect/landmark/start/infiltrator, /obj/effect/turf_decal/tile/bar, @@ -424,7 +424,7 @@ "aW" = ( /obj/structure/chair/stool, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/effect/landmark/start/infiltrator, @@ -559,10 +559,10 @@ /obj/effect/turf_decal/bot_white, /obj/machinery/door/airlock/centcom{ name = "Equipment Room"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/dark, /area/yogs/infiltrator_base) "bk" = ( @@ -591,7 +591,7 @@ "bn" = ( /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/structure/bed, /obj/item/bedsheet/black, @@ -654,7 +654,7 @@ pixel_y = 32 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark/side{ @@ -682,14 +682,15 @@ dir = 8; icon_state = "alarm0"; pixel_x = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/machinery/turretid{ icon_state = "control_kill"; lethal = 1; locked = 1; pixel_y = 28; - req_access = 150 + req_access_txt = "syndicate"; + req_access = null }, /turf/open/floor/plasteel/dark/side{ dir = 5 @@ -742,8 +743,7 @@ /obj/structure/bed, /obj/machinery/airalarm{ pixel_y = 24; - req_access = list(150); - req_access_txt = "0" + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -761,7 +761,7 @@ }, /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/machinery/light/small{ dir = 1 @@ -931,13 +931,13 @@ /area/yogs/infiltrator_base/jail) "bY" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 2"; - req_access_txt = "150" + name = "Cell 2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "bZ" = ( @@ -1021,7 +1021,7 @@ "ch" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/effect/turf_decal/tile/red{ @@ -1082,7 +1082,7 @@ icon_state = "control_stun"; name = "Security turret control"; pixel_x = 26; - req_access = 150 + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -1099,7 +1099,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -1154,10 +1154,10 @@ /area/yogs/infiltrator_base) "cr" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Foyer"; - req_access_txt = "150" + name = "E.V.A. Foyer" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cs" = ( @@ -1165,7 +1165,7 @@ dir = 4; icon_state = "alarm0"; pixel_x = -24; - req_access = list(150) + req_access = list("syndicate") }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -1218,19 +1218,19 @@ }, /obj/machinery/airalarm{ pixel_y = 24; - req_access = list(150); + req_access = list("syndicate"); req_access_txt = "0" }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "cx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 1"; - req_access_txt = "150" + name = "Cell 1" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "cy" = ( @@ -1394,12 +1394,12 @@ /area/yogs/infiltrator_base/jail) "cN" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "cO" = ( @@ -1442,12 +1442,12 @@ /area/yogs/infiltrator_base) "cT" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cU" = ( @@ -1496,10 +1496,9 @@ /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cZ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "da" = ( @@ -1605,12 +1604,11 @@ /turf/open/floor/plating/asteroid/snow/airless, /area/yogs/infiltrator_base/outside) "di" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "dj" = ( diff --git a/_maps/templates/lazy_templates/chapel1.dmm b/_maps/templates/lazy_templates/chapel1.dmm index eb24c365d12d..6f38bd6d1914 100644 --- a/_maps/templates/lazy_templates/chapel1.dmm +++ b/_maps/templates/lazy_templates/chapel1.dmm @@ -50,7 +50,7 @@ /obj/machinery/door/window{ dir = 8; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/machinery/mass_driver{ dir = 4; @@ -142,13 +142,13 @@ /area/chapel/main) "gS" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "hp" = ( @@ -243,8 +243,7 @@ /area/chapel/main) "mP" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -261,6 +260,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "nb" = ( @@ -497,7 +497,7 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -567,8 +567,7 @@ /area/chapel/main) "ML" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -579,12 +578,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "Ny" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -592,6 +591,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "NG" = ( @@ -624,8 +624,7 @@ /area/chapel/main) "PO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -645,6 +644,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "Qh" = ( @@ -652,7 +652,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -664,7 +664,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "Sa" = ( -/obj/structure/altar_of_gods, +/obj/structure/table/altar_of_gods, /turf/open/floor/plasteel/dark, /area/chapel/main) "Sf" = ( diff --git a/_maps/templates/lazy_templates/chapel2.dmm b/_maps/templates/lazy_templates/chapel2.dmm index 34bf2e658ad4..599410335362 100644 --- a/_maps/templates/lazy_templates/chapel2.dmm +++ b/_maps/templates/lazy_templates/chapel2.dmm @@ -150,8 +150,7 @@ /area/chapel/main) "gJ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -162,6 +161,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "gL" = ( @@ -234,7 +234,7 @@ /obj/machinery/door/window{ dir = 8; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/machinery/mass_driver{ dir = 4; @@ -275,9 +275,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "mq" = ( @@ -508,13 +508,13 @@ /area/chapel/main) "Dj" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "Dq" = ( @@ -722,9 +722,9 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "Kc" = ( @@ -743,7 +743,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -790,7 +790,7 @@ /area/chapel/office) "Nz" = ( /obj/structure/railing, -/obj/structure/altar_of_gods, +/obj/structure/table/altar_of_gods, /turf/open/floor/carpet/red, /area/chapel/main) "NN" = ( @@ -874,7 +874,7 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -1081,8 +1081,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/structure/cable{ icon_state = "1-2" @@ -1093,6 +1092,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "Zw" = ( diff --git a/_maps/templates/lazy_templates/clerk_box.dmm b/_maps/templates/lazy_templates/clerk_box.dmm index a4ddeccf4cb8..1fbce40e3469 100644 --- a/_maps/templates/lazy_templates/clerk_box.dmm +++ b/_maps/templates/lazy_templates/clerk_box.dmm @@ -22,7 +22,7 @@ /area/clerk) "c" = ( /obj/machinery/door/window/southleft{ - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -327,8 +327,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -346,6 +345,7 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "B" = ( @@ -528,8 +528,7 @@ /area/clerk) "Q" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -544,6 +543,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "R" = ( diff --git a/_maps/templates/lazy_templates/clerk_gamble.dmm b/_maps/templates/lazy_templates/clerk_gamble.dmm index 8cafe09ef10c..6e9f2e547bd7 100644 --- a/_maps/templates/lazy_templates/clerk_gamble.dmm +++ b/_maps/templates/lazy_templates/clerk_gamble.dmm @@ -275,8 +275,7 @@ /area/clerk) "R" = ( /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -287,6 +286,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "S" = ( @@ -302,11 +302,11 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "U" = ( diff --git a/_maps/templates/lazy_templates/clerk_meta.dmm b/_maps/templates/lazy_templates/clerk_meta.dmm index cf9d20b43e56..c332bcdfcf1e 100644 --- a/_maps/templates/lazy_templates/clerk_meta.dmm +++ b/_maps/templates/lazy_templates/clerk_meta.dmm @@ -198,8 +198,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -217,6 +216,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "B" = ( @@ -306,8 +306,7 @@ /area/clerk) "O" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -321,6 +320,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "P" = ( @@ -361,14 +361,14 @@ }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "T" = ( diff --git a/_maps/templates/lazy_templates/clerk_pod.dmm b/_maps/templates/lazy_templates/clerk_pod.dmm index 8a532dab3bf5..64c6a4df0820 100644 --- a/_maps/templates/lazy_templates/clerk_pod.dmm +++ b/_maps/templates/lazy_templates/clerk_pod.dmm @@ -245,8 +245,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 @@ -406,8 +405,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 @@ -439,8 +437,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index aabe42b6a117..5d3bb107fd79 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -146,7 +146,7 @@ alert = 0; desc = "A display case containing an expensive forgery, probably."; pixel_y = -4; - req_access_txt = "48"; + req_access_txt = "mining"; start_showpiece_type = /obj/item/fakeartefact }, /turf/open/floor/carpet/black, diff --git a/_maps/templates/shipbreaker/old_repair.dmm b/_maps/templates/shipbreaker/old_repair.dmm index faf463f9b3e9..39de43049061 100644 --- a/_maps/templates/shipbreaker/old_repair.dmm +++ b/_maps/templates/shipbreaker/old_repair.dmm @@ -42,15 +42,14 @@ /turf/open/floor/mineral/titanium/airless, /area/template_noop) "l" = ( -/obj/machinery/door/airlock/external/glass{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external/glass, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating/airless, /area/template_noop) "m" = ( diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm index 372dd1e7849d..b604e1135437 100644 --- a/_maps/templates/shipbreaker/old_syndicate.dmm +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -15,9 +15,9 @@ /area/template_noop) "e" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Storage and Crew Quarters"; - req_access_txt = "150" + name = "Storage and Crew Quarters" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "f" = ( @@ -32,9 +32,9 @@ /area/template_noop) "g" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Bridge"; - req_access_txt = "150" + name = "Bridge" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "h" = ( @@ -124,9 +124,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/template_noop) "M" = ( -/obj/machinery/door/airlock/external/glass{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) "O" = ( diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5e8b06172bd5..ffb89331b14c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -392,7 +392,7 @@ /obj/machinery/door/window/brigdoor/security/holding name = "holding cell door" - req_one_access = list(ACCESS_SEC_BASIC, ACCESS_LAWYER) //love for the lawyer + req_one_access = list(ACCESS_SEC_BASIC) //love for the lawyer /obj/machinery/door/window/clockwork name = "brass windoor" diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 1244b87fc62d..27790ec8c5d3 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -77,7 +77,7 @@ access_list += ACCESS_SECURITY return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/entrance/get_access() +/obj/effect/mapping_helpers/airlock/access/any/security/basic/get_access() var/list/access_list = ..() access_list += ACCESS_SEC_BASIC return access_list @@ -92,12 +92,12 @@ access_list += ACCESS_ARMORY return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/court/get_access() +/obj/effect/mapping_helpers/airlock/access/any/security/detective/get_access() var/list/access_list = ..() access_list += ACCESS_DETECTIVE return access_list -/obj/effect/mapping_helpers/airlock/access/any/security/court/get_access() +/obj/effect/mapping_helpers/airlock/access/any/security/brig_phys/get_access() var/list/access_list = ..() access_list += ACCESS_BRIG_PHYS return access_list @@ -365,6 +365,11 @@ access_list += ACCESS_LAWYER return access_list +/obj/effect/mapping_helpers/airlock/access/any/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + /obj/effect/mapping_helpers/airlock/access/any/service/hop/get_access() var/list/access_list = ..() access_list += ACCESS_HOP @@ -425,7 +430,7 @@ access_list += ACCESS_SECURITY return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/entrance/get_access() +/obj/effect/mapping_helpers/airlock/access/all/security/basic/get_access() var/list/access_list = ..() access_list += ACCESS_SEC_BASIC return access_list @@ -440,12 +445,12 @@ access_list += ACCESS_ARMORY return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/court/get_access() +/obj/effect/mapping_helpers/airlock/access/all/security/detective/get_access() var/list/access_list = ..() access_list += ACCESS_DETECTIVE return access_list -/obj/effect/mapping_helpers/airlock/access/all/security/court/get_access() +/obj/effect/mapping_helpers/airlock/access/all/security/brig_phys/get_access() var/list/access_list = ..() access_list += ACCESS_BRIG_PHYS return access_list @@ -714,6 +719,11 @@ access_list += ACCESS_LAWYER return access_list +/obj/effect/mapping_helpers/airlock/access/all/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + /obj/effect/mapping_helpers/airlock/access/all/service/hop/get_access() var/list/access_list = ..() access_list += ACCESS_HOP From fa7eb65ac2f770a15d9d867a51229a3458af69c2 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sun, 28 Jul 2024 19:06:16 +0200 Subject: [PATCH 16/48] ballin --- _maps/RandomRuins/JungleRuins/miningbase.dmm | 73 +-- .../lavaland_surface_russianbunker.dmm | 3 +- .../lavaland_surface_syndicate_base1.dmm | 440 ++++++++++++------ _maps/RandomRuins/LavaRuins/miningbase.dmm | 74 +-- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 83 ++-- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 145 +++--- .../RandomRuins/SpaceRuins/caravanambush.dmm | 20 +- .../SpaceRuins/crashedclownship.dmm | 7 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 94 ++-- _maps/RandomRuins/SpaceRuins/gameroom.dmm | 8 +- .../SpaceRuins/listeningstation.dmm | 150 +++--- .../RandomRuins/SpaceRuins/mechtransport.dmm | 4 +- .../SpaceRuins/mrow_thats_right.dmm | 27 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 12 +- _maps/RandomRuins/SpaceRuins/spacebar.dmm | 47 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 80 ++-- .../BoxStation/engine_reactor.dmm | 36 +- .../BoxStation/engine_singulo_tesla.dmm | 28 +- .../StationRuins/BoxStation/engine_sm.dmm | 46 +- .../StationRuins/BoxStation/engine_teg.dmm | 33 +- .../StationRuins/BoxStation/transfer1.dmm | 6 +- .../StationRuins/BoxStation/transfer10.dmm | 2 +- .../StationRuins/BoxStation/transfer2.dmm | 6 +- .../StationRuins/BoxStation/transfer3.dmm | 8 +- .../StationRuins/BoxStation/transfer4.dmm | 6 +- .../StationRuins/BoxStation/transfer5.dmm | 6 +- .../StationRuins/BoxStation/transfer6.dmm | 8 +- .../StationRuins/BoxStation/transfer7.dmm | 8 +- .../StationRuins/BoxStation/transfer8.dmm | 6 +- .../StationRuins/BoxStation/transfer9.dmm | 17 +- .../StationRuins/GaxStation/ai_whale.dmm | 65 +-- .../StationRuins/MetaStation/meta_reactor.dmm | 28 +- .../MetaStation/meta_singulo_tesla.dmm | 48 +- .../StationRuins/MetaStation/meta_sm.dmm | 42 +- .../StationRuins/MetaStation/meta_teg.dmm | 36 +- .../maint/10x10/10x10_snakefighter.dmm | 8 +- .../maint/10x5/10x5_deltaclutter1.dmm | 2 +- _maps/RandomZLevels/VR/snowdin_VR.dmm | 8 +- _maps/RandomZLevels/challenge.dmm | 32 +- _maps/RandomZLevels/moonoutpost19.dmm | 157 +++---- _maps/RandomZLevels/research.dmm | 212 ++++----- _maps/RandomZLevels/snowdin.dmm | 165 ++++--- _maps/shuttles/emergency_asteroid.dmm | 8 +- code/__DEFINES/access.dm | 6 +- code/game/machinery/ai_slipper.dm | 2 +- .../machinery/porta_turret/portable_turret.dm | 2 +- code/modules/jobs/access.dm | 12 +- .../jobs/job_types/head_of_personnel.dm | 2 +- .../jobs/job_types/research_director.dm | 2 +- code/modules/jobs/job_types/synthetic.dm | 2 +- code/modules/mapping/access_helpers.dm | 8 +- 51 files changed, 1219 insertions(+), 1111 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index a76174f98fcc..d7e8caa36f08 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -82,8 +82,7 @@ /area/mine/storage) "aX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -100,6 +99,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -954,8 +956,7 @@ /area/mine/living_quarters) "iz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -963,6 +964,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/mine/living_quarters) "iC" = ( @@ -1386,13 +1388,13 @@ /area/mine/break_room) "px" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "pB" = ( @@ -1440,14 +1442,14 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qh" = ( @@ -1498,13 +1500,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/siding/wideplating{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qR" = ( @@ -1832,9 +1834,11 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "wU" = ( @@ -2185,8 +2189,7 @@ /area/mine/break_room) "BC" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2203,6 +2206,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/production) "BM" = ( @@ -2600,12 +2604,12 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "GT" = ( @@ -2728,13 +2732,13 @@ /area/mine/maintenance) "Je" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "Ji" = ( @@ -2768,6 +2772,12 @@ /obj/machinery/door/airlock/medical{ name = "Recovery Room" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -2798,8 +2808,7 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2808,6 +2817,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) "Kf" = ( @@ -3156,19 +3166,18 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "PS" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -3185,6 +3194,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3207,8 +3217,7 @@ /area/mine/maintenance) "Qv" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Station EVA"; - req_access_txt = "54" + name = "Mining Station EVA" }, /obj/structure/cable{ icon_state = "1-2" @@ -3222,6 +3231,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "QE" = ( @@ -3304,6 +3314,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "RR" = ( @@ -3370,8 +3383,7 @@ /area/mine/break_room) "Tf" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Mining Station Atmospherics"; - req_access_txt = "48" + name = "Mining Station Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3379,6 +3391,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3399,7 +3412,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/door/airlock/engineering/glass{ + name = "Vacant Room" + }, /turf/open/floor/plasteel, /area/mine/vacant) "TG" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm index 152899714d8f..604ee0c5c79c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm @@ -164,8 +164,7 @@ name = "Shuttle turret control"; pixel_x = 32; pixel_y = -28; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/suit/armor/heavy/juggernaut, /obj/item/clothing/head/helmet/juggernaut, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index ce1bd0cc41ad..5dcf1ac10a9a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -19,8 +19,7 @@ /area/ruin/powered/syndicate_lava_base/testlab) "af" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -32,7 +31,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "ah" = ( @@ -78,7 +83,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "ap" = ( @@ -217,10 +225,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "bU" = ( @@ -417,9 +428,8 @@ /area/ruin/powered/syndicate_lava_base/virology) "dL" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "dM" = ( @@ -463,8 +473,7 @@ /area/ruin/powered/syndicate_lava_base/medbay) "dU" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plating, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/powered/syndicate_lava_base/chemistry) "dV" = ( /obj/effect/turf_decal/siding/wood{ @@ -494,8 +503,7 @@ pixel_y = -5 }, /obj/structure/closet/secure_closet/chemical{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/storage/box/beakers/bluespace, /obj/item/storage/box/beakers/bluespace, @@ -566,7 +574,7 @@ /area/ruin/powered/syndicate_lava_base/arrivals) "ej" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -592,9 +600,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "em" = ( -/obj/effect/turf_decal/siding/green{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -604,6 +609,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/turf_decal/siding/green/corner, +/obj/effect/turf_decal/siding/green/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "eo" = ( @@ -633,7 +642,7 @@ pixel_y = 32 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark, @@ -681,9 +690,7 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "eD" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "4-8" }, @@ -694,6 +701,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/testlab) "eE" = ( @@ -763,7 +771,7 @@ /obj/machinery/button/door{ id = "lavalandsyndi_virology"; name = "Virology Blast Door Control"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/storage/box/monkeycubes, /obj/effect/turf_decal/siding/green{ @@ -824,7 +832,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "fa" = ( @@ -838,7 +851,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "fb" = ( @@ -915,8 +932,7 @@ /area/ruin/powered/syndicate_lava_base/medbay) "fh" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "150" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -924,8 +940,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/grass, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "fj" = ( /obj/structure/cable{ @@ -980,7 +1008,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "fu" = ( @@ -1163,7 +1196,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark, @@ -1193,8 +1226,7 @@ dir = 8 }, /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/gun/syringe/rapidsyringe, /obj/item/storage/firstaid/hypospray/syndicate, @@ -1218,12 +1250,11 @@ /area/ruin/powered/syndicate_lava_base/medbay) "gu" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "gv" = ( @@ -1260,7 +1291,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "gB" = ( @@ -1706,7 +1742,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "hR" = ( @@ -1813,7 +1852,7 @@ id = "syndicate_lavaland_vault_windows"; name = "Vault Window Shutters"; pixel_y = -24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) @@ -1838,7 +1877,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /turf/open/floor/mineral/plastitanium, @@ -1883,8 +1922,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "ie" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1896,7 +1934,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "ig" = ( @@ -1923,7 +1967,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "iq" = ( @@ -1966,7 +2016,7 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1985,8 +2035,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "iA" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "150" + name = "Cargo Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1994,7 +2043,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/cargo) "iB" = ( @@ -2005,7 +2060,7 @@ id = "lavalandsyndi_chemistry"; name = "Chemistry Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/chem_master, /obj/effect/turf_decal/siding/purple{ @@ -2027,7 +2082,7 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/siding/red{ dir = 1 @@ -2289,6 +2344,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/powered/syndicate_lava_base/dormitories) "jq" = ( @@ -2339,7 +2400,7 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/structure/table/reinforced, @@ -2359,8 +2420,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "jA" = ( /obj/machinery/door/airlock/atmos{ - name = "Turbine"; - req_access_txt = "150" + name = "Turbine" }, /obj/structure/cable{ icon_state = "4-8" @@ -2374,7 +2434,13 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "jC" = ( @@ -2656,7 +2722,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/machinery/airalarm/syndicate{ @@ -2777,15 +2843,18 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "ks" = ( -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "ku" = ( @@ -2929,7 +2998,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/bar, -/obj/structure/closet/syndicate, +/obj/structure/closet/syndicate{ + req_access_txt = "syndicate" + }, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/ammo_casing/shotgun/beanbag, /obj/item/ammo_casing/shotgun/beanbag, @@ -3010,9 +3081,8 @@ /area/ruin/powered/syndicate_lava_base/engineering) "kY" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/telecomms) "kZ" = ( @@ -3069,13 +3139,18 @@ /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "lh" = ( -/obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "150" +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/grass, -/area/ruin/powered/syndicate_lava_base/virology) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ruin/powered/syndicate_lava_base/medbay) "lj" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/cable{ @@ -3181,9 +3256,8 @@ /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "lM" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "lN" = ( @@ -3215,7 +3289,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/machinery/airalarm/syndicate{ @@ -3308,7 +3382,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "lZ" = ( @@ -3361,7 +3440,7 @@ name = "syndicate commander's gloves" }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plating/lavaland_baseturf, /area/ruin/powered/syndicate_lava_base/engineering) @@ -3456,9 +3535,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "mr" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "4-8" }, @@ -3469,6 +3546,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/testlab) "ms" = ( @@ -3544,8 +3622,7 @@ /area/lavaland/surface/outdoors) "mN" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "150" + name = "Experimentation Lab" }, /obj/structure/cable{ icon_state = "1-2" @@ -3556,7 +3633,11 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) "mS" = ( @@ -3565,7 +3646,7 @@ /obj/item/circuitboard/machine/clonescanner, /obj/structure/closet/crate/secure/medical{ desc = "A crate with a lock on it, painted in the scheme of the station's doctors. This one is marked to contain prototype circuitry and clearly hasn't been touched in years."; - req_access_txt = "151" + req_access_txt = "syndicate_leader" }, /obj/item/paper{ info = "You have been assigned to test an old cloner system provided to us by one of our research stations. Your monkeys should make excellent DNA sources. Do not clone too many crew, and be prepared to treat genetic defects and cellular damage." @@ -3651,7 +3732,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "np" = ( @@ -3731,6 +3817,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/arrivals) "ny" = ( @@ -3774,7 +3863,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, @@ -3836,7 +3925,7 @@ id = "lavalandsyndi_arrivals"; name = "Arrivals Blast Door Control"; pixel_y = -26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -3867,7 +3956,7 @@ id = "lavalandsyndi_medsci"; name = "Medical Bay Shutters"; pixel_y = 24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -4006,18 +4095,17 @@ /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "oo" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "op" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/machinery/airalarm/syndicate{ @@ -4027,13 +4115,12 @@ /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "ou" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "ov" = ( @@ -4103,12 +4190,11 @@ /turf/open/floor/engine/vacuum, /area/ruin/powered/syndicate_lava_base/engineering) "oI" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/bar) "oJ" = ( @@ -4124,13 +4210,8 @@ /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "oK" = ( -/obj/machinery/door/firedoor/window{ - desc = "A second window that slides in when the original window is broken, designed to protect against hull breaches. Truly a work of genius by Cybersun engineers." - }, /obj/machinery/smartfridge/chemistry/virology/preloaded, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/plating, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/powered/syndicate_lava_base/virology) "oP" = ( /obj/structure/table/reinforced, @@ -4150,7 +4231,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "oV" = ( @@ -4177,25 +4261,34 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "pz" = ( -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "pK" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 +/obj/machinery/door/airlock/vault{ + id_tag = "syndie_lavaland_vault"; + name = "Vault Access" }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24 +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base/arrivals) +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/syndicate_lava_base/vault) "qh" = ( /obj/effect/turf_decal/siding/red{ dir = 10 @@ -4229,7 +4322,7 @@ /area/ruin/powered/syndicate_lava_base/telecomms) "qG" = ( /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/grass, @@ -4251,7 +4344,10 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "rc" = ( @@ -4265,7 +4361,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/mineral/plastitanium, @@ -4276,7 +4372,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -4291,7 +4387,7 @@ }, /obj/machinery/door/window/brigdoor/westleft{ name = "Disposals Conveyor"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/structure/sign/warning/deathsposal{ pixel_x = 32 @@ -4320,7 +4416,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, @@ -4383,13 +4479,12 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "tS" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/bar) "tU" = ( @@ -4402,7 +4497,7 @@ "tZ" = ( /obj/machinery/door/window/brigdoor{ name = "Isolation Pen"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/light{ dir = 1; @@ -4432,7 +4527,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/structure/disposalpipe/segment{ @@ -4491,7 +4586,7 @@ "uT" = ( /obj/machinery/door/window/northleft{ name = "Bar"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4647,8 +4742,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "wL" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "150" + name = "Cargo Bay" }, /obj/structure/cable{ icon_state = "4-8" @@ -4659,10 +4753,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "xd" = ( @@ -4853,7 +4953,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/structure/disposalpipe/segment{ @@ -4902,7 +5002,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "Ay" = ( @@ -4910,7 +5015,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -5057,14 +5162,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "Cr" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "Cv" = ( @@ -5154,7 +5261,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "Ed" = ( @@ -5361,7 +5471,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -5384,7 +5494,7 @@ name = "Base turret controls"; pixel_y = 30; req_access = null; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -5432,8 +5542,7 @@ /area/ruin/powered/syndicate_lava_base/main) "Hi" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/structure/cable{ icon_state = "4-8" @@ -5444,10 +5553,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/telecomms) "Hn" = ( @@ -5543,14 +5658,18 @@ "IC" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndie_lavaland_vault"; - name = "Vault Access"; - req_access_txt = "150" + name = "Vault Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) "IJ" = ( @@ -5659,13 +5778,17 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medbay" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "JV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/machinery/airalarm/syndicate{ @@ -5829,7 +5952,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -5949,8 +6072,7 @@ /area/ruin/powered/syndicate_lava_base/virology) "Om" = ( /obj/machinery/door/airlock/research{ - name = "Chemistry"; - req_access_txt = "150" + name = "Chemistry" }, /obj/structure/cable{ icon_state = "4-8" @@ -5961,10 +6083,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) "Ou" = ( @@ -6114,7 +6242,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "QQ" = ( @@ -6214,10 +6345,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "RR" = ( @@ -6490,7 +6624,7 @@ /area/ruin/powered/syndicate_lava_base/main) "VH" = ( /obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/brown{ dir = 10 @@ -6506,7 +6640,7 @@ }, /obj/machinery/door/window/eastright{ name = "Kitchen"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -7715,7 +7849,7 @@ kQ kQ ip cO -JE +lh kQ kQ pz @@ -7723,7 +7857,7 @@ Ao eh eh eh -lh +eh eh eh kU @@ -8114,7 +8248,7 @@ it dE IC TA -IC +pK Ib jo hz @@ -8183,7 +8317,7 @@ hz mb iW hz -pK +nt nW on ab diff --git a/_maps/RandomRuins/LavaRuins/miningbase.dmm b/_maps/RandomRuins/LavaRuins/miningbase.dmm index 07f81b825a05..e89e62a772a0 100644 --- a/_maps/RandomRuins/LavaRuins/miningbase.dmm +++ b/_maps/RandomRuins/LavaRuins/miningbase.dmm @@ -68,8 +68,7 @@ /area/mine/storage) "aX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -86,6 +85,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -863,8 +865,7 @@ /area/mine/living_quarters) "iz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -872,6 +873,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/mine/living_quarters) "iC" = ( @@ -1325,13 +1327,13 @@ /area/mine/break_room) "px" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "py" = ( @@ -1388,14 +1390,14 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qh" = ( @@ -1457,13 +1459,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/siding/wideplating{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qR" = ( @@ -2174,8 +2176,7 @@ /area/mine/break_room) "BC" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2192,6 +2193,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/production) "BM" = ( @@ -2540,9 +2542,11 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "Gi" = ( @@ -2590,12 +2594,12 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "GT" = ( @@ -2722,21 +2726,21 @@ /area/mine/maintenance) "Je" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "Ji" = ( /obj/machinery/door/window/eastleft{ - req_access_txt = "48" + req_access_txt = "mining_station" }, /obj/machinery/door/window/westleft{ - req_access_txt = "48" + req_access_txt = "mining_station" }, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 @@ -2762,6 +2766,9 @@ /obj/machinery/door/airlock/medical{ name = "Recovery Room" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -2784,8 +2791,7 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2794,6 +2800,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) "Ke" = ( @@ -3161,19 +3168,18 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "PS" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -3190,6 +3196,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3212,8 +3219,7 @@ /area/mine/maintenance) "Qv" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Station EVA"; - req_access_txt = "54" + name = "Mining Station EVA" }, /obj/structure/cable{ icon_state = "1-2" @@ -3227,6 +3233,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "QE" = ( @@ -3315,6 +3322,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "RR" = ( @@ -3414,8 +3424,7 @@ /area/mine/break_room) "Tf" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Mining Station Atmospherics"; - req_access_txt = "48" + name = "Mining Station Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3423,6 +3432,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3443,7 +3453,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/door/airlock/engineering/glass{ + name = "Vacant Room" + }, /turf/open/floor/plasteel, /area/mine/vacant) "TG" = ( diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 3050febc5afc..57cb5cef7460 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -387,12 +387,12 @@ /area/ruin/space/derelict/bridge/ai_upload) "bh" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Solar Access"; - req_access_txt = "10" + name = "Starboard Solar Access" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/solar_control) "bi" = ( @@ -910,19 +910,19 @@ /area/ruin/space/derelict/bridge/access) "cV" = ( /obj/machinery/door/airlock/command{ - name = "E.V.A."; - req_access_txt = "18" + name = "E.V.A." }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/command, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cW" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Secure Storage"; - req_access_txt = "10" + name = "Engineering Secure Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cX" = ( @@ -946,9 +946,9 @@ /area/ruin/space/derelict/gravity_generator) "da" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "db" = ( @@ -1113,8 +1113,7 @@ /area/ruin/space/derelict/singularity_engine) "dC" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -1122,6 +1121,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dD" = ( @@ -1225,12 +1225,12 @@ /area/ruin/space/derelict/singularity_engine) "dT" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "dU" = ( @@ -1413,7 +1413,7 @@ "eB" = ( /obj/machinery/door/window/eastleft{ name = "Heads of Staff"; - req_access_txt = "command" + req_access_txt = "ruins_command" }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) @@ -1643,7 +1643,7 @@ /obj/machinery/door/window{ dir = 2; name = "Captain's Quarters"; - req_access_txt = "20" + req_access_txt = "ruins_command" }, /obj/structure/grille, /turf/open/floor/plating/airless, @@ -1813,9 +1813,9 @@ /area/ruin/space/derelict/singularity_engine) "fR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/bridge/access) "fS" = ( @@ -2217,9 +2217,9 @@ /area/ruin/space/derelict/medical/chapel) "hu" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/medical, /turf/open/floor/plasteel/dark, /area/ruin/space/derelict/medical/chapel) "hv" = ( @@ -2277,9 +2277,9 @@ /area/ruin/space/derelict/medical/chapel) "hG" = ( /obj/machinery/door/morgue{ - name = "coffin storage"; - req_access_txt = "22" + name = "coffin storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/derelict/medical/chapel) "hH" = ( @@ -2586,7 +2586,7 @@ }, /obj/machinery/door/window{ dir = 4; - req_access_txt = "25" + req_access_txt = "ruins_general" }, /obj/structure/closet/crate/coffin, /turf/open/floor/plating, @@ -2696,9 +2696,9 @@ /area/ruin/space/derelict/medical) "ja" = ( /obj/machinery/door/airlock/public/glass{ - name = "Med-Sci"; - req_access_txt = "9" + name = "Med-Sci" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/science, /turf/open/floor/plating/airless, /area/ruin/space/derelict/medical) "jb" = ( @@ -2930,9 +2930,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Toxins Research"; - req_access_txt = "7" + name = "Toxins Research" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/science, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "jR" = ( @@ -3043,9 +3043,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Toxins Research"; - req_access_txt = "7" + name = "Toxins Research" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/science, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/arrival) "ki" = ( @@ -3070,6 +3070,7 @@ /obj/machinery/door/airlock/command{ name = "Teleporter Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/command, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/medical/chapel) "km" = ( @@ -3226,12 +3227,12 @@ /area/ruin/space/derelict/hallway/primary) "kR" = ( /obj/machinery/door/airlock/security{ - name = "Security"; - req_access_txt = "1" + name = "Security" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/security, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "kS" = ( @@ -3302,9 +3303,9 @@ /area/ruin/space/derelict/hallway/primary) "lh" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Access"; - req_access_txt = "24" + name = "Atmospherics Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "li" = ( @@ -3488,9 +3489,9 @@ /area/ruin/space/derelict/atmospherics) "lP" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Access"; - req_access_txt = "24" + name = "Atmospherics Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lQ" = ( @@ -3789,9 +3790,9 @@ /area/ruin/space/derelict/hallway/secondary) "mW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Aux Storage"; - req_access_txt = "23" + name = "Aux Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "mX" = ( @@ -4000,9 +4001,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Aft Solar Access"; - req_access_txt = "10" + name = "Aft Solar Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/se_solar) "nD" = ( @@ -4057,9 +4058,9 @@ icon_state = "1-8" }, /obj/machinery/door/airlock/engineering{ - name = "Aft Solar Access"; - req_access_txt = "10" + name = "Aft Solar Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/se_solar) "nM" = ( @@ -4475,10 +4476,10 @@ /area/ruin/space/derelict/singularity_engine) "RF" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "Sv" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index f5b99d72b918..c6eac51cbe7d 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -503,8 +503,7 @@ "by" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Security Checkpoint"; - req_access_txt = "63" + name = "Security Checkpoint" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -516,6 +515,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/derelictoutpost) "bz" = ( @@ -588,6 +588,11 @@ icon_state = "smooth"; name = "gelatinous wall" }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) "bG" = ( @@ -978,13 +983,13 @@ /area/ruin/space/has_grav/derelictoutpost/powerstorage) "cr" = ( /obj/machinery/door/airlock/engineering{ - name = "Power Storage"; - req_access_txt = "10" + name = "Power Storage" }, -/obj/structure/barricade/wooden, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/barricade/wooden, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/powerstorage) "cs" = ( @@ -1783,17 +1788,16 @@ }, /area/ruin/space/has_grav/derelictoutpost) "dO" = ( -/obj/structure/alien/resin/membrane{ - color = "#4BAE56"; - desc = "A strange combination of thin, gelatinous material."; - icon_state = "smooth"; - name = "gelatinous membrane" - }, /obj/effect/decal/cleanable/blood/old{ dir = 8; icon_state = "trails_1"; name = "dried blood trail" }, +/obj/structure/alien/resin/membrane{ + color = "#4BAE56"; + desc = "A strange combination of thin, gelatinous material."; + name = "gelatinous membrane" + }, /turf/open/floor/plating{ icon_state = "wall_thermite"; name = "melted wall" @@ -1833,6 +1837,11 @@ icon_state = "smooth"; name = "gelatinous membrane" }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) "dS" = ( @@ -1940,7 +1949,6 @@ /obj/structure/alien/resin/membrane{ color = "#4BAE56"; desc = "A strange combination of thin, gelatinous material."; - icon_state = "smooth"; name = "gelatinous membrane" }, /turf/open/floor/plating/asteroid/airless, @@ -2005,7 +2013,6 @@ /obj/structure/alien/resin/wall{ color = "#8EC127"; desc = "Thick material shaped into a wall. Eugh."; - icon_state = "smooth"; name = "gelatinous wall" }, /turf/open/floor/plating/asteroid, @@ -2188,6 +2195,20 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/derelictoutpost/cargobay) +"rI" = ( +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + icon_state = "smooth"; + name = "gelatinous wall" + }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/unpowered/no_grav) "uV" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -2195,6 +2216,20 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/derelictoutpost/powerstorage) +"Ks" = ( +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + icon_state = "smooth"; + name = "gelatinous wall" + }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/space/has_grav/derelictoutpost) "LB" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -3164,8 +3199,8 @@ aZ dO aZ en -en -en +rI +rI ad ad aa @@ -3201,8 +3236,8 @@ dP cR cR cR -cm -cm +Ks +Ks aa aa aa @@ -3238,9 +3273,9 @@ eg cR cR cR -cm -cm -cm +Ks +Ks +Ks aa aa aa @@ -3276,7 +3311,7 @@ ev dD cR cR -cm +Ks aa aa aa @@ -3343,10 +3378,10 @@ cC bl cC dD -cm -cm -cm -cm +Ks +Ks +Ks +Ks cR dR aa @@ -3379,12 +3414,12 @@ bF bF bl cR -cm +Ks cR cR cR cR -cm +Ks aa aa aa @@ -3415,12 +3450,12 @@ bl bF bl bl -cm +Ks dt -cm -cm -cm -cm +Ks +Ks +Ks +Ks aa aa aa @@ -3451,9 +3486,9 @@ bl bF dk cR -cm +Ks cR -cm +Ks aa aa aa @@ -3486,8 +3521,8 @@ bF bl bF bl -cm -cm +Ks +Ks eg dR aa @@ -3516,13 +3551,13 @@ bX cl cD cR -cm +Ks dm -cm +Ks dD -cm -cm -cm +Ks +Ks +Ks cR bl dR @@ -3552,7 +3587,7 @@ aZ aZ cE cR -cm +Ks dn du cR @@ -3561,7 +3596,7 @@ cR cR cR ev -cm +Ks aa aa aa @@ -3585,19 +3620,19 @@ ad aC aC aC -cm +Ks cF cS cZ do cR -cm -cm +Ks +Ks dR dR dR -cm -cm +Ks +Ks aa aa aa @@ -3621,13 +3656,13 @@ ad ad ad aC -cm -cm -cm -cm -cm -cm -cm +Ks +Ks +Ks +Ks +Ks +Ks +Ks aa ad ad diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index d5d5cfa4580a..db8e8a74a620 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -461,10 +461,9 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "gc" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "gd" = ( @@ -623,10 +622,9 @@ /area/shuttle/caravan/freighter2) "hs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "ht" = ( @@ -1202,12 +1200,11 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/unpowered) "vE" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "vN" = ( @@ -1233,12 +1230,11 @@ /area/shuttle/caravan/freighter2) "GL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "JZ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 3adef24b4e1d..1b487c05976a 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -44,13 +44,10 @@ "k" = ( /obj/structure/closet/secure_closet{ name = "clown locker"; - req_access_txt = "46" + req_access_txt = "theatre" }, /obj/item/clothing/shoes/clown_shoes/banana_shoes, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "l" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 886d8e1f10c3..4acf92745317 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -13,8 +13,7 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) @@ -308,8 +307,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage) @@ -322,21 +320,21 @@ /area/ruin/space/has_grav/deepstorage) "aO" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Recycling Room"; - req_access_txt = "200" + name = "Recycling Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/crusher) "aP" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Recycling Room"; - req_access_txt = "200" + name = "Recycling Room" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/crusher) "aQ" = ( @@ -497,8 +495,7 @@ "bh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8; - icon_state = "vent_map_on-1" + dir = 8 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/storage) @@ -567,8 +564,7 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8; - icon_state = "vent_map_on-1" + dir = 8 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/hydroponics) @@ -654,12 +650,12 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "bC" = ( /obj/machinery/door/airlock/highsecurity{ - name = "General Storage"; - req_access_txt = "200" + name = "General Storage" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/storage) "bD" = ( @@ -1010,8 +1006,7 @@ /area/ruin/space/has_grav/deepstorage/storage) "cl" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Provisions Storage"; - req_access_txt = "200" + name = "Provisions Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1023,6 +1018,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/storage) "cm" = ( @@ -1203,8 +1199,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage) @@ -1292,9 +1287,9 @@ /area/ruin/space/has_grav/deepstorage/storage) "cP" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Storage"; - req_access_txt = "200" + name = "Secure Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) "cQ" = ( @@ -1735,8 +1730,7 @@ /area/ruin/space/has_grav/deepstorage) "dM" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Storage"; - req_access_txt = "200" + name = "Secure Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1747,6 +1741,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) "dN" = ( @@ -1790,8 +1785,7 @@ /area/ruin/space/has_grav/deepstorage/armory) "dQ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Airlock Control"; - req_access_txt = "200" + name = "Airlock Control" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1799,6 +1793,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/airlock) "dR" = ( @@ -1894,23 +1889,23 @@ /area/ruin/space/has_grav/deepstorage) "dZ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Atmospherics and Power Storage"; - req_access_txt = "200" + name = "Atmospherics and Power Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/power) "ea" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Atmospherics and Power Storage"; - req_access_txt = "200" + name = "Atmospherics and Power Storage" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/power) "eb" = ( @@ -1954,8 +1949,7 @@ /area/ruin/space/has_grav/deepstorage/dorm) "eg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) @@ -2010,16 +2004,15 @@ /obj/structure/chair/stool, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/wood, /area/ruin/space/has_grav/deepstorage/dorm) "en" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Canister Storage"; - req_access_txt = "200" + name = "Canister Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "eo" = ( @@ -2159,20 +2152,20 @@ name = "exterior blast door access"; pixel_x = -24; pixel_y = -8; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /obj/machinery/button/door{ id = "bunkerinterior"; name = "interior blast door access"; pixel_x = -24; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /obj/machinery/button/door{ id = "bunkershutter"; name = "hallway shutter toggle"; pixel_x = -24; pixel_y = 8; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /obj/machinery/computer/security/telescreen{ dir = 1; @@ -2200,8 +2193,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -2592,8 +2584,7 @@ /obj/machinery/light, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" + dir = 1 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/airlock) @@ -2624,7 +2615,6 @@ "fz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer2{ dir = 8; - icon_state = "vent_map_siphon_on-1"; id_tag = "o2_out_bunker"; name = "oxygen out" }, @@ -2787,8 +2777,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" + dir = 1 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/dorm) @@ -2834,7 +2823,6 @@ "gf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer2{ dir = 8; - icon_state = "vent_map_siphon_on-1"; id_tag = "n2_out_bunker"; name = "nitrogen out" }, @@ -2943,10 +2931,10 @@ "gz" = ( /obj/machinery/door/airlock/highsecurity{ desc = "Nothing to see here, folks, just an inconspicuous airlock. Now go away!"; - name = "Inconspicuous Airlock"; - req_access_txt = "200" + name = "Inconspicuous Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "gC" = ( @@ -3013,12 +3001,12 @@ /area/ruin/space/has_grav/deepstorage/power) "gL" = ( /obj/machinery/door/airlock/highsecurity{ - name = "RTG Observation"; - req_access_txt = "200" + name = "RTG Observation" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gN" = ( @@ -3028,13 +3016,13 @@ "gQ" = ( /obj/machinery/door/airlock/highsecurity{ desc = "Nothing to see here, folks, just an inconspicuous airlock. Now go away!"; - name = "Inconspicuous Airlock"; - req_access_txt = "200" + name = "Inconspicuous Airlock" }, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "gR" = ( @@ -3064,9 +3052,9 @@ /area/ruin/space/has_grav/deepstorage/power) "gY" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecomms"; - req_access_txt = "200" + name = "Telecomms" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gZ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/gameroom.dmm b/_maps/RandomRuins/SpaceRuins/gameroom.dmm index e146bce6fedc..1a7bdfd4d885 100644 --- a/_maps/RandomRuins/SpaceRuins/gameroom.dmm +++ b/_maps/RandomRuins/SpaceRuins/gameroom.dmm @@ -251,7 +251,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = 23; pixel_y = -21; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/gaming) @@ -687,8 +687,7 @@ "EO" = ( /obj/machinery/door/airlock/vault{ id_tag = "snack_vault"; - name = "Secure Snack Storage"; - req_access_txt = "200" + name = "Secure Snack Storage" }, /obj/machinery/door/poddoor/preopen{ id = "snack_vault"; @@ -701,6 +700,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powered/gaming) "Gt" = ( @@ -918,7 +918,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = -22; pixel_y = -21; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powered/gaming) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 8b64f833c5f9..48284f49704c 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -32,6 +32,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/white_stairs_alone{ dir = 1 }, @@ -45,7 +46,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/plasteel/dark, @@ -65,8 +66,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "ai" = ( /obj/machinery/door/airlock/grunge{ - name = "Bathroom"; - req_access_txt = "150" + name = "Bathroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -75,6 +75,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/listeningstation/quarters) "aj" = ( @@ -234,8 +235,7 @@ "aO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external_engi"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external_engi" }, /obj/structure/cable{ icon_state = "1-2" @@ -243,6 +243,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/sand/plating, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "aP" = ( @@ -261,9 +262,7 @@ /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "aT" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -279,6 +278,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "aU" = ( @@ -310,6 +310,7 @@ "aX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "aY" = ( @@ -336,7 +337,7 @@ id = "lpost_privacy_left"; name = "Privacy Shutters"; pixel_y = 23; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -481,8 +482,9 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "150"; - specialfunctions = 4 + req_access_txt = "syndicate"; + specialfunctions = 4; + pixel_x = -3 }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) @@ -802,6 +804,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/stairs_alone{ dir = 1 }, @@ -875,6 +878,9 @@ /area/ruin/space/has_grav/listeningstation/quarters) "hp" = ( /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/white_stairs_alone, /area/ruin/space/has_grav/listeningstation/quarters) "hr" = ( @@ -885,6 +891,9 @@ dir = 1 }, /obj/item/kirbyplants, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "hv" = ( @@ -931,9 +940,12 @@ dir = 10 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "il" = ( @@ -948,7 +960,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_y = -24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/critter, @@ -1014,6 +1026,9 @@ /obj/structure/closet/wardrobe/black{ anchored = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "iz" = ( @@ -1069,7 +1084,7 @@ "iO" = ( /obj/structure/closet/secure_closet/medical1{ req_access = null; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -1083,7 +1098,7 @@ id = "lpost_privacy_right"; name = "Privacy Shutters"; pixel_y = 23; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -1100,13 +1115,10 @@ "jn" = ( /obj/machinery/door/window/northright{ name = "Document Storage"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/paper/monitorkey, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/item/paper/fluff/ruins/listeningstation/odd_report, /obj/item/paper/fluff/ruins/listeningstation/receipt, /obj/item/paper/fluff/ruins/listeningstation/reports/april, @@ -1227,20 +1239,18 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/airlock) "kR" = ( -/obj/structure/closet/syndicate{ - req_access_txt = "150" - }, +/obj/structure/closet/syndicate, /obj/effect/decal/cleanable/dirt, /obj/item/ammo_box/a357, /obj/item/crowbar/red, @@ -1446,6 +1456,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "rO" = ( /obj/machinery/oven, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "rP" = ( @@ -1459,6 +1470,9 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs_alone, /area/ruin/space/has_grav/listeningstation/quarters) "rW" = ( @@ -1572,6 +1586,7 @@ "tF" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder/kitchen, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "tG" = ( @@ -1593,8 +1608,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "tK" = ( /obj/machinery/door/airlock/grunge{ - name = "Cabin"; - req_access_txt = "150" + name = "Cabin" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1605,6 +1619,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "tO" = ( @@ -1651,9 +1666,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "um" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "uy" = ( @@ -1790,9 +1804,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "we" = ( -/obj/structure/closet/syndicate{ - req_access_txt = "150" - }, +/obj/structure/closet/syndicate, /obj/item/ammo_box/magazine/m10mm, /obj/item/crowbar/red, /obj/item/clothing/head/HoS/beret/syndicate, @@ -1822,6 +1834,9 @@ faction = list("Syndicate"); name = "Cayenne II" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "wp" = ( @@ -1952,6 +1967,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood/broken/six, /area/ruin/space/has_grav/listeningstation/quarters) "zg" = ( @@ -2053,7 +2069,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/mineral/ore_redemption{ - req_access = list(150) + req_access = list("syndicate") }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) @@ -2080,12 +2096,12 @@ /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/reagent_containers/food/snacks/meat/slab, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "Da" = ( /obj/machinery/door/airlock/grunge{ - name = "Shower"; - req_access_txt = "150" + name = "Shower" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2094,6 +2110,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/listeningstation/quarters) "Dk" = ( @@ -2337,6 +2354,7 @@ "IC" = ( /obj/machinery/griddle, /obj/item/reagent_containers/glass/mixbowl, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "IU" = ( @@ -2361,7 +2379,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_x = -24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/airlock) @@ -2714,6 +2732,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) +"OQ" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/space/has_grav/listeningstation/quarters) "OV" = ( /obj/machinery/light/small{ brightness = 3; @@ -2835,12 +2859,13 @@ "Qq" = ( /obj/structure/table/reinforced, /obj/machinery/microwave, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "QE" = ( /obj/machinery/door/window/northleft{ name = "Telecommunications"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2881,11 +2906,11 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/warehouse) "Ri" = ( +/obj/structure/fans/tiny, /obj/machinery/door/airlock/hatch{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, -/obj/structure/holosign/barrier/atmos, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "RB" = ( @@ -2899,14 +2924,14 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external_engi"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external_engi" }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/sand/plating, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "Si" = ( @@ -2942,8 +2967,7 @@ /area/ruin/space/has_grav/listeningstation/airlock) "Su" = ( /obj/machinery/door/airlock/grunge{ - name = "Cabin"; - req_access_txt = "150" + name = "Cabin" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2954,6 +2978,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "SG" = ( @@ -3031,7 +3056,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/door/window/survival_pod{ name = "Showcase and Self-Destruct Access"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/red/fourcorners, @@ -3064,8 +3089,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "UC" = ( -/obj/effect/spawner/structure/window/reinforced/shutter, -/turf/open/floor/plasteel/grimy, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "UF" = ( /obj/machinery/vending/boozeomat/syndicate_access, @@ -3097,25 +3122,27 @@ /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "Vu" = ( /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "VE" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/airlock) "VH" = ( @@ -3135,7 +3162,7 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_x = 24; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -3224,9 +3251,9 @@ dir = 4 }, /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "Xl" = ( @@ -3271,6 +3298,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "XE" = ( @@ -3287,14 +3317,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "XI" = ( @@ -3371,6 +3400,9 @@ dir = 1 }, /obj/item/kirbyplants, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "YH" = ( @@ -3845,7 +3877,7 @@ sb kz aY pp -aV +OQ af wj cR @@ -3883,9 +3915,9 @@ aN zV NN Nn -tg -aV +UC aV +OQ tg iO ua diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm index 5bc1da717495..96e887c1dc4b 100644 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm @@ -60,9 +60,9 @@ /area/ruin/space/has_grav/powered/mechtransport) "p" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "101" + name = "Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "r" = ( diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index 9af5ce7cbb6c..3f88163ea519 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -85,16 +85,16 @@ /area/ruin/space/has_grav/powered/cat_man) "aq" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Misc Supplies"; - req_access_txt = "201" + name = "Misc Supplies" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "ar" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Custodial Supplies"; - req_access_txt = "201" + name = "Custodial Supplies" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "as" = ( @@ -163,7 +163,7 @@ }, /obj/machinery/door/window{ name = "kitty door"; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/plating, @@ -294,7 +294,7 @@ }, /obj/machinery/door/window/westleft{ name = "kitty door"; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 @@ -620,7 +620,7 @@ }, /obj/machinery/door/window/northleft{ name = "kitty door"; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/plating, @@ -754,10 +754,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bY" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "201" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bZ" = ( @@ -780,10 +779,10 @@ /area/ruin/space/has_grav/powered/cat_man) "cc" = ( /obj/machinery/door/airlock{ - name = "Limb Storage"; - req_access_txt = "200" + name = "Limb Storage" }, /obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/powered/cat_man) "cd" = ( @@ -810,9 +809,9 @@ /area/ruin/space/has_grav/powered/cat_man) "cg" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Portable Atmos Equipment"; - req_access_txt = "201" + name = "Portable Atmos Equipment" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powered/cat_man) "ch" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index b6ab5b15bcb6..fde0baf80584 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2362,7 +2362,7 @@ /obj/item/assembly/flash/handheld, /obj/item/storage/box/firingpins, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "203" + req_access_txt = "ruins_security" }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -4587,8 +4587,7 @@ "qc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/highsecurity{ - name = "Prototype Laboratory"; - req_access_txt = "200" + name = "Prototype Laboratory" }, /obj/structure/cable{ icon_state = "1-2" @@ -4597,20 +4596,21 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white/side, /area/ruin/space/has_grav/ancientstation/proto) "qd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/highsecurity{ - name = "Prototype Laboratory"; - req_access_txt = "200" + name = "Prototype Laboratory" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white/side, /area/ruin/space/has_grav/ancientstation/proto) "qe" = ( @@ -8835,7 +8835,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/engineering{ name = "plasma tank crate"; - req_access_txt = "204" + req_access_txt = "ruins_engineering" }, /obj/item/tank/internals/plasma/full, /obj/item/tank/internals/plasma/full, diff --git a/_maps/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/RandomRuins/SpaceRuins/spacebar.dmm index de7e58f48f39..ab8d9849e66f 100644 --- a/_maps/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacebar.dmm @@ -86,7 +86,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -265,9 +265,9 @@ dir = 4 }, /obj/machinery/door/airlock/grunge{ - name = "Storage"; - req_access_txt = "25" + name = "Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "jk" = ( @@ -386,7 +386,7 @@ }, /obj/structure/closet/secure_closet/freezer/fridge{ req_access = null; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -455,9 +455,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Bedroom"; - req_access_txt = "25" + name = "Bedroom" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "qR" = ( @@ -641,9 +641,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Backroom"; - req_access_txt = "25" + name = "Backroom" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "xY" = ( @@ -708,9 +708,9 @@ dir = 4 }, /obj/machinery/door/airlock/grunge{ - name = "Backroom"; - req_access_txt = "25" + name = "Backroom" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/spacebar) "BT" = ( @@ -829,7 +829,7 @@ "Gk" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access = null; - req_access_txt = "25" + req_access_txt = "bar" }, /obj/structure/window{ dir = 4 @@ -852,9 +852,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "GH" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/gun/ballistic/revolver/russian, /obj/item/storage/box/dishdrive, /obj/effect/decal/cleanable/dirt, @@ -1091,9 +1089,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Solars"; - req_access_txt = "25" + name = "Solars" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/spacebar) "NQ" = ( @@ -1106,9 +1104,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Kitchen"; - req_access_txt = "25" + name = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) "Ow" = ( @@ -1119,7 +1117,8 @@ id = "barshutters"; name = "Bar Shutters Control"; pixel_x = 25; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "bar" }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/spacebar) @@ -1268,9 +1267,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/spacebar) "TU" = ( @@ -1399,12 +1397,11 @@ /turf/template_noop, /area/template_noop) "YY" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/spacebar) "Zg" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index cb07ee717dae..b985b166ea21 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -877,8 +877,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_6) "cs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -889,6 +888,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ct" = ( @@ -1250,6 +1250,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/workroom) "dk" = ( @@ -1836,9 +1837,9 @@ /area/ruin/space/has_grav/hotel) "eN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "eO" = ( @@ -1969,9 +1970,9 @@ /area/ruin/space/has_grav/hotel/bar) "fj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "200,201" + name = "Hotel Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/bar) "fk" = ( @@ -2068,8 +2069,7 @@ /area/ruin/space/has_grav/hotel) "fs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -2080,6 +2080,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ft" = ( @@ -2158,7 +2159,8 @@ /area/ruin/space/has_grav/hotel/bar) "fE" = ( /obj/machinery/vending/boozeomat{ - req_access_txt = "200" + req_access_txt = "ruins_general"; + req_access = null }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -2307,9 +2309,9 @@ /area/ruin/space/has_grav/hotel/bar) "fT" = ( /obj/machinery/door/airlock/freezer{ - name = "Freezer"; - req_access_txt = "200" + name = "Freezer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/hotel/bar) "fU" = ( @@ -2498,9 +2500,9 @@ /area/ruin/space/has_grav/hotel/bar) "gs" = ( /obj/machinery/door/airlock/grunge{ - name = "Hotel Staff Room"; - req_access_txt = "200" + name = "Hotel Staff Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "gt" = ( @@ -2571,7 +2573,8 @@ /area/ruin/space/has_grav/hotel/bar) "gC" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access_txt = "200" + req_access_txt = "ruins_general"; + req_access = null }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2658,7 +2661,8 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access_txt = "200" + req_access_txt = "ruins_general"; + req_access = null }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2834,7 +2838,7 @@ /obj/item/reagent_containers/food/condiment/flour, /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null; - req_access_txt = "200" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3011,11 +3015,11 @@ /area/ruin/space/has_grav/hotel/workroom) "hI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "200,201" + name = "Hotel Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "hJ" = ( @@ -3105,7 +3109,7 @@ /area/ruin/space/has_grav/hotel/custodial) "hT" = ( /obj/machinery/vending/dinnerware{ - req_access_txt = "200" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3191,14 +3195,14 @@ /area/ruin/space/has_grav/hotel/custodial) "ib" = ( /obj/machinery/door/airlock/engineering{ - name = "Power Storage"; - req_access_txt = "200,201" + name = "Power Storage" }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ic" = ( @@ -3212,11 +3216,11 @@ /area/ruin/space/has_grav/hotel) "id" = ( /obj/machinery/door/airlock/security/glass{ - name = "Hotel Security Checkpoint"; - req_access_txt = "203" + name = "Hotel Security Checkpoint" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/security, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ie" = ( @@ -3391,8 +3395,7 @@ /area/ruin/space/has_grav/hotel/power) "iw" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "200,201" + name = "Custodial Closet" }, /obj/structure/cable{ icon_state = "4-8" @@ -3403,6 +3406,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ix" = ( @@ -3430,9 +3434,9 @@ /area/ruin/space/has_grav/hotel/bar) "iA" = ( /obj/machinery/door/airlock{ - name = "Theatre"; - req_access_txt = "200" + name = "Theatre" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/hotel/bar) "iB" = ( @@ -3445,8 +3449,7 @@ /area/ruin/space/has_grav/hotel) "iD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -3454,6 +3457,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "iE" = ( @@ -3986,7 +3990,7 @@ icon_state = "rightsecure"; name = "Cell Door"; req_access = null; - req_access_txt = "203" + req_access_txt = "ruins_security" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -4057,10 +4061,10 @@ /area/ruin/space/has_grav/hotel/power) "kI" = ( /obj/machinery/door/airlock/engineering{ - name = "Air Supply"; - req_access_txt = "200,201" + name = "Air Supply" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kK" = ( @@ -4336,8 +4340,7 @@ /area/ruin/space/has_grav/hotel/security) "lF" = ( /obj/machinery/door/airlock/security/glass{ - name = "Hotel Security Checkpoint"; - req_access_txt = "203" + name = "Hotel Security Checkpoint" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -4349,6 +4352,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/security, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/security) "lG" = ( @@ -4476,7 +4480,7 @@ "lT" = ( /obj/structure/closet/secure_closet/security{ req_access = null; - req_access_txt = "203" + req_access_txt = "ruins_security" }, /obj/item/gun/energy/laser/scatter/shotty, /obj/item/clothing/head/helmet/justice, @@ -4880,12 +4884,12 @@ /area/ruin/space/has_grav/hotel/workroom) "mQ" = ( /obj/machinery/door/airlock/grunge{ - name = "Hotel Staff Room"; - req_access_txt = "200" + name = "Hotel Staff Room" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "mR" = ( @@ -5036,7 +5040,7 @@ icon_state = "right"; layer = 3; name = "Hotel Bar Access"; - req_access_txt = "200,201" + req_access_txt = "ruins_general" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/bar) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm index e9fffc883d07..346c6cf577ed 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm @@ -94,12 +94,12 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 9 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "cz" = ( @@ -211,12 +211,12 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Clean Room"; - req_access_txt = "10" + name = "Reactor Clean Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "hV" = ( @@ -256,11 +256,11 @@ "iB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "iV" = ( @@ -669,8 +669,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Clean Room"; - req_access_txt = "10" + name = "Reactor Clean Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -687,6 +686,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "vl" = ( @@ -822,7 +822,7 @@ /obj/machinery/button/door{ id = "reactorcore"; name = "Core Access"; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -917,10 +917,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "CI" = ( @@ -993,8 +993,7 @@ /area/engine/engineering) "FU" = ( /obj/machinery/door/airlock/engineering{ - name = "Reactor Core"; - req_one_access_txt = "10;24" + name = "Reactor Core" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1009,6 +1008,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Gc" = ( @@ -1124,8 +1124,7 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Control Room"; - req_access_txt = "10" + name = "Control Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1142,6 +1141,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Jj" = ( @@ -1196,7 +1196,7 @@ /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -1219,8 +1219,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Control Room"; - req_access_txt = "10" + name = "Control Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1231,6 +1230,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "KS" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm index c0a9844406c7..5ed3477960ef 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm @@ -247,7 +247,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -337,7 +337,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/engine, /area/engine/engineering) @@ -352,7 +352,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -459,7 +459,7 @@ icon_state = "1-4" }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/engine/engineering) "iX" = ( /obj/machinery/camera/emp_proof{ c_tag = "Engineering Singularity Northwest"; @@ -538,7 +538,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/engine/engineering) "mP" = ( /obj/item/weldingtool, /turf/open/space/basic, @@ -601,7 +601,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access_txt = "10" + req_access_txt = "engineering" }, /mob/living/simple_animal/opossum/poppy, /turf/open/floor/engine, @@ -688,9 +688,9 @@ /area/engine/engineering) "xH" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "xO" = ( @@ -711,8 +711,7 @@ /area/engine/engineering) "zz" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -720,6 +719,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Aa" = ( @@ -843,9 +843,9 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "Hf" = ( @@ -882,8 +882,7 @@ "Jk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -894,6 +893,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Jy" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm index 79e358d186b4..feb4225e9cb1 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm @@ -14,13 +14,13 @@ /area/engine/engineering) "ae" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "af" = ( @@ -196,7 +196,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 @@ -301,14 +301,14 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "bj" = ( @@ -424,13 +424,13 @@ /area/engine/engineering) "bA" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "bD" = ( @@ -466,12 +466,12 @@ "bH" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "bI" = ( @@ -1462,10 +1462,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "kP" = ( @@ -1485,11 +1485,11 @@ "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "li" = ( @@ -1630,8 +1630,7 @@ /area/engine/engineering) "wi" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1648,6 +1647,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "wn" = ( @@ -1771,9 +1771,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "Fa" = ( @@ -1856,8 +1856,7 @@ /area/engine/engineering) "JV" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1874,12 +1873,12 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "JY" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -1889,6 +1888,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "Kg" = ( @@ -1974,8 +1974,7 @@ /area/engine/engineering) "Pt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -1988,6 +1987,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "Pu" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index cb8108cb54b1..00291a2d1a0c 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -179,7 +179,7 @@ name = "Hot Chamber Vent"; pixel_x = -26; pixel_y = 8; - req_access_txt = "10" + req_access_txt = "engineering" }, /mob/living/simple_animal/opossum/poppy, /obj/structure/chair/office/dark{ @@ -321,10 +321,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "iX" = ( @@ -332,10 +332,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "kp" = ( @@ -375,11 +375,11 @@ "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "lw" = ( @@ -807,7 +807,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_x = 26; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/structure/lattice/catwalk, /turf/template_noop, @@ -1019,9 +1019,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "FG" = ( @@ -1137,7 +1137,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/machinery/light{ @@ -1184,8 +1184,7 @@ /area/engine/engineering) "Lt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1320,9 +1319,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "Ov" = ( @@ -1743,9 +1742,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "ZP" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm index b348c1d3697c..8a7047c4ce99 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm @@ -69,7 +69,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -251,9 +251,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "H" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm index d5c0f7cef2b3..98671e91be56 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm @@ -243,7 +243,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm index 0c1cbad69eb3..7baa8b71c36c 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm @@ -15,9 +15,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/showroomfloor, /area/template_noop) "c" = ( @@ -115,7 +115,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm index 81ad6e9e9166..a7cf16f08546 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm @@ -74,7 +74,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -95,7 +95,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, @@ -182,12 +182,12 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "v" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm index 68b75aea2a11..732cc28d3293 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm @@ -128,7 +128,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -329,12 +329,12 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "N" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm index 9f20fe50a9f1..1478a16312eb 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm @@ -108,7 +108,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -269,9 +269,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "H" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm index a7fe4762e3c4..26abccddbb10 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm @@ -276,9 +276,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/template_noop) "K" = ( @@ -362,7 +362,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -383,7 +383,7 @@ name = "Crush"; pixel_x = 25; pixel_y = -15; - req_access_txt = "2" + req_access_txt = "brig" }, /turf/open/floor/plasteel/dark, /area/template_noop) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm index 1c1032ea4d13..f9c04c5facbe 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm @@ -173,7 +173,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -199,7 +199,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, @@ -246,8 +246,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 1 @@ -255,6 +254,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/engine, /area/template_noop) "A" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm index 8ee200c7d112..5be52b0cbd2c 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm @@ -91,7 +91,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -382,9 +382,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/template_noop) "X" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm index 0bc1d803c183..114ad20d519f 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm @@ -58,9 +58,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/template_noop) "j" = ( @@ -90,20 +90,12 @@ /turf/open/floor/plasteel/showroomfloor, /area/template_noop) "o" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/button/door{ id = "executionfireblast"; name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" - }, -/obj/machinery/button/flasher{ - id = "executionflash"; - pixel_x = 24; - pixel_y = 5 + req_access_txt = "brig" }, /obj/structure/cable{ icon_state = "1-8" @@ -262,6 +254,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/template_noop) "G" = ( diff --git a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm index 8a9272a49a69..34f474f437af 100644 --- a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm +++ b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm @@ -105,9 +105,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bV" = ( @@ -129,8 +130,7 @@ /area/ai_monitored/turret_protected/ai) "cn" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -140,6 +140,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cJ" = ( @@ -635,9 +637,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "lm" = ( @@ -704,8 +707,7 @@ /area/ai_monitored/storage/satellite) "lN" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -716,6 +718,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "mb" = ( @@ -902,8 +905,7 @@ "pP" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "16" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -921,6 +923,7 @@ /obj/structure/ethernet_cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "pQ" = ( @@ -1259,8 +1262,7 @@ /area/tcommsat/server) "xf" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Server Room"; - req_access_txt = "61" + name = "Server Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1280,6 +1282,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "xn" = ( @@ -1419,8 +1422,7 @@ /area/ai_monitored/turret_protected/ai) "zk" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Monitoring Room"; - req_access_txt = "65" + name = "MiniSat Monitoring Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1433,6 +1435,7 @@ /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "zp" = ( @@ -1847,8 +1850,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "Hw" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_access_txt = "61" + name = "Telecomms Control Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1859,6 +1861,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "HD" = ( @@ -1977,13 +1980,14 @@ /area/ai_monitored/storage/satellite) "Kt" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_one_access_txt = "65;61" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "KM" = ( @@ -2033,8 +2037,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "Lm" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2049,6 +2052,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/aisat_interior) "Lt" = ( @@ -2261,9 +2265,6 @@ /turf/closed/wall, /area/tcommsat/computer) "Pe" = ( -/obj/machinery/door/airlock/public{ - id_tag = "ai_core_airlock_interior" - }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -2277,6 +2278,11 @@ /obj/structure/ethernet_cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/highsecurity{ + id_tag = "ai_core_airlock_exterior"; + name = "AI Core" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "Pg" = ( @@ -2685,13 +2691,13 @@ /area/solar/port/aft) "Vc" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "Vm" = ( @@ -2754,8 +2760,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "WY" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Server Room"; - req_access_txt = "61" + name = "Server Room" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -2772,6 +2777,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "Xc" = ( @@ -2850,9 +2856,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_one_access_txt = "65;61" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "Yo" = ( diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm index 22f56df63a59..bc6a20255059 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm @@ -634,13 +634,13 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; diry = -2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "rz" = ( @@ -918,8 +918,7 @@ /area/engine/engineering) "AO" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -934,6 +933,7 @@ dirx = 2; diry = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "AZ" = ( @@ -1066,13 +1066,13 @@ id = "reactorcore"; name = "Core Access"; pixel_y = -2; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; pixel_y = 8; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1550,9 +1550,9 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/door/airlock/engineering{ - name = "Reactor Maintenance"; - req_access_txt = "10" + name = "Reactor Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Sl" = ( @@ -1686,9 +1686,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "Reactor Maintenance"; - req_access_txt = "10" + name = "Reactor Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Wq" = ( @@ -1707,8 +1707,7 @@ /area/engine/engineering) "WC" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1723,6 +1722,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "XZ" = ( @@ -1786,8 +1786,7 @@ /area/engine/engineering) "Zt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1799,6 +1798,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "ZC" = ( diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm index 9796b0371329..997bc7c9c017 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm @@ -143,6 +143,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "eZ" = ( @@ -277,7 +278,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = -24; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -357,6 +358,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "rF" = ( @@ -438,7 +440,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/engine, /area/engine/engineering) @@ -453,7 +455,7 @@ icon_state = "2-8" }, /turf/open/floor/plating/snowed/smoothed, -/area/icemoon/top_layer/outdoors) +/area/engine/engineering) "vB" = ( /obj/structure/particle_accelerator/end_cap{ dir = 4 @@ -469,20 +471,6 @@ "vP" = ( /turf/closed/wall/r_wall, /area/engine/engineering) -"wr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/button/door{ - dir = 4; - id = "engsm"; - name = "Radiation Shutters Control"; - pixel_x = 24; - pixel_y = 0; - req_access_txt = "10" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "wu" = ( /obj/structure/grille, /obj/structure/cable/orange{ @@ -498,9 +486,9 @@ /area/engine/engineering) "xa" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "yo" = ( @@ -583,7 +571,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -666,7 +654,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/snowed/smoothed, -/area/icemoon/top_layer/outdoors) +/area/engine/engineering) "JC" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -684,17 +672,6 @@ /obj/item/clothing/gloves/color/yellow, /turf/open/floor/plasteel, /area/engine/engineering) -"Ks" = ( -/obj/machinery/button/door{ - dir = 8; - id = "engsm"; - name = "Radiation Shutters Control"; - pixel_x = -24; - pixel_y = 0; - req_access_txt = "10" - }, -/turf/open/floor/engine, -/area/engine/engineering) "KT" = ( /obj/structure/cable/orange{ icon_state = "1-8" @@ -758,7 +735,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = 24; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/engine, /area/engine/engineering) @@ -790,6 +767,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "PS" = ( @@ -1040,7 +1018,7 @@ aO Lj ul Lj -wr +Lj Lj zG Lj @@ -1092,7 +1070,7 @@ Ik vP cR oj -Ks +oj oj cR vP diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm index 9738ab3466f6..1d9bf888d0de 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm @@ -262,8 +262,7 @@ /area/engine/engineering) "jg" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -277,6 +276,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "jj" = ( @@ -584,8 +584,7 @@ /area/engine/engineering) "qj" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -596,6 +595,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "qm" = ( @@ -783,8 +783,7 @@ /area/engine/engineering) "vl" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -798,6 +797,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "vq" = ( @@ -1044,8 +1044,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1053,6 +1052,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Cs" = ( @@ -1282,14 +1282,14 @@ /area/engine/engineering) "Jp" = ( /obj/machinery/door/airlock/engineering{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Jq" = ( @@ -1380,8 +1380,7 @@ /area/engine/engineering) "Ne" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1392,6 +1391,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Ny" = ( @@ -1429,12 +1429,12 @@ "Ov" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "OD" = ( @@ -1442,8 +1442,7 @@ /area/template_noop) "OR" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1457,6 +1456,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Pm" = ( @@ -1468,8 +1468,7 @@ "Pz" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1480,6 +1479,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "PA" = ( @@ -1507,7 +1507,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1591,13 +1591,13 @@ "RX" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "SM" = ( diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm index b61308f19584..0bddc0553ef0 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm @@ -137,12 +137,12 @@ /area/engine/engineering) "fh" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "fm" = ( @@ -200,7 +200,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_y = 22; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/structure/lattice/catwalk, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -254,8 +254,7 @@ /area/engine/engineering) "hO" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -266,6 +265,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "ib" = ( @@ -282,8 +282,7 @@ /area/engine/engineering) "ij" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -294,6 +293,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "iq" = ( @@ -408,8 +408,7 @@ /area/engine/engineering) "oc" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -417,12 +416,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "oJ" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -430,6 +429,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "oN" = ( @@ -891,7 +891,7 @@ name = "Hot Chamber Vent"; pixel_x = -7; pixel_y = -24; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/machinery/button/ignition{ id = "teghotburn"; @@ -1058,14 +1058,14 @@ /area/engine/engineering) "Ns" = ( /obj/machinery/door/airlock/engineering{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "NH" = ( @@ -1147,8 +1147,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1156,6 +1155,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "QQ" = ( @@ -1479,8 +1479,7 @@ /area/engine/engineering) "Yy" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1491,6 +1490,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Yz" = ( diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm index 9fa1693ba7c8..ebb3a172c1e0 100644 --- a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm +++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm @@ -237,24 +237,24 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research/glass{ - name = "Research Pit"; - req_access_txt = "12" + name = "Research Pit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "U" = ( /obj/machinery/door/airlock/research/glass{ - name = "Research Pit"; - req_access_txt = "12" + name = "Research Pit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "V" = ( diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm index b3f4fb526834..4f7ab27057e5 100644 --- a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /obj/structure/table/wood, -/obj/item/clothing/under/waiter, +/obj/item/clothing/under/suit/waiter, /obj/item/clothing/accessory/waistcoat, /turf/open/floor/plasteel/dark, /area/template_noop) diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index 5a2b130e3f02..3073723a1811 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -3473,8 +3473,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "surgery" + name = "Medbay Storage" }, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -3482,6 +3481,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post) "hP" = ( @@ -6328,8 +6328,7 @@ }, /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; - req_access = null; - req_access_txt = "security" + req_access = null }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6341,6 +6340,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/secpost) "nH" = ( diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index 515f813eedec..84d0739d8731 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -3,9 +3,7 @@ /turf/open/space, /area/space) "ab" = ( -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/start) "ac" = ( /obj/structure/girder, @@ -120,9 +118,7 @@ /turf/open/floor/plasteel/airless, /area/awaymission/challenge/start) "aA" = ( -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/main) "aB" = ( /obj/structure/girder, @@ -556,9 +552,7 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bP" = ( -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/end) "bQ" = ( /obj/item/gun/ballistic/revolver/russian, @@ -662,9 +656,9 @@ "cf" = ( /obj/machinery/door/airlock/centcom{ name = "Airlock"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plating, /area/awaymission/challenge/end) "cg" = ( @@ -771,9 +765,9 @@ "cx" = ( /obj/machinery/door/airlock/centcom{ name = "Security"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plasteel/dark, /area/awaymission/challenge/end) "cy" = ( @@ -792,16 +786,14 @@ /area/space/nearstation) "cA" = ( /obj/structure/sign/warning/securearea, -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/end) "cB" = ( /obj/machinery/door/airlock/centcom{ name = "Administrator"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plasteel/dark, /area/awaymission/challenge/end) "cC" = ( @@ -1091,9 +1083,9 @@ "dk" = ( /obj/machinery/door/airlock/centcom{ name = "Gateway Access"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plasteel/dark, /area/awaymission/challenge/end) "dl" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index f1256a899029..11a6dd993614 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -536,15 +536,13 @@ }, /area/awaymission/moonoutpost19/syndicate) "bo" = ( -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = null; - req_access_txt = "150" - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -605,7 +603,7 @@ /obj/machinery/door/window{ dir = 1; name = "Gateway Access"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/structure/cable{ icon_state = "1-2" @@ -733,13 +731,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/airalarm{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ dir = 8; - pixel_x = 24; - req_access = null; - req_access_txt = "150" + pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -857,9 +853,9 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ - name = "Gateway"; - req_access_txt = "150" + name = "Gateway" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -914,14 +910,12 @@ /area/awaymission/moonoutpost19/syndicate) "bU" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = null; - req_access_txt = "150" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -1020,10 +1014,8 @@ }, /area/awaymission/moonoutpost19/syndicate) "cd" = ( -/obj/machinery/airalarm/unlocked{ - pixel_y = 24; - req_access = null; - req_access_txt = "150" +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /turf/open/floor/plasteel{ dir = 8; @@ -1256,9 +1248,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ - name = "Power Maintenance"; - req_access_txt = "150" + name = "Power Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -1411,9 +1403,8 @@ locked = 1; name = "Worn-out APC"; pixel_y = -23; - req_access = null; - req_access_txt = "150"; - start_charge = 0 + start_charge = 0; + req_access = list("syndicate") }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -1511,12 +1502,6 @@ }, /area/awaymission/moonoutpost19/syndicate) "cS" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24; - req_access = null; - req_access_txt = "150" - }, /obj/machinery/light/broken{ dir = 4 }, @@ -1524,6 +1509,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -1691,13 +1680,11 @@ /area/awaymission/moonoutpost19/syndicate) "dh" = ( /obj/structure/chair/wood/normal, -/obj/machinery/airalarm{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ dir = 4; - pixel_x = -24; - req_access = null; - req_access_txt = "150" + pixel_x = -24 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" @@ -1721,11 +1708,9 @@ }, /area/awaymission/moonoutpost19/syndicate) "dk" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 8; - pixel_x = 24; - req_access = null; - req_access_txt = "150" + pixel_x = 24 }, /turf/open/floor/wood{ heat_capacity = 1e+006 @@ -1799,7 +1784,7 @@ /area/awaymission/moonoutpost19/syndicate) "dr" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/ammo_box/magazine/m10mm{ icon_state = "9x19p-8" @@ -1824,7 +1809,7 @@ "dt" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/stack/spacecash/c50, /turf/open/floor/wood{ @@ -1837,10 +1822,10 @@ density = 0; icon_state = "open"; opacity = 0; - req_access_txt = "150"; set_obj_flags = "EMAGGED" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating{ heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" @@ -1994,12 +1979,12 @@ density = 0; icon_state = "open"; opacity = 0; - req_access_txt = "150"; set_obj_flags = "EMAGGED" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating{ heat_capacity = 1e+006; icon_plating = "asteroidplating"; @@ -2396,7 +2381,7 @@ name = "Containment Chamber Blast Doors"; pixel_x = 4; pixel_y = -2; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/machinery/button/ignition{ id = "awayxenobio"; @@ -2534,14 +2519,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "201" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/blood/tracks{ desc = "Your instincts say you shouldn't be following these."; dir = 8; icon_state = "ltrails_1" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2767,9 +2751,9 @@ icon_state = "open"; name = "Xenobiology Lab"; opacity = 0; - req_access_txt = "201"; set_obj_flags = "EMAGGED" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -2988,7 +2972,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/clothing/suit/armor/vest, /obj/item/reagent_containers/spray/pepper, @@ -3158,9 +3142,9 @@ /area/awaymission/moonoutpost19/research) "gk" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Post"; - req_access_txt = "201" + name = "Security Post" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -3182,7 +3166,7 @@ icon_state = "1-2" }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 28 }, /obj/structure/alien/weeds, @@ -3506,7 +3490,7 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_x = -25; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/machinery/light/small{ dir = 8 @@ -3756,7 +3740,7 @@ /area/awaymission/moonoutpost19/hive) "hm" = ( /obj/machinery/vending/medical{ - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /turf/open/floor/plasteel/white/side{ dir = 2; @@ -3799,7 +3783,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/storage/backpack/satchel/tox, /obj/item/clothing/gloves/color/latex, @@ -3913,7 +3897,7 @@ /obj/structure/table, /obj/item/storage/firstaid/fire, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 28 }, /turf/open/floor/plasteel/white/side{ @@ -3940,9 +3924,9 @@ icon_state = "open"; name = "Research Director's Office"; opacity = 0; - req_access_txt = "201"; set_obj_flags = "EMAGGED" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -3976,9 +3960,9 @@ /area/awaymission/moonoutpost19/research) "hG" = ( /obj/machinery/door/airlock/research/glass{ - name = "Research Storage"; - req_access_txt = "201" + name = "Research Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -4207,10 +4191,10 @@ /area/awaymission/moonoutpost19/research) "ie" = ( /obj/machinery/door/airlock/medical{ - name = "Research Division"; - req_access_txt = "201" + name = "Research Division" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -4315,13 +4299,13 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_y = 8; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/machinery/button/door{ id = "AwayRD"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5563,7 +5547,7 @@ /area/awaymission/moonoutpost19/arrivals) "kO" = ( /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -5630,7 +5614,7 @@ "kU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/clothing/under/suit/navy, /turf/open/floor/carpet{ @@ -5860,7 +5844,7 @@ /area/awaymission/moonoutpost19/arrivals) "ls" = ( /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -5890,9 +5874,9 @@ /area/awaymission/moonoutpost19/arrivals) "lu" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "201" + name = "Kitchen Cold Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 }, @@ -5920,7 +5904,7 @@ name = "Kitchen Crate" }, /obj/item/storage/box/mousetraps, -/obj/item/clothing/under/waiter, +/obj/item/clothing/under/suit/waiter, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; initial_temperature = 273.15 @@ -6038,9 +6022,9 @@ "lQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "201" + name = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/dark, /area/awaymission/moonoutpost19/arrivals) "lR" = ( @@ -6183,7 +6167,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -6198,7 +6182,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, @@ -6213,7 +6197,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, @@ -6561,9 +6545,9 @@ "nb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, -/obj/item/clothing/under/assistantformal, +/obj/item/clothing/under/rank/civilian/assistantformal, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -6760,9 +6744,8 @@ }, /area/awaymission/moonoutpost19/arrivals) "nz" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "201" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -6971,7 +6954,7 @@ "nT" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/clothing/under/suit/burgundy, /turf/open/floor/carpet{ @@ -7097,7 +7080,7 @@ icon_state = "science"; locked = 0; name = "scientist's locker"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/clothing/suit/toggle/labcoat, /turf/open/floor/plasteel{ @@ -7110,7 +7093,7 @@ icon_state = "science"; locked = 1; name = "scientist's locker"; - req_access_txt = "201" + req_access_txt = "ruins_maintenance" }, /obj/item/clothing/suit/toggle/labcoat, /obj/item/tank/internals/air, @@ -7138,12 +7121,12 @@ /area/awaymission/moonoutpost19/arrivals) "Mm" = ( /obj/machinery/door/airlock/medical{ - name = "Research Division"; - req_access_txt = "201" + name = "Research Division" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 7b17864b8c0a..b8dab8f0b64f 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -228,12 +228,6 @@ "aO" = ( /turf/open/floor/plating, /area/awaymission/research/interior/maint) -"aP" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "aQ" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/white, @@ -548,9 +542,8 @@ /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "bx" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/awaymission/research/interior/maint) "by" = ( @@ -922,14 +915,14 @@ /area/awaymission/research/interior) "cq" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "cr" = ( @@ -943,8 +936,7 @@ /area/awaymission/research/interior) "cs" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/yellow{ @@ -953,6 +945,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "ct" = ( @@ -987,10 +980,9 @@ /turf/closed/wall/r_wall, /area/awaymission/research/interior/genetics) "cy" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Genetics Maintenance"; - req_access_txt = "9" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/awaymission/research/interior/maint) "cz" = ( @@ -1189,9 +1181,9 @@ }, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Gateway Access"; - req_access_txt = "205" + name = "Gateway Access" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/awaymission/research/interior/gateway) "cS" = ( @@ -1289,19 +1281,18 @@ /area/awaymission/research/interior/maint) "cZ" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "da" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -1309,6 +1300,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "db" = ( @@ -1878,18 +1870,18 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage C"; - req_access_txt = "205" + name = "Secure Storage C" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "dX" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage D"; - req_access_txt = "205" + name = "Secure Storage D" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "dY" = ( @@ -2060,16 +2052,6 @@ "es" = ( /turf/open/floor/plating, /area/awaymission/research/interior) -"et" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "eu" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -2197,12 +2179,8 @@ /turf/open/floor/plating, /area/awaymission/research/interior/maint) "eH" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/research/interior/maint) "eI" = ( @@ -2281,7 +2259,7 @@ "eQ" = ( /obj/machinery/door/window/northright{ name = "Cell Door"; - req_access_txt = "63" + req_access_txt = "sec_basic" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2301,8 +2279,7 @@ "eS" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2310,6 +2287,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/awaymission/research/interior/security) "eT" = ( @@ -2706,13 +2684,13 @@ /area/awaymission/research/interior/cryo) "fK" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/cryo) "fL" = ( @@ -2724,8 +2702,7 @@ /area/awaymission/research/interior) "fM" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -2734,6 +2711,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "fN" = ( @@ -2796,13 +2774,13 @@ "fS" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "fT" = ( @@ -2966,12 +2944,12 @@ "gg" = ( /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Power Storage"; - req_access_txt = "205" + name = "Power Storage" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "gh" = ( @@ -3000,12 +2978,12 @@ }, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 0; - name = "Vault Storage"; - req_access_txt = "205" + name = "Vault Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "gm" = ( @@ -3017,8 +2995,7 @@ /area/awaymission/research/interior/secure) "gn" = ( /obj/machinery/door/airlock/research{ - name = "Secure Storage"; - req_access_txt = "9,63" + name = "Secure Storage" }, /obj/structure/cable{ icon_state = "4-8" @@ -3026,6 +3003,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/awaymission/research/interior/secure) "go" = ( @@ -3046,8 +3025,7 @@ /area/awaymission/research/interior) "gq" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/structure/cable{ icon_state = "4-8" @@ -3055,6 +3033,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/awaymission/research/interior) "gr" = ( @@ -3097,8 +3076,7 @@ /area/awaymission/research/interior) "gt" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -3113,6 +3091,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/cryo) "gu" = ( @@ -3575,8 +3554,7 @@ "hb" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -3584,6 +3562,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "hc" = ( @@ -3880,7 +3859,7 @@ "hE" = ( /obj/machinery/door/window/southright{ name = "Cell Door"; - req_access_txt = "63" + req_access_txt = "sec_basic" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -3918,18 +3897,18 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage A"; - req_access_txt = "205" + name = "Secure Storage A" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "hJ" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage B"; - req_access_txt = "205" + name = "Secure Storage B" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "hK" = ( @@ -4351,16 +4330,6 @@ }, /turf/open/floor/plating, /area/awaymission/research/interior/maint) -"iv" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance"; - req_access_txt = "63" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "iw" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 4; @@ -4576,15 +4545,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/research/interior/maint) -"iT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "iU" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6371,8 +6331,7 @@ /area/awaymission/research/interior) "va" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6381,6 +6340,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "wM" = ( @@ -6406,12 +6366,8 @@ /turf/open/floor/plating, /area/awaymission/research/interior/escapepods) "zn" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -6419,8 +6375,7 @@ /area/awaymission/research/interior/maint) "Bx" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6429,12 +6384,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "Do" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -6443,8 +6398,7 @@ "Km" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -6453,6 +6407,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "Qd" = ( @@ -6473,8 +6428,7 @@ "Qz" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -6485,12 +6439,12 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "TD" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6501,6 +6455,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "TE" = ( @@ -6515,8 +6470,7 @@ "Uu" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6525,12 +6479,12 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "UA" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -6539,8 +6493,7 @@ "WR" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6551,6 +6504,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "XE" = ( @@ -37265,7 +37219,7 @@ ad aH cm dZ -et +cy fa fC gs @@ -39077,7 +39031,7 @@ cK dt cK cK -cy +eH cd id cd @@ -39088,7 +39042,7 @@ iX iX iX iX -aP +eH iX iX iX @@ -42164,7 +42118,7 @@ iK iN iM id -iT +eH iX iX iX @@ -42905,7 +42859,7 @@ ar ar ar ar -aP +eH ar ar ar @@ -43207,7 +43161,7 @@ lN lU lU lY -aP +eH cd mb mi @@ -43449,7 +43403,7 @@ id id id id -iT +eH iX jp jG @@ -43466,7 +43420,7 @@ iX iX iX cd -aP +eH mi mn mn @@ -43969,7 +43923,7 @@ jq jH kd iD -iT +eH iD iD iD @@ -44997,7 +44951,7 @@ js jJ ke cp -iT +eH iD iD iD @@ -45007,7 +44961,7 @@ iD iD iD iD -aP +eH iD mp mx @@ -46261,11 +46215,11 @@ aH aO aO aO -aP +eH fT gG hc -aP +eH cm bD cw @@ -49371,7 +49325,7 @@ jh lg lt kh -aP +eH cd aH ad @@ -50639,7 +50593,7 @@ hH hR hR ik -iv +eH cw aH ad diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 72be40fc2578..659f9e40a385 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -856,9 +856,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "cp" = ( @@ -1641,9 +1640,8 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "dM" = ( @@ -1661,10 +1659,10 @@ /area/awaymission/snowdin/post/messhall) "dQ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "dR" = ( @@ -2298,11 +2296,11 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/machinery/door/firedoor, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "fk" = ( @@ -3158,9 +3156,9 @@ pixel_y = 5 }, /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "hc" = ( @@ -3497,8 +3495,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "45" + name = "Medbay Storage" }, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -3506,6 +3503,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post) "hP" = ( @@ -3518,9 +3516,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "hQ" = ( @@ -3613,9 +3610,8 @@ /turf/closed/wall, /area/awaymission/snowdin/post/garage) "if" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "ig" = ( @@ -5431,10 +5427,10 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "lF" = ( @@ -5830,10 +5826,10 @@ /area/awaymission/snowdin/post/messhall) "mq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mr" = ( @@ -6013,10 +6009,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mQ" = ( @@ -6405,8 +6401,7 @@ }, /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; - req_access = null; - req_access_txt = "1" + req_access = null }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6418,6 +6413,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/secpost) "nH" = ( @@ -6547,9 +6543,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/hydro) "nY" = ( @@ -6585,7 +6581,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access_txt = "security" }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7296,9 +7292,9 @@ /area/awaymission/snowdin/post/secpost) "pJ" = ( /obj/machinery/door/airlock/vault{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/post/secpost) "pK" = ( @@ -7657,9 +7653,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) "qD" = ( @@ -7823,7 +7818,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access_txt = "32" + req_access_txt = "construction" }, /obj/machinery/button/ignition{ id = "snowdin_turbine_ignitor"; @@ -8036,10 +8031,10 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_exterior"; - name = "Turbine Exterior Airlock"; - req_access_txt = "32" + name = "Turbine Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "rr" = ( @@ -8360,12 +8355,12 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_interior"; - name = "Turbine Interior Airlock"; - req_access_txt = "32" + name = "Turbine Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "sh" = ( @@ -8446,12 +8441,12 @@ /area/awaymission/snowdin/post/cavern2) "su" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sv" = ( @@ -8650,9 +8645,9 @@ /area/awaymission/snowdin/cave/cavern) "sQ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sR" = ( @@ -9093,12 +9088,12 @@ /area/awaymission/snowdin/post/cavern1) "us" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "ut" = ( @@ -9179,9 +9174,9 @@ /area/awaymission/snowdin/outside) "uD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "uE" = ( @@ -10061,12 +10056,12 @@ /area/awaymission/snowdin/cave/mountain) "wR" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "wS" = ( @@ -10382,8 +10377,7 @@ /area/awaymission/snowdin/post/mining_dock) "xH" = ( /obj/machinery/door/airlock/vault{ - name = "Relic Storage"; - req_access_txt = "3" + name = "Relic Storage" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -10395,6 +10389,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "xI" = ( @@ -11761,9 +11756,8 @@ /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) "Bj" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "Bk" = ( @@ -12755,8 +12749,7 @@ /area/awaymission/snowdin/cave) "DG" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -12768,6 +12761,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "DH" = ( @@ -12780,9 +12774,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/cave) "DJ" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/snowdin/cave) "DK" = ( @@ -14245,9 +14238,9 @@ /area/awaymission/snowdin/post/mining_dock) "Hy" = ( /obj/machinery/door/airlock/research/glass{ - name = "Mech Lab"; - req_access_txt = "29" + name = "Mech Lab" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main/mechbay) "Hz" = ( @@ -14453,12 +14446,12 @@ /area/awaymission/snowdin/post/mining_main/robotics) "Ic" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post/mining_main/robotics) "Id" = ( @@ -14646,9 +14639,8 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "IE" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) "IF" = ( @@ -14715,12 +14707,11 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IN" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IO" = ( @@ -14841,12 +14832,12 @@ /area/awaymission/snowdin/post/mining_dock) "Jb" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Jc" = ( @@ -14904,9 +14895,9 @@ /area/awaymission/snowdin/cave/cavern) "Jj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Jk" = ( @@ -14918,8 +14909,7 @@ /area/awaymission/snowdin/post/mining_dock) "Jl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14931,6 +14921,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "Jm" = ( @@ -14970,8 +14961,7 @@ /area/awaymission/snowdin/cave/cavern) "Jr" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14983,6 +14973,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main) "Js" = ( @@ -15266,9 +15257,9 @@ /area/awaymission/snowdin/post/mining_dock) "JZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Ka" = ( @@ -15576,9 +15567,9 @@ /area/awaymission/snowdin/post/mining_main) "KK" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "KL" = ( @@ -15736,8 +15727,7 @@ /area/awaymission/snowdin/post/mining_dock) "OF" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -15752,12 +15742,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "PR" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/neutral{ @@ -15770,6 +15760,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "SX" = ( diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index c37cc7b6622b..ce457bb589f8 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -78,8 +78,7 @@ /area/shuttle/escape) "ak" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary"; - req_access_txt = "5" + name = "Escape Shuttle Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -87,17 +86,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "al" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "am" = ( diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 2e1b5f33d2f8..d3190b9ffd0c 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -13,9 +13,9 @@ /// Command General Access, typically used for accessing the doors to the bridge, as well as being the general access that Tablet/Computer Programs check for "heads". #define ACCESS_COMMAND "command" -/// Access to the AI Upload Room Doors as well as the AI satellite. Also used for controlling the machinery in the AI Upload (turrets, foam dispensers) -#define ACCESS_AI_UPLOAD "ai_upload" -/// Access to rooms in the mini-sat the AI usually resides in. Given to Network Admins to let them do maintenance on the AI. +/// Access to critical-to-function AI rooms and equipment such as the AI Core, AI Upload, AI mini-sat maintenance, turret controls, and foam dispensers. +#define ACCESS_AI_MASTER "ai_master" +/// Access to non-critical rooms in the mini-sat the AI usually resides in. Given to Network Admins to let them do maintenance on the AI. #define ACCESS_AI_SAT "ai_sat" /// Access to the Teleporter Room, and some cargo crates. #define ACCESS_TELEPORTER "teleporter" diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 62ac20d95d38..4818c912814d 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -11,7 +11,7 @@ var/uses = 20 var/cooldown = 0 var/cooldown_time = 100 - req_access = list(ACCESS_AI_SAT) + req_access = list(ACCESS_AI_MASTER) /obj/machinery/ai_slipper/examine(mob/user) . = ..() diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index d4fcb58b545d..eae0a9d64719 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -799,7 +799,7 @@ var/locked = TRUE var/control_area = null //can be area name, path or nothing. var/ailock = 0 // AI cannot use this - req_access = list(ACCESS_AI_UPLOAD) + req_access = list(ACCESS_AI_MASTER) var/list/obj/machinery/porta_turret/turrets = list() resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 5df9b76f8f78..9d8a6d1b0f84 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -139,7 +139,7 @@ return list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_SEC_BASIC, ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, @@ -147,7 +147,7 @@ ACCESS_THEATRE, ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) + ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_MATERIALS, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -227,7 +227,7 @@ ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, - ACCESS_AI_UPLOAD, + ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_RD) @@ -256,7 +256,7 @@ ACCESS_QM) if(7) // Command return list(ACCESS_COMMAND, - ACCESS_AI_UPLOAD, + ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, @@ -295,8 +295,8 @@ switch(A) if(ACCESS_COMMAND) return "Command General" - if(ACCESS_AI_UPLOAD) - return "AI Upload" + if(ACCESS_AI_MASTER) + return "AI Master Access" if(ACCESS_AI_SAT) return "AI Satellite" if(ACCESS_TELEPORTER) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index b49d21dd84f9..159096d87b47 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -21,7 +21,7 @@ added_access = list(ACCESS_CAPTAIN) base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_WEAPONS_PERMIT, - ACCESS_MEDICAL, ACCESS_ENGINEERING, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_COMMAND, + ACCESS_MEDICAL, ACCESS_ENGINEERING, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 535a890e20ae..c0ca67e4b05f 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -24,7 +24,7 @@ added_access = list(ACCESS_CAPTAIN) base_access = list(ACCESS_RD, ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_TOXINS_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_BASIC, ACCESS_MECH_SCIENCE, - ACCESS_RESEARCH, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, + ACCESS_RESEARCH, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_MASTER, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS, ACCESS_TECH_STORAGE, ACCESS_AI_SAT, ACCESS_MAINT_TUNNELS) paycheck = PAYCHECK_COMMAND diff --git a/code/modules/jobs/job_types/synthetic.dm b/code/modules/jobs/job_types/synthetic.dm index 26fa1687d79b..f1a2e8911ad4 100644 --- a/code/modules/jobs/job_types/synthetic.dm +++ b/code/modules/jobs/job_types/synthetic.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(synthetic_base_access, list( ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 27790ec8c5d3..4c5c03df610a 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -36,9 +36,9 @@ access_list += ACCESS_COMMAND return access_list -/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload/get_access() +/obj/effect/mapping_helpers/airlock/access/any/command/ai_master/get_access() var/list/access_list = ..() - access_list += ACCESS_AI_UPLOAD + access_list += ACCESS_AI_MASTER return access_list /obj/effect/mapping_helpers/airlock/access/any/command/ai_sat/get_access() @@ -389,9 +389,9 @@ access_list += ACCESS_COMMAND return access_list -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload/get_access() +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master/get_access() var/list/access_list = ..() - access_list += ACCESS_AI_UPLOAD + access_list += ACCESS_AI_MASTER return access_list /obj/effect/mapping_helpers/airlock/access/all/command/ai_sat/get_access() From f57593e71d44f369b94a171a02365de59297f9fd Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sun, 28 Jul 2024 19:45:46 +0200 Subject: [PATCH 17/48] ballin --- .../IceRuins/icemoon_surface_inn.dmm | 44 +- .../IceRuins/icemoon_surface_syndicate.dmm | 425 +++++++----------- .../JungleRuins/jungleland_jungle_sinden.dmm | 25 +- .../jungleland_swamp_syndicatestation.dmm | 191 ++++---- _maps/RandomRuins/JungleRuins/miningbase.dmm | 4 +- .../LavaRuins/lavaland_biodome_fishing.dmm | 41 +- ...lavaland_surface_cafe_of_broken_dreams.dmm | 7 +- .../lavaland_surface_gas_station.dmm | 39 +- .../LavaRuins/lavaland_surface_medical.dmm | 10 +- _maps/map_files/mining/Jungleland.dmm | 82 ++-- _maps/map_files/mining/Lavaland.dmm | 18 +- 11 files changed, 384 insertions(+), 502 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm index 1ef9a5f56093..82852d57b293 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm @@ -102,14 +102,14 @@ /area/ruin/powered/inn) "bi" = ( /obj/machinery/door/airlock/grunge{ - name = "Backroom"; - req_access_txt = "25" + name = "Backroom" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/powered/inn) "bx" = ( @@ -223,7 +223,8 @@ id = "inndoor"; name = "Inn Front door Shutter"; pixel_x = 6; - pixel_y = -24 + pixel_y = -24; + req_access_txt = "bar" }, /turf/open/floor/wood/broken/two, /area/ruin/powered/inn) @@ -292,9 +293,7 @@ /turf/open/floor/wood, /area/ruin/powered/inn) "ka" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -302,6 +301,7 @@ dir = 8 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/powered/inn) "kf" = ( @@ -375,7 +375,7 @@ /area/ruin/powered/inn) "mW" = ( /obj/machinery/door/window/southright{ - req_access_txt = "25" + req_access_txt = "bar" }, /obj/machinery/light/small{ dir = 4 @@ -476,15 +476,14 @@ /turf/open/floor/wood, /area/ruin/powered/inn) "qm" = ( -/obj/machinery/door/airlock/wood/glass{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood/glass, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/inn) "qq" = ( @@ -499,7 +498,7 @@ /area/ruin/powered/inn) "qT" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = list(25) + req_access = list("bar") }, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/tank/internals/emergency_oxygen, @@ -782,7 +781,7 @@ /obj/item/bedsheet/adjusted/brown, /obj/structure/bed, /obj/effect/mob_spawn/human/innkeeper{ - dir = 8 + dir = 4 }, /turf/open/floor/carpet/red, /area/ruin/powered/inn) @@ -861,7 +860,9 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/inn) "Lb" = ( -/obj/structure/closet/secure_closet/freezer/meat, +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list("bar") + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/inn) "Ld" = ( @@ -879,8 +880,7 @@ /area/ruin/powered/inn/shed) "LE" = ( /obj/machinery/door/airlock/wood{ - name = "Personal Quarters"; - req_access_txt = "25" + name = "Personal Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -888,10 +888,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/red, /area/ruin/powered/inn) "LU" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = list("bar") + }, /obj/machinery/light{ dir = 8 }, @@ -1090,9 +1093,7 @@ /turf/open/floor/plating, /area/icemoon/underground/explored) "Xs" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1102,6 +1103,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/inn) "XK" = ( @@ -1129,7 +1131,9 @@ /turf/open/floor/wood, /area/ruin/powered/inn) "YJ" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/freezer/fridge{ + req_access = list("bar") + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/inn) "YV" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm index b0767b732f5d..20a0a04360c1 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm @@ -213,7 +213,7 @@ id = "icemoon_syndicate_canteen_windows"; name = "Canteen Shutters"; pixel_y = 24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/oven, /turf/open/floor/plasteel/cafeteria, @@ -279,8 +279,7 @@ /area/ruin/syndicate_icemoon/xenobio) "bP" = ( /obj/machinery/door/airlock/hatch{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -289,6 +288,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/secred/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "bQ" = ( @@ -355,8 +355,7 @@ /area/ruin/syndicate_icemoon/command) "cl" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Command Wing"; - req_access_txt = "150" + name = "Command Wing" }, /obj/structure/cable{ icon_state = "1-2" @@ -373,6 +372,7 @@ /obj/effect/turf_decal/siding/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) "cn" = ( @@ -505,10 +505,6 @@ /area/ruin/syndicate_icemoon/canteen) "cN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "cQ" = ( @@ -542,9 +538,6 @@ dir = 10 }, /obj/item/storage/fancy/donut_box, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "cV" = ( @@ -563,8 +556,7 @@ "cW" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station"; - req_access_txt = "150" + name = "Nuclear Power Station" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable{ @@ -576,12 +568,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/reactor) "cZ" = ( @@ -715,8 +702,7 @@ /area/ruin/syndicate_icemoon/engine) "dz" = ( /obj/machinery/door/airlock/research/glass{ - name = "Xenobiology"; - req_access_txt = "150" + name = "Xenobiology" }, /obj/structure/cable{ icon_state = "4-8" @@ -737,6 +723,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/xenobio) "dB" = ( @@ -769,8 +756,7 @@ /area/icemoon/surface/outdoors) "dI" = ( /obj/machinery/door/airlock/engineering{ - name = "Fuel Storage"; - req_access_txt = "150" + name = "Fuel Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -778,6 +764,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "dK" = ( @@ -1115,8 +1102,7 @@ /area/ruin/syndicate_icemoon/warehouse) "fA" = ( /obj/machinery/door/airlock{ - name = "Cabin 4"; - req_access_txt = "150" + name = "Cabin 4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1312,8 +1298,7 @@ /area/ruin/syndicate_icemoon/warehouse) "gH" = ( /obj/machinery/door/airlock/engineering{ - name = "Power Storage and Radiation Response Equipment"; - req_access_txt = "150" + name = "Power Storage and Radiation Response Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1327,6 +1312,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) "gK" = ( @@ -1449,9 +1435,6 @@ /area/ruin/syndicate_icemoon/warehouse) "ht" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) "hu" = ( @@ -1465,9 +1448,6 @@ "hv" = ( /obj/effect/turf_decal/trimline/purple/filled/line/lower, /obj/structure/filingcabinet, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/structure/window/reinforced/spawner/east, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -1541,8 +1521,7 @@ /area/ruin/syndicate_icemoon/hallway) "ib" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Primary Treatment Centre"; - req_access_txt = "150" + name = "Primary Treatment Centre" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1560,6 +1539,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/blue, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "im" = ( @@ -1667,8 +1647,7 @@ /area/ruin/syndicate_icemoon/canteen) "jd" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Commander's Quarters"; - req_access_txt = "151" + name = "Commander's Quarters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1682,6 +1661,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/carpet/red, /area/ruin/syndicate_icemoon/command) "ji" = ( @@ -1689,9 +1669,7 @@ /turf/open/floor/engine, /area/ruin/syndicate_icemoon/reactor) "jp" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" @@ -1701,6 +1679,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "jr" = ( @@ -1745,8 +1725,7 @@ /area/ruin/syndicate_icemoon/command) "jL" = ( /obj/machinery/door/airlock/hatch{ - name = "Security"; - req_access_txt = "150" + name = "Security" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1754,6 +1733,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "jM" = ( @@ -1764,19 +1744,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "jN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "jP" = ( @@ -1797,11 +1772,10 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "kg" = ( -/obj/machinery/computer/reactor/syndie_base, -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 +/obj/machinery/computer/reactor/syndie_base{ + pixel_y = 7 }, +/obj/structure/table/reinforced, /obj/item/paper/guides/jobs/engi/agcnr, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) @@ -1869,10 +1843,9 @@ /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "kG" = ( -/obj/machinery/door/airlock/external/glass{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external/glass, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/xenobio) "kH" = ( @@ -2004,8 +1977,7 @@ /area/ruin/syndicate_icemoon/hallway) "ll" = ( /obj/machinery/door/airlock/research{ - name = "Research Wing"; - req_access_txt = "150" + name = "Research Wing" }, /obj/structure/cable{ icon_state = "4-8" @@ -2026,6 +1998,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "ln" = ( @@ -2133,9 +2106,6 @@ pixel_y = -23; req_access = list(150) }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "lG" = ( @@ -2205,7 +2175,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "First-Aid Supplies"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular{ @@ -2315,7 +2285,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -2354,7 +2324,7 @@ /obj/structure/table/reinforced, /obj/item/pen, /obj/machinery/door/window/brigdoor/northleft{ - req_access_txt = "151" + req_access_txt = "syndicate_leader" }, /obj/machinery/door/window, /obj/machinery/door/firedoor/border_only, @@ -2411,8 +2381,7 @@ /area/ruin/syndicate_icemoon/reactor) "mu" = ( /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station Access"; - req_access_txt = "150" + name = "Nuclear Power Station Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -2432,6 +2401,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "mv" = ( @@ -2541,13 +2511,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ - name = "Chemistry"; - req_access_txt = "150" + name = "Chemistry" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/research) "np" = ( @@ -2568,8 +2538,7 @@ /area/ruin/syndicate_icemoon/canteen) "nt" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Commander's Office"; - req_access_txt = "151" + name = "Commander's Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -2592,6 +2561,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/command) "nz" = ( @@ -2652,8 +2622,8 @@ /area/ruin/syndicate_icemoon/security) "nN" = ( /obj/machinery/ministile{ - req_one_access = list(151); - dir = 4 + dir = 4; + req_access = list("syndicate_leader") }, /obj/effect/turf_decal/trimline/white/arrow_ccw{ dir = 1 @@ -2741,8 +2711,7 @@ /area/ruin/syndicate_icemoon/hallway) "oD" = ( /obj/machinery/door/airlock{ - name = "Cabin 1"; - req_access_txt = "150" + name = "Cabin 1" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2758,7 +2727,7 @@ }, /obj/machinery/door/window/eastright{ name = "Kitchen"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -2805,7 +2774,7 @@ dir = 8 }, /obj/machinery/door/window{ - req_access_txt = "150"; + req_access_txt = "syndicate"; dir = 8 }, /turf/open/floor/engine, @@ -2814,10 +2783,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "pd" = ( @@ -2914,17 +2879,13 @@ /obj/structure/closet/crate/secure/gear{ desc = "A secure gear crate. A faded note on it reads 'CHAIR NOT INCLUDED'."; name = "electric chair kit crate"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/screwdriver/nuke, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "pC" = ( @@ -3066,8 +3027,7 @@ /area/ruin/syndicate_icemoon/research) "qo" = ( /obj/machinery/door/airlock/medical{ - name = "Operating Room"; - req_access_txt = "150" + name = "Operating Room" }, /obj/machinery/holosign/surgery{ id = "syndie_icemoon_surgery_holo" @@ -3088,6 +3048,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "qq" = ( @@ -3250,8 +3211,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station Access"; - req_access_txt = "150" + name = "Nuclear Power Station Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -3259,12 +3219,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "re" = ( @@ -3518,8 +3473,7 @@ /area/ruin/syndicate_icemoon/xenobio) "su" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Control Room"; - req_access_txt = "150" + name = "Control Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -3530,6 +3484,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) "sw" = ( @@ -3670,7 +3625,7 @@ dir = 4 }, /obj/machinery/door/window{ - req_access_txt = "150"; + req_access_txt = "syndicate"; dir = 4 }, /turf/open/floor/engine, @@ -3714,11 +3669,6 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Syndicate Radio Intercom"; - pixel_y = 24 - }, /turf/open/floor/carpet/red, /area/ruin/syndicate_icemoon/command) "tU" = ( @@ -3762,7 +3712,7 @@ /area/ruin/syndicate_icemoon/hallway) "ub" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -3809,13 +3759,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"ug" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/syndicate_icemoon/reactor) "ul" = ( /turf/open/floor/plating/snowed/smoothed/icemoon, /area/ruin/syndicate_icemoon/canteen) @@ -3868,9 +3811,6 @@ /area/ruin/syndicate_icemoon/hallway) "uV" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/light{ dir = 4 }, @@ -4003,15 +3943,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "vE" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/ruin/syndicate_icemoon/maintenance) "vG" = ( @@ -4043,7 +3982,7 @@ /area/ruin/syndicate_icemoon/medical) "vR" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "151"; + req_access_txt = "syndicate"; desc = "An old, dusty crate." }, /obj/item/clothing/gloves/color/captain/centcom/admiral{ @@ -4142,8 +4081,7 @@ /area/ruin/syndicate_icemoon/medical) "wn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay"; - req_access_txt = "150" + name = "Medical Bay" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -4157,6 +4095,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "wp" = ( @@ -4190,9 +4129,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "wz" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, /obj/structure/fans/tiny, /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -4206,12 +4143,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/shed) "wA" = ( @@ -4264,7 +4196,8 @@ /obj/machinery/button/door{ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; - pixel_y = -24 + pixel_y = -24; + req_access_txt = "syndicate" }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -4372,7 +4305,7 @@ }, /obj/machinery/light, /obj/machinery/door/window{ - req_access_txt = "150"; + req_access_txt = "syndicate"; dir = 4 }, /turf/open/floor/engine, @@ -4461,7 +4394,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, @@ -4544,12 +4477,6 @@ "xV" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) "xW" = ( @@ -4557,8 +4484,7 @@ id = "syndieicemoon_brig_cell" }, /obj/machinery/door/airlock/hatch{ - name = "Cell"; - req_access_txt = "150" + name = "Cell" }, /obj/structure/cable{ icon_state = "1-2" @@ -4574,14 +4500,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "xY" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "ya" = ( @@ -4639,7 +4563,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "151"; + req_access_txt = "syndicate_leader"; specialfunctions = 4; pixel_x = 6 }, @@ -4657,7 +4581,7 @@ id = "syndicate_icemoon_bridge_windows"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "150"; + req_access_txt = "syndicate_leader"; specialfunctions = 4; pixel_x = -6 }, @@ -4746,8 +4670,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/hatch{ - name = "Electric Chair"; - req_access_txt = "150" + name = "Electric Chair" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -4756,6 +4679,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/secred/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "zm" = ( @@ -4771,8 +4695,7 @@ lethal = 1; name = "base turret controls"; pixel_y = -24; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) @@ -4920,8 +4843,7 @@ "zW" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndicate_icemoon_vault"; - name = "Vault"; - req_access_txt = "151" + name = "Vault" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4930,6 +4852,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) "zX" = ( @@ -4987,8 +4910,7 @@ "Af" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/door/airlock/medical/glass{ - name = "Primary Treatment Centre"; - req_access_txt = "150" + name = "Primary Treatment Centre" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5002,6 +4924,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "Ag" = ( @@ -5042,7 +4965,7 @@ "AG" = ( /obj/machinery/vending/toyliberationstation{ onstation = 0; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 @@ -5097,7 +5020,8 @@ /obj/machinery/button/door{ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "syndicate" }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -5121,7 +5045,7 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_access"; name = "Reactor Access"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) @@ -5196,7 +5120,7 @@ "Bt" = ( /obj/machinery/button/door{ id = "syndieicemoon_observatory_shutters"; - req_access_txt = "150"; + req_access_txt = "syndicate"; name = "Observatory Shutters"; pixel_x = -24 }, @@ -5379,8 +5303,7 @@ /area/ruin/syndicate_icemoon/dorms) "Cl" = ( /obj/machinery/door/airlock{ - name = "Cabin 5"; - req_access_txt = "150" + name = "Cabin 5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5398,8 +5321,7 @@ /area/ruin/syndicate_icemoon/xenobio) "Cq" = ( /obj/machinery/door/airlock/hatch{ - name = "Security"; - req_access_txt = "150" + name = "Security" }, /obj/structure/cable{ icon_state = "1-2" @@ -5416,6 +5338,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "Cz" = ( @@ -5430,8 +5353,7 @@ /obj/item/storage/box/beakers/bluespace, /obj/item/storage/box/beakers/bluespace, /obj/structure/closet/secure_closet/chemical{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/storage/box/syringes, /turf/open/floor/plasteel/white, @@ -5662,8 +5584,13 @@ "Dq" = ( /obj/structure/table/reinforced, /obj/item/phone/real/syndicate_ruin{ - pixel_x = 4; - pixel_y = 5 + pixel_x = 17; + pixel_y = 7 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Syndicate Radio Intercom"; + pixel_y = -4 }, /turf/open/floor/carpet/red, /area/ruin/syndicate_icemoon/command) @@ -5684,8 +5611,7 @@ /area/ruin/syndicate_icemoon/canteen) "Dx" = ( /obj/machinery/door/airlock/engineering{ - name = "Fuel Storage"; - req_access_txt = "150" + name = "Fuel Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5699,6 +5625,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "Dy" = ( @@ -5712,9 +5639,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "Dz" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -5723,11 +5648,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "DA" = ( /obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150"; name = "Laundry" }, /obj/machinery/door/firedoor/border_only{ @@ -5736,6 +5661,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/dorms) "DB" = ( @@ -5743,7 +5669,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -5886,7 +5812,6 @@ /area/ruin/syndicate_icemoon/canteen) "Ev" = ( /obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150"; name = "Construction Area" }, /obj/effect/decal/cleanable/dirt, @@ -5897,6 +5822,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "Ey" = ( @@ -5951,10 +5877,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access_txt = "150" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 + req_access_txt = list("syndicate_leader") }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -6048,8 +5971,7 @@ /area/ruin/syndicate_icemoon/command) "Fi" = ( /obj/machinery/door/airlock/research{ - name = "Research Wing"; - req_access_txt = "150" + name = "Research Wing" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -6066,6 +5988,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "Fm" = ( @@ -6142,9 +6065,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "FN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -6163,6 +6084,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "FP" = ( @@ -6216,8 +6138,8 @@ dir = 8 }, /obj/machinery/ministile{ - req_one_access = list(151); - dir = 4 + dir = 4; + req_access = list("syndicate_leader") }, /obj/effect/turf_decal/trimline/white/arrow_ccw{ dir = 1 @@ -6265,6 +6187,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/warehouse) "Gj" = ( @@ -6547,8 +6470,7 @@ /area/ruin/syndicate_icemoon/warehouse) "HX" = ( /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station"; - req_access_txt = "150" + name = "Nuclear Power Station" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -6562,6 +6484,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/reactor) "HZ" = ( @@ -6582,7 +6505,6 @@ /area/ruin/syndicate_icemoon/canteen) "Ig" = ( /obj/machinery/door/airlock/hatch{ - req_access_txt = "150"; name = "Moat Observatory" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -6597,6 +6519,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "Il" = ( @@ -6666,9 +6589,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/machinery/door/window/eastright{ - req_access_txt = "150" - }, +/obj/machinery/door/window/eastright, /obj/structure/window/reinforced, /obj/item/soap/syndie, /turf/open/floor/plasteel/showroomfloor, @@ -6837,8 +6758,7 @@ /area/ruin/syndicate_icemoon/shed) "JJ" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay"; - req_access_txt = "150" + name = "Medical Bay" }, /obj/structure/cable{ icon_state = "4-8" @@ -6849,6 +6769,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "JK" = ( @@ -6978,7 +6899,7 @@ id = "syndie_icemoon_surgery_holo"; name = "Surgery Holosign"; pixel_x = 24; - req_access_txt = "150"; + req_access_txt = "syndicate"; pixel_y = -3 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6992,7 +6913,7 @@ name = "Window Shutters"; pixel_x = 24; pixel_y = 6; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) @@ -7163,9 +7084,7 @@ /area/ruin/syndicate_icemoon/medical) "LM" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -7187,6 +7106,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "LP" = ( @@ -7205,10 +7125,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "LT" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, @@ -7226,8 +7142,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Medical Support Systems"; - req_access_txt = "150" + name = "Medical Support Systems" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -7244,6 +7159,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/medical) "LZ" = ( @@ -7313,8 +7229,7 @@ /area/ruin/syndicate_icemoon/dorms) "MB" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7331,6 +7246,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) "MF" = ( @@ -7362,9 +7278,7 @@ /area/ruin/syndicate_icemoon/hallway) "Ng" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -7374,10 +7288,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "Nj" = ( @@ -7386,12 +7297,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "Nk" = ( @@ -7403,7 +7308,7 @@ id = "syndicate_icemoon_dorms_window"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "150"; + req_access_txt = "syndicate"; pixel_x = -6 }, /obj/effect/turf_decal/siding/wood, @@ -7638,7 +7543,7 @@ "OA" = ( /obj/structure/closet/secure_closet/medical1{ req_access = null; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/gun/syringe/rapidsyringe, /obj/item/storage/firstaid/hypospray/syndicate, @@ -7664,13 +7569,13 @@ /area/ruin/syndicate_icemoon/medical) "OK" = ( /obj/machinery/door/airlock/hatch{ - name = "Security"; - req_access_txt = "150" + name = "Security" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "OL" = ( @@ -7723,8 +7628,7 @@ /area/icemoon/surface/outdoors) "Pf" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -7732,6 +7636,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) "Pj" = ( @@ -7739,8 +7644,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "Cold Room"; - req_access_txt = "150" + name = "Cold Room" }, /obj/structure/fans/tiny, /obj/machinery/door/firedoor/border_only{ @@ -7752,6 +7656,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "Pm" = ( @@ -7817,7 +7722,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access_txt = "151"; + req_access_txt = "syndicate_leader"; specialfunctions = 4 }, /turf/open/floor/circuit/red/anim, @@ -7905,8 +7810,7 @@ /area/icemoon/surface/outdoors) "Qm" = ( /obj/machinery/door/airlock/hatch{ - name = "Storage Room"; - req_access_txt = "150" + name = "Storage Room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -7918,6 +7822,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "Qn" = ( @@ -8036,7 +7941,7 @@ info = "Please be advised that the firing pins in your standard-issue SMG and the research team's rifles are designed to explode if removed. DO NOT TRY TO REMOVE THEM." }, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/box/white, /obj/item/gun/ballistic/shotgun/doublebarrel, @@ -8056,9 +7961,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8066,6 +7969,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "Rh" = ( @@ -8147,12 +8051,6 @@ "Rz" = ( /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) "RA" = ( @@ -8266,7 +8164,7 @@ "Sj" = ( /obj/machinery/door/window/eastright{ name = "Bar"; - req_access_txt = "150"; + req_access_txt = "syndicate"; dir = 1 }, /obj/effect/turf_decal/siding/wood{ @@ -8426,8 +8324,7 @@ /area/ruin/syndicate_icemoon/dorms) "SS" = ( /obj/machinery/door/airlock/hatch{ - name = "Storage Room"; - req_access_txt = "150" + name = "Storage Room" }, /obj/structure/fans/tiny, /obj/structure/cable{ @@ -8439,6 +8336,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/cafeteria, /area/ruin/syndicate_icemoon/canteen) "SU" = ( @@ -8505,9 +8403,6 @@ /area/ruin/syndicate_icemoon/engine) "Te" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /mob/living/simple_animal/slime, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) @@ -8639,8 +8534,7 @@ /area/ruin/syndicate_icemoon/command) "TQ" = ( /obj/machinery/door/airlock{ - name = "Cabin 2"; - req_access_txt = "150" + name = "Cabin 2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8747,10 +8641,6 @@ /obj/effect/turf_decal/stripes{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -8856,7 +8746,7 @@ id = "syndicate_icemoon_hop_shutters"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "150"; + req_access_txt = "syndicate"; specialfunctions = 4; pixel_x = -6 }, @@ -9017,12 +8907,6 @@ }, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "Wh" = ( @@ -9125,7 +9009,7 @@ id = "syndicate_icemoon_powerstation_windows"; name = "Window Shutters"; pixel_x = 24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -9147,11 +9031,14 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_vent"; name = "Reactor Vent"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/sealant{ pixel_x = 12 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "WK" = ( @@ -9313,10 +9200,6 @@ /area/ruin/syndicate_icemoon/hallway) "XS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -9462,7 +9345,7 @@ id = "syndieicemoon_brig_cell"; name = "Cell Lockdown"; pixel_x = 24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 6 @@ -9491,9 +9374,7 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/syndicate_icemoon/engine) "YH" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9501,6 +9382,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "YI" = ( @@ -9531,8 +9413,7 @@ /area/ruin/syndicate_icemoon/canteen) "YZ" = ( /obj/machinery/door/airlock{ - name = "Cabin 3"; - req_access_txt = "150" + name = "Cabin 3" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -10834,7 +10715,7 @@ Ez IS wx oI -ug +Ag gU xP NP diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm index 78cd5eacf7b8..4ad9e5387913 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm @@ -351,13 +351,12 @@ /turf/open/floor/carpet/red, /area/ruin/powered/sinden) "tW" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/sinden) "tZ" = ( @@ -417,15 +416,14 @@ /turf/open/floor/plating, /area/ruin/powered/sinden) "xT" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/powered/sinden) "zw" = ( @@ -596,15 +594,14 @@ /turf/open/floor/mineral/titanium, /area/ruin/powered/sinden) "Ln" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/black, /area/ruin/powered/sinden) "LL" = ( @@ -628,15 +625,14 @@ /turf/open/floor/wood, /area/ruin/powered/sinden) "Nb" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/sinden) "Nr" = ( @@ -766,9 +762,8 @@ /turf/open/floor/carpet/green, /area/ruin/powered/sinden) "Va" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/sinden) "Wd" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm index e4f84e8a9721..eb05e1ed3870 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm @@ -642,7 +642,7 @@ /obj/machinery/door/window/brigdoor/westleft{ dir = 2; name = "Disposals Conveyor"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -724,14 +724,14 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 36; - req_access_txt = "150"; + req_access_txt = "syndicate"; pixel_x = -6 }, /obj/machinery/button/door{ id = "lavalandsyndi_centralwindows"; name = "Exterior Windows Blast Door Control"; pixel_y = 36; - req_access_txt = "150"; + req_access_txt = "syndicate"; pixel_x = 6 }, /obj/item/radio/intercom{ @@ -901,7 +901,7 @@ "ja" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -972,15 +972,14 @@ /turf/open/floor/engine/o2, /area/ruin/powered/syndicate_lava_base/engineering) "jo" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "jt" = ( @@ -1123,8 +1122,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "kn" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Convincing Room"; - req_access_txt = "150" + name = "Convincing Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1132,6 +1130,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "ko" = ( @@ -1250,7 +1249,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark, @@ -1323,8 +1322,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "mB" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "150" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1335,6 +1333,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "mF" = ( @@ -1376,8 +1375,7 @@ lethal = 1; name = "Base turret controls"; pixel_y = 30; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/syndicatebomb/self_destruct{ anchored = 1 @@ -1526,8 +1524,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "nR" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1544,6 +1541,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "nY" = ( @@ -1644,12 +1642,12 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/machinery/door/window/northleft{ dir = 8; name = "Bar"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) @@ -1722,7 +1720,7 @@ "qc" = ( /obj/machinery/door/window/eastright{ name = "Kitchen"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/syndicate_lava_base/bar) @@ -1799,6 +1797,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "qv" = ( @@ -2025,8 +2024,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "sb" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" + name = "Warehouse" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2034,6 +2032,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "sk" = ( @@ -2171,8 +2170,7 @@ "td" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndie_lavaland_vault"; - name = "Vault Access"; - req_access_txt = "150" + name = "Vault Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2187,6 +2185,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/vault) "tf" = ( @@ -2424,7 +2423,9 @@ /area/ruin/powered/syndicate_lava_base/vault) "wF" = ( /obj/effect/turf_decal/bot, -/obj/machinery/mineral/ore_redemption, +/obj/machinery/mineral/ore_redemption{ + req_access = list("syndicate") + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "wI" = ( @@ -2534,13 +2535,12 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/powered/syndicate_lava_base/virology) "xN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/machinery/door/poddoor/preopen{ id = "syndie_lavaland_exitdoors" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "xS" = ( @@ -2567,7 +2567,7 @@ icon_state = "1-2" }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/plasteel/dark, @@ -2587,7 +2587,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/structure/chair/office/dark{ dir = 1 @@ -2635,15 +2635,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "yV" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "yY" = ( @@ -2789,8 +2788,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "AJ" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "150" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2800,6 +2798,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "AQ" = ( @@ -2903,7 +2902,7 @@ /obj/item/ammo_casing/shotgun/syndie, /obj/item/ammo_casing/shotgun/syndie, /obj/item/storage/belt/bandolier, -/obj/item/clothing/under/rank/bartender, +/obj/item/clothing/under/rank/civilian/bartender, /obj/item/clothing/head/that, /obj/item/clothing/glasses/sunglasses/reagent, /turf/open/floor/wood, @@ -2964,8 +2963,7 @@ dir = 10 }, /obj/structure/closet/secure_closet/chemical{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, @@ -2977,7 +2975,7 @@ /area/ruin/powered/syndicate_lava_base/chemistry) "BL" = ( /obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/brown/end{ dir = 4 @@ -3037,8 +3035,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "Ci" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "150" + name = "Experimentation Lab" }, /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; @@ -3048,6 +3045,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/engine, /area/ruin/powered/syndicate_lava_base/chemistry) "Cl" = ( @@ -3059,8 +3057,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "Cn" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3080,6 +3077,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/telecomms) "CD" = ( @@ -3180,7 +3178,7 @@ id = "syndie_lavaland_exitdoors"; name = "Central External Airlock Blast Door Control"; pixel_y = -24; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/structure/safe/floor, /obj/item/reagent_containers/food/drinks/bottle/vodka, @@ -3439,10 +3437,9 @@ /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "FN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "FW" = ( @@ -3479,21 +3476,22 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "Gq" = ( -/obj/effect/turf_decal/siding/green{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/siding/green/corner, +/obj/effect/turf_decal/siding/green/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "Gs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -3544,7 +3542,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/engine, /area/ruin/powered/syndicate_lava_base/chemistry) @@ -3629,6 +3627,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "Hi" = ( @@ -3658,25 +3657,30 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "Hv" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "150" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/green/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "Hw" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" + name = "Warehouse" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3684,6 +3688,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "Hy" = ( @@ -4185,15 +4190,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "MH" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "ML" = ( @@ -4230,6 +4234,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "MR" = ( @@ -4380,15 +4385,14 @@ /turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "Oa" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; name = "Syndicate Research Experimentation Shutters" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/chemistry) "Oe" = ( @@ -4431,8 +4435,7 @@ /area/ruin/powered/syndicate_lava_base/chemistry) "OD" = ( /obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "150" + name = "Kitchen cold room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -4449,6 +4452,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/showroomfloor, /area/ruin/powered/syndicate_lava_base/bar) "OL" = ( @@ -4615,6 +4619,16 @@ }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) +"Qm" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/powered/syndicate_lava_base/main) "Qp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -4785,7 +4799,7 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Isolation Pen"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) @@ -4794,8 +4808,7 @@ /area/ruin/powered/syndicate_lava_base/chemistry) "Sj" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -4809,6 +4822,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/telecomms) "Sm" = ( @@ -4816,7 +4830,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access_txt = "150" + req_access_txt = "syndicate" }, /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -4875,9 +4889,7 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/powered/syndicate_lava_base/engineering) "SG" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; name = "Syndicate Research Experimentation Shutters" @@ -4889,6 +4901,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/chemistry) "SI" = ( @@ -4937,11 +4950,10 @@ /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "ST" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/machinery/atmospherics/pipe/simple/yellow/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/telecomms) "SU" = ( @@ -5114,8 +5126,7 @@ /area/ruin/powered/syndicate_lava_base/telecomms) "UK" = ( /obj/machinery/door/airlock/research{ - name = "Science Pod"; - req_access_txt = "150" + name = "Science Pod" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -5135,8 +5146,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) +"UQ" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/preopen{ + id = "syndie_lavaland_exitdoors" + }, +/turf/open/floor/plating, +/area/ruin/powered/syndicate_lava_base/main) "UX" = ( /obj/effect/turf_decal/siding/brown, /obj/structure/disposalpipe/segment{ @@ -5149,8 +5169,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "Vg" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Pod"; - req_access_txt = "150" + name = "Engineering Pod" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -5167,6 +5186,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "VG" = ( @@ -5269,8 +5289,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "WK" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Pod"; - req_access_txt = "150" + name = "Cargo Pod" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -5290,12 +5309,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "WL" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/blue{ dir = 5 @@ -5414,7 +5433,7 @@ /obj/machinery/door/window/brigdoor{ dir = 8; name = "Cell"; - req_access_txt = "150" + req_access_txt = "syndicate" }, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) @@ -7509,7 +7528,7 @@ hc zB qr JU -yV +Qm El WK El @@ -7630,7 +7649,7 @@ fw fw JU fh -xN +UQ MS El yY diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index d7e8caa36f08..1ccde2827054 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -2743,10 +2743,10 @@ /area/mine/maintenance) "Ji" = ( /obj/machinery/door/window/eastleft{ - req_access_txt = "48" + req_access_txt = "mining_station" }, /obj/machinery/door/window/westleft{ - req_access_txt = "48" + req_access_txt = "mining_station" }, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm index 8ce33a885177..adcf67a296b0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm @@ -27,8 +27,7 @@ /area/ruin/powered/fishing/shop) "aF" = ( /obj/machinery/door/airlock/maintenance{ - name = "kitchen storage"; - req_access_txt = "Fisherman" + name = "kitchen storage" }, /obj/effect/turf_decal/trimline/brown/filled/end, /obj/machinery/door/firedoor/border_only, @@ -448,10 +447,6 @@ "ld" = ( /obj/structure/rack, /obj/item/ship_in_a_bottle, -/obj/item/clothing/under/sailor, -/obj/item/clothing/under/sailor, -/obj/item/clothing/under/sailor, -/obj/item/clothing/under/sailor, /obj/effect/spawner/lootdrop/glowstick, /obj/effect/spawner/lootdrop/glowstick, /obj/effect/spawner/lootdrop/glowstick, @@ -786,15 +781,13 @@ id = "fishshop"; name = "Giftshop Shutters"; pixel_x = 28; - pixel_y = 8; - req_access_txt = "Fisherman" + pixel_y = 8 }, /obj/machinery/button/door{ id = "fishing lockdown"; name = "Lockdown Control"; pixel_x = 28; - pixel_y = -7; - req_access_txt = "Fisherman" + pixel_y = -7 }, /obj/effect/mob_spawn/human/fishing/alive, /obj/structure/cloth_curtain, @@ -848,8 +841,7 @@ id = "fishing lockdown"; name = "Lockdown Control"; pixel_x = 25; - pixel_y = -6; - req_access_txt = "Fisherman" + pixel_y = -6 }, /obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel, @@ -1007,8 +999,7 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - dir = 2; - req_access_txt = "Fisherman" + dir = 2 }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, @@ -1332,15 +1323,13 @@ id = "fishing lockdown"; name = "Lockdown Control"; pixel_x = -23; - pixel_y = 9; - req_access_txt = "Fisherman" + pixel_y = 9 }, /obj/machinery/button/door{ id = "fishshop"; name = "Giftshop Shutters"; pixel_x = -23; - pixel_y = -6; - req_access_txt = "Fisherman" + pixel_y = -6 }, /turf/open/floor/plasteel, /area/ruin/powered/fishing/shop) @@ -1418,8 +1407,7 @@ /area/ruin/powered/fishing/shop) "Gv" = ( /obj/machinery/door/airlock/wood{ - name = "bunk room"; - req_access_txt = "Fisherman" + name = "bunk room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1506,9 +1494,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/fishing/kitchen) "IW" = ( -/obj/machinery/door/window/westleft{ - req_access_txt = "Fisherman" - }, +/obj/machinery/door/window/westleft, /obj/machinery/door/poddoor/shutters{ id = "fishshop" }, @@ -1676,8 +1662,7 @@ "Qn" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/airlock/glass{ - name = "kitchen access"; - req_access_txt = "Fisherman" + name = "kitchen access" }, /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -1902,9 +1887,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/window/westleft{ - req_access_txt = "Fisherman" - }, +/obj/machinery/door/window/westleft, /turf/open/floor/plasteel/dark/telecomms, /area/ruin/powered/fishing/tcom) "Vn" = ( @@ -2058,7 +2041,7 @@ /area/ruin/powered/fishing/shop) "Zd" = ( /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/water/safe, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm index dd957aab48fa..f06aa272a98a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm @@ -59,8 +59,7 @@ /area/ruin/powered) "aF" = ( /obj/item/reagent_containers/glass/bottle/radscrub{ - desc = "War. War never changes. But this can clean your radiation contamination problems!"; - + desc = "War. War never changes. But this can clean your radiation contamination problems!" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -95,7 +94,6 @@ "aN" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/item/clothing/under/scratch, /turf/open/floor/wood, /area/ruin/powered) "aO" = ( @@ -217,8 +215,7 @@ "bn" = ( /obj/structure/closet/secure_closet/bar{ pixel_x = -3; - pixel_y = -1; - req_access_txt = "25" + pixel_y = -1 }, /turf/open/floor/wood, /area/ruin/powered) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm index f1ad88e9d389..0aeb4bb8cfd8 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm @@ -14,7 +14,7 @@ }, /obj/structure/closet/crate/secure{ name = "Emergency Supplies Crate"; - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, @@ -67,10 +67,9 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "aU" = ( -/obj/machinery/door/airlock/centcom{ - req_access_txt = "36" - }, +/obj/machinery/door/airlock/centcom, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plating, /area/ruin/powered/gasstation) "aV" = ( @@ -198,10 +197,10 @@ /area/ruin/powered/gasstation) "gZ" = ( /obj/machinery/door/airlock/hatch{ - req_access = null; - req_access_txt = "36" + req_access = null }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "ha" = ( @@ -219,6 +218,18 @@ /obj/effect/mob_spawn/human/gasstation_clerk, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) +"ia" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/displaycase/labcage{ + desc = "For displaying of more valuable items you have acquired."; + name = "Shop Display Case"; + req_access = list("clerk"); + start_showpiece_type = null + }, +/turf/open/floor/plasteel/white, +/area/ruin/powered/gasstation) "ii" = ( /obj/item/trash/chips, /turf/open/floor/plasteel/white, @@ -226,7 +237,7 @@ "iq" = ( /obj/machinery/door/window{ req_access = null; - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "cashiershutters"; @@ -612,8 +623,7 @@ /obj/structure/displaycase/labcage{ desc = "For displaying of more valuable items you have acquired."; name = "Shop Display Case"; - req_access = null; - req_access_txt = "36"; + req_access = list("clerk"); start_showpiece_type = null }, /turf/open/floor/plasteel/white, @@ -622,7 +632,7 @@ /obj/machinery/button/door{ id = "cashiershutters"; name = "Cashier Lockdown"; - req_access_txt = "36" + req_access_txt = "clerk" }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) @@ -722,9 +732,8 @@ /obj/structure/displaycase/labcage{ desc = "For displaying of more valuable items you have acquired."; name = "Shop Display Case"; - req_access = null; - req_access_txt = "36"; - start_showpiece_type = null + start_showpiece_type = null; + req_access = list("clerk") }, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) @@ -772,7 +781,7 @@ /obj/machinery/button/door{ id = "gasstation"; name = "Gas Station Lockdown"; - req_access_txt = "36" + req_access_txt = "clerk" }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) @@ -1315,7 +1324,7 @@ cV cV RV sJ -Qw +ia fB Xf cV diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm index beab03230486..ad298fcfbbee 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm @@ -715,9 +715,7 @@ /turf/open/floor/plasteel, /area/ruin/powered) "bQ" = ( -/obj/machinery/door/airlock/security/glass{ - req_access_txt = "63" - }, +/obj/machinery/door/airlock/security/glass, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8; @@ -731,6 +729,7 @@ dir = 1; icon_state = "tile_corner" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/ruin/powered) "bR" = ( @@ -752,9 +751,7 @@ /area/ruin/powered) "bS" = ( /obj/structure/fans/tiny/invisible, -/obj/machinery/door/airlock/security/glass{ - req_one_access_txt = "63" - }, +/obj/machinery/door/airlock/security/glass, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8; @@ -768,6 +765,7 @@ dir = 1; icon_state = "tile_corner" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/ruin/powered) "bT" = ( diff --git a/_maps/map_files/mining/Jungleland.dmm b/_maps/map_files/mining/Jungleland.dmm index 9a51679d7797..e0c041e8f981 100644 --- a/_maps/map_files/mining/Jungleland.dmm +++ b/_maps/map_files/mining/Jungleland.dmm @@ -48,9 +48,6 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) -"be" = ( -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "bi" = ( /obj/machinery/conveyor{ dir = 10; @@ -237,8 +234,7 @@ /area/jungleland/explored) "gh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -246,6 +242,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "gv" = ( @@ -295,8 +298,7 @@ /area/mine/laborcamp) "hB" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -304,6 +306,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/laborcamp) "hD" = ( @@ -378,8 +383,7 @@ /area/mine/laborcamp) "kD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -393,6 +397,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "lh" = ( @@ -488,7 +496,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -537,10 +545,6 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/laborcamp) -"pA" = ( -/obj/structure/flora/tree/jungle, -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "pQ" = ( /obj/structure/chair/stool, /obj/structure/sign/poster/official/obey{ @@ -700,14 +704,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_access_txt = "2" + name = "Labor Camp Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/mine/laborcamp/security) "vE" = ( @@ -1157,10 +1161,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/mine/laborcamp/security) -"Lv" = ( -/obj/structure/flora/junglebush, -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "LE" = ( /turf/open/water/smooth/toxic_pit/deep, /area/jungleland/ocean) @@ -1216,10 +1216,6 @@ /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) -"NV" = ( -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "Oi" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, @@ -1385,8 +1381,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1395,6 +1390,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "WN" = ( @@ -5571,7 +5567,7 @@ sl FT gv cV -be +Dd LE LE "} @@ -8627,7 +8623,7 @@ Dd vR Dd OJ -Lv +zg UW UW UW @@ -8883,12 +8879,12 @@ UW UW UW Dd -NV +NM zg di -be +Dd di -Lv +zg UW UW LE @@ -9143,11 +9139,11 @@ UW Dd Dd vR -be -be -pA +Dd +Dd +vR mx -Lv +zg UW UW UW @@ -9402,14 +9398,14 @@ UW Dd Dd di -be -Lv +Dd +zg NM di -Lv +zg mx -Lv -be +zg +Dd UW LE LE @@ -9660,11 +9656,11 @@ UW UW Dd Dd -NV +NM +zg zg -Lv di -be +Dd UW UW UW diff --git a/_maps/map_files/mining/Lavaland.dmm b/_maps/map_files/mining/Lavaland.dmm index d767c11c1ea7..7a509b0c0cad 100644 --- a/_maps/map_files/mining/Lavaland.dmm +++ b/_maps/map_files/mining/Lavaland.dmm @@ -1873,8 +1873,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_access_txt = "2" + name = "Labor Camp Maintenance" }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1886,6 +1885,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "sk" = ( @@ -1913,8 +1913,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ @@ -1925,6 +1924,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "sH" = ( @@ -2968,7 +2968,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny, @@ -3054,8 +3054,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Monitoring"; - req_access_txt = "2" + name = "Labor Camp Monitoring" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -3070,6 +3069,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "Sf" = ( @@ -3362,13 +3362,13 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "Yj" = ( From 9fda4ff4c8e84ea03178a2809edce48fbc56e1d8 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sun, 28 Jul 2024 21:02:13 +0200 Subject: [PATCH 18/48] ballin --- _maps/map_files/generic/CentCom.dmm | 1365 ++++++++++++++++---------- _maps/templates/infiltrator_base.dmm | 17 +- 2 files changed, 864 insertions(+), 518 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 59ac59e706df..ae73c9146009 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -20,15 +20,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aaT" = ( @@ -50,6 +45,14 @@ /obj/effect/baseturf_helper/asteroid/snow, /turf/open/floor/plating/asteroid/snow/airless, /area/yogs/infiltrator_base/outside) +"abk" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/machinery/door/airlock/centcom{ + name = "Shuttle Control Office" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/supply) "abp" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt, @@ -107,17 +110,16 @@ /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "acQ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "ada" = ( /obj/structure/bed, /obj/machinery/airalarm{ pixel_y = 24; - req_access = list(150) + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -133,12 +135,11 @@ /turf/open/floor/plasteel, /area/centcom/testchamber) "ado" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "adr" = ( @@ -232,10 +233,10 @@ /area/yogs/infiltrator_base) "adW" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Foyer"; - req_access_txt = "150" + name = "E.V.A. Foyer" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aed" = ( @@ -244,7 +245,7 @@ "ael" = ( /obj/structure/chair/stool, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/effect/landmark/start/infiltrator, @@ -256,12 +257,12 @@ /area/yogs/infiltrator_base) "aet" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 1"; - req_access_txt = "150" + name = "Cell 1" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "aev" = ( @@ -284,15 +285,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aeK" = ( @@ -1359,19 +1355,12 @@ /turf/open/floor/plasteel, /area/centcom/supply) "aiS" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/brown{ +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/centcom/supply) +/area/centcom/control) "aiT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1431,13 +1420,10 @@ /turf/open/floor/plasteel, /area/centcom/supply) "aja" = ( -/obj/machinery/door/firedoor, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, /area/centcom/control) "ajb" = ( @@ -1581,12 +1567,9 @@ /area/centcom/supply) "ajr" = ( /obj/machinery/door/airlock/external{ - name = "Supply Shuttle"; - req_access_txt = "106" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "Supply Shuttle" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supply) "ajs" = ( @@ -1630,14 +1613,16 @@ layer = 4; name = "Loading Doors"; pixel_x = -27; - pixel_y = -5 + pixel_y = -5; + req_access_txt = "cent_storage" }, /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor2"; layer = 4; name = "Loading Doors"; pixel_x = -27; - pixel_y = 5 + pixel_y = 5; + req_access_txt = "cent_storage" }, /obj/machinery/computer/cargo{ dir = 4 @@ -2349,17 +2334,16 @@ /area/centcom/control) "akZ" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "ala" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /obj/machinery/light{ dir = 8 @@ -2393,8 +2377,7 @@ }, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -2410,8 +2393,7 @@ "alf" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /obj/machinery/light{ dir = 4 @@ -2609,18 +2591,18 @@ /area/space) "alJ" = ( /obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office"; - req_access_txt = "109" + name = "Shuttle Control Office" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/supply) "alK" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/supply) "alL" = ( @@ -2705,12 +2687,10 @@ /turf/open/floor/mineral/titanium/white, /area/centcom/evac) "alT" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Security" }, /turf/open/floor/plasteel, /area/centcom/control) @@ -3136,8 +3116,10 @@ /turf/open/floor/grass, /area/centcom/control) "amR" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/centcom/control) "amS" = ( @@ -3645,7 +3627,7 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; - req_access_txt = "109" + req_access_txt = "cent_general" }, /obj/machinery/firealarm{ dir = 4; @@ -3667,7 +3649,7 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; - req_access_txt = "109" + req_access_txt = "cent_general" }, /obj/machinery/firealarm{ dir = 8; @@ -4165,8 +4147,7 @@ /area/centcom/ferry) "aoJ" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -4181,6 +4162,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "aoK" = ( @@ -4482,18 +4465,23 @@ /area/centcom/supply) "apl" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access_txt = "109" + req_access_txt = "cent_storage" }, /obj/item/clipboard, /obj/item/folder/yellow, /obj/item/pen/red, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/supply) "apm" = ( @@ -4710,26 +4698,29 @@ }, /area/yogs/infiltrator_base) "apA" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /obj/machinery/turretid{ ailock = 1; + control_area = null; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; icon_state = "control_stun"; name = "Security turret control"; pixel_x = 26; - req_access = 150 + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "apB" = ( -/obj/machinery/firealarm, +/obj/machinery/firealarm{ + dir = 4 + }, /turf/closed/indestructible/riveted, /area/centcom/ferry) "apC" = ( @@ -4775,8 +4766,7 @@ /area/centcom/holding) "apF" = ( /obj/machinery/door/airlock/centcom{ - name = "Auxillary Dock"; - req_access_txt = "150" + name = "Auxillary Dock" }, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) @@ -4820,10 +4810,6 @@ /turf/open/floor/carpet/green, /area/centcom/ferry) "apM" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -4847,10 +4833,6 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, /turf/open/floor/carpet/green, /area/centcom/ferry) "apO" = ( @@ -4882,13 +4864,18 @@ /area/centcom/supply) "apQ" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/structure/window/reinforced{ dir = 4 }, /obj/item/paper_bin, /obj/item/pen/red, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/supply) "apR" = ( @@ -4989,10 +4976,6 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5389,11 +5372,11 @@ /area/centcom/syndicate_mothership/control) "aqQ" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "aqR" = ( @@ -5402,18 +5385,16 @@ /area/centcom/ferry) "aqS" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supply) "aqT" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/centcom/control) @@ -5466,13 +5447,13 @@ /area/centcom/testchamber) "arc" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 2"; - req_access_txt = "150" + name = "Cell 2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "ard" = ( @@ -5511,13 +5492,13 @@ /area/centcom/syndicate_mothership/control) "arh" = ( /obj/machinery/door/airlock/centcom{ - name = "Restroom"; - req_access_txt = "150" + name = "Restroom" }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/centcom/syndicate_mothership/control) "ari" = ( @@ -6275,8 +6256,7 @@ /area/centcom/ferry) "asD" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Storage"; - req_access_txt = "106" + name = "Administrative Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -6284,9 +6264,8 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "asE" = ( @@ -6369,15 +6348,13 @@ "asH" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ - name = "Vault Door"; - req_access_txt = "53" + name = "Vault Door" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "asI" = ( @@ -6423,12 +6400,10 @@ /area/centcom/control) "asL" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Security" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/evac) "asM" = ( @@ -6525,9 +6500,10 @@ /area/centcom/wizard_station) "asY" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/supplypod) "asZ" = ( @@ -6668,10 +6644,13 @@ /area/centcom/ferry) "atu" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel, @@ -6779,10 +6758,6 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" @@ -6798,10 +6773,6 @@ /obj/item/ammo_box/m44, /obj/item/gun/ballistic/revolver/mateba, /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -6855,8 +6826,10 @@ /turf/open/floor/plasteel, /area/centcom/control) "atL" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel, @@ -6965,9 +6938,9 @@ /area/centcom/testchamber) "aud" = ( /obj/machinery/door/airlock/centcom{ - name = "Primary Hangar"; - req_access_txt = "150" + name = "Primary Hangar" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) "aue" = ( @@ -7323,9 +7296,9 @@ /area/centcom/testchamber) "auJ" = ( /obj/machinery/door/airlock/external/glass{ - name = "Assault Pod Launcher Access"; - req_access_txt = "150" + name = "Assault Pod Launcher Access" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) "auK" = ( @@ -7356,10 +7329,13 @@ /area/centcom/testchamber) "auO" = ( /obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office"; - req_access_txt = "109" + name = "Shuttle Control Office" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/centcom/ferry) "auP" = ( @@ -7489,10 +7465,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7553,7 +7525,7 @@ dir = 1; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access_txt = "109" + req_access_txt = "cent_general" }, /obj/machinery/door/window, /obj/effect/turf_decal/bot, @@ -7679,7 +7651,7 @@ }, /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/machinery/light/small{ dir = 1 @@ -7739,10 +7711,10 @@ /area/centcom/ferry) "avF" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "avG" = ( @@ -7750,9 +7722,7 @@ id = "XCCsec1"; name = "XCC Checkpoint 1 Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "avH" = ( @@ -7788,7 +7758,7 @@ name = "Hanger Bay Shutters"; pixel_x = -8; pixel_y = 24; - req_access_txt = "2" + req_access_txt = "cent_general" }, /obj/machinery/button/door/indestructible{ id = "XCCsec3"; @@ -7865,9 +7835,6 @@ id = "XCCcustoms2"; name = "XCC Customs 2 Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, /area/centcom/control) "avQ" = ( @@ -7924,9 +7891,6 @@ id = "XCCcustoms1"; name = "XCC Customs 1 Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, /area/centcom/evac) "avV" = ( @@ -8072,7 +8036,7 @@ dir = 4; icon_state = "right"; name = "Commander's Desk"; - req_access_txt = "151" + req_access_txt = "syndicate_leader" }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) @@ -8140,27 +8104,24 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "awu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "awv" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, /obj/machinery/door/poddoor/shutters{ id = "XCCFerry"; name = "XCC Ferry Hangar" }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, /turf/open/floor/plasteel, /area/centcom/ferry) "aww" = ( @@ -8168,7 +8129,7 @@ id = "XCCFerry"; name = "Hanger Bay Shutters"; pixel_y = 24; - req_access_txt = "2" + req_access_txt = "cent_general" }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8208,12 +8169,10 @@ /area/centcom/ferry) "awC" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Customs"; - req_access_txt = "109" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Customs" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "awE" = ( @@ -8268,13 +8227,9 @@ /turf/open/floor/plasteel, /area/centcom/control) "awJ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -8708,7 +8663,8 @@ /obj/machinery/button/door/indestructible{ id = "XCCsec1"; name = "CC Shutter 1 Control"; - pixel_y = -24 + pixel_y = -24; + req_access_txt = "cent_general" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -8874,8 +8830,7 @@ /area/centcom/testchamber) "ayj" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8883,6 +8838,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "ayk" = ( @@ -8936,10 +8892,13 @@ /area/centcom/ferry) "ayr" = ( /obj/machinery/door/airlock/centcom{ - name = "Briefing Room"; - req_access_txt = "101" + name = "Briefing Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/ferry) "ays" = ( @@ -9164,9 +9123,6 @@ /area/centcom/testchamber) "ayS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "ayT" = ( @@ -9185,16 +9141,13 @@ /turf/open/floor/plasteel, /area/centcom/testchamber) "ayU" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "ayV" = ( @@ -9391,7 +9344,7 @@ /obj/machinery/door/airlock/medical/glass{ name = "Infirmary" }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "azl" = ( @@ -10561,10 +10514,9 @@ /area/brazil) "aBM" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/evac) "aBN" = ( @@ -10576,7 +10528,7 @@ dir = 1; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access_txt = "109" + req_access_txt = "cent_general" }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -10600,7 +10552,7 @@ dir = 1; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access_txt = "109" + req_access_txt = "cent_general" }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -11485,6 +11437,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aDr" = ( @@ -11499,6 +11452,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel/dark, /area/centcom/control) "aDs" = ( @@ -11510,22 +11464,32 @@ /area/centcom/control) "aDt" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/storage/fancy/donut_box, /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDu" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/reagent_containers/food/drinks/britcup, /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDv" = ( @@ -11677,7 +11641,6 @@ /area/centcom/control) "aDH" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/folder/red, /obj/item/pen/red, /obj/machinery/door/window/brigdoor{ @@ -11685,14 +11648,19 @@ dir = 4; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access_txt = "109" + req_access_txt = "cent_general" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDI" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/folder/white, /obj/item/pen/blue, /obj/machinery/door/window/brigdoor{ @@ -11700,9 +11668,15 @@ dir = 8; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access_txt = "109" + req_access_txt = "cent_medical" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDJ" = ( @@ -11719,9 +11693,10 @@ /area/centcom/control) "aDK" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/evac) "aDL" = ( @@ -11910,7 +11885,7 @@ /obj/machinery/door/airlock/centcom{ name = "Thunderdome Booth" }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "aEh" = ( @@ -11964,7 +11939,6 @@ /area/centcom/tdome/tdomeobserve) "aEq" = ( /obj/machinery/door/airlock/external, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aEr" = ( @@ -12063,10 +12037,8 @@ /area/centcom/tdome/tdomeobserve) "aEB" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) @@ -12175,9 +12147,14 @@ /area/centcom/tdome/tdomeobserve) "aEN" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/paper/pamphlet/centcom/visitor_info, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aEO" = ( @@ -12440,9 +12417,10 @@ base_state = "rightsecure"; icon_state = "rightsecure"; name = "Thunderdome Booth"; - req_access_txt = "109" + req_access_txt = "cent_captain" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aFs" = ( @@ -12590,9 +12568,8 @@ /obj/machinery/door/airlock/centcom{ name = "Thunderdome Backstage" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aFL" = ( @@ -12896,8 +12873,6 @@ /turf/open/floor/plasteel/white, /area/centcom/tdome/tdomeobserve) "aGv" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGw" = ( @@ -12906,10 +12881,10 @@ /area/centcom/tdome/tdomeobserve) "aGx" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - req_access_txt = "101" + name = "Thunderdome" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGy" = ( @@ -12939,7 +12914,7 @@ pixel_y = 32 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark/side{ @@ -12981,7 +12956,9 @@ /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGF" = ( -/obj/structure/closet/secure_closet/freezer/meat, +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list("cent_general") + }, /obj/item/reagent_containers/food/snacks/meat/rawbacon, /obj/item/reagent_containers/food/snacks/meat/rawbacon, /obj/item/reagent_containers/food/snacks/meat/rawbacon, @@ -13051,7 +13028,9 @@ /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGI" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = list("cent_general") + }, /obj/item/reagent_containers/food/snacks/grown/banana, /obj/item/reagent_containers/food/snacks/grown/banana, /obj/item/reagent_containers/food/snacks/grown/wheat, @@ -13673,7 +13652,6 @@ /area/centcom/tdome/tdomeobserve) "aHK" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 @@ -13683,6 +13661,12 @@ }, /obj/item/reagent_containers/food/drinks/britcup, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHM" = ( @@ -13727,8 +13711,13 @@ /area/centcom/tdome/tdomeobserve) "aHP" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHQ" = ( @@ -13765,10 +13754,9 @@ /area/centcom/tdome/tdomeobserve) "aHS" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Locker Room"; - req_access_txt = "101" + name = "Thunderdome Locker Room" }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHT" = ( @@ -13804,10 +13792,15 @@ /area/centcom/tdome/tdomeobserve) "aHV" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/storage/bag/tray, /obj/item/kitchen/fork, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHW" = ( @@ -13871,12 +13864,17 @@ /area/centcom/tdome/tdomeobserve) "aIc" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/structure/noticeboard{ dir = 1; pixel_y = -32 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aId" = ( @@ -14097,11 +14095,11 @@ /area/centcom/tdome/tdomeadmin) "aIx" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" + name = "Thunderdome Administration" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aIy" = ( @@ -14274,8 +14272,9 @@ /turf/open/floor/plating, /area/centcom/tdome/tdomeadmin) "aIS" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aIT" = ( @@ -14757,12 +14756,13 @@ /turf/open/floor/pod/dark, /area/yogs/infiltrator_base) "aJX" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/door/airlock/centcom{ + name = "CentCom Medical Checkpoint" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, /turf/open/floor/plasteel, -/area/centcom/tdome/tdomeadmin) +/area/centcom/control) "aJZ" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -14854,30 +14854,21 @@ }, /area/centcom/tdome/tdomeadmin) "aKh" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "Thunderdome Administration" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aKi" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "aKj" = ( @@ -14885,6 +14876,7 @@ name = "Backup Emergency Escape Shuttle" }, /obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aKk" = ( @@ -15061,7 +15053,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomehea"; name = "Heavy Supply Control"; - req_access_txt = "102" + req_access_txt = "cent_thunder" }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15080,7 +15072,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdome"; name = "Main Blast Doors Control"; - req_access_txt = "102" + req_access_txt = "cent_thunder" }, /obj/structure/table/reinforced, /obj/machinery/light, @@ -15100,7 +15092,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomegen"; name = "General Supply Control"; - req_access_txt = "102" + req_access_txt = "cent_thunder" }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15268,21 +15260,11 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/gun/ballistic/automatic/pistol{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/gun/ballistic/automatic/pistol{ - pixel_y = 1 - }, /obj/item/gun/ballistic/automatic/pistol{ pixel_x = -3; - pixel_y = 4 - }, -/obj/item/gun/ballistic/automatic/pistol{ - pixel_x = 2; - pixel_y = -3 + pixel_y = 3 }, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/pod/light, /area/yogs/infiltrator_base) "aKO" = ( @@ -15301,7 +15283,7 @@ "aKS" = ( /obj/machinery/door/window/northright{ name = "Security Desk"; - req_access_txt = "103" + req_access_txt = "security" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15349,14 +15331,17 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/airalarm{ dir = 8; + icon_state = "alarm0"; pixel_x = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/machinery/turretid{ icon_state = "control_kill"; lethal = 1; + locked = 1; pixel_y = 28; - req_access = 150 + req_access_txt = "syndicate"; + req_access = null }, /turf/open/floor/plasteel/dark/side{ dir = 5 @@ -15413,7 +15398,7 @@ "aLg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/effect/turf_decal/tile/red{ @@ -15472,7 +15457,9 @@ /area/yogs/infiltrator_base) "aLx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aLz" = ( /obj/effect/turf_decal/stripes/corner, @@ -16077,13 +16064,13 @@ /area/centcom/testchamber) "aNk" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - req_access_txt = "101" + name = "Thunderdome" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aNl" = ( @@ -16258,13 +16245,12 @@ /area/centcom/fabric_of_reality) "aNG" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security Checkpoint" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aNH" = ( @@ -16378,10 +16364,10 @@ /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aNV" = ( @@ -16507,7 +16493,7 @@ "aOh" = ( /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/structure/bed, /obj/item/bedsheet/black, @@ -16518,16 +16504,14 @@ /turf/open/floor/bluespace, /area/centcom/testchamber) "aOj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "aOk" = ( @@ -16755,7 +16739,9 @@ /obj/item/storage/crayons, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aOK" = ( /obj/machinery/door/airlock/external{ @@ -16930,7 +16916,7 @@ }, /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -17119,15 +17105,7 @@ /obj/item/suppressor{ pixel_y = 8 }, -/obj/item/suppressor{ - pixel_y = -3 - }, -/obj/item/suppressor{ - pixel_y = 2 - }, -/obj/item/suppressor{ - pixel_y = 13 - }, +/obj/item/suppressor, /turf/open/floor/pod/light, /area/yogs/infiltrator_base) "aPG" = ( @@ -17237,10 +17215,10 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/three) "aPX" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ - dir = 1 + dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aPY" = ( @@ -17648,23 +17626,16 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/radio/headset/syndicate/alt{ - pixel_y = 5 - }, -/obj/item/radio/headset/syndicate/alt{ - pixel_x = 1; - pixel_y = -5 - }, -/obj/item/radio/headset/syndicate/alt{ - pixel_x = 10; - pixel_y = 6 + pixel_x = -3; + pixel_y = 3 }, /obj/item/radio/headset/syndicate/alt{ - pixel_x = 10; - pixel_y = -5 - }, -/obj/item/multitool{ - pixel_x = -6 + pixel_x = -3; + pixel_y = 3 }, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/multitool, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "aRa" = ( @@ -17783,7 +17754,8 @@ }, /obj/machinery/airalarm{ pixel_y = 24; - req_access = list(150) + req_access = list("syndicate"); + req_access_txt = "0" }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) @@ -18301,8 +18273,7 @@ "aSG" = ( /obj/structure/table, /obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 + pixel_y = 8 }, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) @@ -18413,6 +18384,7 @@ pixel_y = -2 }, /obj/item/toy/cards/deck/syndicate{ + icon_state = "deck_syndicate_full"; pixel_x = -6; pixel_y = 6 }, @@ -18960,11 +18932,11 @@ /area/centcom/holding) "aUn" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - req_access_txt = "101" + name = "Thunderdome" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aUo" = ( @@ -19180,8 +19152,7 @@ /area/centcom/evac) "aUO" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -19189,6 +19160,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aUR" = ( @@ -19455,7 +19427,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aVC" = ( /obj/effect/turf_decal/tile/neutral{ @@ -19639,22 +19613,21 @@ /area/centcom/testchamber) "aWc" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Security" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/evac) "aWf" = ( /obj/machinery/airalarm{ dir = 4; + icon_state = "alarm0"; pixel_x = -24; - req_access = list(150) + req_access = list("syndicate") }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -19886,13 +19859,13 @@ /area/centcom/testchamber) "aWJ" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" + name = "Thunderdome Administration" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aWK" = ( @@ -19936,25 +19909,27 @@ /area/centcom/testchamber) "aWP" = ( /obj/machinery/door/airlock/titanium{ - name = "Cockpit"; - req_access_txt = "109" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command, /turf/open/floor/mineral/titanium, /area/centcom/evac) "aWQ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel, @@ -20018,18 +19993,12 @@ /area/yogs/infiltrator_base/jail) "aWY" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aWZ" = ( @@ -20182,11 +20151,10 @@ /area/centcom/supplypod/loading/one) "aXt" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security Checkpoint" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aXu" = ( @@ -20211,8 +20179,7 @@ id = "testvent"; name = "Testing Chamber Vent Control"; pixel_x = -25; - pixel_y = 5; - req_access_txt = "7" + pixel_y = 5 }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -20628,10 +20595,8 @@ /area/centcom/testchamber) "aYt" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -20668,9 +20633,9 @@ /area/centcom/testchamber) "aYA" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supplypod) "aYC" = ( @@ -20872,9 +20837,10 @@ /obj/effect/turf_decal/bot_white, /obj/machinery/door/airlock/centcom{ name = "Equipment Room"; - req_access_txt = "150" + opacity = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/dark, /area/yogs/infiltrator_base) "aZk" = ( @@ -20942,13 +20908,15 @@ "aZt" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aZu" = ( /obj/structure/chair/stool, /obj/machinery/airalarm{ pixel_y = 24; - req_access = list(150) + req_access = list("syndicate") }, /obj/effect/landmark/start/infiltrator, /obj/effect/turf_decal/tile/bar, @@ -21109,8 +21077,7 @@ /area/centcom/testchamber) "aZJ" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -21118,6 +21085,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/evac) "aZL" = ( @@ -21206,13 +21174,12 @@ /area/centcom/holding) "aZX" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supply) "aZY" = ( @@ -21315,10 +21282,25 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"buB" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "bwc" = ( /obj/machinery/vending/medical, /turf/open/floor/plasteel/bluespace, /area/centcom) +"bwt" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec3"; + name = "XCC Checkpoint 3 Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "bwX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, @@ -21335,6 +21317,16 @@ /obj/machinery/vending/robotics, /turf/open/floor/plasteel/bluespace, /area/centcom) +"bCI" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/evac) "bDC" = ( /obj/machinery/cryopod{ dir = 4 @@ -21367,6 +21359,14 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"bPd" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "bQp" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/lavendergrass, @@ -21417,6 +21417,7 @@ pixel_x = -4; pixel_y = 2 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "bUq" = ( @@ -21443,6 +21444,11 @@ /obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plasteel/cafeteria, /area/centcom/syndicate_mothership) +"bXd" = ( +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/centcom/tdome/tdomeobserve) "bYz" = ( /obj/structure/railing/corner{ dir = 4 @@ -21470,6 +21476,14 @@ icon_state = "info29" }, /area/centcom/testchamber) +"cuz" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "cAw" = ( /obj/machinery/vending/snack, /turf/open/floor/plasteel/bluespace, @@ -21546,12 +21560,11 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ pixel_y = 24; - req_access = 150 + req_access = list("syndicate") }, /obj/structure/table, /obj/item/storage/toolbox/syndicate, /obj/item/flashlight, -/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "dgH" = ( @@ -21563,6 +21576,18 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel/bluespace, /area/centcom) +"dth" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/evac) "dwq" = ( /turf/open/indestructible/wiki/info{ icon_state = "info18" @@ -21620,9 +21645,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/end/lower, /obj/machinery/door/airlock/centcom{ - name = "Strike Team Dispatch Bay"; - req_access_txt = "150" + name = "Strike Team Dispatch Bay" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "eeI" = ( @@ -21764,6 +21789,11 @@ icon_state = "title5" }, /area/centcom/testchamber) +"fxu" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "fxK" = ( /obj/machinery/vending/modularpc, /turf/open/floor/plasteel/bluespace, @@ -21806,13 +21836,28 @@ /obj/machinery/vending/wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"ggU" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "gkW" = ( /obj/item/kirbyplants/photosynthetic, /turf/open/floor/wood, /area/centcom/holding) +"gqR" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec3"; + name = "CC Main Access Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "gxx" = ( -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -21820,7 +21865,11 @@ /obj/structure/mirror{ pixel_x = 28 }, -/turf/open/floor/plasteel/freezer, +/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "gCx" = ( /obj/effect/landmark/wiki, @@ -21868,26 +21917,35 @@ /area/centcom/testchamber) "gUH" = ( /obj/machinery/door/airlock/centcom{ - name = "Hangar Maintenance"; - req_access_txt = "150" + name = "Hangar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership) "hcE" = ( /obj/machinery/door/airlock/centcom{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/end/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) "hgl" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"hhx" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "hog" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -21961,6 +22019,33 @@ }, /turf/open/floor/plasteel, /area/centcom/testchamber) +"hJE" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) +"hSa" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel/dark, +/area/centcom/control) "hUh" = ( /obj/machinery/vending/sovietsoda, /turf/open/floor/plasteel/bluespace, @@ -21988,9 +22073,13 @@ /area/centcom/testchamber) "ilE" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" + name = "Thunderdome Administration" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/tdome/tdomeadmin) "ipF" = ( @@ -22008,17 +22097,29 @@ }, /turf/closed/indestructible/opsglass, /area/centcom/syndicate_mothership/control) +"itu" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "iuu" = ( /obj/machinery/door/airlock/centcom{ - name = "Commander's Quarters"; - req_access_txt = "151" + name = "Commander's Quarters" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) "iuX" = ( /obj/machinery/vending/wardrobe/jani_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"ivD" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "iCm" = ( /turf/open/indestructible/wiki/info{ icon_state = "info19" @@ -22035,6 +22136,23 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) +"iJz" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) +"iOU" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "iSo" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -22063,6 +22181,16 @@ /obj/machinery/vending/plasmaresearch, /turf/open/floor/plasteel/bluespace, /area/centcom) +"jBX" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Medical Checkpoint" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, +/turf/open/floor/plasteel, +/area/centcom/control) "jFI" = ( /obj/structure/railing{ dir = 4 @@ -22114,6 +22242,12 @@ icon_state = "info26" }, /area/centcom/testchamber) +"jQn" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/turf/open/floor/wood, +/area/centcom/control) "jQK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light, @@ -22203,6 +22337,22 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) +"kyK" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/ferry) "kBy" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/plasteel/bluespace, @@ -22226,6 +22376,15 @@ icon_state = "info28" }, /area/centcom/testchamber) +"kUZ" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "kWx" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -22264,6 +22423,16 @@ /obj/item/flashlight/lantern, /turf/open/indestructible/brazil/lostit, /area/brazil) +"lSB" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "lSY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, @@ -22352,6 +22521,14 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"mzp" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCcustoms1"; + name = "XCC Customs 1 Shutters" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/evac) "mzy" = ( /obj/structure/bed, /obj/item/bedsheet/prisoner{ @@ -22369,8 +22546,7 @@ /area/centcom/syndicate_mothership/control) "mFl" = ( /obj/machinery/door/airlock/centcom{ - name = "Holding Cells"; - req_access_txt = "150" + name = "Holding Cells" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -22378,6 +22554,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "mFt" = ( @@ -22425,6 +22602,14 @@ icon_state = "title2" }, /area/centcom/testchamber) +"ncM" = ( +/obj/machinery/door/poddoor/shutters{ + id = "nukie_leader_dorm_windows" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "nfW" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small{ @@ -22433,9 +22618,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ + dir = 2; pixel_y = 24 }, -/obj/machinery/recharge_station/fullupgrade, +/obj/structure/table, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "ngw" = ( @@ -22483,6 +22670,13 @@ /obj/machinery/vending/cart, /turf/open/floor/plasteel/bluespace, /area/centcom) +"nAO" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Administration" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeadmin) "nDx" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/plasteel/dark, @@ -22499,6 +22693,18 @@ icon_state = "title8" }, /area/centcom/testchamber) +"nNw" = ( +/obj/structure/table/reinforced, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "nNJ" = ( /turf/open/indestructible/wiki/info{ icon_state = "info8" @@ -22506,12 +22712,12 @@ /area/centcom/testchamber) "nVx" = ( /obj/machinery/door/airlock/centcom{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /obj/effect/turf_decal/trimline/secred/filled/end/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) "nVy" = ( @@ -22582,6 +22788,10 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"oxc" = ( +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "oxS" = ( /obj/item/clothing/shoes/combat/coldres{ pixel_x = 6; @@ -22658,6 +22868,10 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"paa" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeadmin) "pfQ" = ( /obj/effect/decal/fakelattice{ color = "#808080" @@ -22669,6 +22883,14 @@ color = "#808080" }, /area/centcom/syndicate_mothership) +"pjW" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/shutters{ + id = "XCCcustoms2"; + name = "XCC Customs 2 Shutters" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "poJ" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 @@ -22826,10 +23048,10 @@ /area/centcom/testchamber) "rmm" = ( /obj/machinery/door/airlock/centcom{ - name = "Exhibit Access"; - req_access_txt = "" + name = "Exhibit Access" }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership) "rod" = ( @@ -22846,10 +23068,10 @@ dir = 4 }, /obj/machinery/door/airlock/centcom{ - name = "Atmos Room"; - req_access_txt = "150" + name = "Atmos Room" }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/yogs/infiltrator_base) "rxZ" = ( @@ -22928,10 +23150,37 @@ icon_state = "title9" }, /area/centcom/testchamber) +"sqU" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsecdepartment"; + name = "XCC Security Checkpoint Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "sqW" = ( /obj/machinery/vending/boozeomat, /turf/open/floor/plasteel/bluespace, /area/centcom) +"szv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90); + name = "Test Chamber Blast Doors" + }, +/turf/open/floor/plasteel/bluespace, +/area/centcom/testchamber) "sNZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -22966,10 +23215,10 @@ /area/centcom/syndicate_mothership) "tna" = ( /obj/machinery/door/airlock/external/glass{ - name = "Assault Pod Launcher Access"; - req_access_txt = "150" + name = "Assault Pod Launcher Access" }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) "tnm" = ( @@ -22999,9 +23248,9 @@ "tKR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/centcom{ - name = "Temporary Holding Cell"; - req_access_txt = "150" + name = "Temporary Holding Cell" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "tLI" = ( @@ -23012,11 +23261,27 @@ /obj/item/flashlight/lantern, /turf/open/indestructible/brazil/narsie, /area/brazil) +"tSh" = ( +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "tVg" = ( /turf/open/indestructible/wiki/info{ icon_state = "256" }, /area/centcom/testchamber) +"tWG" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "uav" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/plasteel/dark, @@ -23035,10 +23300,23 @@ /obj/structure/mecha_wreckage/seraph, /turf/open/floor/plating/asteroid/snow/temperatre, /area/centcom/syndicate_mothership) +"ukj" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "una" = ( /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"usR" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "uwR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -23048,7 +23326,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "uDo" = ( /obj/item/storage/firstaid/toxin, @@ -23140,7 +23420,7 @@ /obj/machinery/button/door{ id = "nukie_leader_dorm_windows"; name = "Window Shutters"; - req_access_txt = "151" + req_access_txt = "syndicate_leader" }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) @@ -23219,6 +23499,21 @@ /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"vPo" = ( +/obj/structure/table/reinforced, +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "vPD" = ( /obj/machinery/vending/security, /turf/open/floor/plasteel/bluespace, @@ -23234,9 +23529,9 @@ "vVe" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "150" + name = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "vYx" = ( @@ -23253,6 +23548,19 @@ icon_state = "info15" }, /area/centcom/testchamber) +"vYQ" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/evac) "wbL" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, /turf/open/floor/plasteel/bluespace, @@ -23336,6 +23644,30 @@ /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/control) +"wNb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/turf/open/floor/plasteel/dark, +/area/centcom/control) +"wNE" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "wPo" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -23356,17 +23688,18 @@ /area/centcom/syndicate_mothership) "xfK" = ( /obj/machinery/door/airlock/centcom{ - name = "Storage"; - req_access_txt = "150" + name = "Storage" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) "xgw" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/machinery/defibrillator_mount/loaded{ pixel_y = 28 }, @@ -23375,32 +23708,35 @@ layer = 2.9 }, /obj/item/clothing/mask/gas/syndicate{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas/syndicate{ - pixel_x = -4; - pixel_y = -8 + pixel_x = -3; + pixel_y = 3 }, /obj/item/clothing/mask/gas/syndicate{ - pixel_x = 9; - pixel_y = 4 + pixel_x = -3; + pixel_y = 3 }, /obj/item/clothing/mask/gas/syndicate{ - pixel_x = 9; - pixel_y = -8 + pixel_x = 1; + pixel_y = -1 }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) +"xhp" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec1"; + name = "XCC Checkpoint 1 Shutters" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "xhO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/public/glass{ - name = "Canteen"; - req_access_txt = "150" + name = "Canteen" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "xia" = ( @@ -23450,10 +23786,26 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"xxx" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "xzH" = ( /obj/machinery/light/floor, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"xAh" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Backstage" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "xGe" = ( /turf/open/indestructible/wiki/info{ icon_state = "info31" @@ -23486,6 +23838,7 @@ /area/centcom/ctf) "yal" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/item/reagent_containers/food/snacks/chocolatebar{ pixel_x = -3; @@ -23524,7 +23877,9 @@ /obj/machinery/door/window{ name = "Shower Door" }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) (1,1,1) = {" @@ -59649,9 +60004,9 @@ atu amD amD amD -awu +kyK axh -awu +kyK amD amD arz @@ -62249,14 +62604,14 @@ aHI aEp aHZ aIh -aGv +bXd aIx -aIS +paa aJe aJo aIS aWJ -aIS +aJG aJG aJG aIv @@ -62506,14 +62861,14 @@ aGc aHS aFI aFL -aGv +bXd aIx -aIS +paa aJf aJp aIS aWJ -aIS +aJG aJG aJG aIv @@ -63287,8 +63642,8 @@ aIz aIv aIv aIv -aJX -aJX +aJG +aJG aIv aaa aaa @@ -64262,7 +64617,7 @@ amg aiR alo amg -alJ +abk amg aiR aiY @@ -64788,11 +65143,11 @@ aiF arK amQ aio +xhp avG +xhp avG -avG -avG -avG +xhp aio arK amQ @@ -64830,7 +65185,7 @@ aIv aIv aIv aIv -aKh +nAO aIv aIv aXC @@ -64840,7 +65195,7 @@ aNt aNt aWx aNt -aPD +szv aNt aPD aNt @@ -65307,7 +65662,7 @@ atK axl axT ays -amR +aiS azF aAm atP @@ -65322,7 +65677,7 @@ aio aEp aEK aEp -aFK +xAh aEp aEp aEp @@ -65529,7 +65884,7 @@ aaa aaa aaa aiF -aiS +aoN aiZ ajf ajq @@ -65564,7 +65919,7 @@ anp anq anq anq -amR +aiS anq azF aXt @@ -65822,8 +66177,8 @@ aiu aiu aiu ain -atL -atL +xxx +xxx aio aiu aio @@ -66091,7 +66446,7 @@ aDH aiu ain aEv -aEN +nNw aEv aFL aFI @@ -66827,7 +67182,7 @@ aaa aaa aaa alr -alM +ncM alr amN anq @@ -66838,8 +67193,8 @@ aoQ anq anq aqt -aqT -arI +ggU +bwt aNU atM anq @@ -66853,8 +67208,8 @@ aiu anq anq aqT -aBE -aNU +gqR +usR awH anq anp @@ -67869,8 +68224,8 @@ aiu aio aiu aio -atL -atL +xxx +xxx aiu aiu awC @@ -68117,9 +68472,9 @@ ail amQ aio anM +sqU anM -anM -anM +sqU anM aio amQ @@ -68134,12 +68489,12 @@ anp anq anq anq -amR +aiS anq azG -aXt +aJX aut -aNG +jBX aiC aiC aiC @@ -68374,9 +68729,9 @@ ail ain aim aiu -aOj +iJz amk -aOj +iJz aiu aio aio @@ -68391,7 +68746,7 @@ atN axo axo ayy -amR +aiS azG aAp aAT @@ -68406,7 +68761,7 @@ aio aEp aEK aEp -aFK +xAh aEp aEp aEp @@ -68627,8 +68982,8 @@ aiT akS als aiC -akZ -amR +alT +aiC akW aiL aiT @@ -68644,9 +68999,9 @@ atP aUO aio aim -ayU +hhx amk -ayU +hhx aim aio aiu @@ -68669,7 +69024,7 @@ aEp aGQ aHf aHu -aGx +cuz aGM aHW aHW @@ -68884,8 +69239,8 @@ aiU aiU alt aiC -akZ -amR +alT +aiC aiC aiK aiU @@ -68901,9 +69256,9 @@ aiu aut aio avP +pjW avP -avP -avP +pjW avP aio arK @@ -68929,7 +69284,7 @@ aHv aGy aHP aHP -aIc +vPo aEp aEp aMh @@ -69128,7 +69483,7 @@ aiu aiu aim aiu -aja +bPd aiu aiu ajw @@ -69136,14 +69491,14 @@ aiC ajG aiu aiu -aja +tSh aiu aim aiu aiu aio aiu -aja +wNE aiu aiu aiu @@ -69158,9 +69513,9 @@ aim ayj aio aim -aOj +kUZ amk -aOj +kUZ aim aio aiu @@ -69170,7 +69525,7 @@ aim aio aio aio -alT +tWG aio aio aio @@ -70156,7 +70511,7 @@ aiu aiu aim aiu -aja +bPd aiu aiu ajw @@ -70164,14 +70519,14 @@ aiC ajG aiu aiu -aja +itu aiu aim aiu aiu aio aiu -aja +oxc aiu aiu aiu @@ -70199,7 +70554,7 @@ aio aiu aio aoc -akZ +iOU aiC aiC aEB @@ -70427,8 +70782,8 @@ aiT als aiC akZ -amR aiC +hSa aiL aiT aiT @@ -70483,8 +70838,8 @@ aMi aIv aIv aIv -aJX -aJX +aJG +aJG aIv aaa aaa @@ -70684,7 +71039,7 @@ akV alt aiC akZ -amR +aiC ans aiK aiU @@ -71214,19 +71569,19 @@ atR aqx aio aim -ayU +hhx amk -ayU +hhx aim aio aio aio -aUO +lSB aio aio aiu aio -aUO +hJE aio aNO aNO @@ -71244,14 +71599,14 @@ aGc aHS aFP aFL -aGv +bXd aIx -aIS +paa aJe aJo aIS aWJ -aIS +aJG aJG aJG aIv @@ -71471,9 +71826,9 @@ aqV auz aqx avU +mzp avU -avU -avU +mzp avU aqx azL @@ -71501,14 +71856,14 @@ aHR aEp aIg aIr -aGv +bXd aIx -aIS +paa aJf aJp aIS aWJ -aIS +aJG aJG aJG aIv @@ -71723,19 +72078,19 @@ aio aqx aqx aqx -aWc +vYQ aqx aqx aqx arS -awJ +dth axr awJ arS aqx aqx aqx -aWc +bCI aqx aqx aqx @@ -71968,7 +72323,7 @@ akz akX alw akl -akZ +alT aiC akm akm @@ -72002,10 +72357,10 @@ aYn aPz aSu aNO -aNO +ukj aPV aPV -aNO +buB aNO aNO aUw @@ -72477,11 +72832,11 @@ aaa aaa aio aio -aja +bPd aio aio aio -aja +bPd aio aio aio @@ -72993,8 +73348,8 @@ aio aka akm akm -akZ -aiC +fxu +wNb aiC amm amX @@ -74283,8 +74638,8 @@ akl akm akm akm -akl -akZ +jQn +ivD aiC akm akm @@ -75563,7 +75918,7 @@ aio aka akm akm -akZ +alT aiC alV alW diff --git a/_maps/templates/infiltrator_base.dmm b/_maps/templates/infiltrator_base.dmm index f42ff2fe8f64..816d98270792 100644 --- a/_maps/templates/infiltrator_base.dmm +++ b/_maps/templates/infiltrator_base.dmm @@ -1265,10 +1265,10 @@ /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "cC" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cD" = ( @@ -1281,7 +1281,7 @@ "cF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) @@ -1424,15 +1424,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) -"cR" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/yogs/infiltrator_base) "cS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -2242,7 +2233,7 @@ bM cd cp cD -cR +bP aj aj aj From 3865e8ad3473647d12623f97493d88c594991a1e Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 00:47:13 +0200 Subject: [PATCH 19/48] ballin --- .../StationRuins/BoxStation/chapel1.dmm | 3 +- .../StationRuins/BoxStation/chapel2.dmm | 3 +- _maps/map_files/GaxStation/GaxStation.dmm | 1292 +++++++++-------- _maps/map_files/YogStation/YogStation.dmm | 3 +- code/game/machinery/doors/airlock_types.dm | 2 +- code/game/machinery/doors/ministile.dm | 4 +- code/game/machinery/doors/turnstile.dm | 2 +- 7 files changed, 723 insertions(+), 586 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm index 4242110c4049..eacddd661aac 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm @@ -855,7 +855,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_x = 24 + pixel_x = 24; + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm index 575b5313fe09..59591bae9ce7 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm @@ -590,7 +590,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_y = 30 + pixel_y = 30; + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index d5b6235b3d5e..beab0831ade9 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -111,8 +111,7 @@ /area/engine/engineering) "add" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -137,6 +136,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "ado" = ( @@ -233,8 +233,7 @@ /area/crew_quarters/kitchen) "afD" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -250,6 +249,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "afH" = ( @@ -545,37 +545,34 @@ name = "CMO Privacy Shutters Control"; pixel_x = 23; pixel_y = -10; - req_access_txt = "40" + req_access_txt = "cmo" }, /obj/machinery/button/door{ id = "cloning_shutters"; name = "cloning shutters"; pixel_x = 33; pixel_y = 10; - req_access_txt = "5; 68"; - req_one_access_txt = null + req_access_txt = "cmo" }, /obj/machinery/button/door{ id = "genetics_shutters"; name = "genetics shutters"; pixel_x = 33; pixel_y = -10; - req_access_txt = "5; 9; 68"; - req_one_access_txt = null + req_access_txt = "cmo" }, /obj/machinery/button/door{ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_x = 36; - req_one_access_txt = "5; 33" + req_access_txt = "cmo" }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; pixel_x = 23; pixel_y = 10; - req_access_txt = "45"; - req_one_access_txt = null + req_access_txt = "cmo" }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) @@ -1214,8 +1211,7 @@ /area/hallway/primary/central) "aEA" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1223,6 +1219,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/aft) "aEH" = ( @@ -1451,8 +1448,7 @@ /area/security/brig) "aKK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1472,6 +1468,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "aKO" = ( @@ -1647,13 +1644,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "aPw" = ( @@ -1705,8 +1702,7 @@ /area/hallway/primary/starboard) "aQq" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1726,6 +1722,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "aQF" = ( @@ -2098,6 +2095,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, +/obj/machinery/door/window/eastright{ + base_state = "left"; + icon_state = "left"; + name = "Security Delivery"; + req_access_txt = "sec_basic" + }, /turf/open/floor/plasteel, /area/security/processing) "aZG" = ( @@ -2179,8 +2182,7 @@ "bbE" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2192,6 +2194,7 @@ dirx = 5; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "bbS" = ( @@ -2219,8 +2222,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2229,6 +2231,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/holosign/surgery, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "bco" = ( @@ -2270,7 +2273,7 @@ dir = 8; icon_state = "right"; name = "Isolation B"; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/effect/turf_decal/trimline/green/filled/line/lower, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2373,6 +2376,7 @@ /obj/effect/turf_decal/trimline/red/corner{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bfb" = ( @@ -2981,11 +2985,11 @@ /area/engine/engineering) "bwQ" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/department/science) "bxx" = ( @@ -3124,8 +3128,7 @@ /area/maintenance/port/aft) "bCH" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3139,6 +3142,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/main) "bDb" = ( @@ -3335,20 +3339,19 @@ /area/medical/medbay/lobby) "bGF" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "bGP" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3356,6 +3359,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "bGV" = ( @@ -3399,8 +3403,7 @@ /area/security/checkpoint/supply) "bHK" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3408,6 +3411,7 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bHY" = ( @@ -3522,8 +3526,7 @@ /area/maintenance/starboard/fore) "bKD" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3534,6 +3537,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "bKU" = ( @@ -3604,7 +3608,6 @@ "bOF" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3612,6 +3615,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "bOI" = ( @@ -3735,8 +3739,7 @@ /area/maintenance/port/aft) "bQE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" + name = "Head of Security" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3754,6 +3757,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "bQI" = ( @@ -3918,8 +3922,7 @@ /area/security/brig) "bTE" = ( /obj/machinery/door/airlock/highsecurity{ - name = "SMES"; - req_one_access_txt = "11;32" + name = "SMES" }, /obj/structure/cable{ icon_state = "1-2" @@ -3928,6 +3931,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "bTR" = ( @@ -3977,8 +3981,7 @@ /area/hallway/primary/starboard) "bUw" = ( /obj/machinery/door/airlock/engineering{ - name = "AI Ship Access"; - req_access_txt = "65" + name = "AI Ship Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3986,6 +3989,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/engine/engineering) "bUP" = ( @@ -4066,7 +4071,7 @@ name = "Virology Access Console"; pixel_x = -23; pixel_y = 24; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/structure/disposalpipe/segment{ dir = 10 @@ -4711,14 +4716,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "57" + req_access_txt = "hop" }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -4757,7 +4762,8 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 1; - pixel_y = 23 + pixel_y = 23; + req_access_txt = "clerk" }, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/five, @@ -5020,13 +5026,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/science) "cxG" = ( @@ -5067,7 +5072,7 @@ dir = 4; layer = 3.1; name = "Cyborg Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/cable{ icon_state = "1-8" @@ -5080,7 +5085,7 @@ name = "Disposal Vent Control"; pixel_x = 4; pixel_y = -25; - req_access_txt = "12" + req_access_txt = "maintenance" }, /obj/machinery/button/massdriver{ id = "trash"; @@ -5096,8 +5101,7 @@ "cyo" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 @@ -5109,6 +5113,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "cyw" = ( @@ -5225,8 +5230,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5234,6 +5238,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "cAG" = ( @@ -5639,7 +5644,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/northleft{ - req_access_txt = "1"; + req_access_txt = "security"; name = "Brig Desk" }, /turf/open/floor/plating, @@ -5711,8 +5716,7 @@ /area/crew_quarters/heads/hos) "cKN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -5721,6 +5725,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/chapel/office) "cKZ" = ( @@ -5792,12 +5797,12 @@ /area/hallway/secondary/service) "cMQ" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "cNu" = ( @@ -5913,8 +5918,7 @@ /area/engine/atmos/storage) "cPG" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5935,12 +5939,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "cPL" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -5955,6 +5959,7 @@ dir = 8 }, /obj/effect/turf_decal/stripes/corner, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "cPM" = ( @@ -6140,8 +6145,7 @@ /area/crew_quarters/heads/hos) "cVM" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6155,6 +6159,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "cVQ" = ( @@ -6167,6 +6172,9 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "cWe" = ( @@ -6178,8 +6186,7 @@ /area/quartermaster/storage) "cWh" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6191,6 +6198,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/aft) "cWt" = ( @@ -6221,8 +6229,7 @@ /area/medical/sleeper) "cWD" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable{ @@ -6231,6 +6238,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "cXc" = ( @@ -6384,8 +6392,7 @@ "dal" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; - normalspeed = 0; - req_access_txt = "55" + normalspeed = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6399,6 +6406,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "dao" = ( @@ -6421,15 +6429,14 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "daP" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/hydroponics/garden) "dbb" = ( @@ -6472,8 +6479,7 @@ "dcq" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -6484,6 +6490,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "dcD" = ( @@ -6502,7 +6509,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_one_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/machinery/chem_master, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ @@ -6663,13 +6670,13 @@ /area/hallway/secondary/entry) "dhw" = ( /obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" + name = "Private Study" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/plating, /area/library) "dhK" = ( @@ -6710,8 +6717,7 @@ /area/medical/chemistry) "dim" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6730,6 +6736,8 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/science, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "div" = ( @@ -6786,10 +6794,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "diO" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ @@ -6803,6 +6808,8 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/any/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "djb" = ( @@ -6847,7 +6854,7 @@ name = "Armory Shutters"; pixel_x = -24; pixel_y = 7; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -6972,7 +6979,7 @@ dir = 2; icon_state = "left"; name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -7341,7 +7348,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 24; - req_access_txt = "command" + req_access_txt = "eva" }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -7965,7 +7972,8 @@ id = "lawyer_blast"; name = "Privacy Shutters"; pixel_x = 25; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "sec_basic" }, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine{ @@ -8284,8 +8292,7 @@ /area/science/mixing) "dWf" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -8293,6 +8300,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "dWF" = ( @@ -8659,7 +8667,7 @@ dir = 4; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/table/glass, /obj/item/storage/firstaid/toxin{ @@ -8858,8 +8866,7 @@ /area/hallway/primary/central) "ekN" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -8870,6 +8877,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ela" = ( @@ -9523,8 +9531,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -9533,6 +9540,7 @@ dir = 8 }, /obj/machinery/holosign/surgery, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/sleeper) "exW" = ( @@ -9564,7 +9572,7 @@ /obj/machinery/door/window/southright{ dir = 8; name = "Bar Door"; - req_one_access_txt = "25;28" + req_one_access_txt = "bar" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9644,11 +9652,11 @@ "eAe" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "eAn" = ( @@ -9737,7 +9745,7 @@ name = "Secure Storage Toggle"; pixel_x = -8; pixel_y = -23; - req_access_txt = "11" + req_access_txt = "engine_equip" }, /obj/structure/closet/radiation{ anchored = 1 @@ -9803,8 +9811,7 @@ /area/crew_quarters/dorms) "eDH" = ( /obj/machinery/door/airlock/research{ - name = "Nanite Laboratory"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -9816,6 +9823,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/dark, /area/science/nanite) "eDL" = ( @@ -9831,19 +9839,18 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "eEd" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -9852,6 +9859,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "eEe" = ( @@ -9934,8 +9942,7 @@ /area/security/prison) "eGu" = ( /obj/machinery/door/airlock{ - name = "Private Restroom"; - req_access_txt = "20" + name = "Private Restroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9943,6 +9950,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/freezer, /area/crew_quarters/heads/captain) "eHi" = ( @@ -10083,7 +10091,7 @@ name = "Warehouse Door Control"; pixel_x = -25; pixel_y = 7; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/camera{ c_tag = "Cargo Bay East"; @@ -10103,13 +10111,13 @@ /area/hydroponics/garden) "eKx" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "eKF" = ( @@ -10153,7 +10161,7 @@ normaldoorcontrol = 1; pixel_x = -6; pixel_y = -2; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/storage/pencil_holder/crew, /turf/open/floor/plasteel/white, @@ -10178,11 +10186,11 @@ /area/solar/starboard/fore) "eLS" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "eLZ" = ( @@ -10259,14 +10267,14 @@ /area/maintenance/department/science) "eMT" = ( /obj/machinery/door/airlock{ - name = "Bar Access"; - req_access_txt = "25" + name = "Bar Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/crew_quarters/bar) "eNb" = ( @@ -10366,8 +10374,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "command" + name = "Command Tool Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -10379,6 +10386,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "eOX" = ( @@ -10531,8 +10539,7 @@ /area/bridge/meeting_room) "eRY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10540,6 +10547,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/department/engine) "eSb" = ( @@ -10789,7 +10797,7 @@ name = "Incinerator Access Console"; pixel_x = -24; pixel_y = -6; - req_one_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -10958,14 +10966,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "feN" = ( @@ -10988,13 +10996,13 @@ /area/engine/foyer) "ffj" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/wood, /area/security/detectives_office) "ffr" = ( @@ -11172,9 +11180,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "fjr" = ( @@ -11260,7 +11268,13 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ name = "Hydroponics Desk"; - req_one_access_txt = "30;35" + req_access_txt = "hydroponics" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -11533,7 +11547,7 @@ name = "Kitchen Shutters Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -11652,8 +11666,7 @@ /area/maintenance/solars/port/aft) "fxo" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -11664,6 +11677,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/aft) "fxy" = ( @@ -11759,8 +11773,7 @@ /area/ai_monitored/storage/eva) "fzA" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11782,12 +11795,12 @@ diry = -4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "fzH" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11800,6 +11813,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fzI" = ( @@ -11828,7 +11842,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 1; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, @@ -12042,8 +12056,7 @@ }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -12057,6 +12070,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "fEj" = ( @@ -12122,10 +12136,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "fES" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, @@ -12136,6 +12146,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/airlock/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "fET" = ( @@ -12278,6 +12292,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/light, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/escapepodbay) "fIC" = ( @@ -12692,8 +12709,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Mech Bay Maintenance"; - req_one_access_txt = "29;75" + name = "Mech Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -12707,6 +12723,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/maintenance/department/science) "fTL" = ( @@ -13159,7 +13176,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -13169,6 +13186,10 @@ pixel_x = 5; pixel_y = -4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/quartermaster/office) "gfF" = ( @@ -13427,12 +13448,12 @@ dir = 8 }, /obj/machinery/door/airlock/grunge{ - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/chapel/office) "glL" = ( @@ -13834,8 +13855,7 @@ /area/medical/storage) "gvW" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -13852,18 +13872,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "gwb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "gwk" = ( @@ -13909,9 +13929,19 @@ /turf/open/floor/plasteel, /area/teleporter) "gyj" = ( -/obj/structure/sign/poster/contraband/ambrosia_vulgaris, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit) +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/bag/sheetsnatcher, +/obj/item/melee/sledgehammer, +/obj/item/storage/bag/trash, +/obj/item/broom, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "gyJ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -14035,8 +14065,7 @@ /area/ai_monitored/storage/eva) "gBR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_one_access_txt = "1; 63" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -14044,6 +14073,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/department/bridge) "gCc" = ( @@ -14115,7 +14145,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 11; pixel_y = -22; - req_access_txt = "30" + req_access_txt = "rnd_servers" }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_exterior"; @@ -14123,7 +14153,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "30" + req_access_txt = "rnd_servers" }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -14131,7 +14161,7 @@ idSelf = "secondary_aicore_controller"; name = "Secondary AI Core Access Console"; pixel_y = -24; - req_access_txt = "30" + req_access_txt = "rnd_servers" }, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) @@ -14139,9 +14169,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -14157,6 +14185,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gFS" = ( @@ -14341,8 +14370,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14356,6 +14384,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "gIY" = ( @@ -14478,12 +14507,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + name = "Shipbreaking Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/department/eva) "gNJ" = ( @@ -14506,8 +14537,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "command" + name = "Conference Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -14521,6 +14551,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge/meeting_room) "gOA" = ( @@ -14593,6 +14624,9 @@ /obj/effect/turf_decal/trimline/red/arrow_ccw{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_alone, /area/hallway/secondary/entry) "gRV" = ( @@ -14645,7 +14679,7 @@ name = "Loading Doors"; pixel_x = -8; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor"; @@ -14653,7 +14687,7 @@ name = "Loading Doors"; pixel_x = 8; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -14783,7 +14817,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 7; - req_access_txt = "3" + req_access_txt = "armory" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -14983,10 +15017,6 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "hdd" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, @@ -15163,9 +15193,12 @@ }, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Server Room" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "hiw" = ( @@ -15183,7 +15216,7 @@ /obj/machinery/button/door{ id = "teleshutter"; name = "Teleporter Shutter Control"; - req_access_txt = "command" + req_access_txt = "teleporter" }, /turf/closed/wall/r_wall, /area/teleporter) @@ -15203,6 +15236,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "hjs" = ( @@ -15210,7 +15246,7 @@ dir = 4; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/table/glass, /obj/item/storage/firstaid/fire{ @@ -15506,7 +15542,6 @@ "hpl" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -15518,6 +15553,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "hpm" = ( @@ -15807,8 +15843,7 @@ /area/library) "hvc" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -15816,6 +15851,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "hvC" = ( @@ -15938,6 +15974,10 @@ "hzb" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/airalarm{ + pixel_y = -24; + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "hzo" = ( @@ -15999,13 +16039,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "1" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -16342,9 +16375,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "hGw" = ( @@ -16712,7 +16745,8 @@ idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "toxins" }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -16720,19 +16754,20 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "toxins" }, /turf/open/floor/engine, /area/science/mixing/chamber) "hSs" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "hSt" = ( @@ -16858,8 +16893,7 @@ /area/science/mixing) "hUQ" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -16882,6 +16916,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "hVc" = ( @@ -17014,7 +17049,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen 2"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -17299,13 +17334,13 @@ /area/hallway/secondary/exit) "ihc" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "ihd" = ( @@ -17402,8 +17437,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -17421,6 +17455,7 @@ color = "#99ccff"; dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "ikb" = ( @@ -17473,8 +17508,7 @@ name = "privacy shutters"; pixel_x = -22; pixel_y = 23; - req_access_txt = "69"; - req_one_access_txt = null + req_access_txt = "paramedic" }, /turf/open/floor/plasteel/white, /area/medical/paramedic) @@ -17486,8 +17520,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "command" + name = "Command Tool Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; @@ -17497,6 +17530,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ilz" = ( @@ -17619,6 +17653,11 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/door/window/southleft{ + dir = 8; + name = "Virology"; + req_access_txt = "virology" + }, /turf/open/floor/plasteel/white, /area/medical/virology) "ioL" = ( @@ -17954,7 +17993,7 @@ dir = 4; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/table/glass, /obj/item/storage/firstaid/o2{ @@ -18029,7 +18068,8 @@ id = "briggate"; name = "Desk Shutters"; pixel_x = -26; - pixel_y = 6 + pixel_y = 6; + req_access_txt = "security" }, /obj/structure/cable{ icon_state = "1-2" @@ -18309,7 +18349,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 10; pixel_y = -22; - req_access_txt = "30" + req_access_txt = "rnd_servers" }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -18436,7 +18476,6 @@ "iKb" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; - req_access_txt = "76"; security_level = 6 }, /obj/effect/mapping_helpers/airlock/locked, @@ -18450,6 +18489,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark, /area/storage/tech) "iKo" = ( @@ -18498,7 +18538,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access_txt = "7" + req_access_txt = "toxins" }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -18598,7 +18638,7 @@ name = "Shutters Control Button"; pixel_x = -26; pixel_y = 8; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/camera{ c_tag = "Robotics Lab - South"; @@ -18773,7 +18813,7 @@ name = "Virology Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/doorButtons/access_button{ idDoor = "virology_airlock_interior"; @@ -18781,7 +18821,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 10; - req_access_txt = "39" + req_access_txt = "virology" }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -19007,8 +19047,7 @@ /area/hallway/primary/starboard) "iWT" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -19023,6 +19062,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/lab) "iXw" = ( @@ -19032,7 +19072,7 @@ icon_state = "right"; name = "Brig Infirmary"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "brig_phys" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -19360,8 +19400,7 @@ id = "medpriv_shutters"; name = "medbay storage shutters"; pixel_x = -24; - req_access_txt = "5"; - req_one_access_txt = null + req_access_txt = "cmo" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -19859,7 +19898,7 @@ dir = 4; icon_state = "right"; name = "Containment Pen 2"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -20013,7 +20052,7 @@ dir = 1; icon_state = "left"; name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -20023,6 +20062,10 @@ pixel_x = -8; pixel_y = -3 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "jAf" = ( @@ -20197,13 +20240,12 @@ "jCA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "jCE" = ( @@ -20217,8 +20259,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -5; @@ -20234,6 +20275,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "jCS" = ( @@ -20593,8 +20635,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -20603,6 +20644,7 @@ color = "#99ccff"; dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "jOc" = ( @@ -20666,13 +20708,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "jPl" = ( @@ -20718,6 +20760,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/aft) "jRd" = ( @@ -20948,8 +20993,7 @@ /area/engine/foyer) "jWg" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" + name = "Gravity Generator" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/firedoor/border_only{ @@ -20961,6 +21005,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/gravity_generator) "jWj" = ( @@ -21006,9 +21051,7 @@ /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "jXz" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -21027,6 +21070,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "jXL" = ( @@ -21518,8 +21562,7 @@ /area/chapel/office) "kmd" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable{ @@ -21528,6 +21571,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "kmh" = ( @@ -21600,8 +21644,7 @@ /area/maintenance/starboard/fore) "knr" = ( /obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" + name = "Teleporter Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21614,6 +21657,7 @@ dirx = 4; diry = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/maintenance/central/secondary) "knX" = ( @@ -21628,8 +21672,7 @@ /area/medical/medbay/lobby) "kov" = ( /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_one_access_txt = "7;47;29" + name = "Research Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21640,6 +21683,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "kpN" = ( @@ -21726,8 +21770,7 @@ /area/clerk) "krv" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21741,6 +21784,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "kst" = ( @@ -21858,8 +21902,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null + req_access_txt = "surgery" }, /obj/machinery/button/holosign{ id = "surgery"; @@ -21959,8 +22002,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -21969,6 +22011,7 @@ color = "#99ccff"; dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "kxF" = ( @@ -22070,12 +22113,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "kBK" = ( @@ -22118,12 +22161,13 @@ "kEh" = ( /obj/machinery/mass_driver{ dir = 1; - id = "chapelgun" + id = "chapelgun"; + name = "Holy Driver" }, /obj/machinery/door/window{ dir = 8; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22225,8 +22269,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -22247,6 +22290,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "kGT" = ( @@ -22377,15 +22421,14 @@ /turf/open/floor/engine, /area/engine/engineering) "kJq" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/eva) "kJw" = ( @@ -22477,12 +22520,12 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "kMo" = ( @@ -22554,8 +22597,7 @@ /area/bridge/meeting_room) "kOt" = ( /obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" + name = "Hydroponics Backroom" }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 @@ -22570,12 +22612,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "kOA" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "63" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -22591,6 +22633,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "kOZ" = ( @@ -22916,9 +22959,9 @@ dir = 1 }, /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "kZP" = ( @@ -23043,11 +23086,11 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "lbS" = ( @@ -23251,8 +23294,7 @@ /area/science/robotics/lab) "lfW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Captain's Office Maintenance"; - req_access_txt = "20" + name = "Captain's Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -23264,6 +23306,7 @@ dirx = -4; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/maintenance/central/secondary) "lgt" = ( @@ -23282,9 +23325,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -23294,12 +23335,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/science) "lgL" = ( /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -23322,6 +23363,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel, /area/teleporter) "lhi" = ( @@ -23423,8 +23465,7 @@ /area/science/mixing) "ljd" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/structure/cable{ icon_state = "1-2" @@ -23440,6 +23481,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/engineering) "ljj" = ( @@ -23557,13 +23599,17 @@ /obj/machinery/door/window/westleft{ dir = 1; name = "Hydroponics Desk"; - req_one_access_txt = "30;35" + req_access_txt = "hydroponics" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/hydroponics{ pixel_x = -8; pixel_y = -2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "lmw" = ( @@ -23638,13 +23684,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plasteel, /area/lawoffice) "lpt" = ( @@ -23671,8 +23717,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/structure/cable{ icon_state = "4-8" @@ -23683,6 +23728,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/execution/transfer) "lqS" = ( @@ -23707,8 +23753,7 @@ "lrP" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -23719,6 +23764,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "lsK" = ( @@ -23959,8 +24005,7 @@ /area/hydroponics/garden) "lxD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -23972,6 +24017,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "lxG" = ( @@ -24012,18 +24058,17 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "lyq" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -24034,6 +24079,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "lys" = ( @@ -24271,8 +24317,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/structure/cable{ icon_state = "1-2" @@ -24285,6 +24330,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "lEH" = ( @@ -24967,6 +25013,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "lVT" = ( @@ -25064,8 +25111,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25076,6 +25122,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port/aft) "lZt" = ( @@ -25314,6 +25361,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/bridge) "mfS" = ( @@ -25411,12 +25461,12 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "mjc" = ( @@ -25474,7 +25524,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Atmospherics Canister Storage"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /turf/open/floor/plasteel/dark, /area/engine/atmos/storage) @@ -25483,8 +25533,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; - req_access_txt = "12" + name = "Mass Driver Intersection" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25504,6 +25553,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mky" = ( @@ -25605,9 +25655,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/highsecurity{ - name = "SMES"; - req_one_access_txt = "11;32" + name = "SMES" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "mmV" = ( @@ -25847,8 +25897,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -25863,6 +25912,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "msJ" = ( @@ -25883,8 +25933,7 @@ /area/quartermaster/office) "mtb" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -25902,6 +25951,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "mtf" = ( @@ -25926,13 +25976,13 @@ /area/hallway/primary/starboard) "mtW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Nanite Laboratory Maintenance"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "muA" = ( @@ -25982,7 +26032,7 @@ /area/security/brig) "mvV" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/structure/cable{ icon_state = "0-4" @@ -26011,6 +26061,10 @@ /obj/effect/turf_decal/trimline/white/filled/corner/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "mwk" = ( @@ -26128,14 +26182,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/ramp_middle{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/stairs/goon/stairs_alone, /area/escapepodbay) "myr" = ( /obj/structure/cable{ @@ -26326,7 +26376,8 @@ id = "hosspace"; name = "Space Shutters Control"; pixel_x = -24; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "security" }, /obj/machinery/light_switch{ pixel_x = -24; @@ -26340,8 +26391,7 @@ /area/crew_quarters/bar) "mFc" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -26361,6 +26411,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel/dark, /area/storage/tech) "mFg" = ( @@ -26595,12 +26646,12 @@ /area/science/robotics/lab) "mMR" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Disposals Access"; - req_access_txt = "12" + name = "Disposals Access" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "mMU" = ( @@ -26824,6 +26875,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mRV" = ( @@ -26856,12 +26910,12 @@ /area/chapel/main) "mSy" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "mSF" = ( @@ -27031,6 +27085,15 @@ /obj/structure/chair/office/dark, /turf/open/floor/plasteel/dark, /area/bridge) +"mWR" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/security/processing) "mXs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -27198,7 +27261,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ name = "Brig Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; @@ -27301,6 +27364,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "nhc" = ( @@ -27369,6 +27434,14 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel, /area/quartermaster/miningdock) +"nix" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "niF" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -27500,8 +27573,7 @@ /area/security/checkpoint/supply) "nmu" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -27525,6 +27597,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "nmx" = ( @@ -27782,17 +27855,17 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "ntC" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/department/science) "nub" = ( @@ -27996,8 +28069,7 @@ dir = 4 }, /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Research" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 @@ -28021,12 +28093,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "nzj" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -28035,6 +28107,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "nzG" = ( @@ -28042,12 +28115,16 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; pixel_y = 9 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/quartermaster/office) "nzI" = ( @@ -28124,8 +28201,7 @@ name = "cloning shutters"; pixel_x = -25; pixel_y = 9; - req_access_txt = "5; 68"; - req_one_access_txt = null + req_access_txt = "cloning;genetics" }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) @@ -28202,8 +28278,7 @@ /area/hallway/primary/central) "nCw" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28220,6 +28295,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "nCy" = ( @@ -28297,8 +28373,7 @@ /area/hallway/primary/central) "nEW" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Bow Solar Access"; - req_access_txt = "10" + name = "Starboard Bow Solar Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -28309,6 +28384,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "nFB" = ( @@ -28575,8 +28651,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -28587,6 +28662,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "nKG" = ( @@ -29115,7 +29191,7 @@ name = "Bar Shutters Control"; pixel_x = -8; pixel_y = 22; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) @@ -29981,8 +30057,7 @@ /area/hallway/primary/central) "ozS" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "65" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -29990,6 +30065,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plating, /area/engine/engineering) "ozU" = ( @@ -30213,10 +30290,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oIe" = ( @@ -30572,7 +30650,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Paramedic Desk"; - req_access_txt = "69" + req_access_txt = "paramedic" }, /obj/item/deskbell/preset/paramedic{ pixel_x = 9; @@ -30620,8 +30698,7 @@ /area/medical/paramedic) "oRe" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30629,6 +30706,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "oRf" = ( @@ -31038,9 +31116,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "peq" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -31051,6 +31127,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/aft) "peJ" = ( @@ -31303,7 +31381,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Engineering Desk"; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/item/deskbell/preset/engi{ pixel_x = 8; @@ -31394,8 +31472,7 @@ /area/security/main) "pmk" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" + name = "Labor Shuttle" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -31413,6 +31490,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "pmr" = ( @@ -31430,8 +31508,7 @@ name = "privacy shutters"; pixel_x = -55; pixel_y = 6; - req_access_txt = "5"; - req_one_access_txt = null + req_access_txt = "medical" }, /turf/open/floor/plasteel/white, /area/medical/storage) @@ -31631,8 +31708,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -31644,6 +31720,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "pqj" = ( @@ -31860,8 +31937,7 @@ /area/hydroponics/garden) "pxj" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -31875,6 +31951,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "pxk" = ( @@ -31887,7 +31964,7 @@ name = "E.V.A. Storage Shutter Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "command" + req_access_txt = "eva" }, /obj/machinery/light_switch{ pixel_x = -24; @@ -32002,7 +32079,7 @@ base_state = "right"; icon_state = "right"; name = "Core Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/ai_monitored/turret_protected/ai_upload"; @@ -32042,8 +32119,7 @@ /area/hallway/primary/starboard) "pBD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "4-8" @@ -32064,6 +32140,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "pBF" = ( @@ -32116,8 +32193,7 @@ /area/science/lab) "pCl" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/structure/cable{ icon_state = "4-8" @@ -32141,6 +32217,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "pCr" = ( @@ -32185,9 +32262,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "pEG" = ( @@ -32218,8 +32295,7 @@ /area/hallway/secondary/entry) "pFT" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -32233,6 +32309,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "pGA" = ( @@ -32273,8 +32350,7 @@ /area/library) "pHK" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_one_access_txt = "1; 63" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -32285,6 +32361,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/starboard/fore) "pHQ" = ( @@ -32401,7 +32478,7 @@ dir = 4; icon_state = "rightsecure"; name = "Head of Personnel's Desk"; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/flasher{ id = "hopflash"; @@ -32983,9 +33060,7 @@ /turf/open/floor/plasteel, /area/teleporter) "pXP" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -32995,6 +33070,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/hydroponics/garden) "pXU" = ( @@ -33019,8 +33095,7 @@ /area/medical/storage) "pYt" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -33054,6 +33129,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "pYB" = ( @@ -33167,13 +33243,13 @@ /area/hallway/secondary/entry) "qcr" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "qcv" = ( @@ -33304,8 +33380,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -33317,6 +33392,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "qfo" = ( @@ -33492,15 +33568,15 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "qiY" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/open/floor/plating, /area/maintenance/department/engine) "qja" = ( @@ -33579,8 +33655,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; - req_access_txt = "12" + name = "Mass Driver Intersection" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -33600,6 +33675,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qlc" = ( @@ -33747,7 +33823,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Atmospherics Desk"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/item/deskbell/preset/atmos{ pixel_x = 8; @@ -33755,6 +33831,12 @@ }, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/atmos/storage) "qnX" = ( @@ -33818,8 +33900,7 @@ "qpx" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -33830,6 +33911,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "qpJ" = ( @@ -33950,8 +34032,7 @@ /area/maintenance/port/aft) "qwa" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -33971,6 +34052,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/wood, /area/security/detectives_office) "qwt" = ( @@ -34026,11 +34108,11 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "qxw" = ( @@ -34053,8 +34135,7 @@ /area/engine/gravity_generator) "qxH" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -34072,6 +34153,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 5 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "qxJ" = ( @@ -34201,7 +34283,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "8" + req_access_txt = "toxins" }, /obj/machinery/light_switch{ pixel_x = -24; @@ -34348,6 +34430,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/pod/old{ + density = 0; + icon = 'icons/obj/airlock_machines.dmi'; + icon_state = "airlock_control_standby"; + id = "chapelgun"; + name = "Mass Driver Controller"; + pixel_x = -24; + req_access_txt = "chapel_office"; + pixel_y = -4 + }, /turf/open/floor/plating, /area/chapel/office) "qIO" = ( @@ -34368,8 +34460,7 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34380,6 +34471,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "qJo" = ( @@ -34516,6 +34608,18 @@ "qOt" = ( /turf/open/space/basic, /area/space/nearstation) +"qOS" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/security/processing) "qPn" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -34524,9 +34628,7 @@ /turf/open/space/basic, /area/solar/starboard/aft) "qPM" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -34548,6 +34650,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science) "qPP" = ( @@ -34590,7 +34694,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34637,7 +34741,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "63" + req_access_txt = "security" }, /obj/machinery/button/door{ id = "outerbrig"; @@ -34645,7 +34749,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access_txt = "63" + req_access_txt = "security" }, /obj/structure/cable{ icon_state = "1-2" @@ -34717,8 +34821,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/machinery/door/airlock/medical{ id_tag = "GeneticsDoor"; - name = "Cloning"; - req_access_txt = "5; 68" + name = "Cloning" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -34741,6 +34844,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "qTj" = ( @@ -34804,7 +34908,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 22; - pixel_y = -10 + pixel_y = -10; + req_access_txt = "atmospherics" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -34835,7 +34940,7 @@ /obj/machinery/door/window/southleft{ dir = 1; name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/loading_area, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -34867,8 +34972,7 @@ /area/engine/atmos/distro) "qXf" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -34878,6 +34982,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qXw" = ( @@ -34933,7 +35038,7 @@ dir = 4; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/table/glass, /obj/item/storage/firstaid/brute{ @@ -35117,7 +35222,7 @@ /obj/machinery/power/apc{ areastring = "/area/escapepodbay"; dir = 1; - name = "Podbay APC"; + name = "Shipbreaking Bay"; pixel_y = 23 }, /obj/structure/cable{ @@ -35207,8 +35312,7 @@ "reE" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -35221,6 +35325,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "rfi" = ( @@ -35292,8 +35397,7 @@ /area/hallway/primary/fore) "rgl" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -35307,6 +35411,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "rgP" = ( @@ -35385,8 +35490,7 @@ /area/quartermaster/office) "riA" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35408,6 +35512,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "rjf" = ( @@ -35730,8 +35835,7 @@ /area/science/storage) "rqW" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -35748,6 +35852,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "rra" = ( @@ -35770,9 +35875,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "65" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plating, /area/engine/engineering) "rrx" = ( @@ -35835,7 +35941,7 @@ dir = 2; icon_state = "left"; name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35924,7 +36030,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = 10 + pixel_y = 10; + req_access_txt = "atmospherics" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -35974,7 +36081,7 @@ /obj/machinery/door/window/westright{ dir = 1; name = "Security Checkpoint"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/item/paper_bin{ pixel_x = 1; @@ -36177,7 +36284,7 @@ dir = 8; icon_state = "right"; name = "Isolation A"; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -36676,7 +36783,7 @@ "rNW" = ( /obj/machinery/door/window/southleft{ name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -36798,8 +36905,7 @@ /area/security/main) "rQq" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36810,6 +36916,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "rQZ" = ( @@ -36909,8 +37016,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -36932,6 +37038,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "rUk" = ( @@ -37242,8 +37349,7 @@ /area/engine/atmos/distro) "scr" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -37264,6 +37370,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/lab) "scs" = ( @@ -37289,7 +37396,7 @@ name = "Warehouse Door Control"; pixel_x = 25; pixel_y = 7; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -37455,8 +37562,7 @@ name = "genetics shutters"; pixel_x = -25; pixel_y = 9; - req_access_txt = "5; 9; 68"; - req_one_access_txt = null + req_access_txt = "genetics" }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -37815,8 +37921,7 @@ /area/hallway/primary/starboard) "srl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_access_txt = "25" + name = "Bar Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -37828,6 +37933,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ssc" = ( @@ -37847,12 +37953,12 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Chemistry Lab Maintenance"; - req_access_txt = "5; 33" + name = "Chemistry Lab Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ssn" = ( @@ -37984,8 +38090,7 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/structure/cable{ icon_state = "2-4" @@ -38003,13 +38108,14 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "sus" = ( /obj/machinery/door/window/westleft{ dir = 2; name = "Monkey Pen"; - req_access_txt = "9" + req_access_txt = "genetics" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ @@ -38102,8 +38208,7 @@ /area/hallway/primary/starboard) "sxT" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "45;5" + name = "Morgue" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 @@ -38126,6 +38231,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "sxY" = ( @@ -38160,7 +38266,8 @@ /obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/door/window/southleft{ - dir = 8 + dir = 8; + req_access_txt = "virology" }, /turf/open/floor/grass, /area/medical/virology) @@ -38529,17 +38636,17 @@ /area/medical/surgery) "sKH" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "sKP" = ( /obj/machinery/door/airlock/mining{ - req_access_txt = "48" + name = "Mining Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38556,6 +38663,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "sLi" = ( @@ -38659,8 +38767,7 @@ /area/quartermaster/storage) "sNN" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38677,6 +38784,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "sOb" = ( @@ -38702,7 +38810,7 @@ /obj/machinery/door/window/southright{ dir = 8; name = "Research and Development Desk"; - req_access_txt = "7" + req_one_access_txt = "science;robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -38717,6 +38825,12 @@ pixel_x = -10; pixel_y = 12 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plating, /area/science/lab) "sPf" = ( @@ -38815,8 +38929,7 @@ /area/medical/virology) "sQI" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38840,6 +38953,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "sQP" = ( @@ -39014,7 +39128,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/engine{ dir = 4; pixel_x = -24 }, @@ -39152,8 +39266,7 @@ /area/quartermaster/warehouse) "sYQ" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -39166,6 +39279,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/department/security) "sYY" = ( @@ -39178,13 +39292,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; - pixel_y = -2 + pixel_y = -2; + req_access_txt = "brig" }, /obj/structure/chair/office/dark, /turf/open/floor/plasteel/showroomfloor, @@ -39209,7 +39324,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -39254,13 +39369,13 @@ /area/security/main) "tal" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "tar" = ( @@ -39332,9 +39447,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "tcS" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -39353,6 +39466,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "tda" = ( @@ -39388,7 +39503,8 @@ id = "disposalshutters"; name = "disposals shutter control"; pixel_x = -24; - pixel_y = 9 + pixel_y = 9; + req_access_txt = "cargo" }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -39761,8 +39877,7 @@ /area/maintenance/starboard/fore) "toK" = ( /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -39779,6 +39894,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) "toM" = ( @@ -40100,7 +40216,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -40240,7 +40356,13 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ name = "Hydroponics Desk"; - req_one_access_txt = "30;35" + req_access_txt = "hydroponics" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -40374,8 +40496,7 @@ /area/maintenance/starboard/fore) "tHe" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40383,6 +40504,7 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "tHs" = ( @@ -40810,8 +40932,7 @@ /area/library) "tSs" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" + name = "Chief Engineer" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -40837,6 +40958,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "tSU" = ( @@ -40914,8 +41036,7 @@ /area/medical/chemistry) "tUy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Conference Room Maintenance"; - req_access_txt = "command" + name = "Conference Room Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -40930,6 +41051,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/bridge/meeting_room) "tUT" = ( @@ -40960,8 +41082,7 @@ /area/science/xenobiology) "tVs" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -40989,6 +41110,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "tVz" = ( @@ -41271,12 +41394,12 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_one_access_txt = "5;12" + name = "Medbay Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ucL" = ( @@ -41335,14 +41458,14 @@ name = "Turbine Vent Control"; pixel_x = -25; pixel_y = 8; - req_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = -25; pixel_y = -9; - req_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -41451,8 +41574,7 @@ /area/crew_quarters/bar) "uhi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41464,6 +41586,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/starboard/fore) "uhN" = ( @@ -41545,8 +41668,7 @@ /area/maintenance/disposal/incinerator) "ukx" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41564,6 +41686,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "ukY" = ( @@ -41656,8 +41779,7 @@ /area/crew_quarters/heads/hop) "umn" = ( /obj/machinery/door/airlock/engineering{ - name = "AI Ship Access"; - req_one_access_txt = "10;17;61" + name = "AI Ship Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -41672,6 +41794,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite/teleporter) "umy" = ( @@ -41697,8 +41822,7 @@ /area/hallway/secondary/entry) "uni" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -41722,6 +41846,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "unn" = ( @@ -41759,14 +41884,14 @@ /area/quartermaster/storage) "upl" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "uqi" = ( @@ -42130,8 +42255,7 @@ /area/hallway/primary/starboard) "uCM" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "9" + name = "Genetics Research Access" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 @@ -42143,6 +42267,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "uCP" = ( @@ -42321,7 +42446,7 @@ /obj/machinery/door/window/northright{ dir = 4; name = "Library Desk Door"; - req_access_txt = "37" + req_access_txt = "library" }, /turf/open/floor/wood, /area/library) @@ -42752,13 +42877,13 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/maintenance/department/eva) "uRb" = ( @@ -42795,10 +42920,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/research/glass{ - name = "Secondary AI Core"; - normalspeed = 0; - req_access_txt = "47" + name = "R&D Server and Networking"; + normalspeed = 0 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "uRz" = ( @@ -42969,8 +43094,7 @@ /area/engine/engineering) "uWk" = ( /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -42978,6 +43102,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) "uWs" = ( @@ -43060,11 +43185,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Virology"; - req_one_access_txt = "39;24" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -43086,7 +43206,7 @@ "uZq" = ( /obj/machinery/door/window/southleft{ name = "Armory"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/structure/cable{ icon_state = "1-2" @@ -43267,9 +43387,9 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "vdo" = ( @@ -43418,7 +43538,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = 5; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/structure/table/optable, /obj/item/storage/backpack/duffelbag/sec/surgery{ @@ -43533,7 +43653,7 @@ name = "Shutters Control Button"; pixel_x = -7; pixel_y = -24; - req_access_txt = "47" + req_access_txt = "science" }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -43945,7 +44065,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ name = "Brig Desk"; - req_access_txt = "2" + req_access_txt = "security" }, /obj/item/restraints/handcuffs, /obj/machinery/door/poddoor/shutters/preopen{ @@ -44032,7 +44152,7 @@ id = "armory_eva"; name = "Armory Shutters"; pixel_x = 24; - req_access_txt = "3" + req_access_txt = "security" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -44124,10 +44244,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/aft) "vwY" = ( @@ -44560,8 +44680,7 @@ /area/science/mixing) "vJz" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -44585,6 +44704,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "vJK" = ( @@ -44640,9 +44761,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "vKU" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -44683,7 +44802,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = 8; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/item/paper_bin{ pixel_x = 4; @@ -44773,8 +44892,7 @@ /area/crew_quarters/dorms) "vMZ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -44786,6 +44904,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "vNb" = ( @@ -44814,7 +44933,7 @@ base_state = "right"; icon_state = "right"; name = "Armory"; - req_access_txt = "3" + req_access_txt = "armory" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -44881,7 +45000,7 @@ icon_state = "right"; layer = 3.1; name = "Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/cable{ icon_state = "2-8" @@ -45595,8 +45714,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs_alone{ - dir = 8 + dir = 4 }, /area/escapepodbay) "wiA" = ( @@ -45745,13 +45867,13 @@ dir = 8 }, /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "wmT" = ( @@ -45789,13 +45911,13 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "wnQ" = ( @@ -45944,7 +46066,8 @@ /obj/machinery/button/door{ id = "kanyewest"; name = "Privacy Shutters"; - pixel_y = -24 + pixel_y = -24; + req_access_txt = "detective" }, /turf/open/floor/wood, /area/security/detectives_office) @@ -46038,7 +46161,7 @@ /obj/machinery/door/window/southleft{ dir = 8; name = "Mass Driver Door"; - req_access_txt = "7" + req_access_txt = "toxins" }, /obj/effect/turf_decal/loading_area{ dir = 8 @@ -46050,6 +46173,9 @@ /obj/effect/turf_decal/trimline/red/arrow_ccw{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{ dir = 4 }, @@ -46178,7 +46304,7 @@ /obj/item/storage/pencil_holder/crew, /obj/machinery/door/window/northright{ name = "Brig Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plating, /area/security/brig) @@ -46310,12 +46436,12 @@ "wCe" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "wCx" = ( @@ -46518,8 +46644,7 @@ /area/lawoffice) "wIb" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -46527,6 +46652,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/engine/engineering) "wIc" = ( @@ -46581,7 +46707,7 @@ dir = 8; icon_state = "left"; name = "Genetics Desk"; - req_access_txt = "5; 9; 68" + req_access_txt = "genetics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "genetics_shutters"; @@ -47203,6 +47329,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/effect/turf_decal/ramp_middle, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "wYp" = ( @@ -47231,9 +47361,12 @@ }, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "wYP" = ( @@ -47368,8 +47501,7 @@ /area/crew_quarters/heads/hor) "xbm" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -47393,6 +47525,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "xbr" = ( @@ -47491,7 +47624,7 @@ dir = 2; name = "Brig Infirmary"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "brig_phys" }, /obj/structure/closet/crate/freezer/blood, /obj/machinery/iv_drip, @@ -47643,11 +47776,11 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Armory Desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/door/window/southleft{ name = "Reception Desk"; - req_access_txt = "63" + req_access_txt = "sec_basic" }, /obj/item/deskbell/preset/warden{ pixel_x = 10; @@ -47685,16 +47818,17 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "xjg" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Service Door"; - req_one_access_txt = "35;28" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/glass{ + name = "Service Door" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -47794,13 +47928,13 @@ /area/hallway/primary/central) "xkX" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" + name = "Kitchen" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -48543,8 +48677,7 @@ /area/security/checkpoint/supply) "xED" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -48561,6 +48694,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "xEO" = ( @@ -48600,7 +48734,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "30" + req_access_txt = "rnd_servers" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -48799,8 +48933,7 @@ /area/hallway/secondary/exit) "xLC" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -48812,6 +48945,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plasteel, /area/crew_quarters/theatre) "xLG" = ( @@ -48967,9 +49101,9 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/department/medical/central) "xOY" = ( @@ -49031,8 +49165,7 @@ /area/quartermaster/storage) "xPi" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -49043,6 +49176,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "xPn" = ( @@ -49271,8 +49405,7 @@ /area/science/xenobiology) "xUK" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49292,6 +49425,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/crew_quarters/kitchen) "xUO" = ( @@ -49518,8 +49652,7 @@ /area/hallway/primary/central) "xZU" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -49531,6 +49664,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xZY" = ( @@ -49680,12 +49814,12 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ name = "Kitchen Window"; - req_access_txt = "28" + req_one_access_txt = "hydroponics;kitchen" }, /obj/machinery/door/window/eastleft{ dir = 8; name = "Hydroponics Window"; - req_one_access_txt = "35" + req_one_access_txt = "hydroponics;kitchen" }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -49826,8 +49960,7 @@ /area/hallway/primary/central) "ygu" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -49851,6 +49984,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "ygz" = ( @@ -74268,9 +74402,9 @@ vRP vRP vRP vRP -eAe +mWR hII -bOF +qOS qfO hRF tdd @@ -93814,7 +93948,7 @@ kxF mLh lWI kxF -gyj +kxF fpk kxF nsC @@ -94890,7 +95024,7 @@ rrI faQ btB wYh -aAR +nix aAR blt aAR @@ -95611,7 +95745,7 @@ mfB vTL lRx taE -xRw +gyj iLQ xgP faH diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 2eba50e94aa5..77b151944401 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -6109,7 +6109,8 @@ /area/maintenance/starboard/aft) "aRJ" = ( /obj/machinery/door/airlock/mining{ - req_access_txt = "48" + req_access_txt = "48"; + name = "Mining Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 6ad06eeccf2f..48dabbc481b7 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -304,7 +304,7 @@ autoclose = FALSE frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior name = "Turbine Interior Airlock" diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 718910547ff0..747eae11dcd3 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -15,8 +15,8 @@ layer = OPEN_DOOR_LAYER /obj/machinery/ministile/hop - name = "HOP line turnstile" - req_one_access = list(ACCESS_COMMAND) + name = "HoP line turnstile" + req_access = list(ACCESS_COMMAND) /obj/machinery/ministile/Initialize(mapload) . = ..() diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index 4e8ccb755614..72d76c09c744 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -17,7 +17,7 @@ /obj/machinery/turnstile/brig name = "Brig turnstile" //Seccies and brig phys may always pass, either way. - req_one_access = list(ACCESS_SEC_BASIC) + req_access = list(ACCESS_SEC_BASIC) max_integrity = 400 /// Made of damn good steel damage_deflection = 21 /// Same as airlocks! From ac065de75b82c92263a2c86cfc620f24da2a7718 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 03:55:12 +0200 Subject: [PATCH 20/48] ballin --- _maps/map_files/GaxStation/GaxStation.dmm | 94 +- _maps/map_files/IceMeta/IceMeta.dmm | 2842 +++++++++++---------- code/__DEFINES/access.dm | 2 +- code/game/machinery/buttons.dm | 4 +- 4 files changed, 1572 insertions(+), 1370 deletions(-) diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index beab0831ade9..c5fe25c711c2 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -545,34 +545,34 @@ name = "CMO Privacy Shutters Control"; pixel_x = 23; pixel_y = -10; - req_access_txt = "cmo" + req_access_txt = "medical" }, /obj/machinery/button/door{ id = "cloning_shutters"; name = "cloning shutters"; pixel_x = 33; pixel_y = 10; - req_access_txt = "cmo" + req_access_txt = "medical" }, /obj/machinery/button/door{ id = "genetics_shutters"; name = "genetics shutters"; pixel_x = 33; pixel_y = -10; - req_access_txt = "cmo" + req_access_txt = "medical" }, /obj/machinery/button/door{ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_x = 36; - req_access_txt = "cmo" + req_access_txt = "medical" }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; pixel_x = 23; pixel_y = 10; - req_access_txt = "cmo" + req_access_txt = "medical" }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) @@ -3989,8 +3989,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "bUP" = ( @@ -5986,6 +5986,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"cQr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "cQK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7777,6 +7785,18 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/port/aft) +"dHv" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/security/processing) "dHA" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -9950,7 +9970,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/freezer, /area/crew_quarters/heads/captain) "eHi" = ( @@ -18637,7 +18656,7 @@ id = "robotics"; name = "Shutters Control Button"; pixel_x = -26; - pixel_y = 8; + pixel_y = 4; req_access_txt = "robotics" }, /obj/machinery/camera{ @@ -18668,7 +18687,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -24 + pixel_x = -24; + pixel_y = -6 }, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -19400,7 +19420,7 @@ id = "medpriv_shutters"; name = "medbay storage shutters"; pixel_x = -24; - req_access_txt = "cmo" + req_access_txt = "medical" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -27085,15 +27105,6 @@ /obj/structure/chair/office/dark, /turf/open/floor/plasteel/dark, /area/bridge) -"mWR" = ( -/obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - shuttledocked = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/security/processing) "mXs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -27434,14 +27445,6 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"nix" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/ramp_corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "niF" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -34608,18 +34611,6 @@ "qOt" = ( /turf/open/space/basic, /area/space/nearstation) -"qOS" = ( -/obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - shuttledocked = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/security/processing) "qPn" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -35490,7 +35481,7 @@ /area/quartermaster/office) "riA" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer" + name = "Chief Medical Officer's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -43653,7 +43644,7 @@ name = "Shutters Control Button"; pixel_x = -7; pixel_y = -24; - req_access_txt = "science" + req_one_access_txt = "science;robotics" }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -48229,6 +48220,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"xsq" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/security/processing) "xst" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -49821,6 +49821,12 @@ name = "Hydroponics Window"; req_one_access_txt = "hydroponics;kitchen" }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "yds" = ( @@ -74402,9 +74408,9 @@ vRP vRP vRP vRP -mWR +xsq hII -qOS +dHv qfO hRF tdd @@ -95024,7 +95030,7 @@ rrI faQ btB wYh -nix +cQr aAR blt aAR diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 16aea1a92cdb..a87e59e0f237 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -45,7 +45,7 @@ /obj/machinery/door/window/eastright{ dir = 2; name = "Research and Development Desk"; - req_one_access_txt = "7;29" + req_one_access_txt = "science;robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; @@ -60,7 +60,7 @@ pixel_y = 7 }, /obj/item/storage/pencil_holder/crew, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/science/lab) "aaU" = ( /turf/open/floor/plasteel, @@ -85,13 +85,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "abl" = ( @@ -129,7 +129,8 @@ /obj/machinery/button/door{ id = "telelab"; name = "Test Chamber Blast Doors"; - pixel_x = 23 + pixel_x = 23; + req_access_txt = "experimentation" }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -174,14 +175,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aci" = ( @@ -478,7 +479,7 @@ /obj/machinery/door/window/brigdoor{ dir = 4; name = "Security Desk"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/item/folder/red, /obj/item/pen, @@ -531,9 +532,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "ahm" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "7;47;29;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -543,6 +542,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "ahq" = ( @@ -666,8 +667,7 @@ /area/maintenance/starboard/fore) "ajG" = ( /obj/machinery/door/airlock/command{ - name = "Council Chamber"; - req_access_txt = "command" + name = "Council Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -681,6 +681,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "ajK" = ( @@ -737,6 +738,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "akG" = ( @@ -860,8 +862,7 @@ /area/medical/virology) "anA" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -878,6 +879,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "anH" = ( @@ -960,6 +962,7 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 2 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port/fore) "aoB" = ( @@ -1263,7 +1266,7 @@ id = "detective_shutters"; name = "detective's office shutters control"; pixel_y = 26; - req_access_txt = "4" + req_access_txt = "detective" }, /obj/machinery/computer/security/wooden_tv{ pixel_x = 3; @@ -1527,8 +1530,7 @@ /area/library) "axC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" + name = "Storage Room" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1536,6 +1538,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "axG" = ( @@ -1686,8 +1689,7 @@ /area/quartermaster/miningoffice) "azL" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1695,6 +1697,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/maintenance/starboard) "azU" = ( @@ -1786,7 +1789,7 @@ /obj/structure/closet/crate/secure/weapon{ desc = "A secure clothing crate."; name = "formal uniform crate"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, @@ -1857,8 +1860,7 @@ /area/medical/virology) "aBu" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1866,12 +1868,12 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "aBJ" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1885,6 +1887,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/freezer, /area/medical/virology) "aCc" = ( @@ -2083,7 +2086,7 @@ "aFd" = ( /obj/machinery/door/window/southleft{ name = "Court Cell"; - req_access_txt = "2" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/security/courtroom) @@ -2211,14 +2214,14 @@ "aGD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "aHc" = ( @@ -2489,6 +2492,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/medical/central) "aLx" = ( @@ -2743,9 +2749,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Foyer"; - req_access_txt = "32" + name = "SMES Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engine_smes) "aPt" = ( @@ -2830,7 +2836,7 @@ id = "xenobio2"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/window/reinforced{ dir = 1 @@ -2845,8 +2851,7 @@ /area/science/xenobiology) "aQK" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_one_access_txt = "48;50" + name = "Cargo Office" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2864,6 +2869,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "aQN" = ( @@ -2874,8 +2880,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Chief Medical Officer's Office"; - req_access_txt = "40" + name = "Chief Medical Officer's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2898,6 +2903,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "aQV" = ( @@ -2905,6 +2911,9 @@ /obj/machinery/airalarm{ pixel_y = 24 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "aQX" = ( @@ -3081,9 +3090,13 @@ /obj/machinery/door/window/westright{ dir = 2; name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "aTa" = ( /obj/item/storage/secure/safe{ @@ -3456,7 +3469,7 @@ dir = 4; name = "Infirmary"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "brig_phys" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -3533,8 +3546,7 @@ /area/hallway/primary/fore) "aZO" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mailroom"; - req_one_access_txt = "50" + name = "Mailroom" }, /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -3555,6 +3567,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "aZX" = ( @@ -3662,7 +3675,7 @@ name = "Warehouse Door Control"; pixel_x = 24; pixel_y = 28; - req_access_txt = "48" + req_access_txt = "cargo_bay" }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -3883,14 +3896,39 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) +"bfu" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/storage/satellite) "bfH" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; @@ -3963,7 +4001,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = -5; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -3971,7 +4009,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = 5; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/computer/cargo{ dir = 4 @@ -4037,13 +4075,13 @@ /area/medical/sleeper) "bhX" = ( /obj/machinery/door/airlock/security{ - name = "Court Cell"; - req_access_txt = "63" + name = "Court Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "bhZ" = ( @@ -4336,15 +4374,14 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "bmf" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bmh" = ( @@ -4433,8 +4470,7 @@ /area/maintenance/starboard/aft) "boa" = ( /obj/machinery/door/airlock/maintenance{ - name = "Toxins Lab Maintenance"; - req_access_txt = "8" + name = "Toxins Lab Maintenance" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -4446,6 +4482,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/science/toxins, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bog" = ( @@ -4559,8 +4596,7 @@ /area/science/research) "bqh" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "65;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -4568,6 +4604,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "bqD" = ( @@ -4722,8 +4759,7 @@ /area/hallway/secondary/entry) "btb" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_one_access_txt = "31;48" + name = "Cargo Bay Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -4734,17 +4770,19 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/maintenance/port/fore) "btq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/port/fore) +/area/maintenance/port/aft) "btz" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -4774,9 +4812,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -4792,6 +4828,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "btW" = ( @@ -5046,8 +5084,7 @@ /area/crew_quarters/bar) "byR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mailroom Maintenance"; - req_access_txt = "50" + name = "Mailroom Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5058,6 +5095,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/maintenance/port/fore) "byY" = ( @@ -5079,6 +5117,9 @@ /obj/machinery/light_switch{ pixel_y = 24 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "bzh" = ( @@ -5161,12 +5202,13 @@ /area/hallway/secondary/entry) "bAk" = ( /obj/machinery/door/airlock/public/glass{ - name = "space-bridge access" + name = "External-Bridge Access" }, /obj/machinery/button/door{ id = "supplybridge"; - name = "Shuttle Bay Space Bridge Control"; - pixel_y = 27 + name = "Shuttle Bay External Bridge Control"; + pixel_y = 27; + req_access_txt = "external" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5180,6 +5222,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "bAE" = ( @@ -5492,6 +5537,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "bFu" = ( @@ -5624,6 +5670,11 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/door/window/northright{ + dir = 8; + name = "delivery door"; + req_access_txt = "maintenance" + }, /turf/open/floor/plating, /area/maintenance/port/fore) "bHp" = ( @@ -5739,8 +5790,7 @@ dir = 4 }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -5749,6 +5799,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "bJa" = ( @@ -5919,7 +5970,7 @@ /obj/machinery/door/window{ dir = 4; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -5931,8 +5982,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Starboard Bow Solar Access"; - req_access_txt = "10" + name = "Starboard Bow Solar Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -5940,6 +5990,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bLw" = ( @@ -5969,8 +6020,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "8" + name = "Toxins Lab" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -5992,6 +6042,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "bMl" = ( @@ -6199,8 +6250,7 @@ /area/engine/atmos/distro) "bPr" = ( /obj/machinery/door/airlock/command{ - name = "Council Chamber"; - req_access_txt = "command" + name = "Council Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6212,6 +6262,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "bPD" = ( @@ -6377,8 +6428,7 @@ /area/medical/virology) "bRV" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" + name = "Atmospherics Monitoring" }, /obj/machinery/door/firedoor/border_only, /obj/structure/cable/yellow{ @@ -6398,18 +6448,21 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "bRZ" = ( /obj/machinery/light/small{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bSj" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Mining Station Atmospherics"; - req_access_txt = "48" + name = "Mining Station Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -6417,6 +6470,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -6875,8 +6929,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6885,6 +6938,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "bZt" = ( @@ -7003,8 +7057,7 @@ /area/hallway/primary/fore) "cbV" = ( /obj/machinery/door/airlock/security/glass{ - name = "Firing Range"; - req_one_access_txt = "1;4" + name = "Firing Range" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7024,6 +7077,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/range) "cbY" = ( @@ -7144,6 +7199,7 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port/fore) "cdr" = ( @@ -7202,14 +7258,13 @@ /area/maintenance/port) "cfs" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/machinery/button/door{ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_y = -25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -7220,6 +7275,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/brig) "cfz" = ( @@ -7352,12 +7408,12 @@ /area/science/mixing) "chk" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "1" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/prison/hallway) "chl" = ( @@ -7399,12 +7455,14 @@ "chC" = ( /obj/machinery/button/holosign{ id = "surgery_b"; - pixel_x = -38 + pixel_x = -38; + req_access_txt = "medical" }, /obj/machinery/button/door{ id = "cmoprivacy"; name = "Privacy Shutters Control"; - pixel_x = -26 + pixel_x = -26; + req_access_txt = "medical" }, /obj/machinery/computer/operating{ dir = 4 @@ -7648,14 +7706,14 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "ckU" = ( @@ -7680,7 +7738,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Kitchen Delivery"; - req_access_txt = "28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel{ dir = 1 @@ -7732,7 +7790,8 @@ /area/hallway/primary/fore) "cmw" = ( /obj/machinery/door/window{ - name = "MiniSat Walkway Access" + name = "MiniSat Walkway Access"; + req_access_txt = "ai_sat" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ @@ -7848,6 +7907,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "coD" = ( @@ -7969,8 +8030,7 @@ /area/science/research) "crH" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -7990,6 +8050,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain/private) "crJ" = ( @@ -8110,8 +8171,7 @@ /area/maintenance/port/fore) "ctK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8128,6 +8188,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "cuc" = ( @@ -8269,14 +8331,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "20;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "cvV" = ( @@ -8309,8 +8370,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "47" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -8323,6 +8383,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cwq" = ( @@ -8361,17 +8422,24 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"cxT" = ( +"cwR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "panelscorched" +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"cxT" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/maintenance/port) +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "cyj" = ( /obj/effect/turf_decal/plaque{ icon_state = "L4" @@ -8415,9 +8483,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -8433,6 +8499,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "czm" = ( @@ -8562,13 +8630,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Chapel Office Maintenance"; - req_one_access_txt = "22" + name = "Chapel Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plating, /area/maintenance/aft) "cBL" = ( @@ -8765,6 +8833,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "cEw" = ( @@ -8802,13 +8871,12 @@ /area/maintenance/port/fore) "cEJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "cFq" = ( @@ -8866,8 +8934,7 @@ /area/vacant_room/office) "cFV" = ( /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -8879,6 +8946,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/construction/storage_wing) "cGg" = ( @@ -9218,9 +9286,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 1 @@ -9425,7 +9490,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen #6"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; @@ -9453,6 +9518,7 @@ dir = 4 }, /obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port/fore) "cPS" = ( @@ -9629,8 +9695,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security{ - name = "Security-Storage Backroom"; - req_access_txt = "63" + name = "Security-Storage Backroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -9644,6 +9709,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "cTc" = ( @@ -9758,13 +9824,13 @@ /area/maintenance/port/fore) "cUk" = ( /obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" + name = "Private Study" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/engine/cult, /area/library) "cUo" = ( @@ -10321,8 +10387,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Research and Development Lab"; - req_one_access_txt = "47" + name = "Research and Development Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -10339,6 +10404,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/lab) "ddd" = ( @@ -10349,8 +10415,7 @@ /area/library) "ddi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Dock Maintenance"; - req_access_txt = "48" + name = "Mining Dock Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10362,6 +10427,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/fore) "ddI" = ( @@ -10372,14 +10438,16 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "toxins" }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_exterior"; idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "toxins" }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -10441,10 +10509,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "dfe" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10452,6 +10516,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Storage Room" + }, /turf/open/floor/plating, /area/maintenance/starboard) "dfv" = ( @@ -10490,10 +10557,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_one_access_txt = "22" + name = "Labor Camp Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/mine/laborcamp/security) "dge" = ( @@ -10510,6 +10577,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "dgl" = ( @@ -10550,7 +10620,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access_txt = "11" + req_access_txt = "engine_equip" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -10719,10 +10789,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/hallway/secondary/service) "dko" = ( @@ -10838,14 +10908,13 @@ /obj/machinery/door/window/eastright{ dir = 8; name = "Genetics Desk"; - req_access_txt = "9" + req_access_txt = "genetics" }, /obj/item/deskbell/preset/genetics{ pixel_x = 8; pixel_y = -3 }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/genetics) "dmh" = ( /obj/machinery/door/poddoor/preopen{ @@ -11188,9 +11257,6 @@ /turf/open/floor/plasteel/white, /area/science/research) "drz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -11291,8 +11357,7 @@ /area/security/prison) "dsR" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Foyer"; - req_one_access_txt = "65;19" + name = "MiniSat Foyer" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -11316,6 +11381,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "dsX" = ( @@ -11427,8 +11495,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/virology/glass{ - name = "Containment Cells"; - req_access_txt = "39" + name = "Containment Cells" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -11445,6 +11512,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "dtY" = ( @@ -11540,7 +11608,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/eastleft{ name = "Mail"; - req_access_txt = "50" + req_access_txt = "cargo" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -11571,13 +11639,13 @@ /area/aisat) "dvB" = ( /obj/machinery/door/airlock/security{ - name = "Court Cell"; - req_access_txt = "63" + name = "Court Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/dark, /area/security/courtroom) "dvD" = ( @@ -11760,8 +11828,7 @@ dir = 8 }, /obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" + name = "Hydroponics Backroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -11774,6 +11841,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "dxf" = ( @@ -11981,7 +12049,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_one_access_txt = "12" + req_access_txt = "atmospherics" }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -12046,7 +12114,7 @@ }, /obj/machinery/door/window/southleft{ name = "Cargo Disposal"; - req_one_access_txt = "50" + req_access_txt = "cargo" }, /obj/structure/window/reinforced{ dir = 8 @@ -12321,8 +12389,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 @@ -12330,6 +12397,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "dGp" = ( @@ -12579,8 +12647,7 @@ /area/security/warden) "dKO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Brig Maintenance"; - req_one_access_txt = "63;12" + name = "Brig Maintenance" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -12594,6 +12661,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "dKS" = ( @@ -12618,8 +12686,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining{ - name = "Mining Office"; - req_access_txt = "48" + name = "Mining Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -12628,6 +12695,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "dKX" = ( @@ -12752,8 +12820,7 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Disposal Conveyor Access"; - req_access_txt = "12" + name = "Disposal Conveyor Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -12761,6 +12828,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/disposal) "dMV" = ( @@ -12896,8 +12964,7 @@ /area/medical/psych) "dPS" = ( /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Courtroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -12905,6 +12972,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, /turf/open/floor/plasteel, /area/security/courtroom) "dPV" = ( @@ -12922,15 +12990,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;37;25;28" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "dQj" = ( @@ -12958,14 +13025,14 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "dQm" = ( @@ -13042,7 +13109,7 @@ dir = 2; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/storage/firstaid/regular{ pixel_x = 6; @@ -13243,6 +13310,9 @@ /area/medical/genetics) "dVd" = ( /obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dVf" = ( @@ -13281,7 +13351,7 @@ name = "Warehouse Door Control"; pixel_x = -24; pixel_y = 28; - req_access_txt = "48" + req_access_txt = "cargo_bay" }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -13582,8 +13652,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prisoner Education Chamber"; - req_access_txt = "3" + name = "Prisoner Education Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13594,6 +13663,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/execution/education) "dZM" = ( @@ -13601,6 +13671,9 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port) "eao" = ( @@ -13948,7 +14021,7 @@ }, /obj/machinery/door/window/brigdoor/southleft{ name = "Filing Room"; - req_access_txt = "5" + req_access_txt = "psychology" }, /turf/open/floor/wood, /area/medical/psych) @@ -13991,9 +14064,11 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "ehw" = ( @@ -14074,7 +14149,8 @@ name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; - specialfunctions = 4 + specialfunctions = 4; + req_access_txt = "brig" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -14391,8 +14467,7 @@ /area/ai_monitored/turret_protected/ai) "eno" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14404,6 +14479,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "enq" = ( @@ -14682,20 +14758,22 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_y = 7; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Window Control"; pixel_x = -5; pixel_y = -3; - specialfunctions = 4 + specialfunctions = 4; + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; - pixel_y = -3 + pixel_y = -3; + req_access_txt = "brig" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -14828,8 +14906,7 @@ /area/solar/port/fore) "ete" = ( /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrists office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -15027,8 +15104,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/virology{ - name = "Virology Access"; - req_access_txt = "39" + name = "Virology Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -15055,6 +15131,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "ewp" = ( @@ -15072,20 +15149,19 @@ /area/quartermaster/storage) "ewC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_one_access_txt = "8;70" + name = "Experimentation Lab Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ewK" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15096,10 +15172,17 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ewQ" = ( /obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/central) "ewS" = ( @@ -15232,8 +15315,7 @@ /area/hallway/primary/starboard) "eyS" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15242,6 +15324,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "eyU" = ( @@ -15558,12 +15642,12 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "eEL" = ( @@ -15600,25 +15684,11 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "eFG" = ( -/obj/structure/closet/secure_closet{ - name = "psychiatrist locker"; - req_access_txt = "5" - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/storage/pill_bottle/happiness, -/obj/item/storage/pill_bottle/dice, -/obj/item/storage/pill_bottle/happy{ - name = "happy pills bottle" - }, -/obj/item/storage/pill_bottle/lsd{ - name = "very happy pills bottle" - }, -/obj/item/storage/pill_bottle/psicodine, /obj/structure/window/reinforced/tinted{ dir = 8 }, /obj/effect/turf_decal/stripes/corner, +/obj/structure/closet/secure_closet/psych, /turf/open/floor/wood, /area/medical/psych) "eGr" = ( @@ -15721,7 +15791,7 @@ name = "Access Console"; pixel_x = -25; pixel_y = -25; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -16153,9 +16223,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "eOy" = ( @@ -16440,6 +16507,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"eUy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = -24; + pixel_y = -23 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ai_monitored/storage/satellite) "eUC" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -16741,6 +16827,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "fau" = ( @@ -16772,8 +16861,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -16782,6 +16870,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "faF" = ( @@ -17055,6 +17144,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "ffT" = ( @@ -17066,8 +17158,7 @@ /area/crew_quarters/heads/captain/private) "fgg" = ( /obj/machinery/door/airlock/engineering{ - name = "Telecomms Storage"; - req_access_txt = "61" + name = "Telecomms Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -17088,6 +17179,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -17367,9 +17460,7 @@ /turf/open/floor/plating, /area/bridge) "fjl" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -17379,6 +17470,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "fjt" = ( @@ -17388,7 +17481,7 @@ base_state = "right"; icon_state = "right"; name = "Captain's Desk"; - req_access_txt = "20" + req_access_txt = "captain" }, /obj/structure/disposalpipe/segment, /obj/item/stamp/captain, @@ -17553,8 +17646,7 @@ /area/science/xenobiology) "fml" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -17566,6 +17658,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "fmn" = ( @@ -17627,8 +17720,7 @@ /area/maintenance/fore) "fmL" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access_txt = "3" + name = "Evidence Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17642,6 +17734,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/security/warden) "fmS" = ( @@ -17783,6 +17876,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "foD" = ( @@ -17829,8 +17923,7 @@ /area/science/research) "fpu" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_one_access_txt = "1;4" + name = "Evidence Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17850,6 +17943,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/dark, /area/security/warden) "fpx" = ( @@ -17934,9 +18029,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -17946,12 +18039,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "frI" = ( /obj/machinery/door/airlock/medical{ - name = "Locker Room"; - req_access_txt = "5" + name = "Locker Room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -17962,6 +18056,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/locker) "frV" = ( @@ -18077,7 +18172,7 @@ dir = 4; icon_state = "right"; name = "Core Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/structure/window/reinforced, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -18149,20 +18244,15 @@ /turf/open/floor/plating, /area/maintenance/fore) "fuF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/starboard) "fuT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -18244,7 +18334,7 @@ dir = 2; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/storage/firstaid/regular{ pixel_x = 6; @@ -18371,6 +18461,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison/hallway) "fxN" = ( @@ -18445,8 +18536,7 @@ /area/ai_monitored/turret_protected/ai) "fyO" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -18463,6 +18553,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fyQ" = ( @@ -18549,8 +18640,7 @@ /area/hallway/primary/central) "fzp" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -18560,6 +18650,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fzs" = ( @@ -18578,7 +18669,7 @@ id = "xenobio8"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -18650,7 +18741,7 @@ id = "research_shutters"; name = "research shutters control"; pixel_x = 28; - req_access_txt = "7" + req_one_access_txt = "science;robotics" }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -18752,13 +18843,13 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "fEF" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12;46" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/plating, /area/maintenance/starboard) "fEM" = ( @@ -18849,8 +18940,7 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -18859,6 +18949,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "fHo" = ( @@ -18955,21 +19046,19 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "fIf" = ( -/obj/machinery/door/poddoor{ - id = "Podbaydoor"; - name = "Wilderness Access" +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/structure/fans/tiny{ - resistance_flags = 115 +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/turf/open/floor/engine, -/area/escapepodbay) +/area/maintenance/port) "fIm" = ( /obj/item/crowbar, /turf/open/floor/plating{ @@ -19140,7 +19229,7 @@ }, /obj/machinery/door/window{ name = "HoP's Desk"; - req_access_txt = "57" + req_access_txt = "hop" }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -19333,8 +19422,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "CMO Maintenance"; - req_access_txt = "40" + name = "CMO's Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19345,6 +19433,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plating, /area/maintenance/department/medical/central) "fNt" = ( @@ -19364,6 +19453,9 @@ pixel_y = -4 }, /obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "fNF" = ( @@ -19591,13 +19683,11 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port) "fQZ" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -19608,6 +19698,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "fRa" = ( @@ -19728,7 +19819,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = 22 + pixel_y = 22; + req_access_txt = "atmospherics" }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -19736,7 +19828,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = -21 + pixel_y = -21; + req_access_txt = "atmospherics" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -19766,9 +19859,7 @@ /turf/closed/wall, /area/maintenance/port/aft) "fSQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -19776,6 +19867,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "fSW" = ( @@ -19939,7 +20031,7 @@ }, /obj/machinery/door/window/eastright{ name = "Chemistry Desk"; - req_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19951,7 +20043,7 @@ id = "chemistry_shutters"; name = "chemistry shutters" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/chemistry) "fVS" = ( /obj/machinery/status_display/evac{ @@ -20286,10 +20378,7 @@ /turf/open/floor/plasteel, /area/hydroponics) "fZI" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access_txt = "3" - }, +/obj/structure/closet/secure_closet/contraband/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "fZJ" = ( @@ -20319,8 +20408,7 @@ /area/crew_quarters/fitness/recreation) "gax" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -20330,6 +20418,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain/private) "gay" = ( @@ -20337,7 +20426,7 @@ base_state = "right"; icon_state = "right"; name = "Deliveries"; - req_access_txt = "50" + req_access_txt = "cargo" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -20348,16 +20437,9 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "gaF" = ( -/obj/structure/chair/office/dark, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/mob/living/simple_animal/crab/kreb{ - desc = "Here to lay down the hard claws of the law!"; - health = 50; - name = "Officer Kreb"; - real_name = "Officer Kreb" - }, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "gbd" = ( @@ -20442,8 +20524,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -20451,6 +20532,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "gct" = ( @@ -20478,16 +20560,14 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "gdg" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Disposal Conveyor Access"; - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/decal/cleanable/oil, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/fore) "gdm" = ( @@ -20792,9 +20872,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Medbay Security Post"; - req_access_txt = "63" + name = "Medbay Security Post" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "ghU" = ( @@ -20923,8 +21003,7 @@ "gjp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20939,16 +21018,15 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel{ dir = 1 }, /area/engine/engineering) "gjB" = ( /obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage"; - req_access_txt = "12" + name = "Auxiliary Tool Storage" }, -/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -20961,6 +21039,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/storage/tools) "gjC" = ( @@ -21485,6 +21564,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "grl" = ( @@ -21522,6 +21604,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port) "grK" = ( @@ -21576,14 +21659,14 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ icon_state = "panelscorched" }, /area/maintenance/port/fore) "gsL" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -21591,6 +21674,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "gsZ" = ( @@ -21600,14 +21684,14 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; - req_access_txt = "24" + req_access_txt = "engineering" }, /obj/machinery/light{ dir = 8 @@ -21836,7 +21920,9 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "gwH" = ( -/obj/machinery/door/window/westright, +/obj/machinery/door/window/westright{ + req_access_txt = "captain" + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "gwV" = ( @@ -21877,13 +21963,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;22;25;37;38;46;70" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "gxI" = ( @@ -21929,7 +22014,7 @@ name = "Mech Bay Door Control"; pixel_x = 26; pixel_y = 6; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -21981,14 +22066,11 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "gyB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/starboard/secondary) "gyE" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, @@ -22091,7 +22173,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/vacant_room/commissary) "gAa" = ( /obj/structure/closet/l3closet/virology, @@ -22516,8 +22598,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "65;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -22530,6 +22611,7 @@ pixel_x = 1; pixel_y = 32 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "gHr" = ( @@ -22563,8 +22645,7 @@ /area/hallway/secondary/exit/departure_lounge) "gHu" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Test Subject Cell"; - req_access_txt = "39" + name = "Test Subject Cell" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22581,6 +22662,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/freezer, /area/medical/virology) "gIf" = ( @@ -22606,7 +22688,7 @@ name = "robotics shutters control"; pixel_x = -26; pixel_y = 26; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -23343,8 +23425,7 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -23358,6 +23439,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "gSh" = ( @@ -23500,8 +23582,7 @@ /area/quartermaster/storage) "gTY" = ( /obj/machinery/door/airlock/medical{ - name = "Locker Room"; - req_access_txt = "5" + name = "Locker Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -23512,6 +23593,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/locker) "gUe" = ( @@ -23590,21 +23672,22 @@ id = "secentranceflasher"; name = "Brig Entrance Flash Control"; pixel_x = -24; - pixel_y = 24; - req_access_txt = "1" + pixel_y = 24 }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Window Control"; pixel_x = 5; pixel_y = 27; - specialfunctions = 4 + specialfunctions = 4; + req_access_txt = "security" }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; - pixel_y = 37 + pixel_y = 37; + req_access_txt = "security" }, /obj/machinery/light/small{ dir = 1 @@ -23616,7 +23699,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 37; - req_access_txt = "63" + req_access_txt = "security" }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -23625,7 +23708,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 27; - req_access_txt = "63" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -23636,15 +23719,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "gUW" = ( @@ -23695,8 +23777,7 @@ /area/aisat) "gVE" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23717,6 +23798,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -24046,10 +24128,6 @@ /turf/open/floor/wood, /area/library) "haO" = ( -/obj/machinery/door/airlock{ - name = "Theatre Stage"; - req_one_access_txt = "12;46" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -24059,6 +24137,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Theatre Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/theatre, /turf/open/floor/plating, /area/maintenance/starboard) "haS" = ( @@ -24079,6 +24162,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hbq" = ( @@ -24161,7 +24247,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -23; pixel_y = -24; - req_one_access_txt = "30;70" + req_access_txt = "ai_sat" }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -24169,7 +24255,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = 23; - req_one_access_txt = "30;70" + req_access_txt = "ai_sat" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -24300,9 +24386,9 @@ }, /obj/machinery/door/airlock/research/glass{ name = "Secondary AI Core"; - normalspeed = 0; - req_one_access_txt = "47;70" + normalspeed = 0 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/ai_monitored/secondarydatacore) "hfk" = ( @@ -24374,15 +24460,11 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "hgm" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/stripes/corner{ - dir = 1 + dir = 8 }, /turf/open/floor/plating, -/area/ai_monitored/storage/satellite) +/area/maintenance/starboard) "hgt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24409,8 +24491,7 @@ /area/crew_quarters/fitness/recreation) "hgX" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -24425,6 +24506,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "hhc" = ( @@ -24463,9 +24545,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "hhy" = ( @@ -24546,7 +24627,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "8" + req_access_txt = "toxins" }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -25131,14 +25212,14 @@ /area/mine/maintenance) "htl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vacant Office Maintenance"; - req_access_txt = "32" + name = "Vacant Office Maintenance" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/maintenance/port) "htp" = ( @@ -25288,8 +25369,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -25313,6 +25393,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "hvt" = ( @@ -25482,13 +25563,13 @@ /area/mine/maintenance) "hxE" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_one_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/aft) "hxH" = ( @@ -25684,7 +25765,8 @@ id = "cmoprivacy"; name = "Privacy Shutters Control"; pixel_x = 26; - pixel_y = 4 + pixel_y = 4; + req_access_txt = "medical" }, /obj/machinery/camera{ c_tag = "CMO's Office"; @@ -25701,8 +25783,7 @@ /area/security/checkpoint/customs) "hBi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_one_access_txt = "1;4" + name = "Security Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25712,6 +25793,8 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/fore) "hBk" = ( @@ -25769,6 +25852,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/science/central) +"hCo" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "hCu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -25852,10 +25942,10 @@ /area/quartermaster/sorting) "hDE" = ( /obj/machinery/door/window/eastleft{ - req_access_txt = "48" + req_access_txt = "mining_station" }, /obj/machinery/door/window/westleft{ - req_access_txt = "48" + req_access_txt = "mining_station" }, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 @@ -26184,12 +26274,12 @@ "hIK" = ( /obj/machinery/door/window/brigdoor{ name = "Justice Chamber"; - req_access_txt = "3" + req_access_txt = "brig" }, /obj/machinery/door/window/brigdoor{ dir = 1; name = "Justice Chamber"; - req_access_txt = "3" + req_access_txt = "brig" }, /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" @@ -26275,8 +26365,7 @@ "hJq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26293,6 +26382,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel{ dir = 1 }, @@ -26325,9 +26415,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "hJK" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26338,6 +26426,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "hJW" = ( @@ -26623,7 +26712,7 @@ "hOw" = ( /obj/machinery/door/window/southleft{ name = "Maximum Security Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "Xenolab"; @@ -26741,15 +26830,14 @@ /turf/open/floor/carpet, /area/crew_quarters/bar) "hPY" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "hQf" = ( @@ -26871,7 +26959,7 @@ /obj/item/radio/intercom{ pixel_x = -29 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/plasteel, @@ -27210,9 +27298,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -27273,8 +27358,7 @@ /area/bridge) "ibA" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -27282,6 +27366,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/mine/living_quarters) "ibB" = ( @@ -27976,8 +28061,7 @@ /area/security/brig) "inY" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -27988,6 +28072,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/fore) "ioh" = ( @@ -28123,7 +28208,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/vacant_room/commissary) "iqo" = ( /obj/structure/cable/yellow{ @@ -28188,7 +28273,7 @@ }, /obj/machinery/door/poddoor{ id = "Podbaydoor"; - name = "Wilderness Access" + name = "Shipbreaking External Access" }, /turf/open/floor/engine, /area/escapepodbay) @@ -28236,7 +28321,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen #5"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; @@ -28316,7 +28401,7 @@ "ise" = ( /obj/machinery/door/window{ name = "Captain's Desk"; - req_access_txt = "20" + req_access_txt = "captain" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -28328,7 +28413,7 @@ /obj/machinery/door/window/westleft{ dir = 1; name = "First-Aid Supplies"; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/window/reinforced{ dir = 8 @@ -28466,8 +28551,7 @@ /area/medical/morgue) "iuw" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "8" + name = "Toxins Launch Room Access" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -28486,6 +28570,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/maintenance/department/science) "iuy" = ( @@ -28889,7 +28974,7 @@ id = "xenobio6"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -28963,8 +29048,7 @@ /area/hydroponics) "iAk" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -28986,6 +29070,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "iAo" = ( @@ -29319,8 +29404,7 @@ "iFF" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Physical Core Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ @@ -29331,6 +29415,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "iFQ" = ( @@ -29366,13 +29451,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/science) "iFX" = ( @@ -29605,9 +29693,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/starboard) "iJV" = ( @@ -29708,8 +29796,7 @@ /area/mine/eva) "iLX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -29726,6 +29813,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -29775,10 +29865,6 @@ /turf/closed/wall, /area/security/courtroom) "iMH" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Service Door"; - req_access_txt = "35;79" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -29790,6 +29876,10 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "iMQ" = ( @@ -29886,7 +29976,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -26; - pixel_y = 6 + pixel_y = 6; + req_access_txt = "robotics" }, /obj/machinery/light_switch{ pixel_x = -23; @@ -30096,9 +30187,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "iRj" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30109,6 +30198,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "iRt" = ( @@ -30148,15 +30238,12 @@ /obj/machinery/door/window/southright{ dir = 4; name = "Engineering Deliveries"; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) "iSc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -30218,7 +30305,8 @@ /obj/machinery/button/door{ id = "chapel_shutters_parlour"; name = "chapel shutters control"; - pixel_y = -25 + pixel_y = -25; + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/main) @@ -30377,7 +30465,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen #3"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; @@ -30464,9 +30552,7 @@ /turf/open/floor/plasteel, /area/mine/eva) "iXd" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30474,6 +30560,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "iXu" = ( @@ -30807,8 +30894,7 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -30819,6 +30905,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "jbj" = ( @@ -30961,8 +31048,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -30976,6 +31062,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel, /area/security/detectives_office) "jdM" = ( @@ -31004,8 +31091,7 @@ /area/chapel/main) "jer" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Desk"; - req_access_txt = "5" + name = "Medbay Desk" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -31019,6 +31105,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jev" = ( @@ -31036,7 +31123,7 @@ dir = 2; layer = 3.1; name = "Cyborg Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -31108,13 +31195,12 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "jfW" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "jgd" = ( @@ -31229,8 +31315,7 @@ /area/mine/maintenance) "jhh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -31242,6 +31327,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jhi" = ( @@ -31356,8 +31442,7 @@ dir = 4 }, /obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_access_txt = "5" + name = "Morgue" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -31374,6 +31459,7 @@ /obj/effect/turf_decal/trimline/blue/filled/end/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "jju" = ( @@ -31417,8 +31503,7 @@ "jky" = ( /obj/machinery/button/flasher{ id = "holdingflash"; - pixel_y = -26; - req_access_txt = "1" + pixel_y = -26 }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/trimline/secred/filled/line/lower, @@ -31598,7 +31683,7 @@ name = "Secondary AI Core Access Console"; pixel_x = -24; pixel_y = -25; - req_one_access_txt = "30;70" + req_access_txt = "ai_sat" }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -31606,7 +31691,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -33; pixel_y = -23; - req_one_access_txt = "30;70" + req_access_txt = "ai_sat" }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -31722,14 +31807,14 @@ /area/vacant_room/commissary) "jpE" = ( /obj/machinery/door/airlock/grunge{ - name = "Genetics"; - req_access_txt = "9" + name = "Genetics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/purple/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "jpL" = ( @@ -31871,9 +31956,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -32084,8 +32166,7 @@ name = "bridge blast door" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "command" + name = "Bridge Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -32097,6 +32178,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "jtL" = ( @@ -32110,7 +32192,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ dir = 8 }, @@ -32331,6 +32412,7 @@ /obj/structure/sign/warning/electricshock{ pixel_x = 32 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jxP" = ( @@ -32612,7 +32694,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ name = "Research and Development Desk"; - req_one_access_txt = "7;29" + req_one_access_txt = "science;robotics" }, /obj/item/folder/white{ pixel_x = 4; @@ -32637,7 +32719,7 @@ pixel_x = -7; pixel_y = -3 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/science/lab) "jBl" = ( /obj/effect/turf_decal/trimline/blue/filled/end{ @@ -32726,8 +32808,7 @@ /area/medical/virology) "jDh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 3"; - req_access_txt = "2" + name = "Long-Term Cell 3" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -32739,6 +32820,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jDq" = ( @@ -32825,8 +32907,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ - name = "Head of Security's Office"; - req_access_txt = "58" + name = "Head of Security's Office" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -32840,6 +32921,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "jEB" = ( @@ -32916,7 +32998,7 @@ }, /obj/machinery/door/window/westleft{ name = "Medical Delivery"; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/window, /obj/effect/turf_decal/stripes/corner{ @@ -32951,10 +33033,6 @@ /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/security/execution/education) "jGi" = ( @@ -32983,8 +33061,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -32999,6 +33076,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "jGE" = ( @@ -33347,6 +33425,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engine/engineering) +"jKN" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ai_monitored/storage/satellite) "jKY" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -33449,9 +33542,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 1 }, @@ -33978,13 +34068,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/siding/wideplating{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "jVw" = ( @@ -33996,7 +34086,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 30; - req_access_txt = "command" + req_access_txt = "eva" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -34012,9 +34102,7 @@ }, /area/maintenance/port) "jVO" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -34140,8 +34228,7 @@ /area/crew_quarters/kitchen) "jXH" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34156,6 +34243,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jXO" = ( @@ -34300,7 +34388,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Test Site Materials Crate"; - req_access_txt = "8" + req_access_txt = "toxins" }, /obj/machinery/light/small{ dir = 1 @@ -34319,9 +34407,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -34672,8 +34757,7 @@ /area/ai_monitored/turret_protected/ai) "kgg" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage"; - req_access_txt = "32" + name = "Engineering Storage" }, /obj/effect/turf_decal/bot{ dir = 1 @@ -34693,6 +34777,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel{ dir = 1 }, @@ -34720,8 +34805,7 @@ name = "bridge blast door" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "command" + name = "Bridge Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -34733,6 +34817,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "kgz" = ( @@ -34873,8 +34958,7 @@ /area/construction/storage_wing) "kiq" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34891,6 +34975,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "kiN" = ( @@ -34925,8 +35010,7 @@ /area/hallway/primary/port) "kjc" = ( /obj/machinery/door/airlock/medical{ - name = "Patient Room B"; - req_access_txt = "45" + name = "Patient Room B" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34947,6 +35031,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "kjg" = ( @@ -34970,7 +35055,7 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_x = -25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only, @@ -35000,8 +35085,7 @@ icon_state = "1-8" }, /obj/machinery/door/airlock/security/glass{ - name = "Gear Room"; - req_one_access_txt = "1;4" + name = "Gear Room" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -35016,6 +35100,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "kjO" = ( @@ -35204,7 +35289,7 @@ name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "command" + req_access_txt = "engineering" }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -35212,7 +35297,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = 5; - req_access_txt = "11" + req_access_txt = "engineering" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 @@ -35355,7 +35440,6 @@ /turf/open/floor/plasteel, /area/storage/tools) "kpy" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, @@ -35381,7 +35465,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen #6"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -35641,7 +35725,7 @@ name = "Virology Access Console"; pixel_x = 26; pixel_y = 26; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -36084,14 +36168,14 @@ }, /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "kBn" = ( @@ -36160,7 +36244,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "Chemistry Desk"; - req_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/item/folder/white{ pixel_x = 4; @@ -36178,11 +36262,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/tile/neutral/fourcorners{ - alpha = 220; - color = "#F29A4D" - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/chemistry) "kCt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36300,8 +36380,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -36311,6 +36390,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "kDD" = ( @@ -36356,8 +36436,7 @@ /area/quartermaster/sorting) "kEO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Tool Storage Maintenance"; - req_access_txt = "12" + name = "Tool Storage Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -36371,6 +36450,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "kFi" = ( @@ -36430,7 +36510,7 @@ id = "xenobio3"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/window/reinforced{ dir = 1 @@ -36515,8 +36595,7 @@ /area/maintenance/starboard) "kGm" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36531,6 +36610,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/brig) "kGq" = ( @@ -36672,7 +36752,7 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plating, /area/chapel/main) @@ -36686,8 +36766,7 @@ /area/security/prison) "kIh" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_one_access_txt = "65;19" + name = "MiniSat Antechamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -36711,6 +36790,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "kIs" = ( @@ -36770,8 +36852,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/virology{ - name = "Virology Access"; - req_access_txt = "39" + name = "Virology Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -36783,6 +36864,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/medical/virology, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "kJa" = ( @@ -36994,9 +37077,7 @@ /turf/open/floor/engine/plasma, /area/engine/atmos/distro) "kLJ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -37004,6 +37085,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "kLZ" = ( @@ -37185,7 +37267,9 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/paper, +/turf/open/floor/plating, /area/hallway/primary/port) "kPy" = ( /obj/machinery/light/small, @@ -37244,7 +37328,6 @@ /turf/open/floor/wood, /area/library) "kQA" = ( -/obj/machinery/door/airlock/public, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -37267,6 +37350,10 @@ /obj/effect/turf_decal/trimline/secred/warning/lower/corner{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Shipbreaking Bay" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "kQR" = ( @@ -37368,8 +37455,7 @@ /area/escapepodbay) "kSO" = ( /obj/machinery/door/airlock/grunge{ - name = "Vacant Office"; - req_access_txt = "32" + name = "Vacant Office" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/yellow{ @@ -37381,6 +37467,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/wood, /area/vacant_room/office) "kTj" = ( @@ -37580,13 +37667,13 @@ /area/maintenance/central) "kWI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "kWK" = ( @@ -37609,8 +37696,7 @@ /area/quartermaster/warehouse) "kWS" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_one_access_txt = "12;22" + name = "Chapel Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37619,6 +37705,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, /turf/open/floor/plating, /area/maintenance/aft) "kXo" = ( @@ -37806,7 +37894,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 9; - pixel_y = 25 + pixel_y = 25; + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) @@ -37814,8 +37903,7 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -37824,6 +37912,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) "laU" = ( @@ -38057,13 +38146,13 @@ /area/medical/medbay/central) "lfj" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "lfp" = ( @@ -38446,7 +38535,7 @@ id = "armory"; name = "Armory Shutters"; pixel_x = 28; - req_access_txt = "3" + req_access_txt = "armory" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -38467,9 +38556,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -38482,6 +38569,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "lkV" = ( @@ -38527,8 +38616,7 @@ /area/mine/production) "llh" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38536,6 +38624,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "lll" = ( @@ -38630,8 +38719,7 @@ /area/crew_quarters/heads/captain/private) "lmr" = ( /obj/machinery/door/airlock/maintenance{ - name = "Detective Maintenance"; - req_access_txt = "4" + name = "Detective Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38641,6 +38729,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, /turf/open/floor/plating, /area/maintenance/fore) "lmx" = ( @@ -38706,12 +38795,12 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "lns" = ( @@ -38822,8 +38911,7 @@ /area/hallway/primary/fore) "loO" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation Monitoring"; - req_one_access_txt = "1;4" + name = "Interrogation Monitoring" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -38831,6 +38919,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/grimy, /area/security/interrogation) "loT" = ( @@ -38891,8 +38981,7 @@ /area/library) "lqj" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38909,6 +38998,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/interrogation) "lqk" = ( @@ -38920,7 +39010,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = -24; - req_one_access_txt = "32;47;48" + req_access_txt = "aux_base" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38985,6 +39075,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "lrR" = ( @@ -39142,10 +39233,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "luA" = ( @@ -39219,7 +39310,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access_txt = "maintenance" }, /obj/machinery/button/massdriver{ id = "trash"; @@ -39271,9 +39362,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "lwo" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -39283,6 +39372,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "lwr" = ( @@ -39500,9 +39590,15 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "lBl" = ( -/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/port/fore) "lBt" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -39556,8 +39652,7 @@ /area/hallway/secondary/entry) "lCz" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Lab"; - req_access_txt = "5; 9; 68" + name = "Genetics Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -39581,6 +39676,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "lCC" = ( @@ -39611,8 +39707,7 @@ /area/mine/eva) "lDx" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -39629,6 +39724,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/production) "lDE" = ( @@ -39638,9 +39734,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -39753,13 +39846,13 @@ /obj/machinery/door/airlock/research{ glass = 1; name = "Slime Euthanization Chamber"; - opacity = 0; - req_access_txt = "55" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "lFE" = ( @@ -39914,10 +40007,8 @@ /area/ai_monitored/secondarydatacore) "lHP" = ( /obj/machinery/door/airlock/security{ - name = "Customs Desk"; - req_access_txt = "1" + name = "Customs Desk" }, -/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -39930,6 +40021,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "lHV" = ( @@ -40213,7 +40305,8 @@ id = "hosprivacy"; name = "Privacy Shutters Control"; pixel_x = 26; - pixel_y = -26 + pixel_y = -26; + req_access_txt = "security" }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 @@ -40222,8 +40315,7 @@ /area/crew_quarters/heads/hos) "lLf" = ( /obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "command" + name = "Corporate Showroom" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40231,6 +40323,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/showroom/corporate) "lLh" = ( @@ -40703,13 +40796,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "command" + name = "Corporate Showroom" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/showroom/corporate) "lSD" = ( @@ -40767,8 +40860,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -40779,6 +40871,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "lTE" = ( @@ -40828,6 +40921,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "lTU" = ( @@ -40870,7 +40969,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen #2"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; @@ -40924,8 +41023,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -40937,6 +41035,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "lVh" = ( @@ -41211,6 +41310,9 @@ /obj/machinery/door/airlock/medical{ name = "Recovery Room" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -41261,8 +41363,7 @@ /area/hallway/primary/aft) "lYQ" = ( /obj/machinery/door/airlock/command{ - name = "Command Desk"; - req_access_txt = "command" + name = "Command Desk" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -41270,6 +41371,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "lYW" = ( @@ -41425,6 +41527,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mbw" = ( @@ -41530,7 +41635,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/machinery/power/apc{ areastring = "/area/security/range"; @@ -41697,10 +41802,6 @@ /turf/open/floor/plating, /area/mine/storage) "meG" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Crematorium"; - req_access_txt = "22;27" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -41713,6 +41814,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, +/obj/machinery/door/airlock{ + name = "Crematorium" + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "meR" = ( @@ -41925,7 +42030,7 @@ id = "emt_shutters"; name = "Paramedic Staging Area Shutters"; pixel_x = 28; - req_access_txt = "69" + req_access_txt = "paramedic" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -42087,6 +42192,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) "mkm" = ( @@ -42123,14 +42231,14 @@ name = "Queue Shutters Control"; pixel_x = 25; pixel_y = -36; - req_access_txt = "28" + req_access_txt = "hop" }, /obj/machinery/button/door{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = -26; - req_access_txt = "28" + req_access_txt = "hop" }, /obj/machinery/button/flasher{ id = "hopflash"; @@ -42206,8 +42314,7 @@ /area/medical/morgue) "mlT" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Sanitarium"; - req_access_txt = "2" + name = "Prison Sanitarium" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -42218,6 +42325,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "mmk" = ( @@ -42349,8 +42457,7 @@ /area/maintenance/starboard/aft) "mow" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -42364,6 +42471,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/brig) "moF" = ( @@ -42578,8 +42686,7 @@ /area/maintenance/starboard) "mrX" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "63" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; @@ -42591,6 +42698,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "msk" = ( @@ -42852,8 +42960,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -42865,6 +42972,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "mxs" = ( @@ -43120,8 +43228,7 @@ /area/crew_quarters/bar) "mAT" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -43129,12 +43236,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/wood, /area/security/courtroom) "mAX" = ( /obj/machinery/door/airlock/security/glass{ - name = "Gear Room"; - req_one_access_txt = "1;4" + name = "Gear Room" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43143,16 +43250,16 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "mBa" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mBh" = ( @@ -43225,6 +43332,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "mBY" = ( @@ -43324,8 +43434,7 @@ /area/science/xenobiology) "mDl" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28;79" + name = "Kitchen" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43342,6 +43451,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -43365,8 +43475,7 @@ /area/medical/paramedic) "mDO" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_one_access_txt = "25;28" + name = "Kitchen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43374,6 +43483,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -43498,9 +43609,9 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "mFE" = ( @@ -43570,14 +43681,14 @@ /area/maintenance/port/fore) "mGW" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access_txt = "3" + name = "Evidence Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "mHe" = ( @@ -43868,8 +43979,7 @@ /area/science/xenobiology) "mKx" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "8" + name = "Toxins Launch Room" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -43884,6 +43994,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/maintenance/department/science) "mKF" = ( @@ -44014,9 +44125,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "mMX" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -44029,6 +44138,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mNg" = ( @@ -44189,8 +44299,7 @@ }, /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -44199,6 +44308,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "mOP" = ( @@ -44290,6 +44400,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"mPH" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/secondary) "mPR" = ( /obj/structure/window/reinforced, /obj/machinery/power/terminal{ @@ -44328,11 +44444,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/icemoon/top_layer/outdoors) "mQy" = ( -/obj/machinery/button/door{ - id = "Podbaydoor"; - pixel_x = 24; - pixel_y = -1 - }, /obj/machinery/light, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -44345,6 +44456,13 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/button/door{ + id = "Podbaydoor"; + pixel_x = 24; + pixel_y = -1; + req_access_txt = "external"; + name = "Shipbreaking External Control" + }, /turf/open/floor/plasteel/dark, /area/escapepodbay) "mQz" = ( @@ -44443,7 +44561,7 @@ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -7; - req_access_txt = "47" + req_access_txt = "sec_basic" }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44451,7 +44569,8 @@ name = "Research Exterior Airlock"; normaldoorcontrol = 1; pixel_x = 7; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "sec_basic" }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44459,7 +44578,8 @@ name = "Research Interior Airlock"; normaldoorcontrol = 1; pixel_x = 7; - pixel_y = -2 + pixel_y = -2; + req_access_txt = "sec_basic" }, /obj/machinery/firealarm{ dir = 4; @@ -44547,13 +44667,9 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Chemistry Desk"; - req_access_txt = "5; 33" + req_access_txt = "chemistry" }, -/obj/effect/turf_decal/tile/neutral/fourcorners{ - alpha = 220; - color = "#F29A4D" - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/chemistry) "mSY" = ( /obj/machinery/status_display/evac{ @@ -44573,7 +44689,7 @@ id = "xenobio1"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -44681,8 +44797,7 @@ /area/crew_quarters/toilet/auxiliary) "mUb" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Tech Storage"; - req_access_txt = "19;23" + name = "Secure Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -44698,6 +44813,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark, /area/storage/tech) "mUc" = ( @@ -44743,8 +44859,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Chief Engineer's Office"; - req_access_txt = "56" + name = "Chief Engineer's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -44761,6 +44876,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel{ dir = 1 }, @@ -44931,7 +45047,7 @@ /obj/machinery/door/window{ dir = 1; name = "Captain's Bedroom"; - req_access_txt = "20" + req_access_txt = "captain" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -45238,15 +45354,15 @@ /turf/open/floor/plasteel/dark, /area/aisat) "nbc" = ( -/obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Theatre Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plating, /area/maintenance/starboard) "nbd" = ( @@ -45311,7 +45427,10 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "ncq" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, @@ -45337,8 +45456,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Psychiatrists office Maintenance"; - req_access_txt = "5" + name = "Psychiatrists office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45346,6 +45464,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, /area/maintenance/aft) "ncI" = ( @@ -45405,7 +45524,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen #1"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -45435,8 +45554,11 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_one_access_txt = "65;19" + name = "MiniSat Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) @@ -45488,12 +45610,12 @@ /area/maintenance/port/aft) "neS" = ( /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/brig) "nfa" = ( @@ -45511,8 +45633,7 @@ /area/security/main) "nfh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Security"; - req_access_txt = "22" + name = "Labor Camp Security" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -45527,6 +45648,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/mine/laborcamp/security) "nfD" = ( @@ -45992,7 +46114,7 @@ /obj/machinery/door/window/eastleft{ dir = 1; name = "Research and Development Deliveries"; - req_one_access_txt = "7;29" + req_one_access_txt = "science;robotics" }, /obj/structure/window/reinforced{ dir = 8 @@ -46031,15 +46153,15 @@ resistance_flags = 115 }, /obj/machinery/door/airlock/external{ - name = "Engineering Escape Pod"; - req_one_access_txt = "10;61" + name = "Engineering Escape Pod" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "npe" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -46054,6 +46176,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "npi" = ( @@ -46217,8 +46340,7 @@ /area/security/checkpoint/science/research) "nrx" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -46226,17 +46348,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "nry" = ( /obj/machinery/door/airlock/maintenance{ - name = "Gift Shop Maintenance"; - req_one_access_txt = "12;17;36" + name = "Gift Shop Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "nrN" = ( @@ -46356,7 +46479,7 @@ name = "Teleporter Shutter Control"; pixel_x = 30; pixel_y = 5; - req_access_txt = "command" + req_access_txt = "teleporter" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -46458,6 +46581,9 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "nuJ" = ( @@ -46631,7 +46757,7 @@ "nxg" = ( /obj/machinery/door/window{ name = "SMES Chamber"; - req_access_txt = "32" + req_access_txt = "engine_equip" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46698,8 +46824,7 @@ /area/security/checkpoint/customs) "nxL" = ( /obj/machinery/door/morgue{ - name = "Relic Closet"; - req_access_txt = "22" + name = "Relic Closet" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -46707,6 +46832,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/cult, /area/chapel/office) "nyc" = ( @@ -46834,8 +46960,7 @@ /area/security/checkpoint/medical) "nAu" = ( /obj/machinery/door/airlock/maintenance{ - name = "Law Office Maintenance"; - req_access_txt = "38" + name = "Law Office Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46844,6 +46969,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/plating, /area/maintenance/fore) "nAv" = ( @@ -46867,8 +46993,7 @@ /area/library) "nAM" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -46878,6 +47003,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "nAO" = ( @@ -46936,6 +47062,9 @@ /obj/structure/sign/departments/minsky/supply/cargo{ pixel_y = 32 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "nBm" = ( @@ -47026,7 +47155,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -47242,8 +47371,7 @@ "nGP" = ( /obj/machinery/button/crematorium{ id = "crematoriumChapel"; - pixel_x = -26; - req_access_txt = "27" + pixel_x = -26 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -47637,12 +47765,12 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_interior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "nMf" = ( @@ -47707,8 +47835,7 @@ /area/hallway/primary/central) "nMJ" = ( /obj/machinery/door/airlock/security{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47720,6 +47847,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "nMN" = ( @@ -47748,7 +47876,7 @@ icon_state = "right"; name = "Monkey Pen"; pixel_y = 2; - req_access_txt = "9" + req_access_txt = "genetics" }, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass, @@ -48056,8 +48184,7 @@ /area/hallway/primary/aft) "nRB" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25;79" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -48066,6 +48193,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/hallway/secondary/service) "nRF" = ( @@ -48390,27 +48518,11 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "nVE" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_one_access_txt = "65;19" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/storage/satellite) +/turf/open/floor/plating, +/area/maintenance/starboard) "nVN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48491,8 +48603,7 @@ /area/ai_monitored/secondarydatacore) "nWM" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -48500,6 +48611,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "nWO" = ( @@ -48595,8 +48707,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48613,6 +48724,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/hfr) "nYT" = ( @@ -49016,6 +49128,9 @@ "oek" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "oey" = ( @@ -49035,8 +49150,7 @@ /area/medical/medbay/aft) "oeD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Departure Lounge Security Post"; - req_access_txt = "63" + name = "Departure Lounge Security Post" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49053,6 +49167,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "oeF" = ( @@ -49107,15 +49222,14 @@ /turf/baseturf_bottom, /area/maintenance/port/aft) "oeW" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "ofi" = ( @@ -49221,14 +49335,14 @@ /area/science/research) "ogT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Nanite Laboratory Maintenance"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory Maintenance" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "ohc" = ( @@ -49251,7 +49365,7 @@ /obj/machinery/door/window{ dir = 8; name = "High-Risk Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/structure/window/reinforced, /obj/machinery/flasher{ @@ -49296,6 +49410,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ohS" = ( @@ -49381,13 +49498,13 @@ "oiY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - name = "Morgue Maintenance"; - req_access_txt = "6" + name = "Morgue Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plating, /area/maintenance/aft) "ojs" = ( @@ -49603,11 +49720,6 @@ location = "Disposals" }, /obj/structure/plasticflaps, -/obj/machinery/door/window/northright{ - dir = 2; - name = "delivery door"; - req_access_txt = "31" - }, /obj/structure/disposalpipe/segment, /obj/machinery/conveyor{ dir = 1; @@ -49627,9 +49739,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/fore) "omA" = ( @@ -49695,13 +49804,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/purple/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner/lower, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "onA" = ( @@ -49721,8 +49829,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49733,6 +49840,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/starboard) "onO" = ( @@ -49784,8 +49892,7 @@ autoclose = 0; frequency = 1449; id_tag = "xeno_airlock_interior"; - name = "Xenobiology Lab Internal Airlock"; - req_access_txt = "55" + name = "Xenobiology Lab Internal Airlock" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49808,6 +49915,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "ooN" = ( @@ -49834,7 +49942,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen #5"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49891,6 +49999,9 @@ /obj/item/clothing/mask/gas, /obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "oqA" = ( @@ -49944,9 +50055,9 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "5;9;68" + name = "Genetics Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ors" = ( @@ -50042,9 +50153,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main) "osD" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -50063,12 +50172,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "osK" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "10;32" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -50079,6 +50188,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/engine/foyer) "osN" = ( @@ -50213,6 +50324,16 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/aisat) +"ouV" = ( +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "ouZ" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -50241,8 +50362,7 @@ /area/hallway/primary/central) "ovw" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -50256,6 +50376,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "ovx" = ( @@ -50492,7 +50613,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ name = "Cargo Desk"; - req_access_txt = "50" + req_access_txt = "cargo" }, /obj/item/paper_bin{ pixel_x = -3; @@ -50513,7 +50634,7 @@ pixel_x = -5; pixel_y = -9 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/office) "ozK" = ( /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -50580,17 +50701,16 @@ /obj/machinery/button/flasher{ id = "holdingflash"; name = "holding cell flasher button"; - pixel_x = 23; - pixel_y = 23; - req_access_txt = "1" + pixel_x = 24; + pixel_y = -8 }, /obj/machinery/camera{ c_tag = "Brig - Desk"; dir = 8 }, /obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -2 + pixel_x = 28; + pixel_y = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -50624,8 +50744,7 @@ /area/engine/atmos/distro) "oAE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Desk"; - req_access_txt = "63" + name = "Security Desk" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50639,6 +50758,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "oAG" = ( @@ -50731,8 +50851,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security{ - name = "Security-Storage Backroom"; - req_access_txt = "63" + name = "Security-Storage Backroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -50740,6 +50859,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "oCv" = ( @@ -50930,7 +51050,8 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "gas ports" + name = "gas ports"; + req_access_txt = "brig" }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, @@ -50992,7 +51113,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = -12; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/item/radio/intercom{ freerange = 1; @@ -51018,8 +51139,7 @@ /area/maintenance/port/fore) "oGC" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage"; - req_one_access_txt = "10;32" + name = "Shared Engineering Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -51032,6 +51152,8 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/storage_shared) "oGG" = ( @@ -51047,7 +51169,7 @@ /obj/machinery/door/window/westright{ dir = 1; name = "Atmospherics Access"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/structure/window/reinforced{ dir = 4 @@ -51122,8 +51244,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_one_access_txt = "8;70" + name = "Experimentation Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -51137,6 +51258,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plasteel/white, /area/science/explab) "oJE" = ( @@ -51187,7 +51309,8 @@ /obj/machinery/button{ id = "lawyer_shutters"; name = "law office shutter control"; - pixel_y = -26 + pixel_y = -26; + req_access_txt = "lawyer" }, /turf/open/floor/wood, /area/lawoffice) @@ -51303,9 +51426,7 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "oNu" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -51315,6 +51436,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oNv" = ( @@ -51426,12 +51548,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/trimline/purple/filled/line/lower{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/trimline/purple/filled/corner/lower{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "oPB" = ( @@ -51468,14 +51591,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;48;50;1" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "oPO" = ( @@ -51563,9 +51685,7 @@ /turf/open/floor/carpet, /area/crew_quarters/theatre) "oQL" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51574,6 +51694,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "oQN" = ( @@ -51624,8 +51745,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Psychiatrists office Maintenance"; - req_access_txt = "5" + name = "Psychiatrists office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -51637,6 +51757,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, /area/maintenance/aft) "oSm" = ( @@ -51676,7 +51797,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Research Division Deliveries"; - req_access_txt = "47" + req_access_txt = "science" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -51785,14 +51906,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "oVE" = ( @@ -51955,8 +52076,7 @@ /area/maintenance/starboard/secondary) "oXB" = ( /obj/machinery/door/airlock/maintenance{ - name = "Research Lab Maintenance"; - req_one_access_txt = "7;29" + name = "Research Lab Maintenance" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51965,6 +52085,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "oXC" = ( @@ -52016,11 +52137,6 @@ /area/hallway/secondary/entry) "oYk" = ( /obj/structure/plasticflaps, -/obj/machinery/door/window/northright{ - dir = 4; - name = "delivery door"; - req_access_txt = "31" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -52151,6 +52267,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "pak" = ( @@ -52213,8 +52332,7 @@ /area/hallway/primary/central) "paJ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -52225,6 +52343,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "paV" = ( @@ -52233,8 +52352,7 @@ /area/security/execution/education) "pbC" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "10;32" + name = "Engineering Foyer" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -52261,6 +52379,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "pbX" = ( @@ -52490,13 +52610,13 @@ /area/engine/foyer) "phd" = ( /obj/machinery/door/airlock/maintenance{ - name = "Robotics Maintenance"; - req_one_access_txt = "29;75" + name = "Robotics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "phm" = ( @@ -52523,13 +52643,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "1;4;38;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "phK" = ( @@ -52548,7 +52667,9 @@ }, /obj/machinery/door/window/brigdoor/security/holding{ id = "Holding Cell"; - name = "Holding Cell" + name = "Holding Cell"; + req_one_access_txt = "security;detective"; + req_one_access = null }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -52644,11 +52765,16 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "pjj" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "pjm" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, @@ -52855,7 +52981,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen #3"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -53091,10 +53217,6 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "ppf" = ( -/obj/machinery/door/airlock/command{ - name = "Emergency Escape"; - req_access_txt = "20" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -53107,6 +53229,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Captain's Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/maintenance/central) "ppr" = ( @@ -53125,7 +53251,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -53301,8 +53427,7 @@ /area/crew_quarters/bar) "prZ" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -53323,6 +53448,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel/dark, /area/engine/atmos) "psb" = ( @@ -53455,16 +53581,16 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "puz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" - }, +/obj/machinery/door/airlock/command, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -53480,6 +53606,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "puL" = ( @@ -53498,13 +53625,14 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47;70" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/department/science) "pve" = ( @@ -53520,14 +53648,14 @@ /area/science/lab) "pvq" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chemistry Lab Maintenance"; - req_access_txt = "5; 33" + name = "Chemistry Lab Maintenance" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plating, /area/maintenance/department/medical/central) "pvr" = ( @@ -53621,7 +53749,7 @@ /obj/machinery/door/window/southleft{ dir = 1; name = "Maximum Security Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -53674,6 +53802,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "pxu" = ( @@ -53909,6 +54040,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "pBx" = ( @@ -54000,9 +54132,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -54128,15 +54257,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "pEO" = ( @@ -54162,7 +54290,7 @@ dir = 1; icon_state = "rightsecure"; name = "Head of Personnel's Desk"; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54506,10 +54634,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "pMb" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, +/obj/machinery/door/airlock/vault, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54520,6 +54645,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "pMi" = ( @@ -54748,6 +54875,9 @@ /area/security/brig) "pPz" = ( /obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "pPR" = ( @@ -54784,17 +54914,15 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "pQQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, +/turf/open/floor/plating, /area/maintenance/starboard/aft) "pQR" = ( /obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54802,6 +54930,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "pQT" = ( @@ -54838,15 +54967,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "20;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "pRE" = ( @@ -54897,10 +55025,6 @@ /turf/open/floor/plasteel, /area/security/prison) "pSM" = ( -/obj/machinery/door/airlock{ - name = "Research Emergency Storage"; - req_one_access_txt = "47" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54913,6 +55037,10 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/research{ + name = "Research Emergency Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "pSN" = ( @@ -54989,8 +55117,7 @@ dir = 4 }, /obj/machinery/door/airlock/hatch{ - name = "Test Chamber Maintenance"; - req_access_txt = "47" + name = "Test Chamber Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54998,6 +55125,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "pUH" = ( @@ -55102,8 +55230,7 @@ /obj/machinery/door/airlock/research{ glass = 1; name = "Slime Euthanization Chamber"; - opacity = 0; - req_access_txt = "55" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -55114,6 +55241,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "pVK" = ( @@ -55286,19 +55414,22 @@ /area/quartermaster/storage) "pYo" = ( /obj/machinery/door/window{ - dir = 1 + dir = 1; + req_access_txt = "detective" }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "pYs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/light, +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) @@ -55554,6 +55685,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "qdV" = ( @@ -55599,8 +55733,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "47" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -55613,6 +55746,8 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /turf/open/floor/plasteel/white, /area/science/research) "qeE" = ( @@ -55628,8 +55763,7 @@ /area/aisat) "qeI" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "10;32" + name = "MiniSat Space Access Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -55637,6 +55771,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/engine/foyer) "qeN" = ( @@ -55861,14 +55997,20 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "qic" = ( -/obj/item/paper, -/obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ name = "Arrivals Security Checkpoint"; pixel_y = -8; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/mob/living/simple_animal/crab/kreb{ + desc = "Here to lay down the hard claws of the law!"; + health = 50; + name = "Officer Kreb"; + real_name = "Officer Kreb" + }, +/obj/structure/chair/office/dark, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "qih" = ( @@ -55876,6 +56018,7 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -56097,13 +56240,15 @@ /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) "qlF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/light, -/obj/machinery/space_heater, /obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) @@ -56189,7 +56334,7 @@ name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -56262,12 +56407,12 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "qnI" = ( @@ -56323,8 +56468,7 @@ /area/tcommsat/computer) "qor" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -56336,6 +56480,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "qot" = ( @@ -56361,20 +56506,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "qoH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = -23 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ai_monitored/storage/satellite) "qoL" = ( /obj/item/taperecorder, @@ -56462,9 +56597,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;9" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -56474,6 +56607,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/medical/central) "qqy" = ( @@ -56555,8 +56689,7 @@ /area/crew_quarters/bar) "qrk" = ( /obj/machinery/door/airlock/hatch{ - name = "Test Chamber Maintenance"; - req_access_txt = "47" + name = "Test Chamber Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56567,6 +56700,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "qrm" = ( @@ -56796,7 +56930,8 @@ /area/hallway/primary/fore) "quD" = ( /obj/machinery/firealarm{ - pixel_y = 38 + pixel_y = 38; + dir = 1 }, /obj/machinery/computer/ai_server_console, /turf/open/floor/plasteel/grimy, @@ -56909,6 +57044,9 @@ "qwd" = ( /obj/item/stack/sheet/cardboard, /obj/item/storage/box/lights/mixed, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "qws" = ( @@ -56922,7 +57060,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/medbay/central) "qwx" = ( /obj/structure/table, @@ -57133,7 +57271,7 @@ "qzU" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57463,14 +57601,16 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 10; - pixel_y = 22 + pixel_y = 22; + req_access_txt = "ai_master" }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 9; - pixel_y = 32 + pixel_y = 32; + req_access_txt = "ai_master" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 @@ -57523,7 +57663,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen #4"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57733,10 +57873,10 @@ frequency = 1449; glass = 1; id_tag = "telecomms_airlock_interior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/computer) "qHl" = ( @@ -57765,8 +57905,7 @@ /area/security/main) "qHr" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security E.V.A. Storage"; - req_access_txt = "3" + name = "Security E.V.A. Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -57781,6 +57920,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/brig) "qHs" = ( @@ -57802,6 +57942,16 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) +"qHw" = ( +/obj/structure/rack, +/obj/item/clothing/suit/poncho, +/obj/item/clothing/head/sombrero, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qHT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -57824,7 +57974,7 @@ icon_state = "right"; name = "Infirmary"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "brig_phys" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -58066,14 +58216,13 @@ /turf/open/floor/plasteel/white, /area/science/research) "qLD" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "qLU" = ( @@ -58120,7 +58269,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = 24; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58130,8 +58279,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -58149,6 +58297,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "qNy" = ( @@ -58228,7 +58377,7 @@ icon_state = "right"; layer = 3.1; name = "Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -58356,7 +58505,7 @@ name = "Access Button"; pixel_x = 29; pixel_y = -8; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/light{ dir = 4 @@ -58725,8 +58874,15 @@ /area/maintenance/department/science/xenobiology) "qXd" = ( /obj/effect/spawner/lootdrop/tanks/highquality, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) +"qXi" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/maintenance/starboard) "qXt" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -58842,12 +58998,11 @@ /turf/open/floor/plasteel/dark, /area/mine/laborcamp) "qZg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plating, -/area/maintenance/port/fore) +/area/maintenance/starboard) "qZl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -59033,7 +59188,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = -24; - req_one_access_txt = "30;70" + req_access_txt = "ai_sat" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -59088,7 +59243,8 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = 1; - pixel_y = 22 + pixel_y = 22; + req_access_txt = "medical" }, /obj/machinery/modular_computer/telescreen/preset/medical{ pixel_y = 32 @@ -59253,7 +59409,7 @@ }, /obj/machinery/door/window/westright{ name = "MULEbot Access"; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -59444,8 +59600,7 @@ /area/science/storage) "rjE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Server Access"; - req_access_txt = "30" + name = "Server Access" }, /obj/machinery/atmospherics/pipe/simple{ dir = 4 @@ -59456,6 +59611,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "rjI" = ( @@ -59496,25 +59652,13 @@ /turf/open/floor/plating, /area/engine/atmos/distro) "rkd" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 27 - }, -/obj/structure/table, -/obj/item/folder/yellow, -/obj/item/folder/yellow, -/obj/item/paper, -/obj/item/paper, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/storage/firstaid/regular{ - pixel_x = 1; - pixel_y = 15 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/structure/table, /turf/open/floor/plasteel, /area/quartermaster/storage) "rkg" = ( @@ -59762,12 +59906,13 @@ base_state = "right"; dir = 2; icon_state = "right"; - name = "Reception Window" + name = "Reception Window"; + req_access_txt = "sec_basic" }, /obj/machinery/door/window/brigdoor{ dir = 1; name = "Brig Control Desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/item/paper, /obj/structure/cable/yellow{ @@ -59789,11 +59934,11 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "rnE" = ( @@ -60260,8 +60405,7 @@ /area/maintenance/port) "rwI" = ( /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -60269,6 +60413,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "rwS" = ( @@ -60532,9 +60677,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "rAz" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;25;46;70" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -60544,6 +60687,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "rAA" = ( @@ -60595,6 +60739,7 @@ /area/hallway/primary/central) "rBq" = ( /obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port/aft) "rBr" = ( @@ -60741,8 +60886,7 @@ /area/crew_quarters/heads/hop) "rDE" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Backroom"; - req_access_txt = "5" + name = "Medbay Backroom" }, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor/border_only, @@ -60753,6 +60897,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "rER" = ( @@ -60803,7 +60948,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_y = 12 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/medbay/central) "rFg" = ( /obj/machinery/atmospherics/pipe/simple/violet/hidden{ @@ -60862,13 +61007,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "rGz" = ( @@ -61008,8 +61153,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/security/glass{ - name = "Secure Gear Storage"; - req_access_txt = "3" + name = "Secure Gear Storage" }, /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -61027,6 +61171,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "rIP" = ( @@ -61052,6 +61197,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "rIY" = ( @@ -61106,8 +61252,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -61117,6 +61262,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "rKz" = ( @@ -61183,7 +61329,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -61298,8 +61443,7 @@ /area/chapel/main) "rNs" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61313,6 +61457,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/freezer, /area/medical/virology) "rNy" = ( @@ -61403,6 +61548,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "rOi" = ( @@ -61435,7 +61581,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 9; - pixel_y = -22 + pixel_y = -22; + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -61597,8 +61744,7 @@ /area/hallway/secondary/service) "rQz" = ( /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -61610,12 +61756,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/construction/storage_wing) "rQJ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Network Access"; - req_access_txt = "command" + name = "Secure Network Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61629,6 +61775,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "rQK" = ( @@ -62177,15 +62324,19 @@ /obj/machinery/door/window/eastleft{ dir = 1; name = "Kitchen Window"; - req_access_txt = "28" + req_access_txt = "kitchen" }, /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; name = "Kitchen Window"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "rXX" = ( /obj/effect/spawner/structure/window/reinforced/tinted, @@ -62417,6 +62568,9 @@ /area/engine/engine_smes) "saT" = ( /obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -62649,7 +62803,9 @@ /obj/machinery/button/door{ id = "Podbaydoor"; pixel_x = -24; - pixel_y = -1 + pixel_y = -1; + req_access_txt = "external"; + name = "Shipbreaking External Control" }, /obj/machinery/light, /turf/open/floor/plasteel, @@ -62696,7 +62852,7 @@ /obj/machinery/door/window/eastleft{ dir = 1; name = "Robotics Deliveries"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -62925,6 +63081,7 @@ "sjB" = ( /obj/item/extinguisher, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/central) "skc" = ( @@ -63032,20 +63189,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "sme" = ( -/obj/machinery/button/door{ - id = "chemistry_shutters"; - name = "chemistry shutters control"; - pixel_x = 24; - pixel_y = 24; - req_access_txt = "5; 33" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "chemistry shutters" +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plating, -/area/medical/chemistry) +/area/maintenance/central) "smi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -63204,9 +63352,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "10;61" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "soE" = ( @@ -63457,7 +63605,7 @@ "ssB" = ( /obj/machinery/door/window/southleft{ name = "Mass Driver Door"; - req_access_txt = "7" + req_access_txt = "toxins" }, /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, @@ -63708,8 +63856,7 @@ "svx" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -63721,6 +63868,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "svG" = ( @@ -63811,7 +63959,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen #4"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; @@ -64000,8 +64148,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48" + name = "Auxillary Base Construction" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -64018,6 +64165,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "syr" = ( @@ -64094,8 +64242,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "E.V.A. Storage"; - req_access_txt = "18" + name = "E.V.A. Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -64104,6 +64251,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "sAo" = ( @@ -64240,9 +64388,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -64250,6 +64396,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/maintenance/aft) "sBR" = ( @@ -64295,13 +64443,13 @@ /area/security/checkpoint/science/research) "sCe" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "sCl" = ( @@ -64354,6 +64502,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/storage/tools) "sCT" = ( @@ -64964,6 +65113,9 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "sNR" = ( @@ -65073,8 +65225,7 @@ /area/security/brig) "sOG" = ( /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -65084,6 +65235,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/port) "sOJ" = ( @@ -65296,8 +65449,7 @@ /area/icemoon/top_layer/outdoors) "sRs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65311,6 +65463,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "sRC" = ( @@ -65419,11 +65572,6 @@ dir = 4 }, /obj/structure/plasticflaps, -/obj/machinery/door/window/northright{ - dir = 8; - name = "delivery door"; - req_access_txt = "31" - }, /turf/open/floor/plating, /area/maintenance/disposal) "sTK" = ( @@ -65500,12 +65648,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "sUq" = ( @@ -65643,7 +65791,7 @@ /obj/machinery/door/window/brigdoor{ dir = 4; name = "Security Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -65724,7 +65872,7 @@ /obj/machinery/door/window/westleft{ dir = 1; name = "Delivery Desk"; - req_access_txt = "50" + req_access_txt = "cargo" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor/border_only{ @@ -65736,7 +65884,7 @@ pixel_y = -4 }, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/sorting) "sXC" = ( /obj/machinery/light{ @@ -65934,8 +66082,7 @@ /area/crew_quarters/kitchen) "sZY" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -65944,6 +66091,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "tal" = ( @@ -66022,7 +66170,7 @@ id = "xenobio7"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -66067,7 +66215,14 @@ /obj/item/radio/intercom{ frequency = 1485; name = "Station Intercom (Medbay)"; - pixel_x = 32 + pixel_x = 28 + }, +/obj/machinery/button/door{ + id = "chemistry_shutters"; + name = "chemistry shutters control"; + pixel_x = 24; + pixel_y = -8; + req_access_txt = "chemistry" }, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -66380,6 +66535,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "tfU" = ( @@ -66592,8 +66750,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -66606,6 +66763,7 @@ pixel_x = 1; pixel_y = 32 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "tja" = ( @@ -66631,6 +66789,9 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "tjn" = ( @@ -66677,6 +66838,9 @@ pixel_x = 23; pixel_y = -9 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/vacant_room/commissary) "tjL" = ( @@ -66949,8 +67113,7 @@ "tnY" = ( /obj/machinery/door/airlock/research{ id_tag = "AuxGenetics"; - name = "Genetics Access"; - req_access_txt = "9" + name = "Genetics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -66965,6 +67128,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel, /area/medical/genetics) "toh" = ( @@ -67009,7 +67173,8 @@ /obj/machinery/meter, /obj/machinery/door/window/westleft{ dir = 1; - name = "gas ports" + name = "gas ports"; + req_access_txt = "brig" }, /turf/open/floor/plasteel/dark, /area/security/execution/education) @@ -67073,8 +67238,7 @@ /area/hallway/secondary/exit/departure_lounge) "tpY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -67085,6 +67249,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tqs" = ( @@ -67724,9 +67889,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -67734,6 +67897,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "tzL" = ( @@ -67940,7 +68104,7 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 26; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -68082,7 +68246,7 @@ name = "research shutters control"; pixel_x = -26; pixel_y = -26; - req_access_txt = "7" + req_one_access_txt = "science;robotics" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68169,9 +68333,9 @@ autoclose = 0; frequency = 1449; id_tag = "telecomms_airlock_exterior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "tHq" = ( @@ -68246,14 +68410,14 @@ /area/security/prison) "tIJ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Podbay Maintenence"; - req_access_txt = "12" + name = "Podbay Maintenence" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tIS" = ( @@ -68345,9 +68509,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/captain/private) "tKa" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "1;4;38;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -68357,6 +68519,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "tKc" = ( @@ -68419,6 +68582,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port/fore) "tKY" = ( @@ -68504,7 +68668,8 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -36; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "paramedic" }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -68529,8 +68694,7 @@ /area/security/checkpoint/supply) "tMs" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -68546,6 +68710,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "tMF" = ( @@ -68593,6 +68758,9 @@ /obj/structure/sign/departments/minsky/research/research{ pixel_y = 32 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tNz" = ( @@ -68665,9 +68833,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "tPi" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -68686,6 +68852,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "tQb" = ( @@ -68934,8 +69101,7 @@ /area/security/checkpoint/science/research) "tTg" = ( /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -68943,6 +69109,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "tTj" = ( @@ -68950,8 +69117,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_one_access_txt = "17;19" + name = "Teleport Access" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, @@ -68961,6 +69127,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel, /area/teleporter) "tTn" = ( @@ -69197,8 +69364,7 @@ /area/security/brig) "tVz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Secure Gear Storage"; - req_access_txt = "3" + name = "Secure Gear Storage" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -69219,6 +69385,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "tVI" = ( @@ -69238,8 +69405,7 @@ "tVU" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -69250,6 +69416,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "tVZ" = ( @@ -69317,6 +69484,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -69560,8 +69728,7 @@ /area/maintenance/port/aft) "ubV" = ( /obj/machinery/door/airlock/maintenance{ - name = "Disposal Conveyor Access"; - req_access_txt = "12" + name = "Disposal Conveyor Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -69569,6 +69736,7 @@ }, /obj/effect/decal/cleanable/oil, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/disposal) "ucj" = ( @@ -69640,6 +69808,7 @@ "ucZ" = ( /obj/structure/barricade/wooden/crude/snow, /obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/mine/abandoned) "udj" = ( @@ -69649,13 +69818,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/research{ id_tag = "ResearchExt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "udm" = ( @@ -69674,8 +69843,7 @@ id = "secentranceflasher"; name = "Brig Entrance Flasher"; pixel_x = -3; - pixel_y = -38; - req_access_txt = "1" + pixel_y = -38 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, @@ -69812,13 +69980,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ufT" = ( @@ -70072,8 +70240,7 @@ /area/science/xenobiology) "uiA" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -70088,6 +70255,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "uiK" = ( @@ -70108,13 +70276,13 @@ /area/chapel/main) "uiY" = ( /obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "command" + name = "Corporate Showroom" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/showroom/corporate) "ujv" = ( @@ -70123,7 +70291,7 @@ dir = 8; icon_state = "left"; name = "Security Delivery"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -70191,9 +70359,13 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "ukA" = ( /obj/structure/cable{ @@ -70367,7 +70539,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -70468,8 +70640,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor/border_only{ @@ -70479,6 +70650,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "uoi" = ( @@ -70572,8 +70744,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Foyer"; - req_access_txt = "32" + name = "Vacant Room" }, /turf/open/floor/plasteel, /area/mine/vacant) @@ -71137,7 +71308,8 @@ "uyh" = ( /obj/machinery/door/window{ dir = 1; - name = "MiniSat Walkway Access" + name = "MiniSat Walkway Access"; + req_access_txt = "ai_sat" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -71249,7 +71421,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -71434,13 +71606,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "uDR" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_one_access_txt = "65;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -71453,9 +71618,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "uDV" = ( @@ -72055,9 +72224,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -72388,15 +72554,13 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "uPk" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "26"; - req_one_access_txt = "12;25;46" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "uPI" = ( @@ -72452,7 +72616,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "Atmospherics Desk"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -72513,11 +72677,16 @@ /turf/open/floor/plasteel, /area/vacant_room/commissary) "uQC" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating{ - icon_state = "platingdmg1" +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/area/maintenance/starboard/aft) +/obj/machinery/door/window/northright{ + dir = 4; + name = "delivery door"; + req_access_txt = "maintenance" + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "uQD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -72661,12 +72830,12 @@ /area/maintenance/disposal) "uSQ" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "1" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/prison/hallway) "uTc" = ( @@ -72913,8 +73082,7 @@ /area/maintenance/solars/port/aft) "uWT" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Station EVA"; - req_access_txt = "54" + name = "Mining Station EVA" }, /obj/structure/cable{ icon_state = "1-2" @@ -72928,6 +73096,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "uWU" = ( @@ -73243,13 +73412,13 @@ "vby" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/starboard) "vbQ" = ( @@ -73316,14 +73485,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "vcw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, -/area/ai_monitored/storage/satellite) +/area/maintenance/port/fore) "vcy" = ( /obj/structure/chair{ dir = 4 @@ -73434,7 +73604,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 1; pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -73551,6 +73720,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "vfR" = ( @@ -73684,7 +73856,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen #2"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -73770,6 +73942,7 @@ /obj/machinery/firealarm{ pixel_y = 26 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, /area/vacant_room/commissary) "vkJ" = ( @@ -73799,8 +73972,7 @@ /area/storage/tech) "vkX" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -73812,6 +73984,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "vkY" = ( @@ -73857,10 +74030,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, -/obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ +/obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 8 }, /turf/open/floor/plasteel, @@ -73870,6 +74040,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/vacant_room/commissary) "vlO" = ( @@ -73884,15 +74057,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "vmb" = ( @@ -73906,11 +74077,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "vmi" = ( -/obj/machinery/door/airlock/external{ - req_one_access_txt = "13,8" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vmq" = ( @@ -74006,7 +74176,8 @@ /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; - pixel_y = -26 + pixel_y = -26; + req_access_txt = "engineering" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel/dark, @@ -74033,7 +74204,7 @@ name = "chemistry shutters control"; pixel_x = 26; pixel_y = -26; - req_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -74129,7 +74300,7 @@ /obj/item/pen, /obj/machinery/door/window/eastright{ name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/item/folder/white{ pixel_x = 4; @@ -74157,7 +74328,7 @@ pixel_x = -5; pixel_y = -9 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/science/robotics/lab) "vpY" = ( /obj/structure/sink{ @@ -74348,9 +74519,10 @@ }, /obj/machinery/button/door{ id = "hosspace"; - name = "Space Shutters Control"; + name = "External Shutters Control"; pixel_x = -26; - pixel_y = 34 + pixel_y = 34; + req_access_txt = "security" }, /obj/machinery/photocopier/faxmachine{ department = "Head of Security"; @@ -74394,12 +74566,13 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Outer Window" + name = "Outer Window"; + req_access_txt = "security" }, /obj/machinery/door/window/brigdoor{ dir = 8; name = "Brig Control Desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -74418,6 +74591,7 @@ name = "Escape Pod Two" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison/hallway) "vub" = ( @@ -74426,14 +74600,12 @@ }, /obj/machinery/door/window/westleft{ name = "MULEbot Access"; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /turf/open/floor/plasteel, /area/quartermaster/storage) "vue" = ( -/obj/machinery/vending/cart{ - req_access_txt = "57" - }, +/obj/machinery/vending/cart, /obj/item/radio/intercom{ pixel_y = 21 }, @@ -74908,8 +75080,7 @@ /area/janitor) "vzB" = ( /obj/machinery/door/window/brigdoor/security/cell/westright{ - dir = 4; - req_one_access = "2" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general{ dir = 10 @@ -74997,9 +75168,13 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "Paramedic Desk"; - req_access_txt = "69" + req_access_txt = "paramedic" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, /area/medical/paramedic) "vAJ" = ( /obj/machinery/cell_charger, @@ -75171,7 +75346,7 @@ icon_state = "left"; name = "Library Desk Door"; pixel_x = 3; - req_access_txt = "37" + req_access_txt = "library" }, /turf/open/floor/wood, /area/library) @@ -75276,8 +75451,7 @@ /area/security/courtroom) "vFO" = ( /obj/machinery/door/airlock/command{ - name = "Research Division Server Room"; - req_access_txt = "30" + name = "Research Division Server Room" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -75288,6 +75462,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "vFW" = ( @@ -75305,7 +75480,7 @@ name = "Test Chamber Blast Doors"; pixel_x = 4; pixel_y = -3; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -75406,9 +75581,7 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "vHR" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -75421,6 +75594,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vHY" = ( @@ -75518,14 +75692,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "vJN" = ( -/obj/machinery/door/airlock/external{ - req_one_access_txt = "13,8" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vJR" = ( @@ -75635,6 +75808,7 @@ /area/hallway/primary/starboard) "vLm" = ( /obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/mine/abandoned) "vLp" = ( @@ -75670,8 +75844,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Research Director's Office"; - req_access_txt = "30" + name = "Research Director's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -75691,6 +75864,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -75739,8 +75913,7 @@ /area/security/brig) "vMm" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_one_access_txt = "23;30" + name = "Tech Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75757,6 +75930,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel/dark, /area/storage/tech) "vMo" = ( @@ -76040,13 +76214,13 @@ icon_state = "1-4" }, /obj/machinery/door/airlock/medical/glass{ - name = "Brig Physician's Office"; - req_access_txt = "74" + name = "Brig Physician's Office" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/brig) "vQV" = ( @@ -76129,11 +76303,14 @@ /turf/open/floor/wood, /area/vacant_room/office) "vSm" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/port/fore) "vSu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -76194,8 +76371,7 @@ /area/storage/primary) "vTc" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -76206,6 +76382,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/port/fore) "vTj" = ( @@ -76325,7 +76502,7 @@ name = "Justice Area Lockdown"; pixel_x = -25; pixel_y = 26; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/item/assembly/signaler{ pixel_x = -3; @@ -76335,8 +76512,7 @@ id = "justiceflash"; name = "Justice Flash Control"; pixel_x = -36; - pixel_y = 36; - req_access_txt = "1" + pixel_y = 36 }, /obj/machinery/button/door{ id = "SecJusticeChamber"; @@ -76344,7 +76520,7 @@ name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; - req_access_txt = "3" + req_access_txt = "brig" }, /turf/open/floor/plasteel/dark, /area/security/execution/education) @@ -76514,7 +76690,7 @@ dir = 8; icon_state = "right"; name = "Containment Pen #1"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; @@ -76643,6 +76819,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "vYW" = ( @@ -76650,6 +76829,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "vYZ" = ( @@ -76790,6 +76972,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/foyer) "wbb" = ( @@ -76999,11 +77183,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/research{ id_tag = "ResearchExt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "wen" = ( @@ -77139,7 +77323,8 @@ /obj/machinery/button/door{ id = "telelab"; name = "Test Chamber Blast Doors"; - pixel_y = -25 + pixel_y = -25; + req_access_txt = "experimentation" }, /turf/open/floor/engine, /area/science/explab) @@ -77317,9 +77502,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Foyer"; - req_access_txt = "32" + name = "SMES Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "wis" = ( @@ -77332,7 +77517,7 @@ name = "Psych Office Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access_txt = "5" + req_access_txt = psychology }, /obj/machinery/light_switch{ pixel_x = 8; @@ -77529,9 +77714,6 @@ /turf/open/floor/plasteel/dark, /area/bridge) "wlk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/item/cigbutt{ pixel_x = -10; pixel_y = -3 @@ -77659,8 +77841,7 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -77669,6 +77850,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "wmI" = ( @@ -78206,8 +78388,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -78231,6 +78412,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "wtG" = ( @@ -78326,7 +78508,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 10; - pixel_y = -22 + pixel_y = -22; + req_access_txt = "ai_master" }, /obj/machinery/light_switch{ pixel_x = -23 @@ -78447,8 +78630,7 @@ /area/engine/atmos/distro) "wxG" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -78456,6 +78638,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "wxL" = ( @@ -78847,9 +79030,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -78902,13 +79082,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "wFh" = ( @@ -79132,10 +79311,6 @@ /turf/open/floor/plasteel, /area/hydroponics) "wIx" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -79143,6 +79318,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wIz" = ( @@ -79254,9 +79430,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Engineering Escape Pod"; - req_one_access_txt = "10;61" + name = "Engineering Escape Pod" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "wKG" = ( @@ -79271,9 +79448,6 @@ "wKL" = ( /obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/item/cigbutt{ pixel_x = 5; pixel_y = -9 @@ -79696,8 +79870,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Brig Infirmary Maintenance"; - req_access_txt = "74" + name = "Brig Infirmary Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -79705,6 +79878,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig_phys, /turf/open/floor/plating, /area/maintenance/port/fore) "wPG" = ( @@ -79778,6 +79952,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/door/window/northright{ + name = "delivery door"; + req_access_txt = "maintenance" + }, /turf/open/floor/plating, /area/maintenance/port/fore) "wQE" = ( @@ -80079,8 +80257,7 @@ /area/hallway/primary/aft) "wVn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -80095,6 +80272,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "wVq" = ( @@ -80118,8 +80296,7 @@ /area/hallway/primary/central) "wVZ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Post - Research Division"; - req_access_txt = "63" + name = "Security Post - Research Division" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -80136,6 +80313,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) "wWf" = ( @@ -80283,13 +80461,13 @@ /area/science/xenobiology) "wXZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mech Bay Maintenance"; - req_one_access_txt = "29;75" + name = "Mech Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/maintenance/department/science/central) "wYe" = ( @@ -80348,8 +80526,7 @@ /area/hallway/primary/central) "wYZ" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -80358,6 +80535,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "wZa" = ( @@ -80458,6 +80636,9 @@ /area/crew_quarters/heads/captain/private) "xaY" = ( /obj/item/trash/cheesie, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "xaZ" = ( @@ -80661,6 +80842,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -80867,8 +81051,7 @@ /area/mine/maintenance) "xhN" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -80876,6 +81059,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "xhP" = ( @@ -80970,8 +81154,7 @@ "xjt" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ @@ -80990,6 +81173,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "xjB" = ( @@ -81526,7 +81710,7 @@ name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; - req_access_txt = "28" + req_access_txt = "hop" }, /obj/machinery/light_switch{ pixel_x = -25; @@ -81580,15 +81764,15 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 24; - req_one_access_txt = "1;24" + req_access_txt = "sec_basic" }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = 24; - pixel_y = 16; - req_one_access_txt = "1;10" + pixel_y = 14; + req_access_txt = "sec_basic" }, /obj/structure/table, /obj/item/paper_bin{ @@ -81737,8 +81921,7 @@ /area/crew_quarters/heads/captain/private) "xtB" = ( /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -81746,6 +81929,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/port) "xtF" = ( @@ -81901,7 +82086,7 @@ id = "hop"; name = "Privacy Shutters Control"; pixel_y = 25; - req_access_txt = "28" + req_access_txt = "hop" }, /obj/structure/table/wood, /turf/open/floor/wood, @@ -81978,8 +82163,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; - req_one_access_txt = "12;63;48;50;36" + id_tag = "commissarydoor" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -81987,6 +82171,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "xww" = ( @@ -82120,7 +82305,7 @@ idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = -24; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82130,8 +82315,7 @@ autoclose = 0; frequency = 1449; id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock"; - req_access_txt = "55" + name = "Xenobiology Lab External Airlock" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ @@ -82139,6 +82323,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "xxX" = ( @@ -82166,8 +82351,7 @@ /area/science/robotics/lab) "xyb" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -82184,6 +82368,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -82360,7 +82545,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Hydroponics Delivery"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -82410,7 +82595,7 @@ name = "Bar Shutters Control"; pixel_x = 24; pixel_y = 9; - req_access_txt = "25" + req_access_txt = "bar" }, /obj/machinery/light_switch{ pixel_x = 22 @@ -82499,6 +82684,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/laborcamp) +"xBK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ai_monitored/storage/satellite) "xBM" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -82695,13 +82892,12 @@ /area/medical/medbay/aft) "xEu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;25;46" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "xEx" = ( @@ -82725,7 +82921,7 @@ name = "Kitchen Shutters Control"; pixel_x = -8; pixel_y = 23; - req_access_txt = "28" + req_access_txt = "kitchen" }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -82865,8 +83061,7 @@ /area/engine/engineering) "xGx" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_one_access_txt = "19; 61" + name = "Telecomms Control Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -82880,6 +83075,7 @@ /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "xGM" = ( @@ -82913,20 +83109,15 @@ "xHh" = ( /obj/machinery/button/holosign{ id = "surgery_b"; - pixel_x = -36; - pixel_y = -10 - }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -9 + pixel_x = -24; + pixel_y = -6 }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; - pixel_x = -36; - pixel_y = -1; - req_access_txt = "45"; - req_one_access_txt = null + pixel_x = -24; + pixel_y = 6; + req_access_txt = "surgery" }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -82956,28 +83147,29 @@ name = "Secure Lab Shutter Control"; pixel_x = -5; pixel_y = -5; - req_access_txt = "47" + req_access_txt = "science" }, /obj/structure/table/reinforced, /obj/machinery/button/door{ id = "rdprivacy"; name = "Privacy Shutters Control"; pixel_x = 5; - pixel_y = 5 + pixel_y = 5; + req_access_txt = "science" }, /obj/machinery/button/door{ id = "Biohazard"; name = "Entrance Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access_txt = "47" + req_access_txt = "science" }, /obj/machinery/button/door{ id = "toxins_blastdoor"; name = "Toxins Shutter Control"; pixel_x = 5; pixel_y = -5; - req_access_txt = "47" + req_access_txt = "science" }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -83159,8 +83351,7 @@ /area/hallway/primary/fore) "xKk" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop"; - req_access_txt = "24" + name = "Distribution Loop" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/door/firedoor/border_only{ @@ -83181,6 +83372,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "xKu" = ( @@ -83304,7 +83496,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = 24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -83366,14 +83558,14 @@ /area/chapel/main) "xNf" = ( /obj/machinery/door/airlock/command{ - name = "E.V.A. Storage"; - req_access_txt = "18" + name = "E.V.A. Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "xNl" = ( @@ -83586,12 +83778,6 @@ name = "bridge blast door" }, /obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel, /area/bridge) "xPG" = ( @@ -83601,6 +83787,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xPI" = ( @@ -83666,12 +83856,12 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "xQE" = ( @@ -83757,8 +83947,7 @@ /area/maintenance/department/science) "xSu" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -83767,6 +83956,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/crew_quarters/bar) "xSx" = ( @@ -83829,12 +84019,13 @@ /area/quartermaster/office) "xTW" = ( /obj/machinery/door/airlock/public/glass{ - name = "space-bridge access" + name = "External-Bridge Access" }, /obj/machinery/button/door{ id = "supplybridge"; - name = "Shuttle Bay Space Bridge Control"; - pixel_y = 27 + name = "Shuttle Bay External Bridge Control"; + pixel_y = 27; + req_access_txt = "external" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -83848,6 +84039,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "xUa" = ( @@ -83954,8 +84148,7 @@ /obj/machinery/door/airlock/research{ glass = 1; name = "Slime Euthanization Chamber"; - opacity = 0; - req_access_txt = "55" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -83966,6 +84159,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "xVS" = ( @@ -84156,8 +84350,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security/glass{ - name = "Security Post - Cargo"; - req_access_txt = "63" + name = "Security Post - Cargo" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -84171,18 +84364,19 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "xYv" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "xYI" = ( @@ -84264,15 +84458,14 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "xZO" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xZR" = ( @@ -84280,8 +84473,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring"; - req_access_txt = "32" + name = "Power Monitoring" }, /obj/effect/turf_decal/bot{ dir = 1 @@ -84292,6 +84484,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel{ dir = 1 }, @@ -84351,8 +84544,7 @@ /area/crew_quarters/heads/hos) "yaE" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -84369,6 +84561,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -84678,8 +84871,7 @@ /area/medical/virology) "yeI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_one_access_txt = "7;47;29" + name = "Research Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -84690,6 +84882,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "yeY" = ( @@ -84710,6 +84903,9 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "yfb" = ( @@ -84751,8 +84947,7 @@ /area/science/xenobiology) "ygb" = ( /obj/machinery/door/airlock/virology{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -84770,6 +84965,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "ygo" = ( @@ -84835,8 +85031,7 @@ /area/crew_quarters/fitness/recreation) "yhs" = ( /obj/machinery/door/airlock/research{ - name = "Nanite Laboratory"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -84856,6 +85051,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/science/nanite) "yhz" = ( @@ -230176,7 +230372,7 @@ dUL eyU rNk tZe -qZg +mRX gdg kfK kfK @@ -230432,7 +230628,7 @@ dUL dUL dUL hCU -pjj +tZe pjg rNk cTU @@ -230690,7 +230886,7 @@ dUL dUL rNk tZe -btq +pjg rNk uOH cTU @@ -231203,7 +231399,7 @@ pZb tZe sSA tZe -mRX +uQC drz tZe tZe @@ -231521,7 +231717,7 @@ fPt vSj ilD wnd -ydD +fIf oiw jmC jmC @@ -232528,7 +232724,7 @@ dUC qwd cPQ vQC -hHv +vcw vDG duv kfs @@ -233270,7 +233466,7 @@ tZe tZe vfB uGV -tZe +ten edc rNk aMT @@ -233321,7 +233517,7 @@ dHB dHB dHB dUg -cxT +oQs wyz lGh kZT @@ -235320,10 +235516,10 @@ cTR exh vhC dfW -ncq +tZe cED tZe -ncq +tZe hHv rNk rNk @@ -236691,7 +236887,7 @@ pTD sUg rBq vlc -xLq +btq xLq xLq mqk @@ -237139,7 +237335,7 @@ qTj hOk xqM rNk -mKF +vSm rNk rNk rNk @@ -237400,10 +237596,10 @@ vYV gvO cdk xsU -gvO +ncq qih nMx -fWd +lBl fWd gsh rNk @@ -240752,7 +240948,7 @@ hAt byf ewQ gUm -jBJ +sme sKP sbe kHW @@ -242841,7 +243037,7 @@ hUC nbv sEn diI -sme +pcn diI pcn diI @@ -243879,7 +244075,7 @@ nAn mpG oPx onx -rNV +pjj mHL vLa qJI @@ -245450,7 +245646,7 @@ wlq bwy hIF pDH -fIf +iqX ueX ozK ozK @@ -247725,7 +247921,7 @@ aeK rbU rbU rbU -cFq +mPH lWb aJi tdO @@ -249808,7 +250004,7 @@ boa jWS aCX mae -gyB +aCX iuS ksP bQS @@ -251283,7 +251479,7 @@ oJE dqx uxM uxM -wdp +cxT jXO jXO jXO @@ -251331,7 +251527,7 @@ wVd nhL abB lXG -cFq +gyB uwo cFq ydb @@ -251345,13 +251541,13 @@ aAj aKa kdu ksP -xwT +pQQ bnL wLc wLc qkE mhr -uQC +mot hmb bQS bQS @@ -252322,7 +252518,7 @@ sTW wDW pZy kal -kal +qXi rfi aQV dZc @@ -252378,9 +252574,9 @@ bQS bQS bQS uhS -fuF +leq +ciy ciy -lBl uhS bQS bQS @@ -252823,7 +253019,7 @@ hTI jMb dTU aYL -wdp +cwR nOj nOj prA @@ -252836,7 +253032,7 @@ lFl jwm pZy cRI -kal +hgm rfi bza iiO @@ -253146,8 +253342,8 @@ kmI txK ksP xyL -pQQ -vSm +tOC +ciy tOC ciy aZX @@ -253628,7 +253824,7 @@ pOP pOP rTH rTH -jls +hCo uUC uUC xqA @@ -254377,7 +254573,7 @@ lLS cgk srU pZy -kal +nVE oDs uha uha @@ -254394,9 +254590,9 @@ bUG uha qdH qaH -pAu +ouV uUC -kal +qZg kal qvw kal @@ -254655,7 +254851,7 @@ gFP alO alO alO -vMf +fuF eeF xdW pLF @@ -256144,7 +256340,7 @@ rfQ mYF lhB jXO -sZq +qHw nOj rfW nOj @@ -259249,7 +259445,7 @@ whE whE whE ept -kal +nVE hFP xog kGl @@ -272109,9 +272305,9 @@ jYF tRh tRh jYF -cPn -reK -aUQ +uEX +eUy +qlF qoe cDq lum @@ -272366,9 +272562,9 @@ jYF tRh tRh jYF -nWc -mQJ -iOi +jrS +xBK +qXd jYF qoe qoe @@ -272623,9 +272819,9 @@ tRh tRh tRh jYF -fvM -qDz -fHR +rYS +jKN +pYs jYF jYF jYF @@ -272880,9 +273076,9 @@ tRh tRh tRh jYF -git -hon -oWL +dPj +bfu +qoH jYF tRh tRh @@ -273137,9 +273333,9 @@ tRh tRh tRh jYF -dPj -nVE -dPj +cPn +reK +aUQ jYF tRh tRh @@ -273394,9 +273590,9 @@ gWW tRh tRh jYF -uEX -qoH -hgm +nWc +mQJ +iOi jYF tRh tRh @@ -273651,9 +273847,9 @@ euQ tRh tRh jYF -jrS -vcw -qXd +fvM +qDz +fHR jYF tRh tRh @@ -273908,9 +274104,9 @@ oET ueX ueX jYF -rYS -pYs -qlF +git +hon +oWL jYF ueX ueX diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index d3190b9ffd0c..607252768cf6 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -77,7 +77,7 @@ #define ACCESS_TCOMMS "tcomms" /// Access needed to view message logs recorded on the message monitor console in Telecomms. #define ACCESS_TCOMMS_ADMIN "tcomms_admin" -/// Access to the Auxiliary Base Room, as well as the ability over launching it. +/// Access to the Auxiliary Base Room, as well as the ability to launch it. #define ACCESS_AUX_BASE "aux_base" /// Access for the Chief Engineer's office, Secure Tech Storage, as well as some other CE-related things. #define ACCESS_CE "ce" diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 83e0b197e38a..a6b9983b33ab 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -256,12 +256,12 @@ /obj/machinery/button/door/incinerator_vent_atmos_main name = "turbine vent control" id = INCINERATOR_ATMOS_MAINVENT - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_one_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/button/door/incinerator_vent_atmos_aux name = "combustion chamber vent control" id = INCINERATOR_ATMOS_AUXVENT - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_one_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/button/door/incinerator_vent_syndicatelava_main name = "turbine vent control" From 0f0f5ec926eee29dfd8124f944bd81c9ddc4ef14 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 17:20:22 +0200 Subject: [PATCH 21/48] ballin --- .../IceRuins/icemoon_surface_syndicate.dmm | 106 +- .../JungleRuins/jungleland_jungle_sinden.dmm | 3 +- .../jungleland_swamp_syndicatestation.dmm | 12 +- .../lavaland_surface_syndicate_base1.dmm | 109 +- .../SpaceRuins/hilbertshoteltestingsite.dmm | 9 +- .../SpaceRuins/listeningstation.dmm | 78 +- .../StationRuins/GaxStation/ai_whale.dmm | 4 + _maps/RandomZLevels/VR/snowdin_VR.dmm | 4 +- _maps/RandomZLevels/snowdin.dmm | 2 +- .../AsteroidStation/AsteroidStation.dmm | 2113 +++++++++-------- _maps/map_files/DonutStation/DonutStation.dmm | 1567 ++++++------ _maps/map_files/GaxStation/GaxStation.dmm | 33 +- _maps/map_files/IceMeta/IceMeta.dmm | 62 +- _maps/map_files/YogStation/YogStation.dmm | 8 +- 14 files changed, 2191 insertions(+), 1919 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm index 20a0a04360c1..11576ba88fbe 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm @@ -1,11 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23 - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc/syndicate{ + name = "Power Station APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "ab" = ( @@ -663,13 +664,13 @@ /area/ruin/syndicate_icemoon/engine) "dq" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/machinery/power/apc/syndicate{ + name = "Central Hallway APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "dt" = ( @@ -727,10 +728,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/xenobio) "dB" = ( -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -744,6 +741,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + name = "Warehouse APC"; + pixel_x = -25 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/warehouse) "dF" = ( @@ -2102,9 +2103,9 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Research Wing APC"; + pixel_y = -23 }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -2240,7 +2241,8 @@ /area/ruin/syndicate_icemoon/command) "mc" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/effect/spawner/lootdrop/donkpockets, /obj/effect/spawner/lootdrop/donkpockets, @@ -2482,10 +2484,6 @@ /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "nf" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, @@ -2493,6 +2491,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/apc/syndicate{ + name = "Command APC"; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/command) "nj" = ( @@ -2522,7 +2524,8 @@ /area/ruin/syndicate_icemoon/research) "np" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/item/storage/box/ingredients/american, /obj/item/storage/box/ingredients/delights, @@ -2597,10 +2600,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "nL" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -2618,6 +2617,10 @@ /obj/item/stack/sheet/glass{ amount = 10 }, +/obj/machinery/power/apc/syndicate{ + name = "Security Wing APC"; + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "nN" = ( @@ -2662,8 +2665,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/east{ - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Engineering Wing APC"; + pixel_x = 25 }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) @@ -3792,13 +3796,13 @@ /area/ruin/syndicate_icemoon/command) "uG" = ( /obj/machinery/deepfryer, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc/syndicate{ + name = "Canteen APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/syndicate_icemoon/canteen) "uS" = ( @@ -5506,11 +5510,11 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "Db" = ( -/obj/machinery/power/apc/auto_name/west{ +/obj/structure/cable, +/obj/machinery/power/apc/syndicate{ pixel_x = -25; - req_access = list(150) + name = "Shed APC" }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/shed) "De" = ( @@ -6200,10 +6204,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/structure/closet/crate, /obj/item/paper{ info = "Due to several incidents of dumbasses tripping into plasma rivers, we have stocked plasmaman survival supplies. Not that you'll be able to get them alive anyway." @@ -6216,6 +6216,10 @@ /obj/item/tank/internals/plasmaman/belt/full, /obj/item/tank/internals/plasmaman/full, /obj/item/tank/internals/plasmaman/full, +/obj/machinery/power/apc/syndicate{ + name = "Medical Wing APC"; + pixel_x = -25 + }, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/medical) "Gp" = ( @@ -6833,7 +6837,8 @@ /area/ruin/syndicate_icemoon/hallway) "JZ" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/machinery/light/small, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -6978,10 +6983,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -6995,6 +6996,10 @@ pixel_x = 13; pixel_y = 23 }, +/obj/machinery/power/apc/syndicate{ + name = "Crew Quarters APC"; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/dorms) "KY" = ( @@ -7549,7 +7554,8 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/effect/turf_decal/siding/blue{ dir = 10 @@ -8293,13 +8299,13 @@ /area/icemoon/surface/outdoors) "SG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc/syndicate{ + name = "Maintenance APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel, /area/ruin/syndicate_icemoon/maintenance) "SK" = ( @@ -9252,9 +9258,9 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Xenobiology Wing APC"; + pixel_y = 23 }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/xenobio) diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm index 4ad9e5387913..f60f86414540 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm @@ -542,7 +542,8 @@ /area/ruin/powered/sinden) "HD" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = list(25) + req_access = null; + req_access_txt = "bar" }, /obj/item/storage/firstaid/regular, /obj/item/stack/spacecash/c200, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm index eb05e1ed3870..95c9db789bfc 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm @@ -3395,7 +3395,8 @@ /area/ruin/powered/syndicate_lava_base/bar) "Ft" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, @@ -4505,7 +4506,8 @@ /area/ruin/powered/syndicate_lava_base/bar) "Pk" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/effect/spawner/lootdrop/donkpockets, /obj/item/storage/box/ingredients/vegetarian, @@ -4870,7 +4872,8 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -5323,7 +5326,8 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 5dcf1ac10a9a..58deb21db784 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -209,7 +209,8 @@ dir = 8 }, /obj/machinery/mineral/ore_redemption{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) @@ -489,11 +490,11 @@ /obj/item/paper_bin, /obj/item/pen, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/effect/turf_decal/siding/purple, +/obj/machinery/power/apc/syndicate{ + name = "Chemistry Division APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) "dY" = ( @@ -783,7 +784,8 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -1232,7 +1234,8 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/machinery/airalarm/syndicate{ dir = 4; @@ -1423,11 +1426,11 @@ "gW" = ( /obj/effect/turf_decal/siding/blue, /obj/machinery/vending/medical/syndicate_access, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable, +/obj/machinery/power/apc/syndicate{ + name = "Medical Division APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "gX" = ( @@ -1460,9 +1463,9 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Engineering Division APC"; + pixel_y = -23 }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) @@ -1562,7 +1565,8 @@ /area/ruin/powered/syndicate_lava_base/engineering) "hr" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/machinery/airalarm/syndicate{ dir = 1; @@ -1694,10 +1698,6 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "hJ" = ( -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-2" }, @@ -1705,6 +1705,10 @@ dir = 4 }, /obj/machinery/vending/fishing, +/obj/machinery/power/apc/syndicate{ + name = "Primary Hallway APC"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "hM" = ( @@ -1905,10 +1909,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -1918,6 +1918,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/power/apc/syndicate{ + name = "Bar Division APC"; + pixel_x = 25 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "ie" = ( @@ -2900,12 +2904,12 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe/antiviral, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable, /obj/machinery/light_switch, +/obj/machinery/power/apc/syndicate{ + name = "Virology Division APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "ky" = ( @@ -3301,7 +3305,8 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "lT" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -3415,16 +3420,16 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/power/apc/syndicate{ + name = "Crew Quarters APC"; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "mc" = ( @@ -4167,11 +4172,11 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + name = "Arrival Dock APC"; + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/arrivals) "oE" = ( @@ -5139,10 +5144,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -5154,6 +5155,10 @@ name = "emergency backup red phone safe" }, /obj/item/phone/real/syndicate_ruin, +/obj/machinery/power/apc/syndicate{ + name = "Vault APC"; + pixel_x = 25 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) "Cm" = ( @@ -6197,10 +6202,6 @@ /area/ruin/powered/syndicate_lava_base/engineering) "Qg" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/turf_decal/siding/red{ dir = 9 }, @@ -6212,6 +6213,10 @@ icon_state = "0-2"; pixel_y = 1 }, +/obj/machinery/power/apc/syndicate{ + name = "Telecommunications Division APC"; + pixel_y = 23 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/telecomms) "Ql" = ( @@ -6310,15 +6315,15 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/table/reinforced, /obj/item/taperecorder, /obj/effect/turf_decal/siding/purple{ dir = 4 }, +/obj/machinery/power/apc/syndicate{ + name = "Experimentation Division APC"; + pixel_x = 25 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) "RE" = ( @@ -6684,10 +6689,6 @@ /obj/effect/turf_decal/siding/yellow/corner{ dir = 4 }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable, /obj/structure/cable{ icon_state = "1-2" @@ -6697,6 +6698,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/power/apc/syndicate{ + name = "Cargo Division APC"; + pixel_x = 25 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "WP" = ( diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm index 8cbb2290e82b..6424c3e13e95 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm @@ -145,10 +145,10 @@ /area/ruin/space/has_grav/hilbertresearchfacility) "z" = ( /obj/machinery/door/airlock/vault{ - name = "secured door"; - req_access = 207 + name = "secured door" }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic3, /turf/open/floor/plasteel/grimy{ icon_state = "engine" }, @@ -187,10 +187,9 @@ /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/hilbertresearchfacility) "I" = ( -/obj/machinery/door/airlock/highsecurity{ - req_access = 207 - }, +/obj/machinery/door/airlock/highsecurity, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic3, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/hilbertresearchfacility) "J" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 48284f49704c..74e23ee1caa4 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -437,10 +437,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -448,6 +444,10 @@ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + name = "Maintenance APC"; + pixel_x = -25 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "by" = ( @@ -911,10 +911,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -926,6 +922,10 @@ /obj/item/stock_parts/cell/bluespace, /obj/item/stock_parts/cell/bluespace, /obj/item/storage/part_replacer/bluespace, +/obj/machinery/power/apc/syndicate{ + pixel_y = 23; + name = "Warehouse APC" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/warehouse) "hW" = ( @@ -1156,9 +1156,6 @@ /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/listeningstation/quarters) -"jw" = ( -/turf/closed/wall/rust, -/area/ruin/space/has_grav/listeningstation) "jB" = ( /obj/effect/baseturf_helper/asteroid/airless, /turf/closed/wall/explosive, @@ -1330,10 +1327,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "ms" = ( -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -1341,6 +1334,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, +/obj/machinery/power/apc/syndicate{ + name = "Telecommunications APC"; + pixel_x = -25 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "na" = ( @@ -1570,11 +1567,11 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/north{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ pixel_y = 23; - req_access = list(150) + name = "Crew Quarters APC" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "tz" = ( @@ -1694,7 +1691,8 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) @@ -1922,19 +1920,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/listeningstation/hallway) -"yI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/space/has_grav/listeningstation) "yN" = ( /turf/closed/wall/r_wall, /area/ruin/space/has_grav/listeningstation/telecomms) @@ -2088,7 +2073,8 @@ pixel_y = 23 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/snacks/meat/slab, @@ -2379,7 +2365,8 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_x = -24; - req_access_txt = "syndicate" + req_access_txt = "syndicate"; + pixel_y = 6 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/airlock) @@ -2399,10 +2386,6 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "JQ" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -2411,6 +2394,10 @@ dir = 1 }, /obj/item/kirbyplants/random, +/obj/machinery/power/apc/syndicate{ + pixel_y = 23; + name = "Central Hallway APC" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "JS" = ( @@ -2758,10 +2745,6 @@ /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/listeningstation) "OZ" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -2775,6 +2758,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/power/apc/syndicate{ + pixel_y = 23; + name = "Dock APC" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/airlock) "Pa" = ( @@ -3003,7 +2990,8 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = list(150) + req_access = null; + req_access_txt = "syndicate" }, /obj/machinery/light/small{ brightness = 3; @@ -4596,8 +4584,8 @@ Mw NO NO NO -jw -yI +NO +lq NO NO NO diff --git a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm index 34f474f437af..fb3b6764b20f 100644 --- a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm +++ b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm @@ -108,6 +108,7 @@ name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) @@ -640,6 +641,7 @@ name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) @@ -1987,6 +1989,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) @@ -2859,6 +2862,7 @@ name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index 3073723a1811..a6ed7d6f9109 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -1821,7 +1821,7 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"ek" = ( +"ek" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1840,7 +1840,7 @@ dir = 2; name = "Gateway APC"; pixel_y = -23; - req_access = 150 + req_access_txt = "syndicate" }, /obj/structure/cable/yellow{ icon_state = "4-8" diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 659f9e40a385..963fee3d467f 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -1851,7 +1851,7 @@ dir = 2; name = "Gateway APC"; pixel_y = -23; - req_access = 150 + req_access_txt = "syndicate" }, /obj/structure/cable/yellow{ icon_state = "4-8" diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 1f1933e8016c..f56921851134 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -41,15 +41,14 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "aam" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aao" = ( @@ -224,7 +223,7 @@ }, /obj/machinery/door/window{ name = "High-Risk Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/effect/spawner/lootdrop/aimodule_harmful, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ @@ -447,8 +446,7 @@ /area/solar/starboard/aft) "aeg" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -469,6 +467,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "aej" = ( @@ -477,6 +476,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/port/fore) "aeo" = ( @@ -673,9 +673,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "afR" = ( @@ -846,8 +846,7 @@ /area/crew_quarters/locker) "ahw" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -857,6 +856,7 @@ dirx = 1; diry = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "ahy" = ( @@ -1086,7 +1086,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen 5"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1264,7 +1264,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = 25; - req_access_txt = "28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -1302,13 +1302,13 @@ /area/security/prison) "alR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Locker Room Maintenance"; - req_access_txt = "12" + name = "Locker Room Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/crew_quarters/locker) "alS" = ( @@ -1346,8 +1346,7 @@ /area/hydroponics/garden) "ama" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1359,6 +1358,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "amb" = ( @@ -1370,7 +1370,8 @@ dir = 1 }, /obj/effect/turf_decal/arrows/white{ - color = "#99ccff" + color = "#99ccff"; + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -1678,7 +1679,8 @@ /area/security/physician) "apj" = ( /obj/machinery/door/window/westleft{ - dir = 4 + dir = 4; + req_access_txt = "chapel_office" }, /obj/structure/closet/crate/coffin, /turf/open/floor/wood, @@ -2094,7 +2096,7 @@ "asF" = ( /obj/machinery/door/window/eastleft{ name = "Medical Delivery"; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/cable{ icon_state = "4-8" @@ -2121,13 +2123,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/quartermaster/miningdock) "asL" = ( @@ -2150,8 +2152,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_access_txt = "12" + name = "Bar Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2160,6 +2161,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "ata" = ( @@ -2584,7 +2586,7 @@ /obj/machinery/door/window{ dir = 4; name = "Mass Driver"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plating, /area/chapel/office) @@ -2759,8 +2761,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Testing Lab"; - req_access_txt = "47" + name = "Testing Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2781,6 +2782,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/misc_lab) "azo" = ( @@ -2801,9 +2803,11 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "azt" = ( -/obj/effect/turf_decal/stripes, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) "azw" = ( /obj/effect/landmark/stationroom/maint/threexfive, /turf/template_noop, @@ -3077,7 +3081,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "aBC" = ( -/obj/machinery/door/window/westleft, +/obj/machinery/door/window/westleft{ + req_access_txt = "captain"; + name = "Captain's Desk Door" + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "aBD" = ( @@ -3248,8 +3255,7 @@ /area/maintenance/solars/port/aft) "aCu" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -3266,6 +3272,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "aCx" = ( @@ -3475,7 +3482,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /obj/machinery/light_switch{ pixel_y = -23 @@ -3730,14 +3738,14 @@ /area/maintenance/port/aft) "aGa" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/blue/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "aGc" = ( @@ -3772,8 +3780,7 @@ /area/crew_quarters/fitness) "aGy" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3781,6 +3788,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "aGA" = ( @@ -4157,8 +4165,7 @@ /area/security/checkpoint/medical) "aJx" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4175,6 +4182,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel, /area/storage/tech) "aJy" = ( @@ -4448,7 +4456,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /obj/structure/closet/crate/coffin, /turf/open/floor/wood, @@ -4503,7 +4511,7 @@ /obj/machinery/door/window/westright{ dir = 1; name = "Security Checkpoint"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/structure/table/reinforced, /obj/item/paper, @@ -4511,7 +4519,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/security/checkpoint/auxiliary) "aNQ" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -4747,7 +4755,7 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ name = "Coffin Storage"; - req_access_txt = "22" + req_access_txt = "chapel_office" }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -4884,9 +4892,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aRx" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -4905,6 +4911,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aRz" = ( @@ -5010,8 +5017,7 @@ /area/medical/surgery) "aTb" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -5032,6 +5038,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "aTc" = ( @@ -5427,9 +5434,7 @@ dir = 8 }, /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -5977,9 +5982,7 @@ }, /obj/machinery/door/airlock/medical/glass{ closingLayer = 3.3; - name = "Medical Storage"; - normalspeed = 0; - req_access_txt = "5" + name = "Medical Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -5988,6 +5991,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "bei" = ( @@ -6067,11 +6071,11 @@ /area/medical/patients_rooms/room_b) "beX" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "bfm" = ( @@ -6225,12 +6229,12 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "bhr" = ( @@ -6321,8 +6325,7 @@ "bik" = ( /obj/machinery/door/window/eastleft{ dir = 8; - name = "Ice Cream Shoppe"; - req_access_txt = "28" + name = "Ice Cream Shoppe" }, /obj/machinery/light{ dir = 1 @@ -6624,8 +6627,7 @@ /area/ai_monitored/security/armory) "bpj" = ( /obj/machinery/door/airlock/hatch{ - name = "Hardware Workshop"; - req_access_txt = "61" + name = "Hardware Workshop" }, /obj/structure/cable{ icon_state = "1-2" @@ -6636,6 +6638,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/carpet/black, /area/tcommsat/computer) "bpp" = ( @@ -6651,7 +6654,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Containment Pen 1"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -6921,8 +6924,7 @@ /area/engine/engineering) "buN" = ( /obj/machinery/door/airlock{ - name = "Private Restroom"; - req_access_txt = "20" + name = "Private Restroom" }, /turf/open/floor/mineral/silver, /area/crew_quarters/heads/captain) @@ -6946,7 +6948,7 @@ icon_state = "right"; layer = 3.1; name = "Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -7023,8 +7025,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bwR" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -7038,6 +7039,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bwU" = ( @@ -7097,9 +7100,7 @@ /turf/open/floor/wood, /area/bridge/meeting_room) "bxQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7109,6 +7110,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "bxX" = ( @@ -7132,6 +7134,17 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/storage) +"byp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "byq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -7141,8 +7154,7 @@ /area/medical/virology) "byH" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/structure/cable{ icon_state = "4-8" @@ -7166,6 +7178,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "byL" = ( @@ -7335,9 +7348,9 @@ dir = 2 }, /obj/machinery/door/airlock/maintenance{ - name = "Disposal Access"; - req_access_txt = "12" + name = "Disposal Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/disposal) "bCM" = ( @@ -7615,13 +7628,14 @@ name = "Prison Wing Lockdown"; pixel_x = 8; pixel_y = -25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = 8; - pixel_y = -35 + pixel_y = -35; + req_access_txt = "brig" }, /obj/machinery/light_switch{ pixel_x = -5; @@ -7791,7 +7805,7 @@ name = "Public Teleporter Access Control"; pixel_x = 5; pixel_y = 24; - req_access_txt = "17" + req_access_txt = "teleporter" }, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -7927,7 +7941,7 @@ /obj/item/surgical_drapes, /obj/machinery/door/window/northleft{ name = "Autopsy Desk"; - req_access_txt = "4" + req_access_txt = "detective" }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) @@ -8190,8 +8204,7 @@ /area/space/nearstation) "bRt" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -8205,6 +8218,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bRG" = ( @@ -8461,8 +8475,7 @@ /area/medical/surgery) "bXj" = ( /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8470,6 +8483,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bXz" = ( @@ -8479,9 +8493,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -8554,13 +8565,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bYJ" = ( @@ -8646,6 +8657,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"bZX" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/port/fore) "cab" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -8762,8 +8777,7 @@ /area/hallway/secondary/entry) "cbx" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8786,6 +8800,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 5 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/pumproom) "cbA" = ( @@ -8862,8 +8877,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8871,6 +8885,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/aisat_interior) "cch" = ( @@ -9003,7 +9018,8 @@ idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 8; - pixel_y = 25 + pixel_y = 25; + req_access_txt = "toxins" }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -9011,7 +9027,8 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = 8; - pixel_y = -25 + pixel_y = -25; + req_access_txt = "toxins" }, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Mix to Space" @@ -9214,8 +9231,7 @@ /area/security/prison) "chF" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "2" + name = "Interrogation" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9229,6 +9245,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "chG" = ( @@ -9249,8 +9266,7 @@ /area/chapel/office) "chH" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9262,6 +9278,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "chM" = ( @@ -9299,8 +9316,7 @@ /area/science/lab) "cid" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9317,6 +9333,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/dark, /area/science/mixing) "cii" = ( @@ -9348,7 +9365,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 26; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/structure/closet/crate/freezer, /obj/machinery/light_switch{ @@ -9369,8 +9386,7 @@ /area/crew_quarters/heads/captain) "ciE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9391,6 +9407,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/teleporter) "ciJ" = ( @@ -9412,15 +9429,18 @@ /turf/open/floor/plasteel/dark, /area/bridge) "ciY" = ( -/obj/machinery/door/window/westright, +/obj/machinery/door/window/westright{ + name = "Bar Window"; + req_access_txt = "bar" + }, /obj/structure/table/reinforced, -/obj/effect/turf_decal/sand, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel{ - icon_state = "cafeteria" +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "ciZ" = ( /obj/structure/table/wood, @@ -9555,7 +9575,7 @@ name = "Psych Office Shutters Control"; pixel_x = -6; pixel_y = -25; - req_access_txt = "5" + req_access_txt = "psychology" }, /obj/machinery/light_switch{ pixel_x = 9; @@ -9692,9 +9712,10 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cmU" = ( @@ -9880,8 +9901,7 @@ /area/engine/engineering) "cqM" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9900,6 +9920,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "crb" = ( @@ -10147,7 +10168,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -10156,7 +10177,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access_txt = "5" + req_access_txt = "medical" }, /turf/closed/wall, /area/medical/medbay/central) @@ -10430,8 +10451,7 @@ "czZ" = ( /obj/machinery/door/window/eastleft{ icon_state = "right"; - name = "Mail"; - req_access_txt = "50" + name = "Mail" }, /obj/structure/disposalpipe/segment{ dir = 6 @@ -10573,6 +10593,9 @@ /area/security/main) "cBB" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/wood, /area/lawoffice) "cBC" = ( @@ -10763,7 +10786,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen 2"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -10789,8 +10812,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "5;9;68" + name = "Cloning Lab Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10798,6 +10820,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/cloning, +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, /turf/open/floor/plating, /area/medical/genetics/cloning) "cFx" = ( @@ -10990,8 +11014,7 @@ /area/crew_quarters/dorms) "cIi" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -11002,6 +11025,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "cIj" = ( @@ -11231,8 +11255,7 @@ /area/security/prison) "cNb" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -11243,6 +11266,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNg" = ( @@ -11260,8 +11284,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -11270,7 +11293,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -11286,12 +11309,12 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "cNs" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -11299,6 +11322,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "cNx" = ( @@ -11380,7 +11404,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = -6; - req_access_txt = "2" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/execution/transfer) @@ -11470,7 +11494,8 @@ "cQr" = ( /obj/machinery/quantumpad{ map_pad_id = "aitobridge"; - map_pad_link_id = "bridgetoai" + map_pad_link_id = "bridgetoai"; + name = "Bridge Transport" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -11478,7 +11503,7 @@ /obj/effect/turf_decal/sand, /obj/machinery/door/window/southright{ name = "Bar Door"; - req_one_access_txt = "25;28" + req_access_txt = "bar" }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -11599,6 +11624,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 8 }, @@ -11836,9 +11864,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "cWI" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/machinery/light{ dir = 8 }, @@ -11930,14 +11956,14 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = -26; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio"; name = "Xenobiology Desk Shutters"; pixel_x = 7; pixel_y = -26; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/stripes{ dir = 8 @@ -12240,8 +12266,7 @@ /area/vacant_room) "dcK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Armoury"; - req_access_txt = "1" + name = "Armoury" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -12252,6 +12277,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "dcM" = ( @@ -12396,9 +12422,9 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "deC" = ( @@ -12442,10 +12468,7 @@ /turf/open/floor/plasteel/dark, /area/science/mixing) "dfz" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -12465,6 +12488,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "dgg" = ( @@ -12723,14 +12748,11 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "dke" = ( -/obj/effect/turf_decal/arrows/white{ - color = "#99ccff" - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/turf/open/floor/plasteel/dark, +/area/ai_monitored/storage/eva) "dkh" = ( /obj/structure/table/wood, /obj/item/hand_labeler{ @@ -12775,7 +12797,7 @@ id = "barshutters"; name = "Bar Shutters Control"; pixel_y = 24; - req_access_txt = "25" + req_access_txt = "bar" }, /obj/machinery/firealarm{ dir = 8; @@ -12982,8 +13004,7 @@ /area/science/storage) "dpi" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable{ @@ -13005,6 +13026,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "dps" = ( @@ -13055,7 +13077,9 @@ /turf/open/floor/plasteel/dark, /area/medical/sleeper) "dqS" = ( -/obj/machinery/door/airlock/medical/glass, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Treatment Center" + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -13064,6 +13088,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "drg" = ( @@ -13231,8 +13256,7 @@ /area/maintenance/starboard) "dtv" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -13244,6 +13268,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "dtM" = ( @@ -13393,9 +13418,9 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "dxN" = ( @@ -13714,8 +13739,7 @@ /area/engine/atmos) "dEi" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -13727,6 +13751,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "dEx" = ( @@ -13792,9 +13817,9 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Networking Chamber Access" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacoreserver) "dFy" = ( @@ -13806,9 +13831,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plating, /area/ai_monitored/storage/eva) "dFN" = ( @@ -13892,8 +13917,7 @@ /area/engine/atmos/storage) "dHh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "1-2" @@ -13910,6 +13934,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "dHk" = ( @@ -14114,8 +14139,7 @@ dir = 4 }, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -14131,6 +14155,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "dLg" = ( @@ -14351,7 +14376,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -14416,8 +14442,7 @@ /area/hallway/primary/fore) "dOx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63;50" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -14431,6 +14456,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "dOL" = ( @@ -14504,7 +14530,7 @@ /obj/machinery/door/window/southleft{ dir = 4; name = "Engineering Delivery"; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -14572,8 +14598,7 @@ /area/maintenance/starboard/fore) "dQq" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14587,6 +14612,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port) "dQz" = ( @@ -14631,7 +14657,9 @@ /turf/open/floor/plasteel/white, /area/science/nanite) "dQR" = ( -/obj/machinery/door/window/eastright, +/obj/machinery/door/window/eastright{ + req_access_txt = "armory" + }, /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -14955,8 +14983,7 @@ dir = 1 }, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 @@ -14964,6 +14991,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "dVp" = ( @@ -15234,7 +15262,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/medical/glass, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Treatment Center" + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -15243,6 +15273,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 9 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "eaw" = ( @@ -15312,7 +15343,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -15320,7 +15351,7 @@ name = "Loading Doors"; pixel_x = -7; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/computer/cargo{ dir = 1 @@ -15404,13 +15435,13 @@ /area/hallway/secondary/service) "ecG" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "ecO" = ( @@ -15625,6 +15656,9 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "efC" = ( @@ -15646,8 +15680,7 @@ /area/bridge) "efO" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -15657,6 +15690,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "efW" = ( @@ -15691,7 +15725,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15701,7 +15735,7 @@ pixel_x = -7; pixel_y = -4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hydroponics) "ehz" = ( /obj/structure/cable{ @@ -15840,6 +15874,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "ejx" = ( @@ -15876,9 +15911,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/port/fore) "ejM" = ( @@ -16023,9 +16058,6 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/turf_decal/arrows/white{ - color = "#99ccff" - }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, @@ -16037,7 +16069,7 @@ dir = 1; icon_state = "left"; name = "Security Delivery"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ @@ -16150,13 +16182,12 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "end" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "ent" = ( @@ -16544,12 +16575,12 @@ dir = 4 }, /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "esl" = ( @@ -16568,8 +16599,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -16584,6 +16614,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "esZ" = ( @@ -16681,8 +16712,7 @@ /area/medical/medbay/central) "eur" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -16690,6 +16720,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "euH" = ( @@ -16784,6 +16815,9 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "evA" = ( @@ -16935,8 +16969,7 @@ /area/engine/engineering) "eyr" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6;5" + name = "Morgue" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -16953,6 +16986,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/white, /area/medical/morgue) "eyX" = ( @@ -17020,8 +17054,7 @@ /area/tcommsat/computer) "eAw" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -17038,6 +17071,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "eAB" = ( @@ -17061,7 +17095,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Atmospherics Desk"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/item/paper_bin, /obj/item/pen, @@ -17076,7 +17110,13 @@ pixel_x = -10; pixel_y = 12 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, /area/engine/atmos) "eBg" = ( /obj/structure/cable{ @@ -17231,9 +17271,9 @@ }, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Networking Chamber Access" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/secondarydatacoreserver) "eEw" = ( @@ -17247,13 +17287,13 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "eEH" = ( @@ -17571,8 +17611,7 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance"; - req_access_txt = "11" + name = "Electrical Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -17580,6 +17619,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plating, /area/maintenance/starboard/fore) "eIN" = ( @@ -17615,6 +17655,15 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"eJP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/courtroom) "eJT" = ( /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 @@ -17690,6 +17739,9 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "eKQ" = ( @@ -17751,8 +17803,7 @@ /area/engine/atmos/distro) "eLZ" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/tile/darkgreen{ dir = 1 @@ -17768,6 +17819,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "eMc" = ( @@ -17930,13 +17982,10 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "eOr" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "0-2" - }, -/obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-4" }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) "eOB" = ( @@ -17992,8 +18041,7 @@ /area/medical/genetics) "ePa" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/structure/cable{ icon_state = "4-8" @@ -18014,6 +18062,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "ePs" = ( @@ -18058,8 +18107,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -18069,6 +18117,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "eQb" = ( @@ -18126,8 +18175,7 @@ /area/crew_quarters/locker) "eQL" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "4-8" @@ -18148,6 +18196,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "eQS" = ( @@ -18395,18 +18444,18 @@ "eUh" = ( /obj/machinery/door/window/westleft{ name = "armoury desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/door/window/eastleft{ name = "armoury desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/armory{ pixel_x = 5; pixel_y = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/security/warden) "eUk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -18598,7 +18647,7 @@ name = "Shutters Control Button"; pixel_x = -25; pixel_y = -26; - req_access_txt = "47" + req_one_access_txt = "science;robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -18902,9 +18951,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "fcX" = ( @@ -18980,7 +19029,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_x = -26; - req_access_txt = "63" + req_access_txt = "brig" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -19094,7 +19143,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/plasteel, @@ -19184,6 +19233,19 @@ }, /turf/open/floor/plasteel, /area/clerk) +"fgk" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line/lower{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 28 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "fgo" = ( /obj/item/a_gift{ pixel_x = -3; @@ -19572,8 +19634,7 @@ /area/ai_monitored/turret_protected/ai_upload) "flH" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Tech Storage"; - req_access_txt = "61" + name = "Telecomms Tech Storage" }, /obj/structure/cable{ icon_state = "1-2" @@ -19584,6 +19645,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "fmn" = ( @@ -19595,7 +19657,8 @@ "fmt" = ( /obj/machinery/quantumpad{ map_pad_id = "aitoadmin"; - map_pad_link_id = "admintoai" + map_pad_link_id = "admintoai"; + name = "Telecomms Transport" }, /obj/machinery/light_switch{ pixel_y = 24 @@ -19822,6 +19885,17 @@ /obj/item/shovel/spade, /turf/open/floor/plasteel, /area/security/prison) +"frL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fsb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19985,22 +20059,21 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "fvw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/door/airlock/glass{ + name = "Service Door" }, -/obj/machinery/door/airlock/public, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/corner/lower, /turf/open/floor/plasteel, /area/hydroponics) "fvF" = ( @@ -20029,8 +20102,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -20044,6 +20116,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "fvZ" = ( @@ -20144,9 +20217,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port) "fxV" = ( @@ -20752,8 +20825,7 @@ /area/ai_monitored/nuke_storage) "fJm" = ( /obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "command" + name = "Conference Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -20772,6 +20844,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fJz" = ( @@ -20883,8 +20956,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -20893,6 +20965,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "fLT" = ( @@ -21064,8 +21137,7 @@ /area/hydroponics) "fOM" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/structure/cable{ icon_state = "1-2" @@ -21083,6 +21155,7 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "fOX" = ( @@ -21167,7 +21240,9 @@ /turf/open/floor/plasteel, /area/engine/engineering) "fQl" = ( -/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/eastleft{ + req_access_txt = "armory" + }, /obj/effect/turf_decal/stripes{ dir = 1 }, @@ -21233,8 +21308,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" + name = "Genetics Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -21242,6 +21316,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel, /area/medical/genetics) "fQX" = ( @@ -21300,13 +21375,11 @@ /turf/open/floor/wood, /area/hallway/secondary/service) "fRP" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/fore) "fRT" = ( @@ -21392,10 +21465,10 @@ dir = 8 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/explab) "fSE" = ( @@ -21456,14 +21529,14 @@ name = "Toxins Mixing Room Access Console"; pixel_x = 6; pixel_y = -25; - req_one_access_txt = "8" + req_access_txt = "toxins" }, /obj/machinery/button/door{ id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -7; pixel_y = -24; - req_access_txt = "7" + req_access_txt = "toxins" }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -21491,8 +21564,7 @@ /area/crew_quarters/kitchen) "fUb" = ( /obj/machinery/door/airlock/engineering{ - name = "Vacant Office A"; - req_access_txt = "32" + name = "Vacant Office A" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21500,6 +21572,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plasteel, /area/vacant_room) "fUp" = ( @@ -21621,14 +21694,14 @@ /area/tcommsat/server) "fWx" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Delivery Office Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/sorting) "fWF" = ( @@ -21716,7 +21789,7 @@ dir = 2; icon_state = "left"; name = "Kitchen Delivery"; - req_access_txt = "28" + req_access_txt = "kitchen" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/showroomfloor, @@ -21742,7 +21815,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen 3"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/cable{ icon_state = "1-2" @@ -21767,9 +21840,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "fZl" = ( @@ -21844,7 +21917,7 @@ "gbo" = ( /obj/machinery/door/window/southleft{ name = "Court Cell"; - req_access_txt = "2" + req_access_txt = "security" }, /turf/open/floor/plasteel, /area/security/courtroom) @@ -21887,8 +21960,7 @@ "gbA" = ( /obj/machinery/door/airlock/medical/glass{ closingLayer = 3.3; - name = "Medical Storage"; - req_access_txt = "5" + name = "Medbay Treatment Center" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -21897,6 +21969,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "gbR" = ( @@ -22052,13 +22126,13 @@ /area/security/prison) "get" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/port/fore) "geG" = ( @@ -22092,15 +22166,13 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "gfQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ggh" = ( @@ -22298,9 +22370,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -22563,8 +22633,7 @@ /area/quartermaster/sorting) "gmG" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -22577,6 +22646,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gmL" = ( @@ -22595,7 +22665,7 @@ dir = 2; icon_state = "left"; name = "Bar Delivery"; - req_access_txt = "25" + req_access_txt = "bar" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plating, @@ -22766,13 +22836,13 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "gry" = ( @@ -22784,7 +22854,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/miningdock) "grP" = ( /obj/structure/chair/wood/wings, @@ -22883,9 +22953,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, @@ -22895,12 +22963,12 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gtW" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -22914,6 +22982,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "gub" = ( @@ -23172,13 +23241,13 @@ dir = 1 }, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/fore) "gyl" = ( @@ -23266,7 +23335,7 @@ }, /obj/machinery/door/window/westleft{ name = "Janitorial Delivery"; - req_access_txt = "26" + req_access_txt = "janitor" }, /mob/living/simple_animal/cockroach{ desc = "Virtually unkillable."; @@ -23566,8 +23635,7 @@ /area/maintenance/starboard/fore) "gEl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Theatre Maintenance"; - req_access_txt = "46" + name = "Theatre Maintenance" }, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -23579,6 +23647,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plating, /area/maintenance/port/fore) "gEr" = ( @@ -23728,8 +23797,7 @@ /area/science/research) "gGK" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23749,6 +23817,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "gGM" = ( @@ -23783,8 +23852,7 @@ dir = 2 }, /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -23796,6 +23864,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "gHW" = ( @@ -23812,9 +23881,7 @@ /turf/open/floor/wood, /area/vacant_room) "gID" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -23822,6 +23889,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gIL" = ( @@ -24057,7 +24125,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "robotics" }, /obj/structure/cable{ icon_state = "2-8" @@ -24066,7 +24135,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -7; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "robotics" }, /turf/open/floor/plasteel/dark, /area/science/robotics/mechbay) @@ -24473,7 +24543,8 @@ /area/crew_quarters/fitness) "gQM" = ( /obj/effect/turf_decal/arrows/white{ - color = "#99ccff" + color = "#99ccff"; + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 @@ -24488,7 +24559,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Containment Pen 4"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/cable{ icon_state = "1-2" @@ -24742,9 +24813,7 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos/distro) "gUB" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -24752,6 +24821,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) "gUG" = ( @@ -24793,13 +24863,13 @@ /area/hallway/primary/port) "gVk" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "gVz" = ( @@ -24958,8 +25028,7 @@ "gYy" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -24974,6 +25043,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "gYG" = ( @@ -25199,9 +25269,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, @@ -25212,6 +25280,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "hdj" = ( @@ -25484,7 +25553,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/item/deskbell/preset/delivery{ pixel_x = 8; @@ -25529,7 +25598,7 @@ base_state = "right"; icon_state = "right"; name = "Core Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -25586,14 +25655,20 @@ base_state = "left"; icon_state = "left"; name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/chemistry{ pixel_x = -8; pixel_y = -3 }, -/turf/open/floor/plasteel/white, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, /area/medical/chemistry) "hiX" = ( /turf/closed/wall, @@ -26054,7 +26129,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = 22; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "atmospherics" }, /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -26275,8 +26351,7 @@ "htR" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -26291,6 +26366,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "htX" = ( @@ -26372,6 +26448,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle{ dir = 8 }, @@ -26546,8 +26625,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "command" + name = "Bridge Access" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -26559,6 +26637,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "hyN" = ( @@ -26609,7 +26688,7 @@ /obj/machinery/door/window/eastright{ dir = 8; name = "Garden Door"; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/structure/flora/ausbushes/ppflowers, /mob/living/simple_animal/butterfly, @@ -26624,8 +26703,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Surgery Access" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 @@ -26633,6 +26711,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "hAa" = ( @@ -26731,9 +26810,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "hAQ" = ( @@ -26759,9 +26839,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "35;79" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/wood, /area/hallway/secondary/service) "hBu" = ( @@ -26911,7 +26991,7 @@ "hCV" = ( /obj/machinery/door/window/northright{ name = "Backup SMES Chamber"; - req_access_txt = "32" + req_access_txt = "engine_equip" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -26956,8 +27036,7 @@ /area/maintenance/port/fore) "hDy" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -26969,6 +27048,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "hDC" = ( @@ -27014,7 +27094,8 @@ }, /obj/machinery/quantumpad{ map_pad_id = "bridgetoai"; - map_pad_link_id = "aitobridge" + map_pad_link_id = "aitobridge"; + name = "AI Satellite Transport" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -27092,7 +27173,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -5; pixel_y = 3; - req_access_txt = "55" + req_access_txt = "science" }, /obj/machinery/button/ignition{ id = "testigniter"; @@ -27179,14 +27260,16 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access_txt = "ai_master" }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -27269,8 +27352,7 @@ /area/security/brig) "hIm" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -27281,6 +27363,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "hIn" = ( @@ -27292,8 +27375,7 @@ /area/ai_monitored/security/armory) "hIA" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" + name = "Gravity Generator" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable{ @@ -27303,6 +27385,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "hIC" = ( @@ -27482,12 +27565,13 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "hMV" = ( @@ -27542,8 +27626,7 @@ frequency = 1449; glass = 1; id_tag = "telecomms_airlock_interior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -27553,6 +27636,8 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "hNw" = ( @@ -27588,8 +27673,7 @@ /area/hallway/secondary/exit) "hNT" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27598,6 +27682,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "hNV" = ( @@ -27706,7 +27791,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Containment Pen 2"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -27933,8 +28018,7 @@ /area/engine/engineering) "hTU" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 3"; - req_access_txt = "2" + name = "Long-Term Cell 3" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27950,6 +28034,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "hUv" = ( @@ -28172,8 +28257,7 @@ /area/maintenance/port/fore) "hYr" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -28186,6 +28270,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "hYt" = ( @@ -28526,20 +28611,20 @@ }, /obj/machinery/door/airlock/medical{ id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "ifH" = ( /obj/machinery/door/window/southleft{ dir = 8; name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/cable{ icon_state = "1-2" @@ -28580,8 +28665,7 @@ /area/quartermaster/office) "igg" = ( /obj/machinery/door/airlock/maintenance{ - name = "Law Office Maintenance"; - req_access_txt = "38" + name = "Law Office Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -28589,6 +28673,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plating, /area/lawoffice) "igi" = ( @@ -28845,13 +28930,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "37;12" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/plating, /area/library) "ikB" = ( @@ -29207,9 +29292,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "iqE" = ( @@ -29236,12 +29321,12 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/escapepodbay) "irh" = ( @@ -29262,10 +29347,10 @@ name = "prison blast door" }, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_one_access_txt = "1;4" + name = "Prison Wing" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "irl" = ( @@ -29289,6 +29374,8 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "irx" = ( @@ -29490,7 +29577,7 @@ dir = 2; icon_state = "left"; name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; @@ -29504,7 +29591,11 @@ pixel_x = 8; pixel_y = -4 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, /area/science/robotics/lab) "iuq" = ( /mob/living/simple_animal/hostile/viscerator{ @@ -29764,8 +29855,7 @@ /area/ruin/space/has_grav/listeningstation) "izl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29780,6 +29870,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "izv" = ( @@ -29816,8 +29907,7 @@ /area/quartermaster/sorting) "izX" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -29826,6 +29916,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "iAh" = ( @@ -29843,8 +29934,7 @@ /area/security/prison) "iAo" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -29853,6 +29943,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "iAq" = ( @@ -29875,8 +29966,7 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -29886,6 +29976,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "iAT" = ( @@ -30193,7 +30284,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = -25; - req_access_txt = "28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel{ icon_state = "cafeteria" @@ -30430,7 +30521,7 @@ /area/security/prison) "iKH" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30441,6 +30532,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/ramp_middle, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "iKT" = ( @@ -30486,8 +30579,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Construction Area"; - req_one_access_txt = "11;24" + name = "Construction Area" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -30497,6 +30589,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/atmos/hfr) "iLV" = ( @@ -30530,8 +30623,7 @@ /area/engine/atmos/pumproom) "iMI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -30545,6 +30637,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/aft) "iMX" = ( @@ -30775,15 +30868,14 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "iQK" = ( @@ -30944,8 +31036,7 @@ /area/maintenance/port/fore) "iSZ" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -30964,6 +31055,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "iTl" = ( @@ -31143,8 +31235,7 @@ "iVZ" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Surgery Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -31162,6 +31253,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "iWd" = ( @@ -31335,7 +31427,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_x = 24 + pixel_x = 24; + req_access_txt = "chapel_office" }, /obj/machinery/light{ dir = 1 @@ -31498,7 +31591,7 @@ name = "CMO Shutter Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "40" + req_access_txt = "medical" }, /obj/machinery/light_switch{ pixel_x = 35; @@ -31614,8 +31707,7 @@ dir = 4 }, /obj/machinery/door/airlock/atmos{ - name = "Equipment Room"; - req_access_txt = "24" + name = "Equipment Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -31628,6 +31720,7 @@ }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "jcB" = ( @@ -31775,12 +31868,16 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_x = 6; - pixel_y = -26 + pixel_y = -26; + req_access_txt = "detective" }, /obj/machinery/light_switch{ pixel_x = -6; pixel_y = -25 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "jdx" = ( @@ -32194,9 +32291,9 @@ name = "blast door" }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/execution/transfer) "jiT" = ( @@ -32249,13 +32346,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "jky" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "jkz" = ( @@ -32328,8 +32424,7 @@ /area/ai_monitored/nuke_storage) "jlc" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -32337,6 +32432,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "jlj" = ( @@ -32439,7 +32535,9 @@ /turf/open/floor/plating, /area/maintenance/central) "jmo" = ( -/obj/machinery/door/window/northleft, +/obj/machinery/door/window/northleft{ + req_access_txt = "toxins" + }, /obj/effect/turf_decal/loading_area{ dir = 1 }, @@ -32598,7 +32696,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = -6; pixel_y = 25; - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -32705,13 +32803,16 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "jql" = ( @@ -32775,8 +32876,7 @@ /area/maintenance/solars/starboard/aft) "jqS" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/structure/cable{ @@ -32793,6 +32893,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "jqV" = ( @@ -33002,13 +33103,13 @@ /area/engine/engineering) "juR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "juW" = ( @@ -33056,8 +33157,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "jvN" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -33074,6 +33174,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "jwc" = ( @@ -33095,13 +33196,13 @@ dir = 6 }, /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "30" + name = "Server Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "jwI" = ( @@ -33156,11 +33257,11 @@ /area/escapepodbay) "jyg" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "jyH" = ( @@ -33291,18 +33392,18 @@ /obj/machinery/button/door{ id = "heads_meeting"; name = "Security Shutters"; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "command" }, /turf/open/floor/wood, /area/bridge/meeting_room) "jBu" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) "jBx" = ( @@ -33426,7 +33527,7 @@ name = "Delivery Office Door"; pixel_x = -6; pixel_y = 7; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/item/folder/yellow{ pixel_x = 6; @@ -33533,6 +33634,7 @@ name = "Detective RC"; pixel_x = 32 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "jEa" = ( @@ -34548,13 +34650,13 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "jVM" = ( @@ -34631,8 +34733,7 @@ /area/bridge/meeting_room) "jXf" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -34645,6 +34746,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "jXg" = ( @@ -34984,10 +35086,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -37 - }, /obj/machinery/camera{ c_tag = "Medbay - Genetics Lab"; dir = 1; @@ -35085,8 +35183,7 @@ /area/maintenance/disposal/incinerator) "kdW" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35095,6 +35192,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "keh" = ( @@ -35162,7 +35260,7 @@ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_y = 25; - req_one_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/machinery/firealarm{ dir = 1; @@ -35260,8 +35358,7 @@ /area/maintenance/starboard/fore) "kgA" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -35278,6 +35375,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "kgB" = ( @@ -35569,9 +35667,9 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Delivery Office"; - req_access_txt = "50" + name = "Delivery Office" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "knl" = ( @@ -35595,7 +35693,7 @@ "knE" = ( /obj/machinery/door/window/northright{ name = "Prize Corner"; - req_access_txt = "12" + req_access_txt = "maintenance" }, /turf/open/floor/eighties, /area/maintenance/starboard/fore) @@ -35686,7 +35784,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical, +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre" + }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -35700,6 +35800,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "koH" = ( @@ -35808,6 +35909,9 @@ /area/engine/engineering) "kqr" = ( /obj/item/radio/off, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "kqx" = ( @@ -35861,7 +35965,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_x = -26; - req_access_txt = "63" + req_access_txt = "brig" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -35876,8 +35980,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Psychiatrists office Maintenance"; - req_access_txt = "5" + name = "Psychiatrists office Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -35888,6 +35991,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, /area/maintenance/port/aft) "krz" = ( @@ -35954,16 +36058,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/airlock/engineering/glass{ + name = "AI Satellite Monitoring" + }, /turf/open/floor/plasteel, /area/engine/engineering) "ksg" = ( @@ -36063,18 +36167,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/arrows/white{ color = "#99ccff"; dir = 1 }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ktf" = ( -/obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -36090,6 +36190,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Gift Shop Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plating, /area/clerk) "kti" = ( @@ -36440,9 +36544,9 @@ tag = "" }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "kAt" = ( @@ -36459,7 +36563,8 @@ dir = 5 }, /obj/effect/turf_decal/arrows/white{ - color = "#99ccff" + color = "#99ccff"; + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /turf/open/floor/plasteel/white, @@ -36513,12 +36618,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "kCn" = ( @@ -36564,8 +36669,7 @@ /area/engine/atmos/storage) "kDj" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -36582,6 +36686,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "kDo" = ( @@ -36765,7 +36870,7 @@ "kGy" = ( /obj/machinery/door/window/westleft{ name = "Atmospherics Delivery"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -37012,15 +37117,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacoreserver) "kKq" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "kLh" = ( @@ -37029,7 +37133,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, @@ -37092,8 +37196,8 @@ dir = 4 }, /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" +/obj/machinery/door/airlock/maintenance/external{ + welded = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -37310,8 +37414,7 @@ /area/crew_quarters/heads/hop) "kQI" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -37321,6 +37424,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "kQM" = ( @@ -37328,7 +37432,7 @@ /obj/machinery/door/window/southright{ dir = 1; name = "Research and Development Desk"; - req_access_txt = "7" + req_one_access_txt = "science;robotics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -37344,9 +37448,9 @@ }, /obj/item/storage/pencil_holder/crew{ pixel_x = -10; - pixel_y = 12 + pixel_y = -1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/science/lab) "kQS" = ( /obj/structure/grille/broken, @@ -38074,6 +38178,7 @@ c_tag = "Law Office"; dir = 1 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/wood, /area/lawoffice) "lep" = ( @@ -38197,7 +38302,8 @@ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = 7; - pixel_y = -23 + pixel_y = -23; + req_access_txt = "tcomms" }, /obj/machinery/light_switch{ pixel_x = -23 @@ -38491,8 +38597,7 @@ /area/security/main) "llW" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Operating Theatre" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -38516,6 +38621,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "llY" = ( @@ -38530,6 +38636,20 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"lml" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "lmB" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/engine, @@ -38629,8 +38749,7 @@ /area/security/processing) "loi" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38642,6 +38761,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "loy" = ( @@ -38712,8 +38832,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38734,6 +38853,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "lqb" = ( @@ -38865,19 +38985,29 @@ /area/engine/atmos/distro) "ltn" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "ltu" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ltA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "ltD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -38917,9 +39047,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ltY" = ( @@ -39117,8 +39248,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null + req_access_txt = "surgery" }, /obj/machinery/button/holosign{ id = "surgery"; @@ -39226,12 +39356,12 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" + name = "Teleporter Maintenance" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/maintenance/central/secondary) "lzi" = ( @@ -39585,7 +39715,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Containment Pen 3"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -39806,6 +39936,18 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"lLn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) "lLu" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/tcommsat/computer"; @@ -39843,8 +39985,7 @@ /area/quartermaster/storage) "lLV" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -39861,6 +40002,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "lMf" = ( @@ -40070,15 +40212,14 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "lOU" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) "lOW" = ( @@ -40174,7 +40315,7 @@ base_state = "right"; icon_state = "right"; name = "Core Modules"; - req_access_txt = "20" + req_access_txt = "psychology" }, /turf/open/floor/wood, /area/medical/psych) @@ -40301,9 +40442,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -40316,6 +40454,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/aft) "lSA" = ( @@ -40544,8 +40683,7 @@ /area/ai_monitored/turret_protected/ai_upload) "lVZ" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - req_access_txt = "10" + name = "Escape Pod Four" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -40557,6 +40695,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "lWa" = ( @@ -40839,8 +40978,7 @@ /area/hallway/primary/starboard) "lZJ" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40851,6 +40989,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "mab" = ( @@ -41081,8 +41220,7 @@ /area/ai_monitored/storage/eva) "mdF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Detective Maintenance"; - req_access_txt = "4" + name = "Detective Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -41096,6 +41234,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plating, /area/security/detectives_office) "mdS" = ( @@ -41691,13 +41830,14 @@ dir = 1 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "mnc" = ( @@ -41901,9 +42041,9 @@ /area/engine/atmos/distro) "mpf" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Teleporter Access"; - req_access_txt = "61" + name = "Telecomms Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "mph" = ( @@ -41944,14 +42084,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/light_switch{ pixel_x = -4; @@ -42142,7 +42282,10 @@ /obj/machinery/light_switch{ pixel_x = -22 }, -/turf/open/floor/plasteel/stairs, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/stairs/goon/stairs_alone, /area/escapepodbay) "msX" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -42249,8 +42392,7 @@ /area/ai_monitored/storage/eva) "mvr" = ( /obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" + name = "Private Study" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -42264,6 +42406,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/carpet, /area/library) "mvN" = ( @@ -42362,13 +42505,13 @@ /area/janitor) "mxQ" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "mxU" = ( @@ -42445,8 +42588,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/atmos/glass{ - name = "Construction Area"; - req_access_txt = "24" + name = "Construction Area" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -42454,6 +42596,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "mzc" = ( @@ -42465,7 +42608,7 @@ id = "Secure Storage"; pixel_x = -24; pixel_y = -26; - req_access_txt = "11" + req_access_txt = "engine_equip" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -42523,7 +42666,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; - req_access_txt = "76"; security_level = 6 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ @@ -42532,6 +42674,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark/side, /area/storage/tech) "mzQ" = ( @@ -42635,7 +42778,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access_txt = "39" + req_access_txt = "virology" }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -42726,9 +42869,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mCM" = ( @@ -42762,16 +42904,16 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "5; 9; 68" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/morgue) "mDt" = ( @@ -43238,11 +43380,11 @@ /area/security/execution/transfer) "mJD" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "mJK" = ( @@ -43411,14 +43553,14 @@ name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 8; - req_access_txt = "47" + req_access_txt = "science" }, /obj/machinery/button/door{ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 8; - req_access_txt = "47" + req_access_txt = "science" }, /obj/item/paper_bin{ pixel_x = -1; @@ -43471,7 +43613,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "19;61" + req_access_txt = "tcomms" }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -43646,7 +43788,7 @@ dir = 8; icon_state = "left"; name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/structure/table/reinforced, /obj/item/folder/white, @@ -43744,7 +43886,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 26; - req_access_txt = "3" + req_access_txt = "armory" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -43864,7 +44006,8 @@ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; - pixel_y = -23 + pixel_y = -23; + req_access_txt = "tcomms" }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -44123,11 +44266,11 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Armory Desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/door/window/southleft{ name = "Reception Desk"; - req_access_txt = "63" + req_access_txt = "sec_basic" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/warden{ @@ -44135,10 +44278,10 @@ pixel_y = -4 }, /obj/item/storage/pencil_holder/crew{ - pixel_x = -12; - pixel_y = 1 + pixel_x = -9; + pixel_y = -2 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/security/warden) "mXM" = ( /obj/structure/disposalpipe/segment{ @@ -44277,8 +44420,7 @@ /area/hallway/secondary/entry) "mZh" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -44292,6 +44434,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "mZp" = ( @@ -44337,8 +44480,7 @@ /area/hallway/secondary/entry) "nai" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/structure/cable{ icon_state = "4-8" @@ -44358,6 +44500,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "nan" = ( @@ -44441,7 +44584,7 @@ name = "Telecommunications server shutters control"; pixel_x = 8; pixel_y = 23; - req_access_txt = "61" + req_access_txt = "tcomms" }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -44559,8 +44702,7 @@ /area/ai_monitored/turret_protected/ai) "ncK" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -44568,6 +44710,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "ncO" = ( @@ -44595,8 +44738,7 @@ /area/maintenance/disposal/incinerator) "ndh" = ( /obj/machinery/door/airlock/maintenance{ - name = "Fitness Room Maintenance"; - req_access_txt = "12" + name = "Fitness Room Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -44616,6 +44758,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/crew_quarters/fitness) "ndo" = ( @@ -44805,8 +44948,7 @@ /area/crew_quarters/heads/cmo) "nfY" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -44818,6 +44960,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel, /area/medical/morgue) "ngf" = ( @@ -45291,8 +45434,7 @@ /area/ai_monitored/security/armory) "nma" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45304,6 +45446,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/prison) "nmj" = ( @@ -45387,9 +45530,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "npe" = ( @@ -45467,13 +45609,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/aisat_interior) "nrj" = ( @@ -45519,13 +45661,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/aft) "nrP" = ( @@ -46002,8 +46142,7 @@ /area/maintenance/starboard/fore) "nyY" = ( /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -46023,6 +46162,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/engine, /area/science/misc_lab) "nzj" = ( @@ -46131,9 +46271,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Toxins Maintenance"; - req_access_txt = "8" + name = "Toxins Storage Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plating, /area/maintenance/starboard) "nAs" = ( @@ -46620,13 +46760,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "nLg" = ( @@ -46650,8 +46790,7 @@ /area/medical/genetics/cloning) "nLF" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_one_access_txt = "1;4" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -46675,6 +46814,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "nLG" = ( @@ -46839,7 +46979,7 @@ name = "Engineering Lockdown"; pixel_x = -8; pixel_y = 39; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -46847,20 +46987,21 @@ name = "Engineering Secure Storage"; pixel_x = -8; pixel_y = 26; - req_access_txt = "11" + req_access_txt = "engineering" }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 7; pixel_y = 26; - req_access_txt = "24" + req_access_txt = "engineering" }, /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_x = 7; - pixel_y = 39 + pixel_y = 39; + req_access_txt = "engineering" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -47082,8 +47223,7 @@ /area/hallway/primary/starboard) "nRQ" = ( /obj/machinery/door/airlock/command{ - name = "Bridge Access"; - req_access_txt = "command" + name = "Bridge Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -47091,6 +47231,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "nRR" = ( @@ -47256,7 +47397,7 @@ name = "Telecommunications server shutters control"; pixel_x = 28; pixel_y = -2; - req_one_access_txt = "19;61" + req_access_txt = "command" }, /obj/machinery/button/door{ id = "bridge blast"; @@ -47403,7 +47544,9 @@ /turf/open/floor/carpet, /area/library) "nVU" = ( -/obj/machinery/door/window/southleft, +/obj/machinery/door/window/southleft{ + req_access_txt = "brig_phys" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, @@ -48043,7 +48186,11 @@ pixel_y = 23 }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" }, /obj/item/kirbyplants/random, /turf/open/floor/carpet, @@ -48067,7 +48214,7 @@ name = "Public Teleporter Access Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "17" + req_access_txt = "teleporter" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, @@ -48294,8 +48441,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "command" + name = "Bridge Access" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -48307,6 +48453,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "olJ" = ( @@ -48352,14 +48499,14 @@ /area/ai_monitored/turret_protected/aisat_interior) "omU" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "omX" = ( @@ -48491,7 +48638,7 @@ "ooL" = ( /obj/machinery/door/window/westleft{ name = "Atmospherics Canister Storage"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /turf/open/floor/plasteel/dark, /area/engine/atmos) @@ -48528,8 +48675,7 @@ /area/crew_quarters/dorms) "opx" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -48552,6 +48698,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "opy" = ( @@ -48789,7 +48937,7 @@ dir = 1; icon_state = "left"; name = "Xenobiology Desk"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/item/paper_bin{ pixel_x = -3; @@ -48808,10 +48956,9 @@ pixel_y = -5 }, /obj/item/storage/pencil_holder/crew{ - pixel_x = -10; - pixel_y = 12 + pixel_x = -10 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/science/xenobiology) "otj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -48874,8 +49021,7 @@ /area/ai_monitored/secondarydatacoreserver) "ous" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -48887,13 +49033,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel/dark, /area/science/mixing) "ouM" = ( /obj/machinery/door/window/southleft{ dir = 4; name = "Virology"; - req_one_access_txt = "39;24" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -48915,8 +49062,7 @@ /area/engine/engineering) "ovp" = ( /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrists office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -49083,7 +49229,6 @@ "oyn" = ( /obj/machinery/door/airlock{ name = "Hydroponics Maintenance"; - req_access_txt = "35"; req_one_access_txt = "0" }, /obj/machinery/door/firedoor/border_only{ @@ -49092,6 +49237,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/port/fore) "oyo" = ( @@ -49368,9 +49514,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "oDf" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -49380,6 +49524,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "oDh" = ( @@ -49418,9 +49563,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "oDL" = ( @@ -49582,8 +49726,7 @@ "oFH" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor/border_only{ @@ -49593,6 +49736,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "oFR" = ( @@ -49796,9 +49940,9 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "oIx" = ( @@ -50162,9 +50306,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "oNt" = ( @@ -50199,9 +50344,9 @@ dir = 2 }, /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/janitor) "oNH" = ( @@ -50337,13 +50482,12 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "oQP" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "oQW" = ( @@ -50509,9 +50653,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "oUf" = ( @@ -51094,6 +51239,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"peB" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "peE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -51176,14 +51330,14 @@ name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 6 @@ -51268,7 +51422,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen 1"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -51345,8 +51499,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -51357,10 +51510,15 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "piD" = ( /obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/grass, /area/hallway/secondary/exit) "piF" = ( @@ -51547,7 +51705,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -51618,8 +51776,7 @@ /area/science/robotics/lab) "pmr" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -51628,6 +51785,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "pmF" = ( @@ -51999,8 +52157,7 @@ /area/maintenance/port) "prI" = ( /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "command" + name = "Command Tool Storage" }, /obj/structure/cable{ icon_state = "1-2" @@ -52011,6 +52168,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "prJ" = ( @@ -52201,7 +52359,9 @@ /area/quartermaster/sorting) "puc" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/window/eastright, +/obj/machinery/door/window/eastright{ + req_access_txt = "hydroponics" + }, /turf/open/floor/plasteel, /area/hydroponics) "puh" = ( @@ -52296,7 +52456,7 @@ /obj/machinery/door/window{ dir = 8; name = "SMES Chamber"; - req_access_txt = "32" + req_access_txt = "engine_equip" }, /obj/structure/cable{ icon_state = "1-2" @@ -52397,8 +52557,7 @@ /area/ai_monitored/storage/eva) "pwX" = ( /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -52406,6 +52565,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "pxl" = ( @@ -52646,13 +52806,9 @@ }, /area/crew_quarters/kitchen) "pAZ" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -52662,6 +52818,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) "pBd" = ( @@ -52715,7 +52872,7 @@ dir = 8; icon_state = "left"; name = "Research Division Delivery"; - req_access_txt = "47" + req_one_access_txt = "science;robotics" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -52783,8 +52940,7 @@ /area/quartermaster/storage) "pCZ" = ( /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -52805,6 +52961,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/misc_lab) "pDe" = ( @@ -52962,8 +53119,7 @@ /area/engine/engineering) "pGl" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -52980,6 +53136,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/bluespace, /area/crew_quarters/heads/hor) "pGm" = ( @@ -53145,7 +53302,7 @@ /obj/machinery/door/window/southleft{ dir = 4; name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -53355,7 +53512,8 @@ "pMQ" = ( /obj/machinery/quantumpad{ map_pad_id = "aitoscience"; - map_pad_link_id = "sciencetoai" + map_pad_link_id = "sciencetoai"; + name = "RD Office Transport" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -53830,7 +53988,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Containment Pen 6"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/cable{ icon_state = "1-2" @@ -53859,7 +54017,7 @@ dir = 4; icon_state = "rightsecure"; name = "Head of Personnel's Desk"; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/door/window/northleft{ dir = 8; @@ -54401,8 +54559,7 @@ /area/hallway/primary/starboard) "qbk" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54414,6 +54571,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "qbt" = ( @@ -54557,6 +54716,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"qer" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qeJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -54696,12 +54861,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/arrows/white{ - color = "#99ccff" - }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/turf_decal/arrows/white{ + color = "#99ccff"; + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "qif" = ( @@ -54884,6 +55050,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "qkB" = ( @@ -54910,7 +55079,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -55054,9 +55223,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "qmH" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -55071,6 +55238,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "qmN" = ( @@ -55097,8 +55265,7 @@ /area/hallway/secondary/exit) "qnL" = ( /obj/machinery/door/airlock/hatch{ - name = "Hardware Workshop"; - req_access_txt = "61" + name = "Hardware Workshop" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -55110,6 +55277,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/carpet/black, /area/tcommsat/computer) "qnO" = ( @@ -55157,13 +55325,12 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "qop" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qoK" = ( @@ -55179,8 +55346,7 @@ /area/engine/engineering) "qoN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Dormitories Maintenance"; - req_access_txt = "12" + name = "Dormitories Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55191,12 +55357,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qoO" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55210,6 +55376,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/wood, /area/chapel/office) "qpg" = ( @@ -55221,8 +55388,8 @@ id = "roboticssurgery"; name = "Shutters Control Button"; pixel_x = -6; - pixel_y = 25; - req_access_txt = "29" + pixel_y = 24; + req_access_txt = "robotics" }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) @@ -55508,8 +55675,7 @@ /area/engine/engineering) "quB" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; @@ -55522,6 +55688,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "quG" = ( @@ -55598,8 +55765,7 @@ /area/maintenance/starboard/fore) "qwA" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -55611,6 +55777,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "qwM" = ( @@ -55744,9 +55911,9 @@ dir = 8 }, /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plating, /area/science/storage) "qzh" = ( @@ -55969,8 +56136,7 @@ /area/medical/sleeper) "qDZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Funeral Parlour Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -55984,6 +56150,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plating, /area/maintenance/port/fore) "qEc" = ( @@ -56193,7 +56360,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "atmospherics" }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -56516,6 +56684,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/medical) +"qNB" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "qNE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -56760,8 +56934,7 @@ "qQO" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -56771,6 +56944,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "qRk" = ( @@ -57362,13 +57536,13 @@ /area/hallway/secondary/entry) "rbC" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "rbK" = ( @@ -57542,9 +57716,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/airlock/mining{ - req_access_txt = "48" - }, +/obj/machinery/door/airlock/mining, /obj/structure/cable{ icon_state = "4-8" }, @@ -57552,12 +57724,12 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "rdK" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vacant Office Maint"; - req_access_txt = "32" + name = "Vacant Office Maint" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -57574,6 +57746,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/vacant_room) "rdW" = ( @@ -58331,7 +58504,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Containment Pen 5"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/cable{ icon_state = "1-2" @@ -58354,11 +58527,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/courtroom) "roM" = ( @@ -58587,9 +58760,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "rsm" = ( @@ -58919,8 +59090,7 @@ "rwD" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "16" + name = "AI Core" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58935,6 +59105,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "rwS" = ( @@ -59084,6 +59255,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rzS" = ( @@ -59175,8 +59349,7 @@ /area/engine/atmos/pumproom) "rBT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Telecomms Maintenance"; - req_access_txt = "61" + name = "Telecomms Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -59184,6 +59357,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plating, /area/maintenance/central) "rBY" = ( @@ -59387,8 +59561,7 @@ /area/janitor) "rEP" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/structure/cable{ icon_state = "1-2" @@ -59404,6 +59577,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "rFg" = ( @@ -59423,11 +59597,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/research/glass{ - name = "Secondary AI Core"; - normalspeed = 0; - req_access_txt = "47" +/obj/machinery/door/airlock/command/glass{ + name = "R&D Servers and Networking" }, +/obj/effect/mapping_helpers/airlock/access/any/science/rnd_servers, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/science/server) "rFr" = ( @@ -59656,7 +59830,7 @@ name = "Warehouse Door Control"; pixel_x = 1; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -59711,8 +59885,7 @@ /area/hallway/primary/central) "rKI" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -59733,6 +59906,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "rKM" = ( @@ -59965,7 +60139,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = -7; - req_one_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -60035,12 +60209,16 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; name = "Chemistry shutters" }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/medical/chemistry) "rOt" = ( @@ -60251,8 +60429,7 @@ /area/engine/engineering) "rRG" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -60264,6 +60441,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "rRH" = ( @@ -60326,8 +60504,7 @@ /area/science/robotics/mechbay) "rSn" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/structure/cable{ icon_state = "1-2" @@ -60351,6 +60528,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/foyer) "rSp" = ( @@ -60418,8 +60596,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -60430,6 +60607,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "rTv" = ( @@ -60642,8 +60820,7 @@ /area/hallway/primary/port) "rWd" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -60652,6 +60829,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "rWg" = ( @@ -61024,9 +61203,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "28" + name = "Kitchen cold room" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "sbp" = ( @@ -61042,8 +61221,7 @@ "sbt" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -61055,6 +61233,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "sbH" = ( @@ -61085,7 +61264,7 @@ base_state = "right"; icon_state = "right"; name = "Monkey Pen"; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -61225,7 +61404,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen 4"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -61235,13 +61414,13 @@ /area/science/xenobiology) "scH" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "sdk" = ( @@ -61310,9 +61489,12 @@ /turf/closed/mineral/random/low_chance_air, /area/space/nearstation) "sek" = ( -/obj/machinery/door/window/westright, +/obj/machinery/door/window/westright{ + dir = 4; + req_access_txt = "kitchen"; + name = "Kitchen Window" + }, /obj/structure/table/reinforced, -/obj/effect/turf_decal/sand, /obj/item/reagent_containers/food/snacks/pie/cream, /obj/structure/disposalpipe/segment{ dir = 8 @@ -61320,9 +61502,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel{ - icon_state = "cafeteria" +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "sem" = ( /obj/structure/chair/sofa/right, @@ -61473,6 +61656,9 @@ /obj/structure/chair{ dir = 4 }, +/obj/structure/sign/poster/official/obey{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/security/execution/transfer) "shP" = ( @@ -61641,7 +61827,7 @@ /area/ruin/powered) "slo" = ( /obj/machinery/door/window/southleft{ - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/machinery/door/poddoor/shutters{ id = "giftshop" @@ -61665,8 +61851,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -61685,6 +61870,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/office) "slC" = ( @@ -62540,12 +62726,12 @@ dir = 8 }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "szs" = ( @@ -62596,13 +62782,13 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "aicoredoor"; name = "AI Chamber entrance shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "szX" = ( @@ -62651,7 +62837,7 @@ id = "atmos"; name = "Atmospherics Lockdown"; pixel_y = 24; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -62775,7 +62961,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -25; - req_access_txt = "31" + req_access_txt = "carsgo_bay" }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -63460,7 +63646,7 @@ }, /obj/machinery/door/window{ name = "Low-Risk Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -63601,8 +63787,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -63619,6 +63804,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "sNj" = ( @@ -63655,20 +63841,20 @@ name = "Left side containment blast doors"; pixel_x = -6; pixel_y = 30; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 6; pixel_y = 30; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = 39; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/plortrefinery, /turf/open/floor/plasteel/white, @@ -63692,13 +63878,13 @@ dir = 8 }, /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Courtroom" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/courtroom) "sOi" = ( @@ -63739,9 +63925,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/security/courtroom) "sOo" = ( @@ -63825,6 +64010,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"sQp" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/open/floor/plating, +/area/maintenance/port/aft) "sQz" = ( /obj/structure/window/reinforced{ dir = 4 @@ -64034,13 +64227,13 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hydroponics) "sVg" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -64106,12 +64299,15 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/turf_decal/arrows/white{ + color = "#99ccff"; + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "sVB" = ( /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -64122,6 +64318,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "sVU" = ( @@ -64158,8 +64355,7 @@ /area/maintenance/port/fore) "sWo" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -64167,6 +64363,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "sWs" = ( @@ -64509,7 +64706,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -64525,9 +64722,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "tbV" = ( @@ -65042,7 +65238,9 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/door/airlock/medical/glass, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Treatment Center" + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -65050,6 +65248,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "tkr" = ( @@ -65102,8 +65302,7 @@ /area/medical/storage/backroom) "tlC" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" + name = "Kitchen" }, /obj/effect/turf_decal/sand, /obj/machinery/door/firedoor/border_only{ @@ -65112,6 +65311,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel{ icon_state = "cafeteria" }, @@ -65208,8 +65408,7 @@ /area/security/brig) "tmQ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -65229,6 +65428,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "tnb" = ( @@ -65348,7 +65548,7 @@ /obj/machinery/door/window{ dir = 1; name = "Backup SMES Chamber"; - req_access_txt = "32" + req_access_txt = "engine_equip" }, /obj/structure/cable{ icon_state = "1-2" @@ -65408,8 +65608,7 @@ /area/crew_quarters/bar) "tqW" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -65417,6 +65616,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "trc" = ( @@ -65679,12 +65879,12 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/explab) "tvh" = ( @@ -65996,9 +66196,7 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "tAj" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;36" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -66014,6 +66212,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/general, /turf/open/floor/plating, /area/maintenance/port/fore) "tAq" = ( @@ -66029,13 +66229,13 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "tAK" = ( @@ -66145,9 +66345,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -66157,6 +66355,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "tCc" = ( @@ -66174,8 +66373,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -66186,6 +66384,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "tCo" = ( @@ -66240,9 +66439,6 @@ pixel_y = 25; specialfunctions = 4 }, -/obj/structure/sign/poster/official/obey{ - pixel_x = 32 - }, /turf/open/floor/plasteel, /area/security/prison) "tCZ" = ( @@ -66435,8 +66631,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 @@ -66444,6 +66639,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "tGC" = ( @@ -66869,8 +67065,7 @@ /area/maintenance/central/secondary) "tOw" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Monitoring Room"; - req_access_txt = "65" + name = "MiniSat Monitoring Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -66882,6 +67077,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/aisat_interior) "tOY" = ( @@ -66966,13 +67162,13 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" + name = "Chief Engineer" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "tPL" = ( @@ -67152,7 +67348,7 @@ dir = 2; icon_state = "left"; name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ @@ -67324,9 +67520,7 @@ /area/science/xenobiology) "tUi" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Storage"; - normalspeed = 0; - req_access_txt = "5" + name = "Medical Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -67337,6 +67531,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "tUl" = ( @@ -67427,14 +67622,14 @@ /area/hallway/primary/central) "tUT" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "tUW" = ( @@ -67513,9 +67708,10 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "tWu" = ( @@ -67664,8 +67860,7 @@ /area/security/prison) "tYy" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67688,6 +67883,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "tYC" = ( @@ -67780,9 +67976,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "uau" = ( @@ -68338,6 +68534,7 @@ "ujc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/lawoffice) "ujr" = ( @@ -68613,9 +68810,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "unf" = ( @@ -68643,7 +68839,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel, @@ -68670,7 +68866,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -68776,9 +68972,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "upW" = ( @@ -68907,8 +69103,7 @@ /area/maintenance/starboard/fore) "uso" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/newscaster{ pixel_x = 32 @@ -68923,6 +69118,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "usq" = ( @@ -68990,8 +69186,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/structure/cable{ icon_state = "4-8" @@ -69002,6 +69197,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plating, /area/hallway/secondary/service) "utD" = ( @@ -69478,13 +69674,15 @@ idInterior = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = 5; - pixel_y = 25 + pixel_y = 25; + req_access_txt = "tcomms" }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = -7; - pixel_y = 23 + pixel_y = 23; + req_access_txt = "tcomms" }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -69605,9 +69803,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Disposal Access"; - req_access_txt = "12" + name = "Disposal Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "uFc" = ( @@ -69615,7 +69813,7 @@ /obj/machinery/door/window/eastleft{ dir = 1; name = "Engineering Desk"; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/item/deskbell/preset/engi{ pixel_x = 8; @@ -69623,8 +69821,12 @@ }, /obj/item/storage/pencil_holder/crew{ pixel_x = -10; - pixel_y = 12 + pixel_y = -1 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/engine/foyer) "uFp" = ( @@ -69746,7 +69948,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plasteel, @@ -70418,6 +70620,9 @@ dir = 1 }, /obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/grass, /area/hallway/secondary/exit) "uVk" = ( @@ -70602,8 +70807,7 @@ "uYy" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; - normalspeed = 0; - req_access_txt = "55" + normalspeed = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -70614,6 +70818,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "uYQ" = ( @@ -70810,7 +71015,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen 1"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; @@ -70970,6 +71175,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics) "veU" = ( @@ -71231,6 +71442,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "vjp" = ( @@ -71529,15 +71743,14 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "voZ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vpg" = ( @@ -71661,7 +71874,7 @@ dir = 2; icon_state = "left"; name = "Genetics Desk"; - req_access_txt = "5;9;68" + req_access_txt = "genetics" }, /obj/item/paper_bin{ pixel_x = -3; @@ -71675,7 +71888,7 @@ pixel_x = 9; pixel_y = 9 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/genetics) "vse" = ( /obj/structure/table/wood, @@ -71835,8 +72048,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 8 @@ -71844,6 +72056,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "vtU" = ( @@ -71898,8 +72111,7 @@ autoclose = 0; frequency = 1449; id_tag = "telecomms_airlock_exterior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable/yellow{ @@ -71911,6 +72123,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/plasteel, /area/tcommsat/storage) "vuV" = ( @@ -72016,15 +72230,14 @@ /obj/item/scalpel, /obj/machinery/door/window/northright{ name = "Autopsy Desk"; - req_access_txt = "4" + req_access_txt = "detective" }, /obj/item/paper/autopsy, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "vwo" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -72032,6 +72245,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "vwp" = ( @@ -72384,7 +72598,7 @@ /obj/machinery/door/window/southleft{ dir = 8; name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 8 @@ -72490,7 +72704,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Monkey Pen"; - req_access_txt = "9" + req_access_txt = "genetics" }, /mob/living/carbon/monkey, /obj/structure/window/reinforced{ @@ -72774,6 +72988,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 8 }, @@ -72848,8 +73065,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -72857,6 +73073,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "vMP" = ( @@ -72914,9 +73131,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "vNA" = ( @@ -73032,7 +73249,9 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "vOS" = ( -/obj/machinery/door/window/southleft, +/obj/machinery/door/window/southleft{ + req_access_txt = "library" + }, /obj/machinery/camera{ c_tag = "Library North"; dir = 4 @@ -73359,7 +73578,8 @@ "vUC" = ( /obj/machinery/quantumpad{ map_pad_id = "sciencetoai"; - map_pad_link_id = "aitoscience" + map_pad_link_id = "aitoscience"; + name = "AI Satellite Transport" }, /obj/item/radio/intercom{ dir = 8; @@ -73417,8 +73637,7 @@ /area/engine/atmos/distro) "vVe" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Power Storage"; - req_access_txt = "11" + name = "Power Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -73437,6 +73656,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engineering) "vVy" = ( @@ -73542,8 +73762,7 @@ /area/hallway/primary/port) "vYq" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -73556,6 +73775,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "vYx" = ( @@ -73580,6 +73800,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/primary/port) +"vYA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/courtroom) "vYC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -73752,14 +73984,14 @@ name = "Public Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/button/door{ id = "robotics2"; name = "Science Shutters Control Button"; pixel_x = 26; pixel_y = 27; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/button/door{ desc = "A remote control switch for the robotics foyer."; @@ -73768,7 +74000,7 @@ normaldoorcontrol = 1; pixel_x = 39; pixel_y = 27; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -74447,7 +74679,6 @@ "wlh" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -74456,6 +74687,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "wln" = ( @@ -74464,8 +74696,7 @@ /area/tcommsat/server) "wlt" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -74482,6 +74713,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/port/fore) "wlB" = ( @@ -75418,7 +75650,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel, @@ -75577,7 +75809,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -75711,8 +75943,7 @@ /area/security/physician) "wBT" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Auxiliary Storage"; - req_access_txt = "24" + name = "Atmospherics Auxiliary Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -75732,6 +75963,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "wCt" = ( @@ -75779,9 +76011,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner, /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "wCU" = ( @@ -75818,8 +76050,7 @@ /area/ai_monitored/storage/satellite) "wDy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Warehouse Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Warehouse Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -75833,6 +76064,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/warehouse) "wDH" = ( @@ -76827,8 +77059,7 @@ dir = 1 }, /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -76849,6 +77080,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/mineral/titanium, /area/teleporter) "wTi" = ( @@ -77004,7 +77236,8 @@ /obj/machinery/button/door{ id = "hosspace"; name = "Space Shutters Control"; - pixel_y = 36 + pixel_y = 36; + req_access_txt = "hos" }, /obj/item/paper_bin{ pixel_y = 5 @@ -77426,12 +77659,12 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "xbn" = ( @@ -77442,12 +77675,12 @@ /area/ai_monitored/turret_protected/aisat_interior) "xbB" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "xcB" = ( @@ -77469,8 +77702,7 @@ /area/security/prison) "xcY" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -77484,6 +77716,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "xds" = ( @@ -77580,9 +77813,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "xfk" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -77595,6 +77825,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/port/fore) "xfu" = ( @@ -77849,8 +78080,7 @@ /area/hallway/primary/starboard) "xkg" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -77861,6 +78091,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "xki" = ( @@ -78077,8 +78308,7 @@ /area/security/brig) "xnZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Paramedic Staging Area Maintenance"; - req_access_txt = "69" + name = "Paramedic Staging Area Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -78089,6 +78319,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "xom" = ( @@ -78118,19 +78349,12 @@ /turf/open/floor/plasteel, /area/engine/foyer) "xpC" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -78140,6 +78364,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + name = "Head of Security" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/plasteel, /area/crew_quarters/heads/hos) "xpM" = ( @@ -78230,7 +78458,7 @@ /obj/machinery/door/window/southleft{ dir = 4; name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -78447,7 +78675,8 @@ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = 21; - pixel_y = -4 + pixel_y = -4; + req_access_txt = "tcomms" }, /obj/item/radio/intercom{ freerange = 1; @@ -78465,7 +78694,7 @@ dir = 1; layer = 3.1; name = "Cyborg Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -78539,7 +78768,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access_txt = "maintenance" }, /obj/machinery/button/massdriver{ id = "trash"; @@ -78603,7 +78832,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_x = -26; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison) @@ -78747,13 +78976,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "xzU" = ( @@ -78828,8 +79057,7 @@ /area/hallway/secondary/entry) "xAQ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Evidence Storage"; - req_access_txt = "63" + name = "Evidence Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -78841,6 +79069,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "xAW" = ( @@ -79283,7 +79513,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/item/deskbell/preset/supply{ pixel_x = 7; @@ -79413,14 +79643,14 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "xKQ" = ( @@ -79473,8 +79703,7 @@ /area/medical/medbay/central) "xLc" = ( /obj/machinery/door/airlock/maintenance{ - name = "Bar Storage Maintenance"; - req_access_txt = "25" + name = "Bar Storage Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -79487,6 +79716,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/maintenance/port/fore) "xLd" = ( @@ -79633,14 +79863,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_one_access_txt = "10" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/engineering/glass{ + name = "External Access and Backup SMES" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "xNz" = ( @@ -79746,8 +79976,7 @@ }, /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -79755,6 +79984,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/execution/transfer) "xOT" = ( @@ -79958,8 +80188,7 @@ /area/engine/foyer) "xSa" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -79967,6 +80196,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "xSo" = ( @@ -80146,9 +80376,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance Closet"; - req_access_txt = "47" + name = "Research Maintenance Closet" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/maintenance/central/secondary) "xVO" = ( @@ -80178,9 +80408,6 @@ /turf/closed/wall/r_wall, /area/engine/atmos/distro) "xWi" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, /turf/open/floor/mech_bay_recharge_floor/dark, /area/science/robotics/mechbay) "xWm" = ( @@ -80264,6 +80491,18 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"xXB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/maintenance/port/fore) "xXG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -80461,7 +80700,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = 6; pixel_y = 25; - req_access_txt = "36" + req_access_txt = "clerk" }, /obj/effect/turf_decal/tile/darkgreen{ dir = 1 @@ -80487,7 +80726,8 @@ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = -5; - pixel_y = 25 + pixel_y = 25; + req_access_txt = "clerk" }, /turf/open/floor/plasteel, /area/clerk) @@ -80618,12 +80858,11 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ycz" = ( @@ -80640,8 +80879,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -80649,6 +80887,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/security/checkpoint/medical) "ycH" = ( @@ -80686,8 +80925,7 @@ /area/quartermaster/sorting) "ydq" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -80695,6 +80933,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "ydt" = ( @@ -80914,8 +81153,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/atmos/glass{ - name = "Construction Area"; - req_access_txt = "24" + name = "Construction Area" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 @@ -80923,6 +81161,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ygB" = ( @@ -80946,7 +81185,6 @@ "ygS" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -80956,6 +81194,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "ygU" = ( @@ -98857,11 +99096,11 @@ nkT aAw aAw aAw -jOx +ltA ixW vYd ixW -aAw +qNB aAw aAw cNO @@ -100351,7 +100590,7 @@ qad nFu xmg kit -aao +bZX sEf aao aao @@ -101194,7 +101433,7 @@ aZG aPk aVy aQo -aVy +peB aaQ wzK oKW @@ -106524,9 +106763,9 @@ wkR lEu qHN wkR -wkR +xXB evt -wkR +lml wdu wkR jTt @@ -107038,8 +107277,8 @@ iXr cLe oXy rft -rft -mab +eJP +vYA aFr gLJ soS @@ -107110,7 +107349,7 @@ thM thM elg oFH -dke +nQb yfs qhQ gbA @@ -108361,7 +108600,7 @@ akp akp akp akp -azt +aAA aNg kfu ycH @@ -110409,7 +110648,7 @@ bXz cij jpN cij -cij +jpN ktk adX aFu @@ -111659,9 +111898,9 @@ qiR axP wjs mLG -eoe +byp rzN -eoe +frL eoe eoe lyn @@ -113207,7 +113446,7 @@ aXS aXS aXS eYe -aZH +qer oGi oGi oGi @@ -113721,7 +113960,7 @@ oGi oGi oGi oGi -ucA +dke nwk ucA oGi @@ -114581,7 +114820,7 @@ ciZ uHk aVN mNt -oQP +sQp aQo aQo atJ @@ -118157,7 +118396,7 @@ aWh eJa hvX mNs -hvX +fgk uKZ aWh agB @@ -125817,9 +126056,9 @@ aNY jDk eIN piD -ajX -qnO -ajX +azt +lLn +azt uVe eIN dfi diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 774c2c0cf55e..0c4cdb9df3d8 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -24,8 +24,7 @@ /area/science/research) "aaO" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -36,6 +35,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "aaQ" = ( @@ -240,14 +240,13 @@ /turf/open/floor/plasteel, /area/security/brig) "aen" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "aeq" = ( @@ -276,8 +275,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -289,6 +287,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel, /area/medical/storage) "afk" = ( @@ -1123,8 +1122,7 @@ /area/engine/atmos) "aur" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "9" + name = "Genetics Research Access" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -1139,6 +1137,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "aux" = ( @@ -1229,9 +1228,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "avK" = ( @@ -1673,8 +1672,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1688,6 +1686,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/hallway/secondary/service) "aGC" = ( @@ -1823,8 +1822,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/structure/cable{ icon_state = "1-2" @@ -1833,6 +1831,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "aJS" = ( @@ -1869,7 +1868,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = 22 + pixel_y = 22; + req_access_txt = "atmospherics" }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -1877,7 +1877,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = -21 + pixel_y = -21; + req_access_txt = "atmospherics" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -2305,6 +2306,9 @@ /area/engine/atmos) "aSn" = ( /obj/structure/railing, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 4 }, @@ -2608,12 +2612,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "aXH" = ( @@ -2803,7 +2807,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 24; - pixel_y = -6 + pixel_y = -6; + req_access_txt = "robotics" }, /obj/machinery/light_switch{ pixel_x = 24; @@ -2928,13 +2933,14 @@ /area/security/warden) "bdj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, /turf/open/floor/plating, /area/maintenance/starboard) "bdC" = ( @@ -3129,13 +3135,14 @@ /area/security/processing) "bhj" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bhk" = ( @@ -3694,8 +3701,7 @@ /area/maintenance/port/aft) "bsQ" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3703,6 +3709,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "btE" = ( @@ -3813,7 +3820,7 @@ /area/hallway/primary/central) "bvJ" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Surgery Observation" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3830,6 +3837,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "bvP" = ( @@ -3970,8 +3978,7 @@ /area/security/courtroom) "byL" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3982,6 +3989,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port) "bzc" = ( @@ -4223,8 +4231,7 @@ /area/tcommsat/computer) "bGn" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -4245,6 +4252,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bGy" = ( @@ -4313,13 +4321,12 @@ /turf/open/space/basic, /area/ai_monitored/storage/satellite) "bIo" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "bIv" = ( @@ -4367,15 +4374,14 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bJc" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/vacant_room/commissary) "bJy" = ( @@ -4711,8 +4717,7 @@ /area/engine/atmos) "bQg" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -4723,6 +4728,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "bQv" = ( @@ -4953,7 +4959,7 @@ name = "Privacy Shutter Controls"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "35;28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5170,8 +5176,7 @@ /area/engine/engineering) "cad" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5185,6 +5190,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/research) "cai" = ( @@ -5228,9 +5234,9 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "caN" = ( @@ -5350,8 +5356,7 @@ /area/bridge) "ccx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -5359,6 +5364,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "ccS" = ( @@ -5382,8 +5388,7 @@ /area/bridge) "cdf" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5401,6 +5406,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "cdj" = ( @@ -5432,7 +5438,8 @@ name = "port to mix" }, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ - pixel_y = 28 + pixel_y = 28; + req_access_txt = "toxins" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5616,6 +5623,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "chE" = ( @@ -5646,8 +5654,7 @@ /area/space/nearstation) "ciy" = ( /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -5664,6 +5671,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "ciD" = ( @@ -5941,21 +5949,21 @@ id = "xenobio_main"; name = "Main containment blast doors"; pixel_x = -32; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = -32; pixel_y = 10; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio_l"; name = "Left side containment blast doors"; pixel_x = -32; pixel_y = -10; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/disposal/bin{ name = "sample disposal unit" @@ -6358,12 +6366,12 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "cyX" = ( @@ -6736,8 +6744,7 @@ /area/crew_quarters/dorms) "cGJ" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/structure/cable{ icon_state = "4-8" @@ -6751,6 +6758,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/crew_quarters/bar) "cGM" = ( @@ -6823,8 +6831,7 @@ /area/maintenance/port/fore) "cHW" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6837,6 +6844,7 @@ id = "Prison Gate"; name = "prison blast door" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "cIi" = ( @@ -6884,8 +6892,7 @@ /area/hallway/secondary/exit/departure_lounge) "cIK" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6905,6 +6912,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "cIN" = ( @@ -6914,14 +6922,14 @@ name = "Secure Storage Control"; pixel_x = -8; pixel_y = 24; - req_access_txt = "56" + req_access_txt = "engineering" }, /obj/machinery/button/door{ id = "enginepashutter"; name = "Particle Accelerator Shutter Control"; pixel_x = 2; pixel_y = 24; - req_access_txt = "56" + req_access_txt = "engineering" }, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer"; @@ -6956,8 +6964,7 @@ /area/maintenance/central) "cJK" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6975,13 +6982,14 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plasteel/white, /area/science/explab) "cLl" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ name = "Engineering Desk"; - req_one_access_txt = "32;19" + req_access_txt = "engineering" }, /obj/item/deskbell/preset/engi{ pixel_x = -8; @@ -7068,8 +7076,7 @@ /area/solar/starboard/fore) "cMt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -7081,6 +7088,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "cMD" = ( @@ -7119,6 +7127,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/window/southleft{ + dir = 8; + name = "Virology"; + req_access_txt = "virology" + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cNq" = ( @@ -7375,9 +7388,7 @@ "cSX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7387,6 +7398,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel/dark, /area/maintenance/aft) "cTN" = ( @@ -7409,13 +7421,15 @@ idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access_txt = "ai_master" }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -7446,7 +7460,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_one_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -7482,8 +7496,7 @@ /area/ai_monitored/turret_protected/ai) "cVJ" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7503,6 +7516,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "cVS" = ( @@ -7553,15 +7567,14 @@ /turf/open/floor/wood, /area/hallway/primary/central) "cWw" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "cWB" = ( @@ -7621,8 +7634,7 @@ /area/science/robotics/lab) "cXJ" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "39" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -7634,6 +7646,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "cXW" = ( @@ -7718,12 +7731,13 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "dbb" = ( @@ -7800,8 +7814,7 @@ /area/maintenance/disposal/incinerator) "dcQ" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/structure/cable{ icon_state = "1-2" @@ -7819,6 +7832,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "dcX" = ( @@ -7840,7 +7854,7 @@ name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = 10; - req_access_txt = "57" + req_access_txt = "hop" }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) @@ -7851,11 +7865,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 2"; - name = "Cell 2"; - req_access_txt = "1" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -7872,6 +7881,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 2"; + name = "Cell 2"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "ddE" = ( @@ -7960,7 +7974,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ name = "Atmospherics Desk"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7971,7 +7985,7 @@ pixel_y = 8 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engine/atmos) "dfZ" = ( /obj/machinery/light{ @@ -7981,8 +7995,7 @@ /area/science/xenobiology) "dgh" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -8015,6 +8028,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "dgk" = ( @@ -8390,8 +8404,7 @@ /area/hallway/primary/central) "dpy" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Foyer"; - req_one_access_txt = "24;10" + name = "Atmospherics Foyer" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -8411,6 +8424,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "dpM" = ( @@ -8447,8 +8461,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "4-8" @@ -8457,6 +8470,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "dqp" = ( @@ -8606,8 +8620,7 @@ /area/hallway/primary/central) "dsZ" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_one_access_txt = "31;48" + name = "Cargo Bay" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 @@ -8616,6 +8629,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/storage) "dtk" = ( @@ -8632,9 +8646,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "5;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -8644,6 +8656,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "dtz" = ( @@ -8978,14 +8991,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = -25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = -25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/light_switch{ pixel_x = -4; @@ -9062,8 +9075,7 @@ /area/maintenance/aft) "dDZ" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -9077,8 +9089,7 @@ /area/security/warden) "dEt" = ( /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9092,6 +9103,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "dEw" = ( @@ -9375,8 +9387,7 @@ "dJN" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9403,6 +9414,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "dJS" = ( @@ -9421,11 +9433,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 3"; - name = "Cell 3"; - req_access_txt = "1" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -9442,6 +9449,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 3"; + name = "Cell 3"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "dKn" = ( @@ -9456,15 +9468,16 @@ /turf/open/floor/plating, /area/maintenance/disposal) "dKX" = ( -/obj/structure/closet/emcloset, -/obj/machinery/button/door{ - id = "podescape"; - name = "Pod Bay Control"; - pixel_x = 8; - pixel_y = 24 +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_l"; + name = "Left side containment blast door" }, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/door/window/southleft{ + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, +/turf/open/floor/engine, +/area/science/xenobiology) "dKY" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ @@ -9956,9 +9969,9 @@ dir = 1 }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "dVN" = ( @@ -10018,6 +10031,7 @@ /obj/machinery/door/airlock/external{ name = "Construction Zone" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "dXy" = ( @@ -10182,6 +10196,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "ebD" = ( @@ -10462,7 +10477,7 @@ dir = 1; layer = 3.1; name = "Cyborg Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/machinery/computer/upload/borg{ dir = 1 @@ -10599,9 +10614,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Paramedic Staging Area Maintenance"; - req_access_txt = "69" + name = "Paramedic Staging Area Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "ejG" = ( @@ -10837,8 +10852,7 @@ /area/quartermaster/storage) "epk" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -10846,6 +10860,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/space/nearstation) "epq" = ( @@ -10868,14 +10883,12 @@ /turf/closed/wall, /area/quartermaster/warehouse) "epV" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/port/aft) "eqh" = ( @@ -11195,13 +11208,13 @@ "exC" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "exN" = ( @@ -11371,8 +11384,7 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11383,6 +11395,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "eBU" = ( @@ -11731,13 +11744,13 @@ /area/maintenance/fore) "eKB" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_access_txt = "1" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "eKG" = ( @@ -12472,8 +12485,7 @@ /area/engine/engineering) "fat" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_one_access_txt = "19; 61" + name = "Telecomms Control Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -12488,6 +12500,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "fau" = ( @@ -12528,8 +12541,7 @@ "fbR" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -12544,6 +12556,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "fbU" = ( @@ -12616,8 +12629,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Monitoring Room"; - req_access_txt = "65" + name = "MiniSat Monitoring Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -12627,6 +12639,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ffa" = ( @@ -12671,14 +12684,15 @@ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -7; - pixel_y = 30 + pixel_y = 30; + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 7; pixel_y = 30; - req_access_txt = "2" + req_access_txt = "brig" }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -12697,6 +12711,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "ffF" = ( +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_middle, /area/library) "ffQ" = ( @@ -12880,8 +12895,7 @@ "fiA" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -12897,6 +12911,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "fiB" = ( @@ -12936,14 +12951,14 @@ /turf/open/floor/engine, /area/science/explab) "fkv" = ( -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_x = -32 - }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/machinery/door_timer{ + id = "Cell 3"; + name = "Cell 3"; + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "fkG" = ( @@ -12982,7 +12997,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "flE" = ( /obj/structure/table/wood, @@ -13089,8 +13104,7 @@ /area/engine/atmos) "fqa" = ( /obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" + name = "Hydroponics Backroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13101,6 +13115,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "fqS" = ( @@ -13240,19 +13255,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "fsl" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/secred/filled/line/lower{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) "fsK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13476,8 +13480,7 @@ dir = 1 }, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -13486,6 +13489,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "fxG" = ( @@ -13575,9 +13579,9 @@ /obj/machinery/door/window/westleft{ dir = 1; name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/office) "fzE" = ( /obj/effect/turf_decal/stripes, @@ -13882,6 +13886,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle{ dir = 4 }, @@ -13991,6 +13998,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/wood, /area/library) "fIB" = ( @@ -14061,8 +14069,7 @@ /area/medical/sleeper) "fJT" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_one_access_txt = "19; 61" + name = "Telecomms Control Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -14075,6 +14082,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "fJY" = ( @@ -14181,8 +14189,7 @@ /area/crew_quarters/heads/chief) "fLH" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14201,6 +14208,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fLS" = ( @@ -14449,6 +14457,9 @@ /area/medical/storage) "fRn" = ( /obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "fRq" = ( @@ -14507,7 +14518,7 @@ name = "Secure Storage Control"; pixel_x = 7; pixel_y = 25; - req_access_txt = "11" + req_access_txt = "engine_equip" }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 @@ -14602,9 +14613,9 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Armory"; - req_access_txt = "3"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "fTU" = ( @@ -14845,7 +14856,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/engine, /area/engine/engineering) @@ -14900,8 +14911,7 @@ /area/engine/engineering) "gaI" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14912,6 +14922,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "gbh" = ( @@ -15309,8 +15320,7 @@ /area/science/server) "gko" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -15321,6 +15331,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "gkJ" = ( @@ -15597,10 +15608,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "63" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15629,8 +15636,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/structure/cable{ icon_state = "4-8" @@ -15638,12 +15644,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "gsD" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -15653,6 +15658,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/vacant_room/commissary) "gsG" = ( @@ -15762,7 +15768,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15772,7 +15778,7 @@ pixel_x = -8; pixel_y = -4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hydroponics) "guQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower{ @@ -15793,8 +15799,7 @@ /area/crew_quarters/kitchen) "gvb" = ( /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_access_txt = "25" + name = "Bar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -15814,6 +15819,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/maintenance/port/aft) "gvo" = ( @@ -15853,13 +15859,13 @@ "gvG" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "gvP" = ( @@ -15886,8 +15892,7 @@ /area/engine/atmos) "gxd" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medical Maintenance Access"; - req_access_txt = "5" + name = "Medical Maintenance Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15896,6 +15901,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "gxe" = ( @@ -16011,8 +16017,7 @@ /area/engine/atmos) "gAg" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -16023,6 +16028,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/starboard) "gAh" = ( @@ -16298,7 +16304,7 @@ /obj/machinery/door/window/brigdoor/northright{ name = "Filing Room"; opacity = 1; - req_access_txt = "77" + req_access_txt = "psychologist" }, /turf/open/floor/wood, /area/medical/psych) @@ -16473,13 +16479,13 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_interior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "aicoredoor"; name = "AI Chamber entrance shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "gMA" = ( @@ -16636,8 +16642,7 @@ /area/hallway/secondary/entry) "gPu" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -16645,6 +16650,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/mixing) "gPv" = ( @@ -16692,7 +16698,7 @@ "gQb" = ( /obj/machinery/door/window/southleft{ name = "Containment Pen"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -16823,13 +16829,12 @@ /turf/closed/wall, /area/crew_quarters/bar) "gSN" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "gSQ" = ( @@ -17016,7 +17021,7 @@ id = "robotics2"; name = "Shutters Control Button"; pixel_y = 24; - req_access_txt = "29" + req_access_txt = "robotics" }, /obj/machinery/light_switch{ pixel_x = -8; @@ -17097,6 +17102,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 4 }, @@ -17226,11 +17234,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = null; - req_one_access_txt = "28;35" + name = "Kitchen" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "hbi" = ( @@ -17653,7 +17660,8 @@ /area/medical/morgue) "hlb" = ( /obj/machinery/door/window/northleft{ - req_access_txt = "37" + req_access_txt = "library"; + name = "Library Desk Door" }, /obj/machinery/light_switch{ pixel_x = 24 @@ -17812,7 +17820,7 @@ id = "barshutters"; name = "bar shutters" }, -/turf/open/floor/carpet/black, +/turf/open/floor/plating, /area/crew_quarters/bar) "hnM" = ( /obj/machinery/advanced_airlock_controller{ @@ -18189,7 +18197,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Robotics Desk"; - req_access_txt = "29" + req_access_txt = "robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "roboticsprivacy"; @@ -18309,9 +18317,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "hAf" = ( @@ -18565,14 +18573,14 @@ /area/bridge) "hFi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Disposals Maintenance"; - req_access_txt = "31" + name = "Disposals Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/sorting) "hFt" = ( @@ -18656,8 +18664,7 @@ /area/storage/primary) "hGO" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -18674,6 +18681,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "hHk" = ( @@ -18720,7 +18728,7 @@ }, /obj/machinery/door/window/northleft{ name = "Secure Board Storage"; - req_access_txt = "53" + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -18798,7 +18806,7 @@ dir = 2; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 5 @@ -18885,9 +18893,9 @@ /area/lawoffice) "hLQ" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + name = "Confession Booth (Chaplain)" }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "hLW" = ( @@ -18984,8 +18992,7 @@ /area/science/research) "hOL" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19006,6 +19013,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "hOQ" = ( @@ -19129,7 +19137,7 @@ name = "Disposal Vent Control"; pixel_x = -8; pixel_y = -23; - req_access_txt = "12" + req_access_txt = "maintenance" }, /obj/structure/window/reinforced/spawner/east, /obj/structure/railing/corner{ @@ -19291,7 +19299,7 @@ "hWs" = ( /obj/machinery/door/window/northleft{ name = "Checkpoint Desk"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -19349,8 +19357,7 @@ /area/bridge) "hXl" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -19363,6 +19370,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plating, /area/maintenance/port/aft) "hXS" = ( @@ -19717,8 +19725,7 @@ /area/crew_quarters/dorms) "iiD" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -19737,6 +19744,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "iiG" = ( @@ -19901,8 +19909,7 @@ /area/ai_monitored/secondarydatacore) "ilL" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Main"; - req_access_txt = "24" + name = "Atmospherics Main" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -19922,6 +19929,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "ilP" = ( @@ -20290,8 +20298,7 @@ /area/crew_quarters/kitchen) "ivt" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20308,6 +20315,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "ivF" = ( @@ -20391,20 +20399,20 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engineering) "ixO" = ( /obj/machinery/door/airlock/security{ - name = "Courtroom Prisoner Access"; - req_access_txt = "63; 42" + name = "Courtroom Prisoner Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/brig) "ixS" = ( @@ -20721,15 +20729,15 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "63" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/aft) "iIH" = ( @@ -20745,9 +20753,7 @@ /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/tcommsat/computer) "iIQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;35" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -20757,6 +20763,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "iIS" = ( @@ -20784,8 +20791,7 @@ /area/bridge) "iJU" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -20794,6 +20800,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "iKb" = ( @@ -20868,7 +20875,7 @@ dir = 4; icon_state = "right"; name = "Captain's Desk Door"; - req_access_txt = "20" + req_access_txt = "captain" }, /obj/machinery/camera{ c_tag = "Bridge - Captain's Office" @@ -20929,14 +20936,14 @@ /area/construction/mining/aux_base) "iMB" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Backroom"; - req_access_txt = "5" + name = "Medbay Backroom" }, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "iMD" = ( @@ -21050,12 +21057,12 @@ /area/hallway/secondary/exit/departure_lounge) "iOb" = ( /obj/machinery/door/airlock/hatch{ - name = "TeleSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "TeleSat Space Access Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plating, /area/tcommsat/computer) "iOe" = ( @@ -21227,8 +21234,7 @@ "iQC" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -21236,16 +21242,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "iQG" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "iQK" = ( @@ -21551,10 +21559,7 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "iXI" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, +/obj/machinery/door/airlock/vault, /obj/structure/cable{ icon_state = "4-8" }, @@ -21574,6 +21579,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/ai_monitored/nuke_storage) "iXL" = ( @@ -21673,9 +21680,11 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "jbc" = ( -/obj/machinery/blackbox_recorder, -/turf/open/floor/circuit/telecomms/mainframe, -/area/tcommsat/server) +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jbD" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -21859,8 +21868,7 @@ /area/engine/atmos) "jgg" = ( /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "30" + name = "Server Room" }, /obj/machinery/atmospherics/pipe/simple, /obj/machinery/door/firedoor, @@ -21868,6 +21876,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "jgE" = ( @@ -21878,10 +21887,10 @@ /area/hallway/primary/central) "jgF" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "jgH" = ( @@ -22161,8 +22170,7 @@ /area/hallway/primary/central) "jla" = ( /obj/machinery/door/airlock/command{ - name = "Server Room"; - req_access_txt = "30" + name = "R&D Servers and Networking" }, /obj/structure/cable{ icon_state = "1-2" @@ -22173,6 +22181,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "jlg" = ( @@ -22348,9 +22357,9 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "joC" = ( @@ -22360,9 +22369,6 @@ name = "Mechbay APC"; pixel_x = -25 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/machinery/camera{ c_tag = "Research - Mech Bay"; dir = 4; @@ -22608,7 +22614,8 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_x = -28; - pixel_y = 5 + pixel_y = 5; + req_access_txt = "detective" }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) @@ -22656,7 +22663,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "jtZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -22764,8 +22771,7 @@ /area/maintenance/port) "jyg" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/structure/cable{ icon_state = "1-2" @@ -22783,6 +22789,7 @@ id = "Prison Gate"; name = "prison blast door" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jyj" = ( @@ -23012,6 +23019,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "jBL" = ( @@ -23097,7 +23107,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - req_access_txt = "7" + req_access_txt = "toxins" }, /turf/open/floor/plasteel, /area/science/research) @@ -23435,6 +23445,11 @@ dir = 4 }, /obj/machinery/disposal/bin, +/obj/machinery/door_timer{ + id = "Cell 1"; + name = "Cell 1"; + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "jLn" = ( @@ -23710,7 +23725,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -23737,9 +23752,7 @@ "jRI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" @@ -23748,6 +23761,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/port) "jRO" = ( @@ -23960,8 +23974,7 @@ /area/crew_quarters/kitchen) "jVz" = ( /obj/machinery/door/airlock/command{ - name = "Chief Engineer's Office"; - req_access_txt = "56" + name = "Chief Engineer's Office" }, /obj/structure/cable{ icon_state = "1-2" @@ -23988,24 +24001,31 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "jVI" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ name = "Brig Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; name = "security shutters" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, /area/security/brig) "jVO" = ( /obj/machinery/door/window/eastright{ name = "Robotics Surgery"; - req_access_txt = "29" + req_access_txt = "robotics" }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) @@ -24223,6 +24243,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plating, /area/tcommsat/computer) "kaw" = ( @@ -24418,7 +24439,7 @@ /area/ai_monitored/turret_protected/ai) "kfe" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/structure/cable{ icon_state = "1-2" @@ -24429,6 +24450,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "kfk" = ( @@ -24454,9 +24476,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Access"; - req_one_access_txt = "32;19" + name = "MiniSat Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/bridge) "kfu" = ( @@ -24909,8 +24932,7 @@ /area/hallway/primary/central) "knb" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -24918,6 +24940,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "knh" = ( @@ -25301,13 +25324,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" - }, +/obj/machinery/door/airlock/highsecurity, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) "kyL" = ( @@ -25664,8 +25685,7 @@ /area/medical/chemistry) "kJb" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25676,6 +25696,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/grimy, /area/chapel/office) "kJg" = ( @@ -25787,12 +25808,13 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "kNt" = ( @@ -26093,8 +26115,7 @@ /area/security/brig) "kTO" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable{ icon_state = "4-8" @@ -26105,6 +26126,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "kTW" = ( @@ -26211,10 +26233,10 @@ /area/hallway/primary/central) "kWk" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/space/nearstation) "kWn" = ( @@ -26309,13 +26331,13 @@ /area/security/prison) "kXM" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/grimy, /area/chapel/office) "kXP" = ( @@ -26469,9 +26491,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "laU" = ( @@ -26581,12 +26604,12 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel, /area/medical/storage) "ldf" = ( @@ -26705,6 +26728,9 @@ dir = 1; network = list("ss13","Medical") }, +/obj/machinery/light_switch{ + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "lgs" = ( @@ -26716,8 +26742,7 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -26725,6 +26750,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "lgu" = ( @@ -26913,7 +26939,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -27084,9 +27110,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "lnZ" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/wood, /area/maintenance/port/fore) "loa" = ( @@ -27144,7 +27168,7 @@ "lpx" = ( /obj/machinery/door/window/eastright{ name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -27157,9 +27181,9 @@ /area/library) "lpE" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "lpJ" = ( @@ -27233,7 +27257,7 @@ dir = 4; icon_state = "rightsecure"; name = "Head of Personnel's Desk"; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/door/window/northleft{ dir = 8; @@ -27345,7 +27369,8 @@ id = "briggate"; name = "Desk Shutters"; pixel_x = -7; - pixel_y = -25 + pixel_y = -25; + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -27368,7 +27393,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access_txt = "ai_master" }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -27707,8 +27733,7 @@ /area/maintenance/port/aft) "lCd" = ( /obj/machinery/door/airlock/virology{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -27722,6 +27747,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "lCv" = ( @@ -27998,6 +28024,7 @@ /obj/structure/railing{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/library) "lJg" = ( @@ -28193,8 +28220,7 @@ /area/space/nearstation) "lNO" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28208,6 +28234,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "lNP" = ( @@ -28335,8 +28362,7 @@ /area/maintenance/disposal/incinerator) "lRp" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28347,6 +28373,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "lRu" = ( @@ -28396,8 +28423,7 @@ /area/maintenance/port/fore) "lSn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28411,6 +28437,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "lSz" = ( @@ -28446,14 +28473,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "lTh" = ( @@ -28470,8 +28497,7 @@ /area/maintenance/starboard) "lTl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_one_access_txt = "31;48" + name = "Cargo Bay" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -28485,6 +28511,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/storage) "lTs" = ( @@ -28526,11 +28553,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload) "lTP" = ( @@ -28841,6 +28868,7 @@ /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/machinery/blackbox_recorder, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "maz" = ( @@ -28975,8 +29003,7 @@ /area/maintenance/fore) "mfh" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Desk"; - req_one_access_txt = "10;32" + name = "Engineering Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28990,6 +29017,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "mfk" = ( @@ -29055,8 +29084,7 @@ "mha" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -29074,6 +29102,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "mhp" = ( @@ -29124,7 +29153,7 @@ /area/science/research) "miG" = ( /obj/machinery/shower{ - pixel_y = 28 + pixel_y = 20 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -29179,8 +29208,7 @@ /area/maintenance/port) "mjO" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29188,6 +29216,8 @@ dirx = 2; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "mki" = ( @@ -29230,29 +29260,16 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "mkT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/door/window/northleft{ + name = "Containment Pen"; + req_access_txt = "xenobiology" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_r"; + name = "Right side containment blast door" }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/engine, +/area/science/xenobiology) "mkY" = ( /obj/machinery/disposal/bin/tagger, /obj/machinery/newscaster/security_unit{ @@ -29271,14 +29288,14 @@ /turf/open/floor/wood, /area/library) "mlJ" = ( -/obj/machinery/door/window/northleft{ - name = "Containment Pen"; - req_access_txt = "55" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_r"; name = "Right side containment blast door" }, +/obj/machinery/door/window/northleft{ + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, /turf/open/floor/engine, /area/science/xenobiology) "mlL" = ( @@ -29305,14 +29322,14 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access_txt = "47" + req_access_txt = "science" }, /obj/machinery/button/door{ id = "rnd2"; name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 5; - req_access_txt = "47" + req_access_txt = "science" }, /obj/item/toy/figure/rd, /turf/open/floor/carpet/purple, @@ -29333,8 +29350,7 @@ /area/clerk) "mmQ" = ( /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29342,6 +29358,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "mnd" = ( @@ -29362,8 +29379,7 @@ /area/hallway/primary/central) "mnx" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -29396,6 +29412,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "mny" = ( @@ -29621,9 +29638,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "mqJ" = ( @@ -30324,7 +30341,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Research Desk"; - req_access_txt = "47" + req_one_access_txt = "science;robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "researchprivate"; @@ -30433,8 +30450,7 @@ /area/security/prison) "mHn" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "47" + name = "Genetics Research Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30451,6 +30467,7 @@ name = "biohazard containment door" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/science/research) "mHy" = ( @@ -31076,12 +31093,13 @@ }, /obj/machinery/door/airlock/security{ name = "Security Office"; - req_one_access_txt = "1;4"; security_level = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "mVo" = ( @@ -31126,8 +31144,7 @@ /area/ai_monitored/storage/eva) "mVH" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -31141,6 +31158,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "mVN" = ( @@ -31188,14 +31207,14 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research/glass{ name = "Computer Science"; - normalspeed = 0; - req_access_txt = "67" + normalspeed = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "mWZ" = ( @@ -31267,7 +31286,7 @@ name = "Virology Access Button"; pixel_x = -28; pixel_y = 8; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31387,8 +31406,7 @@ /area/clerk) "naC" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -31403,6 +31421,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "naG" = ( @@ -31668,10 +31687,10 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance/external{ - name = "toxins launcher intersection"; - req_access_txt = "12" + name = "toxins launcher intersection" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "nhk" = ( @@ -31741,8 +31760,7 @@ /area/construction/mining/aux_base) "niG" = ( /obj/machinery/door/airlock/maintenance{ - name = "Disposal Access"; - req_access_txt = "12" + name = "Disposal Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -31752,6 +31770,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "niP" = ( @@ -31770,8 +31789,7 @@ /area/security/checkpoint/science) "njm" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -31782,6 +31800,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "njB" = ( @@ -31928,7 +31947,7 @@ name = "Cell 2 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -31942,8 +31961,7 @@ /area/security/prison) "nlF" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -31952,6 +31970,8 @@ dirx = -2; diry = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "nlJ" = ( @@ -32073,13 +32093,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "nnZ" = ( @@ -32218,9 +32238,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "nrZ" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" @@ -32439,7 +32456,7 @@ name = "Virology Access Console"; pixel_x = 22; pixel_y = 8; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 6 @@ -32587,7 +32604,7 @@ /obj/machinery/door/window/northright{ name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 6 @@ -32834,7 +32851,7 @@ "nGX" = ( /obj/machinery/door/window/southleft{ name = "Containment Pen"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; @@ -32843,13 +32860,6 @@ /turf/open/floor/engine, /area/science/xenobiology) "nHe" = ( -/obj/machinery/button/door{ - id = "cargowarehouse"; - name = "warehouse shutter controls"; - pixel_x = 8; - pixel_y = -24; - req_access_txt = "50" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -32904,9 +32914,8 @@ /turf/open/floor/plasteel/dark, /area/bridge) "nIc" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "nIe" = ( @@ -32959,7 +32968,7 @@ dir = 2; name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 @@ -33636,10 +33645,10 @@ "nVy" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "nWn" = ( @@ -33729,12 +33738,12 @@ /area/maintenance/port) "nXK" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "nXP" = ( @@ -33991,15 +34000,14 @@ "ocx" = ( /obj/machinery/door/window/northleft{ name = "Containment Pen"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel, /area/science/xenobiology) "ocI" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/science/research) "ocK" = ( @@ -34252,8 +34260,7 @@ /area/crew_quarters/heads/captain) "ojp" = ( /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48" + name = "Auxillary Base Construction" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -34264,6 +34271,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "ojI" = ( @@ -34407,7 +34415,7 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -4; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/deskbell/preset/med{ pixel_x = 7; @@ -34498,12 +34506,12 @@ "ooO" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "ooP" = ( @@ -34547,7 +34555,7 @@ }, /obj/machinery/door/window/eastleft{ name = "Bar Access"; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -34565,8 +34573,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Evidence Storage"; - req_access_txt = "63" + name = "Evidence Storage" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ @@ -34578,6 +34585,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "oqt" = ( @@ -34641,7 +34650,7 @@ "orH" = ( /obj/machinery/door/window/eastleft{ name = "Bar Access"; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/carpet/black, /area/crew_quarters/bar) @@ -34736,10 +34745,8 @@ /area/bridge) "otS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = null; - req_access_txt = "4;12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plating, /area/security/detectives_office) "otU" = ( @@ -34933,6 +34940,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "oyE" = ( @@ -35363,14 +35373,14 @@ /turf/open/floor/plating, /area/maintenance/disposal) "oKR" = ( -/obj/structure/sign/departments/medbay/alt{ - pixel_y = -32 - }, /obj/effect/turf_decal/bot, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; name = "biohazard containment door" }, +/obj/structure/sign/departments/minsky/research/genetics{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/science/research) "oKU" = ( @@ -35379,9 +35389,10 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Access"; - req_one_access_txt = "32;19" + name = "MiniSat Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/bridge) "oLn" = ( @@ -35486,12 +35497,10 @@ /obj/machinery/barsign{ pixel_y = 32 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "barshutters"; - name = "bar shutters" +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" }, -/obj/machinery/smartfridge/drinks, -/turf/open/floor/carpet/black, +/turf/closed/wall, /area/crew_quarters/bar) "oNz" = ( /obj/structure/lattice/catwalk, @@ -35531,8 +35540,7 @@ /area/security/brig) "oOn" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/structure/cable{ icon_state = "1-2" @@ -35543,6 +35551,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint) "oOW" = ( @@ -35716,7 +35725,8 @@ layer = 4; name = "Loading Doors"; pixel_x = 7; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "cargo_bay" }, /obj/machinery/light{ dir = 1 @@ -35726,7 +35736,8 @@ layer = 4; name = "Loading Doors"; pixel_x = -7; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "cargo_bay" }, /obj/machinery/camera{ c_tag = "Cargo - Docking Bay North" @@ -35740,7 +35751,8 @@ }, /obj/machinery/button/door{ id = "xenocontainment"; - name = "Xenobiology Containment Control" + name = "Xenobiology Containment Control"; + req_access_txt = "xenobiology" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -35824,17 +35836,17 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/eastright{ name = "Armory Desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/door/window/westright{ name = "Armory Desk"; - req_access_txt = "63" + req_access_txt = "sec_basic" }, /obj/item/deskbell/preset/armory{ pixel_x = -4; pixel_y = 5 }, -/turf/open/floor/plasteel/showroomfloor, +/turf/open/floor/plating, /area/security/warden) "oVc" = ( /obj/machinery/power/apc{ @@ -36012,8 +36024,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 @@ -36027,6 +36038,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "oZb" = ( @@ -36215,8 +36228,7 @@ /area/maintenance/port/fore) "peD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medical Maintenance Access"; - req_access_txt = "5" + name = "Medical Maintenance Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -36229,6 +36241,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "peP" = ( @@ -36349,7 +36362,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "pjm" = ( /obj/structure/closet/secure_closet/atmospherics, @@ -36375,7 +36388,10 @@ dir = 4; layer = 2.9 }, -/obj/machinery/door/window/brigdoor, +/obj/machinery/door/window/eastleft{ + name = "Mail"; + dir = 2 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "pjU" = ( @@ -36593,9 +36609,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ppd" = ( @@ -36697,8 +36713,7 @@ dir = 4 }, /obj/machinery/door/airlock/security{ - name = "Secure Evidence Storage"; - req_access_txt = "3" + name = "Secure Evidence Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36706,6 +36721,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/main) "pqS" = ( @@ -36824,8 +36840,7 @@ /area/maintenance/fore) "psr" = ( /obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/structure/cable{ icon_state = "1-2" @@ -36836,6 +36851,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "psu" = ( @@ -36949,8 +36965,7 @@ /area/security/brig) "puy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -36958,6 +36973,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/aft) "puF" = ( @@ -37029,8 +37045,7 @@ /area/quartermaster/office) "pwz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -37042,6 +37057,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/port/aft) "pwB" = ( @@ -37095,8 +37111,7 @@ /area/engine/engineering) "pxn" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -37108,6 +37123,7 @@ }, /obj/effect/turf_decal/trimline/green/filled/corner/lower, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "pxq" = ( @@ -37292,8 +37308,7 @@ dir = 4 }, /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrists office" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37356,7 +37371,7 @@ pixel_x = -8; pixel_y = 5 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "pDE" = ( /obj/machinery/air_sensor/atmos/toxin_tank, @@ -37610,7 +37625,8 @@ id = "disposalshutters"; name = "disposals shutter control"; pixel_x = -5; - pixel_y = -25 + pixel_y = -25; + req_access_txt = "cargo" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37664,8 +37680,7 @@ /area/hydroponics/garden) "pJU" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -37673,6 +37688,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "pKm" = ( @@ -37775,8 +37791,7 @@ /area/bridge) "pLS" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "39" + name = "Monkey Pen" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -37791,6 +37806,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "pLU" = ( @@ -38128,7 +38144,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/storage) "pTD" = ( /obj/machinery/modular_computer/console/preset/curator{ @@ -38182,8 +38198,7 @@ /area/maintenance/port) "pVA" = ( /obj/machinery/door/airlock/maintenance{ - name = "Toxins Maintenance Access"; - req_one_access_txt = "7" + name = "Toxins Maintenance Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38203,6 +38218,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plating, /area/maintenance/port/fore) "pVC" = ( @@ -38289,7 +38305,7 @@ /obj/machinery/door/window/northleft{ name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel/dark, @@ -38323,8 +38339,7 @@ /area/quartermaster/warehouse) "pXG" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Aux Solar Access"; - req_access_txt = "10" + name = "Starboard Aux Solar Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -38335,6 +38350,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "pYq" = ( @@ -38384,8 +38400,7 @@ /area/engine/atmos) "pZj" = ( /obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" + name = "Private Study" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38393,6 +38408,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/engine/cult, /area/library) "pZt" = ( @@ -38434,7 +38450,8 @@ dir = 1 }, /obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_x = 28 + pixel_x = 28; + req_access_txt = "toxins" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -38515,9 +38532,9 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "qck" = ( @@ -38818,8 +38835,7 @@ /area/medical/virology) "qhW" = ( /obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage"; - req_access_txt = "12" + name = "Auxiliary Tool Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -38830,6 +38846,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/storage/primary) "qij" = ( @@ -38850,8 +38867,7 @@ /area/engine/atmos) "qiN" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -38862,6 +38878,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "qiR" = ( @@ -39292,8 +39309,7 @@ /area/science/research) "qqD" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -39305,6 +39321,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "qqK" = ( @@ -39444,8 +39461,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, @@ -39536,9 +39552,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel, /area/medical/paramedic) "quW" = ( @@ -39575,8 +39591,7 @@ /area/security/checkpoint/supply) "qvj" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39585,6 +39600,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "qvv" = ( @@ -39658,8 +39674,7 @@ /area/quartermaster/qm) "qwU" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -39674,6 +39689,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "qxi" = ( @@ -39798,8 +39814,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -39811,6 +39826,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "qAe" = ( @@ -39838,7 +39854,7 @@ dir = 0; icon_state = "right"; name = "Core Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/structure/window/reinforced{ dir = 4 @@ -39921,7 +39937,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -40116,13 +40132,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "qHq" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/ramp_middle{ + dir = 8 }, -/obj/effect/spawner/structure/window, /turf/open/floor/plasteel, -/area/clerk) +/area/crew_quarters/fitness) "qHw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -40200,7 +40214,7 @@ name = "Cell 1 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -40269,9 +40283,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, +/obj/machinery/door/airlock/maintenance{ + name = "Gift Shop Maintenance" }, /turf/open/floor/plating, /area/maintenance/central) @@ -40354,8 +40368,7 @@ /area/engine/atmos) "qNk" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40372,6 +40385,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/security/checkpoint/medical) "qNp" = ( @@ -40721,13 +40735,13 @@ /area/engine/engineering) "qWy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chemistry Lab Maintenance"; - req_access_txt = "5; 33" + name = "Chemistry Lab Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plating, /area/maintenance/port/aft) "qWF" = ( @@ -40773,8 +40787,7 @@ /area/crew_quarters/kitchen) "qXg" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -40785,6 +40798,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "qXB" = ( @@ -41654,8 +41669,7 @@ /area/ai_monitored/secondarydatacore) "rqS" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Research" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41667,6 +41681,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "rrd" = ( @@ -41733,9 +41748,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "rrS" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -41768,15 +41781,14 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "rsn" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "5" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "rsE" = ( @@ -41785,7 +41797,7 @@ id = "barshutters"; name = "bar shutters" }, -/turf/open/floor/carpet/black, +/turf/open/floor/plating, /area/crew_quarters/bar) "rsK" = ( /turf/closed/wall/r_wall, @@ -42085,18 +42097,19 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "rAR" = ( /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide2, /area/library) "rAT" = ( @@ -42218,7 +42231,7 @@ "rDI" = ( /obj/machinery/door/window/southleft{ name = "Court Cell"; - req_access_txt = "2" + req_access_txt = "sec_basic" }, /turf/open/floor/plasteel/dark, /area/security/courtroom) @@ -42330,7 +42343,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/northleft{ name = "Armory Desk"; - req_access_txt = "2" + req_access_txt = "armory" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -42397,13 +42410,13 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hydroponics) "rIj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42547,9 +42560,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "rLj" = ( -/obj/machinery/door/airlock/mining{ - req_access_txt = "48" - }, +/obj/machinery/door/airlock/mining, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -42566,6 +42577,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "rLy" = ( @@ -42678,8 +42690,7 @@ /area/hallway/primary/central) "rOf" = ( /obj/machinery/door/airlock/medical{ - name = "Patient Room B"; - req_access_txt = "45" + name = "Patient Room B" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -42703,6 +42714,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "rOl" = ( @@ -42880,7 +42892,7 @@ "rRZ" = ( /obj/machinery/door/window/westleft{ name = "Monkey Pen"; - req_access_txt = "9" + req_access_txt = "genetics" }, /turf/open/floor/grass, /area/medical/genetics) @@ -42982,7 +42994,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; - req_access_txt = "47" + req_access_txt = "experimentation" }, /turf/open/floor/plasteel/white, /area/science/explab) @@ -43020,8 +43032,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -43031,6 +43042,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "rXd" = ( @@ -43367,8 +43380,7 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Incinerator Access"; - req_one_access_txt = "24;10" + name = "Incinerator Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -43379,6 +43391,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "shv" = ( @@ -43545,8 +43558,7 @@ /area/bridge) "slu" = ( /obj/machinery/door/airlock/maintenance/external{ - name = "toxins launcher intersection"; - req_access_txt = "12" + name = "toxins launcher intersection" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43555,6 +43567,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "slw" = ( @@ -43600,8 +43613,7 @@ /area/hallway/primary/central) "smr" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/structure/cable{ icon_state = "1-2" @@ -43617,6 +43629,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plating, /area/storage/tech) "smy" = ( @@ -43702,7 +43715,8 @@ id = "chemistryshutter"; name = "Chemistry Privacy Toggle"; pixel_x = -26; - pixel_y = 31 + pixel_y = 24; + req_access_txt = "chemistry" }, /obj/effect/landmark/start/chemist, /turf/open/floor/plasteel/white, @@ -43947,9 +43961,7 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "svp" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, @@ -43958,18 +43970,18 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/fore) "svz" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/port/fore) "swf" = ( @@ -44005,6 +44017,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "swM" = ( @@ -44034,8 +44049,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -44044,6 +44058,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel, /area/medical/storage) "sxt" = ( @@ -44628,9 +44643,9 @@ /area/hallway/secondary/entry) "sIl" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/space/nearstation) "sIq" = ( @@ -44664,8 +44679,7 @@ /area/engine/engineering) "sIT" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -44681,6 +44695,7 @@ }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "sIW" = ( @@ -44798,12 +44813,12 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Security Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "sKt" = ( @@ -44942,8 +44957,7 @@ /area/science/xenobiology) "sON" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -44960,6 +44974,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "sOU" = ( @@ -44993,7 +45008,7 @@ name = "Bar Shutters Control"; pixel_x = -4; pixel_y = 33; - req_access_txt = "25" + req_access_txt = "bar" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -45147,8 +45162,7 @@ /area/hallway/secondary/entry) "sRP" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -45160,19 +45174,20 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "sSc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/command{ - name = "Head of Personnel's Private Quarters"; - req_access_txt = "57" + name = "Head of Personnel's Private Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "sSe" = ( @@ -45691,12 +45706,12 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/hatch{ - name = "Telecomms"; - req_one_access_txt = "19; 61" + name = "Telecomms" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "teO" = ( @@ -45899,8 +45914,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/structure/cable{ icon_state = "4-8" @@ -45925,6 +45939,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "tiJ" = ( @@ -46059,7 +46074,7 @@ "tkH" = ( /obj/machinery/door/window/westleft{ name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenocontainment"; @@ -46441,12 +46456,12 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "tsu" = ( @@ -46480,12 +46495,12 @@ dir = 1 }, /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "ttt" = ( @@ -46533,7 +46548,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ name = "Brig Desk"; - req_access_txt = "2" + req_access_txt = "security" }, /obj/item/deskbell/preset/sec{ pixel_x = -5; @@ -46543,7 +46558,13 @@ id = "briggate"; name = "security shutters" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, /area/security/brig) "tum" = ( /obj/effect/turf_decal/stripes/line, @@ -46676,9 +46697,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -46689,6 +46708,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/port/aft) "twP" = ( @@ -46731,7 +46751,8 @@ id = "roboticsprivacy"; name = "Desk Privacy Shutters Control"; pixel_x = 4; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 5 @@ -46875,8 +46896,7 @@ /area/quartermaster/warehouse) "tAE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -46890,6 +46910,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "tAF" = ( @@ -47074,23 +47095,6 @@ /turf/open/floor/plasteel, /area/hydroponics) "tGn" = ( -/obj/machinery/button/holosign{ - id = "surgery_b"; - pixel_x = -36; - pixel_y = -10 - }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -9 - }, -/obj/machinery/button/door{ - id = "surgery_shutters"; - name = "Surgery shutters"; - pixel_x = -36; - pixel_y = -1; - req_access_txt = "45"; - req_one_access_txt = null - }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/apron/surgical, @@ -47098,6 +47102,18 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/machinery/button/door{ + id = "surgery_shutters"; + name = "Surgery shutters"; + pixel_x = -24; + pixel_y = 6; + req_access_txt = "surgery" + }, +/obj/machinery/button/holosign{ + id = "surgery_b"; + pixel_x = -24; + pixel_y = -6 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "tGN" = ( @@ -47525,7 +47541,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -47753,7 +47770,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access_txt = "5" + req_access_txt = "psychology" }, /obj/effect/landmark/start/yogs/psychiatrist, /turf/open/floor/carpet, @@ -48040,8 +48057,7 @@ /area/security/courtroom) "ucJ" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -48059,6 +48075,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "uda" = ( @@ -48105,8 +48122,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -48114,6 +48130,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "udT" = ( @@ -48149,7 +48166,7 @@ }, /obj/machinery/door/window/northleft{ name = "Secure Board Storage"; - req_access_txt = "53" + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -48183,7 +48200,7 @@ name = "Armory Shutters"; pixel_x = -5; pixel_y = -25; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/light_switch{ pixel_x = 8; @@ -48488,8 +48505,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -48497,6 +48513,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "uls" = ( @@ -48557,6 +48574,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_middle, /area/library) "ung" = ( @@ -48748,9 +48766,7 @@ /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/turret_protected/ai) "urb" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, @@ -48758,6 +48774,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "urf" = ( @@ -48774,7 +48791,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "69" + req_access_txt = "paramedic" }, /obj/machinery/computer/med_data{ dir = 8 @@ -49257,14 +49274,14 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_x = -32 - }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/machinery/door_timer{ + id = "Cell 2"; + name = "Cell 2"; + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "uBW" = ( @@ -49362,13 +49379,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "uEe" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/mining/glass{ + name = "Freight Mining Airlock" + }, /turf/open/floor/plasteel/dark, /area/quartermaster/warehouse) "uEj" = ( @@ -49467,8 +49483,7 @@ "uEU" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable/yellow{ @@ -49489,6 +49504,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "uEW" = ( @@ -49763,7 +49779,8 @@ id = "researchprivate"; name = "Desk Privacy Shutters Control"; pixel_x = 24; - pixel_y = -4 + pixel_y = -4; + req_one_access_txt = "science;robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -50009,8 +50026,7 @@ /area/teleporter) "uRc" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -50028,6 +50044,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "uRe" = ( @@ -50331,11 +50348,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Virology"; - req_one_access_txt = "39;24" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -50404,8 +50416,7 @@ "uYN" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -50420,6 +50431,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "uZf" = ( @@ -50448,8 +50460,7 @@ /area/ai_monitored/turret_protected/ai_upload) "uZV" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -50467,6 +50478,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "uZX" = ( @@ -50485,11 +50497,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 1"; - name = "Cell 1"; - req_access_txt = "1" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -50506,6 +50513,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 1"; + name = "Cell 1"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "vam" = ( @@ -50766,13 +50778,15 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 26; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "clerk" }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "clerk" }, /obj/structure/table/wood, /obj/machinery/power/apc{ @@ -51022,8 +51036,7 @@ /area/engine/engineering) "vkv" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -51040,6 +51053,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/interrogation) "vkF" = ( @@ -51329,9 +51343,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "vrN" = ( @@ -51358,8 +51372,7 @@ "vsP" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -51373,6 +51386,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "vsV" = ( @@ -51543,8 +51557,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -51555,6 +51568,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload) "vwf" = ( @@ -51849,12 +51863,12 @@ /area/crew_quarters/dorms) "vBw" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/space/nearstation) "vBx" = ( @@ -51941,8 +51955,7 @@ /area/maintenance/aft) "vDt" = ( /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -51957,6 +51970,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel/dark, /area/teleporter) "vEE" = ( @@ -52476,8 +52490,7 @@ /area/hallway/secondary/entry) "vQo" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52501,8 +52514,7 @@ /area/crew_quarters/heads/cmo) "vQE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 @@ -52510,6 +52522,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "vQL" = ( @@ -53064,9 +53077,9 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Armory"; - req_access_txt = "3"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "wfc" = ( @@ -53107,9 +53120,7 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "wgw" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -53122,6 +53133,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "wgO" = ( @@ -53272,8 +53284,7 @@ /area/engine/atmos) "wkP" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -53293,6 +53304,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "wkW" = ( @@ -53698,7 +53710,7 @@ pixel_x = 7; pixel_y = 4 }, -/turf/open/floor/carpet/black, +/turf/open/floor/plating, /area/crew_quarters/bar) "wuw" = ( /obj/machinery/status_display, @@ -53745,12 +53757,20 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "wvm" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "shipbreaking"; - name = "shipbreaking recycler conveyer" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating/airless, -/area/space) +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, +/turf/open/floor/plating, +/area/maintenance/aft) "wvo" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -53840,7 +53860,7 @@ icon_state = "right"; layer = 3.1; name = "Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/machinery/computer/upload/ai{ dir = 1 @@ -53874,7 +53894,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/southright{ name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistryshutter"; @@ -54223,8 +54243,7 @@ "wDY" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -54238,6 +54257,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "wEh" = ( @@ -54285,9 +54305,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "wEG" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "6;12;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -54493,7 +54511,8 @@ /obj/machinery/button/door{ id = "lawyerprivate"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "lawyer" }, /turf/open/floor/wood, /area/lawoffice) @@ -54645,8 +54664,7 @@ "wNt" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -54671,6 +54689,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "wNT" = ( @@ -54951,6 +54970,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "wTs" = ( @@ -54998,9 +55018,9 @@ "wUd" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "wUo" = ( @@ -55012,7 +55032,7 @@ "wUE" = ( /obj/machinery/power/apc{ areastring = "/area/escapepodbay"; - name = "Podbay APC"; + name = "Shipbreaking Bay APC"; pixel_y = -23 }, /obj/structure/cable{ @@ -55217,8 +55237,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/structure/cable{ icon_state = "4-8" @@ -55232,7 +55251,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = -24; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -55247,6 +55266,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "wZP" = ( @@ -55327,10 +55347,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "xaR" = ( @@ -55575,10 +55595,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "xed" = ( @@ -55654,20 +55673,19 @@ /area/crew_quarters/toilet) "xgy" = ( /obj/machinery/door/airlock/research{ - name = "Kill Chamber"; - req_access_txt = "55" + name = "Kill Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "xgz" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" + name = "Head of Security" }, /obj/structure/cable{ icon_state = "1-2" @@ -55685,6 +55703,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "xgN" = ( @@ -56163,7 +56182,7 @@ /area/maintenance/port/fore) "xpi" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;35" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56174,6 +56193,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/central) "xpz" = ( @@ -56369,8 +56390,7 @@ /area/hallway/secondary/exit/departure_lounge) "xsT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -56380,6 +56400,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/starboard) "xti" = ( @@ -56494,8 +56515,7 @@ dir = 8 }, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -56503,6 +56523,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "xwK" = ( @@ -56688,8 +56709,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56697,6 +56717,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "xzn" = ( @@ -57194,9 +57215,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "xLq" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ @@ -57207,6 +57226,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "xMj" = ( @@ -57225,8 +57245,7 @@ dir = 4 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop"; - req_access_txt = "24" + name = "Distribution Loop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57242,6 +57261,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "xMH" = ( @@ -57322,8 +57342,7 @@ /area/engine/engineering) "xOh" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -57334,6 +57353,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "xOp" = ( @@ -57347,8 +57367,7 @@ /area/science/xenobiology) "xPl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -57362,6 +57381,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "xPn" = ( @@ -57506,7 +57526,7 @@ }, /obj/machinery/door/window/eastright{ name = "Secure Board Storage"; - req_access_txt = "53" + req_access_txt = "secure_tech" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -57524,8 +57544,7 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57546,6 +57565,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "xRt" = ( @@ -57807,8 +57827,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -57817,17 +57836,18 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "xXG" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "xXK" = ( @@ -57981,11 +58001,12 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "ycu" = ( @@ -58417,15 +58438,14 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ylV" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -58438,6 +58458,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) @@ -77357,7 +77378,7 @@ uBm uBm uBm ocx -nGX +dKX sGJ sGJ mLc @@ -78373,7 +78394,7 @@ uBm wyp uBm ocx -nGX +dKX sGJ sGJ oDZ @@ -79383,7 +79404,7 @@ hIt goc sGJ sGJ -mlJ +mkT gQb uBm uxG @@ -80892,7 +80913,7 @@ ylr ylr ylr rLR -dKX +cCP rLR qgC ltM @@ -86071,7 +86092,7 @@ ylr qER qER ylr -ylr +mVy ylr ylr ylr @@ -86214,10 +86235,10 @@ bUu fHL dZE xAI -vXz -vXz +jbc +qHq oyr -vXz +qHq jol afm xgc @@ -86304,9 +86325,6 @@ bHj bHj bHj xSu -ylr -ylr -akr akr kal akr @@ -86318,8 +86336,8 @@ vWp nWK vTB bXq -vWp -jbc +euj +abe bXq rjZ vWp @@ -86328,6 +86346,9 @@ ylr ylr qER ylr +mVy +ylr +ylr ylr ylr ylr @@ -86569,8 +86590,8 @@ vWp bXq bXq vdH -euj -abe +udm +fBr jzz rDM vWp @@ -86823,8 +86844,8 @@ aOL deB elw qdc -udm -fBr +fsl +fsl qdc hVn vWp @@ -87839,8 +87860,8 @@ aOL iKs elw qdc -mIs -gxT +fsl +fnu qdc utB vWp @@ -88093,8 +88114,8 @@ vWp bXq bXq bkH -vuQ -kVw +mIs +gxT xSB yeL vWp @@ -88347,8 +88368,8 @@ vWp mfn cUH bXq -vWp -fnu +vuQ +kVw bXq kak vWp @@ -88953,7 +88974,7 @@ tGT tGT tGT bHj -wvm +oBF ylr ylr ylr @@ -90317,7 +90338,7 @@ uUa uiP iUz naB -qHq +cel gRy fwX fRQ @@ -99504,7 +99525,7 @@ oPY gQT gQT aWb -wcv +wvm tJI dNe dNe @@ -99744,7 +99765,7 @@ hwJ ijq ijq xbB -mkT +kXo eJH gyq uJr @@ -103030,7 +103051,7 @@ ddn vra vBx mzt -fsl +voA iLt cVD qEj diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index c5fe25c711c2..6f5d8af2193b 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -3411,7 +3411,8 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bHY" = ( @@ -5672,7 +5673,6 @@ /turf/open/floor/plating, /area/storage/tech) "cJd" = ( -/obj/structure/cable, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/lab) "cJt" = ( @@ -6246,7 +6246,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "cXc" = ( @@ -10992,7 +10993,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "feN" = ( @@ -21591,7 +21593,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "kmh" = ( @@ -23110,7 +23113,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "lbS" = ( @@ -33252,7 +33256,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/prison) "qcv" = ( @@ -35481,7 +35485,7 @@ /area/quartermaster/office) "riA" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer's Office" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35788,9 +35792,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -38632,7 +38633,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/prison) "sKP" = ( @@ -39232,7 +39233,8 @@ "sYa" = ( /obj/machinery/quantumpad{ map_pad_id = "vaulttoai"; - map_pad_link_id = "aitovault" + map_pad_link_id = "aitovault"; + name = "AI Satellite Transport" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -40495,7 +40497,8 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "tHs" = ( @@ -42911,7 +42914,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/research/glass{ - name = "R&D Server and Networking"; + name = "R&D Servers and Networking"; normalspeed = 0 }, /obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index a87e59e0f237..daa8f1b13638 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -182,7 +182,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aci" = ( @@ -4081,7 +4082,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/brig) "bhZ" = ( @@ -11607,8 +11608,7 @@ }, /obj/structure/window/reinforced, /obj/machinery/door/window/eastleft{ - name = "Mail"; - req_access_txt = "cargo" + name = "Mail" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -11645,7 +11645,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "dvD" = ( @@ -12693,9 +12693,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "dKX" = ( @@ -19698,6 +19698,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) @@ -24384,11 +24385,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/research/glass{ - name = "Secondary AI Core"; - normalspeed = 0 +/obj/machinery/door/airlock/command/glass{ + id_tag = "secondary_aicore_exterior"; + name = "AI Networking" }, -/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel, /area/ai_monitored/secondarydatacore) "hfk" = ( @@ -29404,7 +29405,7 @@ "iFF" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access" + name = "Networking Chamber Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ @@ -38401,7 +38402,7 @@ dir = 4; name = "RCD Storage"; pixel_x = 1; - req_access_txt = "command" + req_access_txt = "eva" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -38800,7 +38801,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "lns" = ( @@ -43710,7 +43712,7 @@ dir = 8; name = "Magboot Storage"; pixel_x = -1; - req_access_txt = "command" + req_access_txt = "eva" }, /obj/structure/window/reinforced{ dir = 1; @@ -45845,7 +45847,8 @@ "nif" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(63) + req_access = null; + req_access_txt = "sec_basic" }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -45944,7 +45947,7 @@ dir = 8; name = "Jetpack Storage"; pixel_x = -1; - req_access_txt = "command" + req_access_txt = "eva" }, /obj/structure/window/reinforced, /obj/structure/rack, @@ -50376,6 +50379,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) @@ -51913,7 +51917,8 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "oVE" = ( @@ -59938,7 +59943,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "rnE" = ( @@ -62329,7 +62335,7 @@ /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; - name = "Kitchen Window"; + name = "Hydroponics Window"; req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only, @@ -69986,7 +69992,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ufT" = ( @@ -71100,7 +71107,8 @@ "uvE" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Disposals Chute" + name = "Disposals Chute"; + req_access_txt = "teleporter" }, /obj/machinery/disposal/deliveryChute{ dir = 8; @@ -71490,12 +71498,11 @@ /area/engine/atmos/distro) "uBM" = ( /obj/machinery/mineral/ore_redemption, -/obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/miningoffice) "uCm" = ( /obj/structure/cable/yellow{ @@ -74080,7 +74087,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vmq" = ( @@ -75698,7 +75705,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vJR" = ( @@ -81154,7 +81161,7 @@ "xjt" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access" + name = "Networking Chamber Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ @@ -84376,7 +84383,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "xYI" = ( diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 77b151944401..ba84ba54a458 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -19306,9 +19306,6 @@ name = "Mech Bay APC"; pixel_x = -25 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/mechbay) "edT" = ( @@ -44732,9 +44729,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/open/floor/circuit, /area/science/robotics/mechbay) "ndL" = ( @@ -119285,7 +119279,7 @@ baT eHW uJu bhM -bhM +biJ bhM biO blA From 7263ae650dc4999d616f37c8bd3225c4c99763af Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 18:41:24 +0200 Subject: [PATCH 22/48] ballin finally --- _maps/map_files/GaxStation/GaxStation.dmm | 12 +- _maps/map_files/IceMeta/IceMeta.dmm | 23 +- _maps/map_files/YogStation/YogStation.dmm | 1836 +++++++++-------- .../crates_lockers/closets/secure/security.dm | 7 +- 4 files changed, 991 insertions(+), 887 deletions(-) diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 6f5d8af2193b..c8439b648d45 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -34167,7 +34167,7 @@ /obj/structure/table, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of your own office."; - dir = 4; + dir = 8; name = "Research Monitor"; network = list("rd"); pixel_y = 2 @@ -41393,7 +41393,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ucL" = ( @@ -42913,11 +42914,10 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/research/glass{ - name = "R&D Servers and Networking"; - normalspeed = 0 - }, /obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, +/obj/machinery/door/airlock/command{ + name = "R&D Servers and Networking" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "uRz" = ( diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index daa8f1b13638..1d8c749cefbb 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -44563,7 +44563,7 @@ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -7; - req_access_txt = "sec_basic" + req_access_txt = "security" }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44572,7 +44572,7 @@ normaldoorcontrol = 1; pixel_x = 7; pixel_y = 7; - req_access_txt = "sec_basic" + req_access_txt = "security" }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44581,7 +44581,7 @@ normaldoorcontrol = 1; pixel_x = 7; pixel_y = -2; - req_access_txt = "sec_basic" + req_access_txt = "security" }, /obj/machinery/firealarm{ dir = 4; @@ -68673,9 +68673,9 @@ id = "MedbayFoyer"; name = "Medbay Doors Control"; normaldoorcontrol = 1; - pixel_x = -36; - pixel_y = 7; - req_access_txt = "paramedic" + pixel_x = -24; + pixel_y = 6; + req_access_txt = "security" }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -70298,7 +70298,7 @@ dir = 8; icon_state = "left"; name = "Security Delivery"; - req_access_txt = "security" + req_one_access_txt = "security;detective" }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -78184,15 +78184,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;48;50;1" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "wrv" = ( @@ -81771,7 +81770,7 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 24; - req_access_txt = "sec_basic" + req_access_txt = "security" }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -81779,7 +81778,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 14; - req_access_txt = "sec_basic" + req_access_txt = "security" }, /obj/structure/table, /obj/item/paper_bin{ diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index ba84ba54a458..c336ca0d237d 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -354,14 +354,14 @@ name = "Cell 5 Blast Door Control"; pixel_x = -28; pixel_y = 8; - req_access_txt = "63" + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "cell4 blast"; name = "Cell 4 Blast Door Control"; pixel_x = -28; pixel_y = -8; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison) @@ -430,8 +430,7 @@ "acz" = ( /obj/machinery/door/airlock/medical{ id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 @@ -455,6 +454,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "acF" = ( @@ -692,8 +692,7 @@ dir = 8 }, /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "63" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -705,6 +704,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "aex" = ( @@ -1057,7 +1057,7 @@ dir = 8; icon_state = "left"; name = "Security Delivery"; - req_access_txt = "1" + req_one_access_txt = "security;detective" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1223,7 +1223,7 @@ "aiw" = ( /obj/machinery/door/window/southleft{ name = "Engineering Delivery"; - req_access_txt = "10" + req_access_txt = "engineering" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -1396,7 +1396,7 @@ "ajR" = ( /obj/machinery/door/window/southleft{ name = "Court Cell"; - req_access_txt = "2" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/security/courtroom) @@ -1682,8 +1682,7 @@ /area/security/courtroom) "aml" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1709,6 +1708,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "amn" = ( @@ -1803,8 +1803,7 @@ name = "test chamber blast door" }, /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -1814,6 +1813,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/misc_lab) "amY" = ( @@ -1917,9 +1917,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "anR" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1935,6 +1933,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "anT" = ( @@ -2005,8 +2004,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Detective Maintenance"; - req_access_txt = "4" + name = "Detective Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2023,6 +2021,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plating, /area/maintenance/fore) "aoC" = ( @@ -2316,7 +2315,7 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Prison Security Post"; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/structure/cable{ icon_state = "4-8" @@ -2467,8 +2466,7 @@ /area/crew_quarters/dorms) "aso" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2485,6 +2483,7 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "asv" = ( @@ -2789,13 +2788,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; - pixel_y = -2 + pixel_y = -2; + req_access_txt = "brig" }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -2850,8 +2850,7 @@ /area/science/nanite) "auW" = ( /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2863,6 +2862,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "avd" = ( @@ -3043,8 +3043,7 @@ /area/maintenance/starboard/fore) "awP" = ( /obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance"; - req_access_txt = "11" + name = "Electrical Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3061,6 +3060,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plating, /area/maintenance/starboard/fore) "awQ" = ( @@ -3127,6 +3127,8 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "axl" = ( @@ -3149,8 +3151,7 @@ /area/solar/port/fore) "axw" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3164,6 +3165,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "axG" = ( @@ -3251,9 +3253,9 @@ }, /obj/effect/turf_decal/tile/bar, /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "ayB" = ( @@ -3267,8 +3269,7 @@ /area/security/brig) "ayD" = ( /obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage"; - req_access_txt = "12" + name = "Auxiliary Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3285,6 +3286,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/storage/tools) "ayF" = ( @@ -3629,15 +3631,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aBe" = ( @@ -3675,6 +3676,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "aBs" = ( @@ -3954,12 +3957,12 @@ }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "aDd" = ( @@ -4043,8 +4046,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -4058,6 +4060,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "aDn" = ( @@ -4115,7 +4118,8 @@ id = "briggate"; name = "Desk Shutters"; pixel_x = -26; - pixel_y = 6 + pixel_y = 6; + req_access_txt = "security" }, /obj/machinery/button/flasher{ id = "brigentry"; @@ -4130,13 +4134,13 @@ "aDI" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "command" + name = "Command Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aDR" = ( @@ -4398,8 +4402,7 @@ /area/security/brig) "aGq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -4409,6 +4412,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "aGs" = ( @@ -4487,7 +4491,7 @@ /obj/machinery/door/window{ dir = 8; name = "High-Risk Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/item/aiModule/supplied/oxygen, /obj/item/aiModule/supplied/protectStation, @@ -4603,15 +4607,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aHQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aHR" = ( @@ -4646,13 +4649,13 @@ /area/crew_quarters/toilet) "aHW" = ( /obj/machinery/door/airlock/external{ - name = "Construction Zone"; - req_one_access_txt = "32;47;48" + name = "Construction Zone" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "aHY" = ( @@ -4841,8 +4844,7 @@ /area/hallway/primary/central) "aJy" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Tech Storage"; - req_access_txt = "61" + name = "Telecomms Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -4860,6 +4862,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "aJz" = ( @@ -5101,8 +5104,7 @@ /area/hydroponics) "aKX" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -5117,15 +5119,16 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "aKY" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aLa" = ( @@ -5460,7 +5463,7 @@ name = "Privacy Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access_txt = "28" + req_access_txt = "kitchen" }, /obj/machinery/camera{ c_tag = "Kitchen South"; @@ -5829,9 +5832,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aPF" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -5846,6 +5847,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "aPG" = ( @@ -6090,8 +6092,7 @@ /area/medical/paramedic) "aRv" = ( /obj/machinery/door/airlock/maintenance{ - name = "Testing Lab Maintenance"; - req_access_txt = "47" + name = "Testing Lab Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6105,11 +6106,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "aRJ" = ( /obj/machinery/door/airlock/mining{ - req_access_txt = "48"; name = "Mining Bay" }, /obj/machinery/door/firedoor/border_only{ @@ -6128,6 +6129,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aRM" = ( @@ -6145,8 +6147,7 @@ /area/library) "aRO" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6163,17 +6164,18 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "aRQ" = ( /obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" + name = "Private Study" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/plasteel/cult, /area/library) "aRR" = ( @@ -6254,6 +6256,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "aSk" = ( @@ -6325,7 +6328,7 @@ /obj/machinery/door/window/northright{ dir = 8; name = "Library Desk Door"; - req_access_txt = "37" + req_access_txt = "library" }, /turf/open/floor/wood, /area/library) @@ -6369,8 +6372,7 @@ /area/crew_quarters/locker) "aTz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Fitness Maintenance"; - req_access_txt = "12" + name = "Fitness Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6382,6 +6384,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aTA" = ( @@ -6561,13 +6564,13 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "aicoredoor"; name = "AI Chamber entrance shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "aUL" = ( @@ -6615,8 +6618,7 @@ /area/maintenance/starboard/fore) "aUY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Aux Base Construction Maintenance"; - req_access_txt = "12" + name = "Aux Base Construction Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -6627,6 +6629,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "aVc" = ( @@ -6742,8 +6745,7 @@ /area/crew_quarters/toilet/locker) "aWB" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -6751,6 +6753,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aWC" = ( @@ -6806,8 +6809,7 @@ /area/quartermaster/office) "aXd" = ( /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6831,6 +6833,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel, /area/teleporter) "aXp" = ( @@ -7792,8 +7795,7 @@ "bgv" = ( /obj/machinery/door/window/eastleft{ icon_state = "right"; - name = "Mail"; - req_access_txt = "50" + name = "Mail" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7871,7 +7873,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -7882,9 +7884,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bhh" = ( @@ -7965,8 +7968,7 @@ "bhB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7975,6 +7977,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bhE" = ( @@ -7997,9 +8000,7 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "bhH" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -8010,6 +8011,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "bhM" = ( @@ -8039,12 +8041,13 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage"; - req_one_access_txt = "10;32" + name = "Shared Engineering Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/storage_shared) "bhV" = ( @@ -8167,8 +8170,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Disposals Access"; - req_access_txt = "12" + name = "Disposals Access" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8176,6 +8178,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "bjg" = ( @@ -8498,8 +8501,7 @@ dir = 1 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -8507,6 +8509,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bmi" = ( @@ -8519,14 +8522,14 @@ /area/crew_quarters/dorms) "bmo" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bmr" = ( @@ -8636,8 +8639,7 @@ /area/engine/atmos/storage) "bnE" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8654,6 +8656,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bnH" = ( @@ -8803,11 +8806,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Detective's Backroom"; - req_access_txt = "4" + name = "Detective's Backroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "bpc" = ( @@ -9154,8 +9157,7 @@ /area/science/storage) "bsn" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -9173,6 +9175,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "bsF" = ( @@ -9243,7 +9246,7 @@ dir = 1; icon_state = "right"; name = "Brig Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plating, /area/security/brig) @@ -9274,8 +9277,7 @@ /area/science/mixing) "btn" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -9292,6 +9294,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "bts" = ( @@ -9299,6 +9302,9 @@ /obj/machinery/camera/motion{ c_tag = "EVA Motion Sensor" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "btu" = ( @@ -9474,8 +9480,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9485,6 +9490,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "buU" = ( @@ -9627,13 +9633,13 @@ /area/engine/engineering) "bvX" = ( /obj/machinery/door/airlock/maintenance{ - name = "Garden Maintenance"; - req_access_txt = "12" + name = "Garden Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "bwe" = ( @@ -9913,8 +9919,7 @@ /area/maintenance/fore) "byI" = ( /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9931,6 +9936,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/maintenance/fore) "byP" = ( @@ -10077,8 +10083,7 @@ /area/science/research) "bAb" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10098,6 +10103,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/aft) "bAj" = ( @@ -10132,8 +10138,7 @@ /area/science/server) "bAB" = ( /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "30" + name = "Server Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10144,6 +10149,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "bAC" = ( @@ -10654,8 +10660,7 @@ /area/engine/atmos/mix) "bEh" = ( /obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; - req_one_access_txt = "12;63;48;50;36" + id_tag = "commissarydoor" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10666,6 +10671,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "bEm" = ( @@ -10753,9 +10759,7 @@ /turf/open/floor/plasteel, /area/engine/atmos/mix) "bFY" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10771,6 +10775,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard) "bFZ" = ( @@ -10828,7 +10834,8 @@ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_x = -24; - pixel_y = 10 + pixel_y = 10; + req_access_txt = "engineering" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -10946,8 +10953,7 @@ /area/maintenance/aft) "bHn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10955,6 +10961,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/port/fore) "bHo" = ( @@ -11098,8 +11105,7 @@ /area/science/research) "bIT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Tool Storage Maintenance"; - req_access_txt = "12" + name = "Tool Storage Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11110,6 +11116,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "bJi" = ( @@ -11135,8 +11142,7 @@ "bJu" = ( /obj/structure/lattice, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -11144,6 +11150,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "bJv" = ( @@ -11216,7 +11223,7 @@ "bKf" = ( /obj/machinery/door/window/southleft{ name = "Mass Driver Door"; - req_access_txt = "7" + req_access_txt = "toxins" }, /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, @@ -11457,8 +11464,7 @@ /area/library) "bLT" = ( /obj/machinery/door/airlock/atmos{ - name = "Equipment Room"; - req_access_txt = "24" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11479,6 +11485,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/foyer) "bLX" = ( @@ -11789,13 +11796,13 @@ /area/ai_monitored/storage/eva) "bPg" = ( /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "command" + name = "Command Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "bPh" = ( @@ -11925,8 +11932,7 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -11957,6 +11963,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "bQp" = ( @@ -11980,8 +11987,7 @@ /area/maintenance/solars/starboard/aft) "bQs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_access_txt = "47" + name = "Experimentation Lab Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11995,6 +12001,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plating, /area/maintenance/starboard) "bQw" = ( @@ -12276,14 +12283,14 @@ /area/maintenance/fore) "bTG" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "bTH" = ( @@ -12429,7 +12436,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/eastleft{ dir = 8; - req_access_txt = "9" + req_access_txt = "genetics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "genedesk"; @@ -12614,13 +12621,14 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bYT" = ( @@ -12807,7 +12815,7 @@ normaldoorcontrol = 1; pixel_x = 26; pixel_y = 26; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; @@ -12818,7 +12826,7 @@ name = "Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -12977,7 +12985,7 @@ }, /obj/machinery/door/window/westleft{ name = "Atmospherics Delivery"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -13138,14 +13146,14 @@ /obj/machinery/door/window/westright{ dir = 1; name = "Security Checkpoint"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/secondary/entry) "cfY" = ( /obj/effect/landmark/xeno_spawn, @@ -13286,7 +13294,7 @@ name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = -7; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -13662,9 +13670,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/starboard/fore) "clE" = ( @@ -13677,8 +13685,7 @@ /area/hydroponics) "clF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -13690,6 +13697,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/starboard/fore) "clG" = ( @@ -13810,7 +13818,7 @@ "cna" = ( /obj/machinery/door/window/eastleft{ name = "Medical Delivery"; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -14037,7 +14045,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "robotics" }, /obj/machinery/light_switch{ pixel_x = -6; @@ -14229,14 +14238,15 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "csa" = ( @@ -14304,8 +14314,7 @@ "ctl" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -14322,6 +14331,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "ctu" = ( @@ -14560,13 +14570,14 @@ /area/ai_monitored/storage/satellite) "cvV" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "cwc" = ( @@ -14620,6 +14631,12 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"cxk" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/bot, +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/turf/open/floor/plasteel/showroomfloor, +/area/security/main) "cxn" = ( /obj/structure/lattice, /obj/effect/landmark/carpspawn, @@ -14680,9 +14697,9 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "cyp" = ( @@ -14984,7 +15001,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_one_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/effect/turf_decal/trimline/chemorange/warning/lower, /obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ @@ -15056,6 +15073,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/lawoffice) "cDK" = ( @@ -15101,8 +15119,7 @@ dir = 8 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -15133,6 +15150,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "cEu" = ( @@ -15202,7 +15220,7 @@ /obj/machinery/door/window/brigdoor{ dir = 4; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/item/gun/energy/disabler{ pixel_x = -4; @@ -15311,7 +15329,7 @@ "cIg" = ( /obj/machinery/door/window/eastright{ name = "Hydroponics Delivery"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -15431,8 +15449,7 @@ /area/hallway/secondary/entry) "cKt" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15453,6 +15470,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "cKu" = ( @@ -15486,8 +15504,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "permainterior"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/structure/cable{ icon_state = "1-2" @@ -15497,6 +15514,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "cLg" = ( @@ -15692,9 +15710,7 @@ /turf/open/floor/engine/co2, /area/engine/atmos/distro) "cNI" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -15704,15 +15720,14 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "cNW" = ( /turf/closed/wall, /area/maintenance/starboard/aft) "cNX" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -15728,6 +15743,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNZ" = ( @@ -16158,7 +16175,7 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 28; - req_access_txt = "47" + req_access_txt = "security" }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -16259,12 +16276,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard) "cWd" = ( @@ -16336,8 +16352,7 @@ /area/medical/medbay/central) "cXW" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -16349,6 +16364,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/mix) "cZh" = ( @@ -16491,8 +16507,7 @@ /area/bridge) "daK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Visitation Observation"; - req_access_txt = "2" + name = "Prison Visitation Observation" }, /obj/structure/cable{ icon_state = "1-2" @@ -16503,6 +16518,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "daN" = ( @@ -16571,8 +16587,7 @@ "dcn" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permaouter"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -16587,6 +16602,7 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "ddb" = ( @@ -16687,8 +16703,7 @@ /area/hallway/primary/central) "dfz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Dormitories Maintenance"; - req_access_txt = "12" + name = "Dormitories Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -16699,6 +16714,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "dfD" = ( @@ -16940,8 +16956,7 @@ /area/quartermaster/office) "dlt" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -16949,6 +16964,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "dlv" = ( @@ -17123,7 +17139,8 @@ id = "hosspace"; name = "Space Shutters Control"; pixel_x = -26; - pixel_y = 34 + pixel_y = 34; + req_access_txt = "security" }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) @@ -17169,8 +17186,7 @@ dir = 8 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -17185,6 +17201,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "doP" = ( @@ -17450,8 +17467,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null + req_access_txt = "surgery" }, /obj/machinery/button/holosign{ id = "surgery"; @@ -17711,12 +17727,12 @@ /area/hallway/secondary/exit) "dzN" = ( /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "dzR" = ( @@ -17900,7 +17916,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "dDm" = ( /obj/effect/landmark/observer_start, @@ -18113,8 +18129,7 @@ dir = 8 }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -18122,6 +18137,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "dHE" = ( @@ -18227,8 +18243,7 @@ /area/security/main) "dJK" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -18237,6 +18252,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/foyer) "dJQ" = ( @@ -18271,8 +18287,7 @@ /area/security/checkpoint/engineering) "dKN" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; @@ -18281,12 +18296,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "dKQ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -18295,6 +18310,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "dKR" = ( @@ -18455,7 +18471,7 @@ id = "captain blast"; name = "Privacy Shutters Control"; pixel_x = 5; - req_access_txt = "20" + req_access_txt = "captain" }, /turf/open/floor/stone, /area/crew_quarters/heads/captain) @@ -18581,14 +18597,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/light_switch{ pixel_x = -4; @@ -18622,12 +18638,12 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "dQG" = ( @@ -18716,8 +18732,7 @@ dir = 8 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -18737,6 +18752,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "dSD" = ( @@ -18948,7 +18964,6 @@ "dWG" = ( /obj/machinery/door/airlock/security{ name = "Security Office"; - req_one_access_txt = "1;4"; security_level = 1 }, /obj/machinery/door/firedoor/border_only{ @@ -18967,6 +18982,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "dXb" = ( @@ -19126,8 +19143,7 @@ /area/crew_quarters/heads/hop) "eaO" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19148,6 +19164,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "ebl" = ( @@ -19238,7 +19255,7 @@ }, /obj/machinery/door/window/southleft{ name = "Kitchen Delivery"; - req_access_txt = "28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) @@ -19284,7 +19301,7 @@ name = "Counter Shutters Control"; pixel_x = -25; pixel_y = 24; - req_access_txt = "25" + req_access_txt = "bar" }, /obj/machinery/light_switch{ pixel_x = -25; @@ -19295,7 +19312,7 @@ name = "Window Shutters Control"; pixel_x = -25; pixel_y = 32; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -19310,8 +19327,7 @@ /area/science/robotics/mechbay) "edT" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -19323,6 +19339,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "edX" = ( @@ -19411,7 +19428,7 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; - req_access_txt = "10" + req_access_txt = "security" }, /obj/machinery/recharger/wallrecharger{ pixel_x = -22; @@ -19519,12 +19536,6 @@ /turf/open/floor/plasteel, /area/janitor) "ehI" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_x = 25; - req_access_txt = "47" - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -19591,7 +19602,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "69" + req_access_txt = "paramedic" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -19926,6 +19937,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/wood, /area/lawoffice) "era" = ( @@ -20048,15 +20060,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard) "esK" = ( @@ -20086,7 +20097,7 @@ /obj/machinery/door/window/southleft{ dir = 8; name = "Bar Delivery"; - req_access_txt = "25" + req_access_txt = "bar" }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -20104,13 +20115,13 @@ "etp" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "etv" = ( @@ -20270,7 +20281,7 @@ "evg" = ( /obj/machinery/door/window/southleft{ name = "Armory"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/effect/turf_decal/stripes{ dir = 10 @@ -20288,13 +20299,13 @@ /area/ai_monitored/security/armory) "evq" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "2" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/fore) "evy" = ( @@ -20314,7 +20325,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/southright{ name = "Research and Development Desk"; - req_access_txt = "7" + req_one_access_txt = "science;robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -20436,11 +20447,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "exB" = ( @@ -21048,8 +21059,7 @@ /area/hallway/primary/starboard) "eII" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -21061,6 +21071,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "eIR" = ( @@ -21247,7 +21258,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "eLV" = ( /obj/structure/grille/broken, @@ -21453,8 +21464,7 @@ /area/quartermaster/storage) "eOu" = ( /obj/machinery/door/airlock/maintenance{ - name = "Law Office Maintenance"; - req_access_txt = "38" + name = "Law Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -21466,6 +21476,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plating, /area/maintenance/fore) "eOA" = ( @@ -21557,9 +21568,7 @@ /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "eRb" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -21570,6 +21579,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "eRe" = ( @@ -21809,8 +21819,7 @@ /area/science/misc_lab) "eVH" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -21836,6 +21845,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "eVJ" = ( @@ -22051,12 +22061,12 @@ dir = 8 }, /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel, /area/medical/morgue) "eYI" = ( @@ -22108,8 +22118,7 @@ /area/quartermaster/storage) "eZu" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -22130,6 +22139,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "eZD" = ( @@ -22303,7 +22313,7 @@ icon_state = "right"; layer = 3.1; name = "Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/cable{ icon_state = "1-2" @@ -22480,7 +22490,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -22497,7 +22507,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/item/folder/white{ pixel_x = 4; @@ -22616,7 +22626,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "Captain's Desk Door"; - req_one_access_txt = "20" + req_access_txt = "captain" }, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/crew_quarters/heads/captain) @@ -22678,11 +22688,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "SMES Access"; - req_access_txt = "11" - }, /turf/open/floor/plating, /area/engine/engine_smes) "fke" = ( @@ -23125,12 +23130,11 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "79" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "ftn" = ( @@ -23333,8 +23337,7 @@ /area/maintenance/starboard/aft) "fvN" = ( /obj/machinery/door/airlock/engineering{ - name = "Construction Area"; - req_access_txt = "32" + name = "Construction Area" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -23352,6 +23355,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/plating, /area/construction) "fvP" = ( @@ -23361,13 +23365,12 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "fwa" = ( @@ -23535,8 +23538,7 @@ /area/crew_quarters/toilet) "fzq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -23545,6 +23547,7 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "fzs" = ( @@ -23908,7 +23911,7 @@ dir = 8; icon_state = "left"; name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -23963,8 +23966,7 @@ /area/engine/atmos/mix) "fHf" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -23976,6 +23978,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "fHi" = ( @@ -24125,11 +24128,12 @@ /area/hallway/primary/port) "fJG" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "fJJ" = ( @@ -24163,10 +24167,10 @@ }, /obj/machinery/button/door{ id = "tcomms_bridge"; - name = "Telecommunications server shutters control"; + name = "Telecommunications Shutter Control"; pixel_x = 28; pixel_y = -2; - req_one_access_txt = "19;61" + req_access_txt = "command" }, /obj/structure/chair/comfy/black{ dir = 1; @@ -24342,8 +24346,7 @@ /area/maintenance/port) "fLz" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -24355,6 +24358,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fLD" = ( @@ -24392,8 +24396,7 @@ /area/science/xenobiology) "fMw" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -24410,6 +24413,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "fMR" = ( @@ -24790,9 +24794,6 @@ /area/security/prison) "fVy" = ( /obj/structure/lattice/catwalk, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, /turf/closed/wall, /area/maintenance/starboard/fore) "fVY" = ( @@ -24887,7 +24888,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "fYZ" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ @@ -24936,8 +24937,7 @@ /area/quartermaster/storage) "gaa" = ( /obj/machinery/door/airlock/maintenance{ - name = "Construction Area Maintenance"; - req_access_txt = "32" + name = "Construction Area Maintenance" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -24955,6 +24955,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/plating, /area/maintenance/port/aft) "gac" = ( @@ -25299,8 +25300,7 @@ /area/crew_quarters/bar) "gfL" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -25314,6 +25314,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "gfP" = ( @@ -25470,7 +25471,7 @@ dir = 8; icon_state = "left"; name = "Research Division Delivery"; - req_access_txt = "7" + req_one_access_txt = "science;robotics" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -25648,8 +25649,7 @@ /area/science/xenobiology) "gnW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "5;9;68" + name = "Genetics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -25660,6 +25660,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plating, /area/maintenance/aft) "gon" = ( @@ -25737,8 +25738,7 @@ "gqI" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25752,6 +25752,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "gqO" = ( @@ -25770,14 +25771,22 @@ "gqZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Window"; + req_access_txt = "hydroponics" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel, +/obj/machinery/door/window/eastleft{ + dir = 8; + name = "Kitchen Window"; + req_access_txt = "kitchen" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "gri" = ( /obj/machinery/door/firedoor/border_only{ @@ -25957,7 +25966,7 @@ }, /obj/machinery/door/window/eastright{ name = "Brig Desk"; - req_access_txt = "2" + req_access_txt = "security" }, /obj/item/restraints/handcuffs, /obj/item/radio/off, @@ -26102,7 +26111,7 @@ id = "Shuttle Construction Storage"; name = "Shuttle Construction Storage"; pixel_x = 24; - req_access_txt = "11" + req_access_txt = "aux_base" }, /obj/effect/turf_decal/delivery, /obj/structure/closet/emcloset, @@ -26169,7 +26178,7 @@ name = "Biohazard Shutter Control"; pixel_x = 29; pixel_y = -4; - req_access_txt = "47" + req_access_txt = "security" }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -26272,7 +26281,7 @@ name = "Counter Shutters Control"; pixel_x = -27; pixel_y = -5; - req_access_txt = "28" + req_access_txt = "kitchen" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -26434,7 +26443,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "Atmospherics Desk"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -26518,8 +26527,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/machinery/holosign/surgery{ id = "surgery" @@ -26538,6 +26546,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "gGo" = ( @@ -26561,8 +26570,7 @@ /area/hydroponics/garden) "gGM" = ( /obj/machinery/door/airlock/maintenance{ - name = "Xenobiology Maintenance"; - req_access_txt = "55" + name = "Xenobiology Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -26572,6 +26580,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/maintenance/aft) "gHh" = ( @@ -26943,8 +26952,7 @@ "gPr" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; - normalspeed = 0; - req_access_txt = "55" + normalspeed = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26955,6 +26963,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "gPA" = ( @@ -27356,7 +27365,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -27460,7 +27470,7 @@ "gVS" = ( /obj/machinery/door/window/southleft{ name = "Virology"; - req_one_access_txt = "39;24" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -27818,13 +27828,13 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "hcE" = ( @@ -27952,8 +27962,7 @@ /area/space/nearstation) "hft" = ( /obj/machinery/door/airlock/command{ - name = "Server Room"; - req_access_txt = "30" + name = "R&D Servers and Networking" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27965,6 +27974,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "hfu" = ( @@ -28462,7 +28472,7 @@ /obj/machinery/door/window/brigdoor{ dir = 4; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -28537,7 +28547,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "8" + req_access_txt = "toxins" }, /obj/structure/cable{ icon_state = "1-2" @@ -28676,8 +28686,7 @@ /area/crew_quarters/locker) "hrt" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Warehouse Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Warehouse Maintenance" }, /obj/structure/sign/warning/electricshock{ pixel_x = 32 @@ -28689,6 +28698,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port) "hrw" = ( @@ -28860,8 +28870,7 @@ /area/maintenance/starboard/fore) "htf" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28875,6 +28884,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "htI" = ( @@ -29209,8 +29219,7 @@ /area/maintenance/aft) "hAI" = ( /obj/machinery/door/airlock{ - name = "Private Restroom"; - req_access_txt = "20" + name = "Private Restroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29230,18 +29239,17 @@ /turf/open/floor/plasteel, /area/engine/atmos/storage) "hAT" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen 6"; - req_access_txt = "55" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; name = "Left side containment blast door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, /turf/open/floor/engine, /area/science/xenobiology) "hBe" = ( @@ -29294,8 +29302,7 @@ /area/security/courtroom) "hBA" = ( /obj/machinery/door/airlock/engineering{ - name = "Vacant Office A"; - req_access_txt = "32" + name = "Vacant Office A" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ @@ -29313,6 +29320,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/wood, /area/vacant_room) "hBJ" = ( @@ -29392,8 +29400,7 @@ /area/engine/engineering) "hCu" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" + name = "Kitchen" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29401,6 +29408,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "hCy" = ( @@ -29681,8 +29689,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -29690,6 +29697,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "hIx" = ( @@ -29767,9 +29775,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/bar, -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "hKu" = ( @@ -29864,8 +29870,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_one_access_txt = "12;25" + name = "Bar Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -29873,6 +29878,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hLI" = ( @@ -29898,7 +29905,7 @@ name = "Armory Shutters"; pixel_x = 23; pixel_y = -22; - req_access_txt = "3" + req_access_txt = "armory" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -29998,7 +30005,7 @@ }, /obj/machinery/door/window/brigdoor{ name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -30046,7 +30053,10 @@ name = "Privacy Shutters"; pixel_x = -9; pixel_y = -20; - req_access_txt = "38" + req_access_txt = "lawyer" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, /turf/open/floor/wood, /area/lawoffice) @@ -30601,13 +30611,14 @@ "hWw" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "hWy" = ( @@ -30825,8 +30836,7 @@ /area/storage/tech) "ibl" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -30835,6 +30845,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "ibq" = ( @@ -30849,13 +30860,13 @@ /obj/machinery/door/window/westright{ dir = 1; name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hydroponics) "ibx" = ( /obj/structure/closet/emcloset, @@ -31008,6 +31019,11 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "SMES Access"; + req_access_txt = "engine_equip" + }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "idR" = ( @@ -31397,13 +31413,13 @@ /area/crew_quarters/toilet/locker) "ilr" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "ilw" = ( @@ -31663,7 +31679,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_one_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -32095,7 +32111,7 @@ pixel_x = -6; pixel_y = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "iwj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -32154,8 +32170,7 @@ name = "test chamber blast door" }, /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -32165,6 +32180,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/engine, /area/science/misc_lab) "ixV" = ( @@ -32180,7 +32196,7 @@ /obj/machinery/door/window/northright{ name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/storage/firstaid/fire{ pixel_x = 3; @@ -32373,14 +32389,15 @@ /area/maintenance/disposal/incinerator) "iCk" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "iCl" = ( @@ -32409,9 +32426,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Paramedic Staging Area Maintenance"; - req_access_txt = "69" + name = "Paramedic Staging Area Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plating, /area/maintenance/aft) "iCG" = ( @@ -32419,8 +32436,7 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -32432,6 +32448,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "iCQ" = ( @@ -32590,14 +32607,14 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 10; - req_access_txt = "24" + req_access_txt = "engineering" }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 24; - req_access_txt = "11" + req_access_txt = "engineering" }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -32605,7 +32622,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = -10; - req_access_txt = "10" + req_access_txt = "engineering" }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) @@ -32696,8 +32713,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -32708,6 +32724,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "iHV" = ( @@ -32777,8 +32795,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -32786,6 +32803,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "iJJ" = ( @@ -32853,7 +32872,7 @@ id = "cmo"; name = "CMO Privacy Shutters Control"; pixel_y = 28; - req_access_txt = "40" + req_access_txt = "medical" }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) @@ -32927,8 +32946,7 @@ /area/engine/atmos/distro) "iLO" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -32947,6 +32965,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "iMa" = ( @@ -33020,7 +33039,7 @@ }, /obj/machinery/door/window/brigdoor/northright{ name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -33075,8 +33094,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -33084,6 +33102,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "iNv" = ( @@ -33215,13 +33234,13 @@ dir = 1 }, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "command" + name = "Command Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "iQm" = ( @@ -33266,8 +33285,7 @@ /area/crew_quarters/locker) "iQL" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; @@ -33797,7 +33815,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access_txt = "11" + req_access_txt = "engine_equip" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -33896,12 +33914,12 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "jcf" = ( @@ -33931,7 +33949,7 @@ dir = 8 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "jcF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -34262,7 +34280,7 @@ /obj/structure/closet/secure_closet/lethalshots, /obj/machinery/door/window/brigdoor/northright{ name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -34552,14 +34570,12 @@ "joA" = ( /obj/machinery/door/window/brigdoor/westleft{ name = "AI Satellite Access"; - req_access_txt = "65" + req_access_txt = "ai_sat" }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "joM" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -34575,6 +34591,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "joU" = ( @@ -34631,11 +34648,12 @@ "jpt" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "jpy" = ( @@ -34657,8 +34675,7 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable/yellow{ @@ -34679,6 +34696,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "jpL" = ( @@ -34755,7 +34773,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison/hallway) @@ -35010,7 +35028,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/westleft{ name = "Janitorial Delivery"; - req_access_txt = "26" + req_access_txt = "janitor" }, /turf/open/floor/plasteel, /area/maintenance/aft) @@ -35158,6 +35176,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/mix) +"jzQ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "jzU" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -35530,8 +35555,7 @@ autoclose = 0; frequency = 1449; id_tag = "telecomms_airlock_exterior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -35545,6 +35569,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "jHq" = ( @@ -35555,14 +35580,14 @@ /area/engine/engineering) "jHx" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 1; diry = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jHT" = ( @@ -35614,10 +35639,10 @@ "jIJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore) "jIU" = ( @@ -35801,7 +35826,7 @@ dir = 2; icon_state = "left"; name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/item/paper_bin{ pixel_x = -3; @@ -35954,7 +35979,7 @@ base_state = "right"; icon_state = "right"; name = "Captain's Desk Door"; - req_access_txt = "20" + req_access_txt = "captain" }, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide2, /area/crew_quarters/heads/captain) @@ -36104,8 +36129,7 @@ /area/hallway/primary/aft_starboard) "jVb" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -36122,6 +36146,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/service) "jVe" = ( @@ -36149,8 +36174,7 @@ /area/maintenance/port/aft) "jVX" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36160,6 +36184,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "jWc" = ( @@ -36276,7 +36301,8 @@ "jXL" = ( /obj/machinery/button/holosign{ pixel_x = -7; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "medical" }, /turf/closed/wall/r_wall, /area/crew_quarters/heads/cmo) @@ -36647,7 +36673,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "Engineering Desk"; - req_one_access_txt = "32;19" + req_access_txt = "engineering" }, /obj/item/deskbell/preset/engi{ pixel_x = -6; @@ -36656,7 +36682,11 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, /area/engine/foyer) "khi" = ( /obj/structure/table, @@ -36706,8 +36736,7 @@ /area/hallway/primary/aft) "khF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Locker Room Maintenance"; - req_access_txt = "12" + name = "Locker Room Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36716,6 +36745,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "khH" = ( @@ -37018,8 +37048,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -37034,6 +37063,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "kmI" = ( @@ -37235,8 +37265,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -37257,6 +37286,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "kra" = ( @@ -37294,8 +37324,7 @@ "krO" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_R"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor/border_only{ @@ -37305,6 +37334,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "krX" = ( @@ -37537,13 +37567,15 @@ idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access_txt = "ai_master" }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -37679,10 +37711,10 @@ "kAy" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "kAz" = ( @@ -37762,9 +37794,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "kBR" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -37774,6 +37804,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "kBS" = ( @@ -37881,7 +37912,7 @@ }, /obj/machinery/door/window/brigdoor/northright{ name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -37972,10 +38003,18 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "kGS" = ( -/obj/structure/lattice/catwalk, -/obj/effect/spawner/structure/window/reinforced/shutter, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_r"; + name = "Right side containment blast door" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/science/xenobiology) "kHi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38213,11 +38252,11 @@ "kLB" = ( /obj/machinery/door/airlock/external{ name = "Security Secure External Airlock"; - req_access_txt = "63"; security_level = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/main) "kMc" = ( @@ -38344,7 +38383,7 @@ name = "Visitation Shutters"; pixel_x = -6; pixel_y = 36; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/machinery/button/flasher{ id = "visitorflash"; @@ -38355,8 +38394,7 @@ /area/security/prison) "kNX" = ( /obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "command" + name = "Conference Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38371,6 +38409,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/meeting_room) "kOd" = ( @@ -38405,7 +38444,6 @@ }, /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; - req_access_txt = "76"; security_level = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -38417,6 +38455,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark, /area/storage/tech) "kOH" = ( @@ -38484,8 +38523,7 @@ /area/engine/atmos/distro) "kQW" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38496,6 +38534,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "kRa" = ( @@ -38936,7 +38975,8 @@ id = "disposalshutters"; name = "disposals shutter control"; pixel_x = -24; - pixel_y = 9 + pixel_y = 9; + req_access_txt = "cargo" }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -39419,7 +39459,7 @@ }, /obj/machinery/door/window/eastleft{ name = "Brig Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/item/paper_bin{ pixel_x = -3; @@ -39444,7 +39484,7 @@ id = "testlab"; name = "Test Chamber Blast Doors"; pixel_y = -4; - req_access_txt = "55" + req_access_txt = "science" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -39524,7 +39564,7 @@ "llu" = ( /obj/machinery/door/window{ name = "SMES Chamber"; - req_access_txt = "32" + req_access_txt = "engine_equip" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39768,14 +39808,15 @@ "loB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "loF" = ( @@ -39985,8 +40026,7 @@ /area/space) "ltp" = ( /obj/machinery/door/airlock/security/glass{ - name = "Evidence Storage"; - req_access_txt = "63" + name = "Evidence Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -39998,6 +40038,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "ltM" = ( @@ -40047,7 +40089,7 @@ "lvD" = ( /obj/machinery/door/window/southleft{ name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -40430,8 +40472,7 @@ /area/library) "lDR" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Power Storage"; - req_access_txt = "11" + name = "Power Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40449,6 +40490,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engineering) "lEb" = ( @@ -40626,7 +40668,7 @@ /obj/machinery/door/window/southleft{ dir = 1; name = "Test Chamber"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; @@ -40717,9 +40759,9 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "lLF" = ( @@ -40838,8 +40880,7 @@ /area/medical/surgery) "lMB" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Delivery Office"; - req_access_txt = "50" + name = "Delivery Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40853,6 +40894,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "lME" = ( @@ -40911,8 +40953,7 @@ /area/maintenance/starboard/aft) "lOq" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -40930,6 +40971,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plasteel/white, /area/science/explab) "lOu" = ( @@ -41068,8 +41110,7 @@ /area/hallway/secondary/entry) "lRT" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41086,6 +41127,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "lRX" = ( @@ -41193,8 +41235,7 @@ /area/medical/psych) "lUy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41208,6 +41249,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "lUW" = ( @@ -41326,8 +41368,7 @@ /area/medical/genetics) "lYc" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" + name = "Gravity Generator" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -41340,6 +41381,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) "lYh" = ( @@ -41532,8 +41574,7 @@ /area/security/processing) "mbK" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -41554,6 +41595,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/brig) "mbY" = ( @@ -41760,8 +41802,7 @@ dir = 8 }, /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -41772,6 +41813,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plasteel, /area/crew_quarters/theatre) "mfs" = ( @@ -41844,8 +41886,7 @@ /area/maintenance/port) "mgl" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 1; @@ -41854,6 +41895,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "mgC" = ( @@ -41933,7 +41975,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "63" + req_access_txt = "security" }, /obj/machinery/button/door{ id = "outerbrig"; @@ -41941,7 +41983,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access_txt = "63" + req_access_txt = "security" }, /obj/structure/cable{ icon_state = "1-2" @@ -41985,9 +42027,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -42006,6 +42046,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "mkg" = ( @@ -42050,8 +42091,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -42065,6 +42105,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/main) "mkz" = ( @@ -42101,7 +42142,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -42625,9 +42666,7 @@ /turf/open/floor/plating, /area/crew_quarters/kitchen) "mtD" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -42646,6 +42685,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "mtU" = ( @@ -42741,15 +42781,14 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "mwJ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore/secondary) "mxv" = ( @@ -42836,7 +42875,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ name = "Hydroponics Desk"; - req_access_txt = "35" + req_access_txt = "hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -42846,7 +42885,7 @@ pixel_x = -8; pixel_y = -2 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hydroponics) "mzu" = ( /obj/structure/cable{ @@ -42873,7 +42912,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access_txt = "ai_master" }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -43032,8 +43072,7 @@ /area/hallway/primary/central) "mBy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -43047,6 +43086,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "mBT" = ( @@ -43097,9 +43138,9 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/aft) "mCm" = ( @@ -43194,7 +43235,7 @@ "mEa" = ( /obj/machinery/door/window/brigdoor/eastright{ dir = 2; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -43349,7 +43390,7 @@ /obj/machinery/door/window/southleft{ dir = 1; name = "Brig Desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/item/deskbell/preset/sec{ pixel_x = 9; @@ -43483,8 +43524,7 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -43499,6 +43539,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "mJV" = ( @@ -43560,7 +43601,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "5; 33" + req_access_txt = "chemistry" }, /obj/effect/turf_decal/trimline/chemorange/warning/lower{ dir = 4 @@ -44179,7 +44220,7 @@ name = "Research Lab Shutters Control"; pixel_x = -6; pixel_y = 24; - req_access_txt = "47" + req_one_access_txt = "science;robotics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -44393,14 +44434,16 @@ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = -7; - pixel_y = 23 + pixel_y = 23; + req_access_txt = "tcomms" }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "telecomms_airlock_exterior"; idInterior = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = 5; - pixel_y = 25 + pixel_y = 25; + req_access_txt = "tcomms" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44515,8 +44558,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "nby" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "nbA" = ( /obj/machinery/vending/sustenance, @@ -44564,20 +44606,23 @@ /turf/open/floor/plasteel, /area/security/main) "nca" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_l"; - name = "Left side containment blast door" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/engine, -/area/science/xenobiology) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "ncf" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -44639,7 +44684,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access_txt = "maintenance" }, /obj/machinery/button/massdriver{ id = "trash"; @@ -44673,7 +44718,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access_txt = "7" + req_access_txt = "toxins" }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -44709,8 +44754,7 @@ /area/hallway/secondary/entry) "ndA" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -44723,6 +44767,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port) "ndK" = ( @@ -44788,14 +44833,14 @@ /area/hallway/primary/central) "nfe" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore) "nfk" = ( @@ -45000,7 +45045,7 @@ dir = 4; icon_state = "right"; name = "Core Modules"; - req_access_txt = "20" + req_access_txt = "ai_master" }, /obj/item/aiModule/core/full/asimov, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -45292,8 +45337,7 @@ /area/vacant_room/commissary) "nsk" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -45311,6 +45355,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "nsn" = ( @@ -45326,8 +45371,7 @@ /area/bridge/meeting_room) "nsx" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45351,12 +45395,12 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "nsz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Captain's Office Maintenance"; - req_access_txt = "20" + name = "Captain's Office Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -45364,6 +45408,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/maintenance/central/secondary) "nsA" = ( @@ -45848,13 +45893,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "Abandoned Room"; - req_access_txt = "65" + name = "MiniSat Monitoring" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/barricade/wooden/crude, -/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "nCd" = ( @@ -46060,8 +46103,7 @@ /area/medical/medbay/central) "nFd" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -46073,6 +46115,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "nFx" = ( @@ -46537,9 +46581,9 @@ "nQP" = ( /obj/machinery/button/door{ id = "tcomms"; - name = "Telecommunications server shutters control"; + name = "Telecommunications Shutter Control"; pixel_y = -27; - req_access_txt = "61" + req_access_txt = "tcomms" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/structure/cable{ @@ -46559,8 +46603,7 @@ /area/ai_monitored/turret_protected/ai) "nRs" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Lab" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -46576,6 +46619,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "nRw" = ( @@ -46768,8 +46812,7 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -46779,6 +46822,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "nUD" = ( @@ -46825,7 +46869,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -47512,8 +47556,7 @@ /area/tcommsat/server) "oke" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" + name = "Chief Engineer" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -47525,6 +47568,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "okn" = ( @@ -47775,8 +47819,7 @@ /area/maintenance/starboard/aft) "ooA" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" + name = "Head of Security" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -47792,6 +47835,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "ooC" = ( @@ -47989,14 +48033,14 @@ /area/crew_quarters/heads/cmo) "otq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/green/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "otx" = ( @@ -48290,15 +48334,14 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/virology{ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -48316,6 +48359,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "oxG" = ( @@ -48795,7 +48839,7 @@ id = "genedesk"; name = "Genetics Desk Shutters Control"; pixel_x = 28; - req_access_txt = "9" + req_access_txt = "genetics" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -48858,7 +48902,7 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -28 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "oJt" = ( /obj/structure/cable{ @@ -49012,14 +49056,14 @@ name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/button/door{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "12" + req_access_txt = "atmospherics" }, /obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/effect/turf_decal/stripes/corner{ @@ -49065,12 +49109,12 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "oNb" = ( @@ -49173,7 +49217,7 @@ dir = 4; name = "Brig Infirmary"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "brig_phys" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 @@ -49259,15 +49303,15 @@ /obj/machinery/button/door{ id = "heads_meeting"; name = "Security Shutters"; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "command" }, /turf/open/floor/wood, /area/bridge/meeting_room) "oQy" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permaouter"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -49280,6 +49324,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "oQJ" = ( @@ -49699,7 +49744,7 @@ icon_state = "right"; name = "Brig Infirmary"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "brig_phys" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -49959,8 +50004,7 @@ /area/library) "pgn" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -49973,6 +50017,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "pgx" = ( @@ -50073,8 +50118,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_R"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/structure/cable{ icon_state = "1-2" @@ -50082,13 +50126,13 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "phO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -50106,6 +50150,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "pia" = ( @@ -50381,8 +50426,7 @@ /area/hallway/secondary/entry) "pmW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" + name = "Teleporter Maintenance" }, /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -50398,6 +50442,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/maintenance/central/secondary) "pnf" = ( @@ -50480,7 +50525,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = 24; - req_access_txt = "17" + req_access_txt = "teleporter" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -50502,8 +50547,7 @@ /area/security/checkpoint/auxiliary) "poL" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -50512,6 +50556,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "poU" = ( @@ -50597,11 +50642,12 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "pqG" = ( @@ -50688,8 +50734,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "Hardware Workshop"; - req_access_txt = "61" + name = "Hardware Workshop" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -50705,6 +50750,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "psq" = ( @@ -50802,7 +50848,6 @@ "put" = ( /obj/machinery/door/airlock/external{ name = "Security Secure External Airlock"; - req_access_txt = "63"; security_level = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50810,6 +50855,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/main) "pux" = ( @@ -50836,7 +50882,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_y = -26; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison) @@ -50921,13 +50967,13 @@ }, /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "pwe" = ( @@ -50959,20 +51005,20 @@ name = "Left side containment blast doors"; pixel_x = -7; pixel_y = -24; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 7; pixel_y = -24; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = -34; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -51097,9 +51143,9 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; - req_access_txt = "3"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "pyU" = ( @@ -51123,8 +51169,7 @@ /area/hallway/primary/central) "pzg" = ( /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -51142,6 +51187,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/sleeper) "pzv" = ( @@ -51258,8 +51304,7 @@ /area/vacant_room/commissary) "pAC" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -51273,6 +51318,7 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "pAL" = ( @@ -51329,12 +51375,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "pCi" = ( @@ -51557,8 +51603,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -51566,6 +51611,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "pFU" = ( @@ -51700,7 +51746,7 @@ /obj/machinery/door/window/northleft{ name = "First-Aid Supplies"; red_alert_access = 1; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/item/storage/firstaid/toxin{ pixel_x = 3; @@ -51807,7 +51853,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -52020,7 +52066,7 @@ /area/hallway/primary/central) "pQy" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52032,6 +52078,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/ramp_middle, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "pQS" = ( @@ -52292,9 +52339,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "2" + name = "Interrogation" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/interrogation) "pUS" = ( @@ -52655,7 +52702,7 @@ dir = 1; icon_state = "right"; name = "Monkey Pen"; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52901,7 +52948,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = -8; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -52909,7 +52956,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = 8; - req_access_txt = "31" + req_access_txt = "cargo_bay" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53141,8 +53188,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -53156,6 +53202,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "qlp" = ( @@ -53287,7 +53334,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access_txt = "5" + req_access_txt = "psychology" }, /turf/open/floor/carpet, /area/medical/psych) @@ -53455,8 +53502,7 @@ /area/hallway/primary/fore) "qpF" = ( /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -53467,6 +53513,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/hallway/secondary/service) "qqh" = ( @@ -53510,7 +53557,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "qsk" = ( /obj/machinery/firealarm{ @@ -53800,10 +53847,7 @@ /turf/open/floor/plasteel/white, /area/science/mixing/chamber) "qyR" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -53819,6 +53863,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "qyV" = ( @@ -53832,8 +53878,7 @@ /area/security/courtroom) "qzt" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -53841,6 +53886,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "qAb" = ( @@ -53951,8 +53997,7 @@ /area/janitor) "qCW" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -53973,6 +54018,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel, /area/storage/tech) "qDy" = ( @@ -54174,8 +54220,7 @@ /area/security/prison) "qGC" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54193,6 +54238,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "qGJ" = ( @@ -54284,8 +54330,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -54306,6 +54351,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "qHR" = ( @@ -54439,14 +54485,15 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research/glass{ name = "Computer Science"; - normalspeed = 0; - req_access_txt = "67" + normalspeed = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "qJI" = ( @@ -54476,8 +54523,7 @@ /area/tcommsat/storage) "qKn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -54499,6 +54545,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "qKr" = ( @@ -54689,8 +54736,7 @@ /area/quartermaster/storage) "qNB" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -54707,6 +54753,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "qOa" = ( @@ -54753,8 +54800,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -54762,6 +54808,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "qOw" = ( @@ -54831,7 +54878,7 @@ dir = 4; icon_state = "rightsecure"; name = "Head of Personnel's Desk"; - req_access_txt = "57" + req_access_txt = "hop" }, /obj/machinery/flasher{ id = "hopflash"; @@ -54876,7 +54923,7 @@ dir = 8; network = "tcommsat" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "qQn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -55166,9 +55213,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "qWa" = ( @@ -55273,16 +55320,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "qXB" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "qXS" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass{ @@ -55360,7 +55414,8 @@ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; - pixel_y = -23 + pixel_y = -23; + req_access_txt = "tcomms" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -56178,8 +56233,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -56187,6 +56241,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "rqB" = ( @@ -56212,18 +56267,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "rqS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "rqZ" = ( @@ -56712,8 +56767,7 @@ /area/hydroponics/garden) "rAr" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56728,6 +56782,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "rAx" = ( @@ -56771,13 +56826,13 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; name = "atmos blast door" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "rBs" = ( @@ -56864,8 +56919,7 @@ /area/engine/atmos/distro) "rDa" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56889,6 +56943,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "rDf" = ( @@ -56939,8 +56994,7 @@ /area/security/prison/hallway) "rEz" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -56964,6 +57018,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "rEA" = ( @@ -57033,7 +57089,7 @@ dir = 1; layer = 3.1; name = "Cyborg Upload Console Window"; - req_access_txt = "16" + req_access_txt = "ai_master" }, /obj/structure/cable{ icon_state = "1-2" @@ -57114,7 +57170,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = -24; - req_access_txt = "17" + req_access_txt = "teleporter" }, /turf/open/floor/plating, /area/teleporter) @@ -57540,11 +57596,11 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Armory Desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/machinery/door/window/southleft{ name = "Reception Desk"; - req_access_txt = "63" + req_access_txt = "sec_basic" }, /obj/item/paper_bin{ pixel_x = -3; @@ -57558,6 +57614,10 @@ pixel_x = 10; pixel_y = -3 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/security/warden) "rOu" = ( @@ -57737,8 +57797,7 @@ /area/hallway/primary/starboard) "rRw" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57746,6 +57805,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/fore/secondary) "rRA" = ( @@ -57928,7 +57989,8 @@ idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "toxins" }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -57936,7 +57998,8 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "toxins" }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -58011,8 +58074,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/effect/mapping_helpers/airlock/unres, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ @@ -58021,6 +58083,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "rWx" = ( @@ -58211,7 +58274,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/light_switch{ pixel_x = -4; @@ -58340,13 +58403,13 @@ /area/security/checkpoint/medical) "sdu" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; diry = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "sdv" = ( @@ -58407,7 +58470,6 @@ "sdW" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; - req_access_txt = "3"; security_level = 1 }, /obj/machinery/door/firedoor/border_only{ @@ -58419,6 +58481,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "sdX" = ( @@ -58479,7 +58542,7 @@ "sfg" = ( /obj/machinery/door/window/westleft{ name = "Atmospherics Canister Storage"; - req_access_txt = "24" + req_access_txt = "atmospherics" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -58525,7 +58588,7 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -58649,9 +58712,7 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "siG" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -58670,6 +58731,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "siU" = ( @@ -58833,7 +58895,7 @@ /obj/machinery/door/window/brigdoor/northright{ name = "Filing Room"; opacity = 1; - req_access_txt = "77" + req_access_txt = "psychology" }, /turf/open/floor/wood, /area/medical/psych) @@ -58947,8 +59009,7 @@ /area/engine/engineering) "spk" = ( /obj/machinery/door/airlock/research{ - name = "Testing Lab"; - req_access_txt = "47" + name = "Testing Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -58962,6 +59023,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/misc_lab) "sps" = ( @@ -59132,12 +59194,12 @@ /area/quartermaster/office) "stn" = ( /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "stz" = ( @@ -59265,16 +59327,15 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "sxb" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Visitation"; - req_access_txt = "2" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Visitation" + }, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "sxj" = ( @@ -59405,8 +59466,7 @@ /area/hallway/primary/central) "sAl" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Bow Solar Access"; - req_access_txt = "10" + name = "Starboard Bow Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -59417,6 +59477,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "sAr" = ( @@ -59808,7 +59869,7 @@ dir = 8; icon_state = "left"; name = "Robotics Desk"; - req_one_access_txt = "29;75" + req_access_txt = "robotics" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics2"; @@ -59911,6 +59972,21 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"sIk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/storage/eva) "sIp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -60090,6 +60166,15 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"sMs" = ( +/obj/effect/turf_decal/trimline/secred/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "sMz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -60487,6 +60572,17 @@ }, /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/secondarydatacore) +"sUU" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "sVz" = ( /obj/structure/window/reinforced{ dir = 8 @@ -60534,7 +60630,7 @@ /obj/machinery/modular_computer/console/preset/tcomms{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "sWv" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -60552,12 +60648,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "sWK" = ( @@ -60601,8 +60697,7 @@ /area/lawoffice) "sXr" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -60617,6 +60712,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "sXv" = ( @@ -60795,11 +60891,12 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "sZy" = ( @@ -61080,7 +61177,7 @@ /obj/machinery/door/window/brigdoor{ dir = 4; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/camera/motion/armory{ dir = 4 @@ -61192,7 +61289,7 @@ id = "xenodesk"; name = "Xenobiology Desk Shutters Control"; pixel_x = -28; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 9 @@ -61363,8 +61460,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "permainterior"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ @@ -61374,6 +61470,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "tjY" = ( @@ -61464,7 +61561,7 @@ name = "South Research Lab Shutter Control"; pixel_x = -23; pixel_y = 1; - req_access_txt = "47" + req_access_txt = "science" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 10 @@ -61578,13 +61675,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/stone, /area/crew_quarters/heads/captain) "toz" = ( @@ -61790,17 +61887,23 @@ "trN" = ( /obj/machinery/door/window/eastleft{ name = "armory desk"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/machinery/door/window/westleft{ name = "armory desk"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/armory{ pixel_x = 5; pixel_y = 10 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/security/armory) "tsh" = ( @@ -61820,8 +61923,7 @@ /area/maintenance/starboard/aft) "tss" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -61838,6 +61940,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "tsu" = ( @@ -62233,24 +62336,14 @@ /turf/open/floor/plasteel/white, /area/storage/tech) "tBu" = ( -/obj/machinery/smartfridge/drinks{ - icon_state = "boozeomat" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "barcounter"; - name = "bar shutters" - }, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/effect/turf_decal/tile/bar, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" }, -/turf/open/floor/plasteel, +/turf/closed/wall, /area/crew_quarters/bar) "tBG" = ( /obj/structure/railing, @@ -62302,6 +62395,12 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/machinery/button/door{ + id = "telelab"; + name = "Test Chamber Blast Doors"; + pixel_x = 25; + req_access_txt = "experimentation" + }, /turf/open/floor/plasteel/white, /area/science/explab) "tCY" = ( @@ -62443,8 +62542,7 @@ /area/ai_monitored/storage/satellite) "tGe" = ( /obj/machinery/door/airlock/maintenance{ - name = "Incinerator Access"; - req_one_access_txt = "24;10" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -62455,6 +62553,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "tGr" = ( @@ -62731,9 +62830,7 @@ /turf/open/floor/plasteel/white, /area/science/explab) "tKh" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -62744,6 +62841,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "tKv" = ( @@ -62754,14 +62852,14 @@ /area/crew_quarters/toilet) "tKP" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - req_access_txt = "10" + name = "Escape Pod Four" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; diry = 2 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "tKR" = ( @@ -62827,8 +62925,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6;5" + name = "Morgue" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -62838,6 +62935,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/stripes/corner, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/white, /area/medical/morgue) "tMO" = ( @@ -62858,9 +62956,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/interrogation) "tMW" = ( @@ -63147,9 +63245,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "tRp" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -63160,6 +63256,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "tRq" = ( @@ -63297,8 +63394,7 @@ /area/crew_quarters/heads/hos) "tUz" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -63319,13 +63415,14 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel, /area/medical/paramedic) "tUH" = ( /obj/machinery/door/window/westleft{ dir = 4; name = "Monkey Pen"; - req_access_txt = "9" + req_access_txt = "genetics" }, /mob/living/carbon/monkey{ dir = 1 @@ -63362,8 +63459,7 @@ /area/science/xenobiology) "tVb" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" + name = "Genetics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -63378,6 +63474,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "tVc" = ( @@ -63397,7 +63494,7 @@ dir = 8; network = "tcommsat" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "tVL" = ( /obj/structure/lattice, @@ -63909,7 +64006,7 @@ "ugn" = ( /obj/machinery/door/airlock/maintenance{ name = "Permabrig Maintenance"; - req_access_txt = "1" + req_access_txt = "sec_basic" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -64061,8 +64158,7 @@ /area/crew_quarters/bar) "ukK" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -64080,6 +64176,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "uld" = ( @@ -64200,7 +64297,6 @@ "umX" = ( /obj/machinery/door/airlock/security/glass{ name = "Armory"; - req_access_txt = "1"; security_level = 1 }, /obj/machinery/door/firedoor/border_only{ @@ -64209,6 +64305,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/ai_monitored/security/armory) "uni" = ( @@ -64266,7 +64363,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Chemistry Desk"; - req_access_txt = "33" + req_access_txt = "chemistry" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -64344,7 +64441,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ name = "Cargo Desk"; - req_access_txt = "31" + req_access_txt = "cargo" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -64392,7 +64489,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_y = -26; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison) @@ -64460,13 +64557,13 @@ /area/medical/medbay/lobby) "usD" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "usO" = ( @@ -64775,13 +64872,15 @@ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = 7; - pixel_y = -23 + pixel_y = -23; + req_access_txt = "tcomms" }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; - pixel_y = 6 + pixel_y = 6; + req_access_txt = "tcomms" }, /obj/machinery/camera{ c_tag = "Telecomms Server Room Access"; @@ -64843,7 +64942,7 @@ /obj/machinery/door/window/eastright{ dir = 8; name = "Holding Cell"; - req_access_txt = "2" + req_access_txt = "brig" }, /obj/structure/cable{ icon_state = "4-8" @@ -64906,8 +65005,7 @@ /area/security/processing) "uDp" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "AI Satellite Monitoring"; - req_access_txt = "10" + name = "AI Satellite Monitoring" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -64915,6 +65013,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "uDq" = ( @@ -64928,9 +65027,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "uDL" = ( @@ -65073,13 +65172,13 @@ frequency = 1449; glass = 1; id_tag = "telecomms_airlock_interior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/storage) "uGc" = ( @@ -65128,8 +65227,7 @@ /area/crew_quarters/bar) "uHr" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -65141,6 +65239,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel, /area/medical/morgue) "uHL" = ( @@ -65260,7 +65359,8 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_x = -6; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "detective" }, /turf/open/floor/carpet, /area/security/detectives_office) @@ -65361,9 +65461,9 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "uKB" = ( @@ -65401,7 +65501,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_y = -26; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison) @@ -65426,7 +65526,7 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/structure/window/reinforced{ dir = 4; @@ -65481,8 +65581,7 @@ dir = 8 }, /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -65494,6 +65593,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "uMD" = ( @@ -65569,7 +65669,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "19;61" + req_access_txt = "tcomms" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/effect/turf_decal/trimline/neutral/filled/line/lower{ @@ -65606,7 +65706,7 @@ id = "viropen"; name = "Monkey Pen Shutters"; pixel_x = -24; - req_access_txt = "39" + req_access_txt = "virology" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -66315,8 +66415,7 @@ /area/crew_quarters/heads/cmo) "vcD" = ( /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48" + name = "Auxillary Base Construction" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -66328,6 +66427,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "vcL" = ( @@ -66418,12 +66518,12 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "vdZ" = ( @@ -66463,8 +66563,7 @@ /area/medical/sleeper) "veD" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -66472,6 +66571,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "veK" = ( @@ -66714,7 +66814,7 @@ /obj/machinery/door/window/brigdoor{ dir = 1; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -66949,15 +67049,13 @@ /turf/open/floor/wood, /area/lawoffice) "voe" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, /obj/machinery/door/window/northleft{ - base_state = "right"; dir = 8; - icon_state = "right"; name = "Containment Pen"; - req_access_txt = "55" - }, -/obj/effect/turf_decal/loading_area{ - dir = 4 + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67246,13 +67344,13 @@ /turf/open/floor/engine, /area/science/xenobiology) "vtX" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen"; - req_access_txt = "55" - }, -/obj/effect/turf_decal/loading_area{ - dir = 8 + req_access_txt = "xenobiology" }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67502,7 +67600,7 @@ }, /obj/machinery/door/window/brigdoor{ name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -67519,8 +67617,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "vxY" = ( /obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -67537,6 +67634,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "vyo" = ( @@ -67563,7 +67661,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = 24; - req_one_access_txt = "32;47;48" + req_access_txt = "aux_base" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -67763,8 +67861,7 @@ /area/maintenance/aft) "vBC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -67773,6 +67870,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vBJ" = ( @@ -67935,8 +68034,7 @@ "vDW" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Surgery Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -67944,6 +68042,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "vEi" = ( @@ -68056,7 +68155,7 @@ name = "Biohazard Shutter Control"; pixel_x = 6; pixel_y = 8; - req_access_txt = "47" + req_access_txt = "science" }, /obj/item/storage/pencil_holder/crew/fancy{ pixel_x = -8; @@ -68144,7 +68243,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_access_txt = "atmospherics" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -68237,9 +68337,9 @@ }, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/quartermaster/miningdock) "vJi" = ( @@ -68379,6 +68479,9 @@ /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "vMp" = ( @@ -68434,8 +68537,7 @@ dir = 4 }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -68447,6 +68549,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "vNd" = ( @@ -68483,7 +68586,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access_txt = "ai_master" }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -68662,7 +68766,7 @@ }, /obj/machinery/door/window/brigdoor{ name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -69105,7 +69209,8 @@ id = "secequipment"; name = "Space Shutters Control"; pixel_x = -1; - pixel_y = 23 + pixel_y = 23; + req_access_txt = "security" }, /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -69118,8 +69223,7 @@ /area/maintenance/starboard/aft) "vZm" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -69143,12 +69247,12 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "vZn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -69158,6 +69262,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/aft) "vZp" = ( @@ -69493,7 +69598,7 @@ name = "CMO Privacy Shutters Control"; pixel_x = 7; pixel_y = 24; - req_access_txt = "40" + req_access_txt = "medical" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -69676,13 +69781,13 @@ /area/ai_monitored/turret_protected/aisat_interior) "wkE" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "wkF" = ( @@ -70019,8 +70124,7 @@ /area/quartermaster/miningdock) "wqL" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -70040,6 +70144,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "wqV" = ( @@ -70203,8 +70308,7 @@ /area/maintenance/port/aft) "wvg" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -70215,6 +70319,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "wvh" = ( @@ -70244,8 +70349,7 @@ /area/science/nanite) "wwp" = ( /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrist's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -70304,8 +70408,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -70313,6 +70416,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "wwV" = ( @@ -70463,7 +70567,7 @@ "wzQ" = ( /obj/machinery/door/window/westleft{ name = "Delivery Desk"; - req_access_txt = "50" + req_access_txt = "cargo" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -70546,8 +70650,7 @@ /area/hallway/secondary/entry) "wCs" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -70558,6 +70661,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/fore/secondary) "wCC" = ( @@ -70591,16 +70695,16 @@ /turf/open/floor/plasteel, /area/science/mixing) "wDK" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_r"; name = "Right side containment blast door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, /turf/open/floor/engine, /area/science/xenobiology) "wEe" = ( @@ -70637,13 +70741,13 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "wEA" = ( @@ -70914,7 +71018,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = 22; - pixel_y = 8 + pixel_y = 8; + req_access_txt = "atmospherics" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -71018,7 +71123,7 @@ name = "Cell 6 Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "63" + req_access_txt = "brig" }, /turf/open/floor/plasteel, /area/security/prison) @@ -71447,8 +71552,7 @@ /area/maintenance/aft) "wWx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -71469,6 +71573,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "wWA" = ( @@ -71879,8 +71984,7 @@ /area/security/prison) "xeq" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -71900,6 +72004,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/aft) "xer" = ( @@ -71981,14 +72086,14 @@ /area/engine/atmos/distro) "xgu" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xgF" = ( @@ -72305,14 +72410,15 @@ /area/medical/medbay/central) "xmv" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "xmy" = ( @@ -73008,7 +73114,7 @@ base_state = "right"; icon_state = "right"; name = "Armory"; - req_access_txt = "3" + req_access_txt = "armory" }, /obj/effect/turf_decal/stripes{ dir = 6 @@ -73048,8 +73154,7 @@ /area/crew_quarters/heads/captain) "xBl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -73061,6 +73166,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "xBp" = ( @@ -73544,7 +73650,7 @@ /obj/machinery/door/window/brigdoor{ dir = 4; name = "Armory Door"; - req_access_txt = "1" + req_access_txt = "security" }, /obj/item/card/id/departmental_budget/sec, /obj/item/reagent_containers/syringe/lethal/execution, @@ -73643,15 +73749,14 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "xLY" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "xML" = ( @@ -73908,19 +74013,18 @@ "xRS" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permainterior"; - name = "Permabrig"; - req_access_txt = "2" + name = "Permabrig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "xSl" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 1; @@ -73939,6 +74043,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "xSN" = ( @@ -73946,7 +74051,7 @@ id = "phoenixwright"; name = "Lawyer Shutters"; pixel_x = -23; - req_access_txt = "38" + req_access_txt = "lawyer" }, /turf/open/floor/wood, /area/lawoffice) @@ -74030,8 +74135,7 @@ /area/maintenance/aft) "xUj" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -74048,6 +74152,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "xUn" = ( @@ -74079,13 +74184,13 @@ /area/science/robotics/lab) "xUO" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/main) "xUX" = ( @@ -74248,9 +74353,8 @@ /obj/machinery/door/window/northleft{ base_state = "right"; dir = 8; - icon_state = "right"; name = "Containment Pen"; - req_access_txt = "55" + req_access_txt = "xenobiology" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; @@ -74462,14 +74566,14 @@ /area/crew_quarters/bar) "ydd" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "yey" = ( @@ -74660,7 +74764,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access_txt = "5" + req_access_txt = "medical" }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -74669,7 +74773,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access_txt = "5" + req_access_txt = "medical" }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) @@ -74697,8 +74801,7 @@ /area/science/robotics/lab) "yhB" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -74716,6 +74819,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "yhF" = ( @@ -74741,8 +74845,7 @@ /area/storage/primary) "yiM" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -74766,6 +74869,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "yiP" = ( @@ -101006,7 +101110,7 @@ aph lVQ ayL bts -aAb +sIk ttQ bKG bOU @@ -101774,7 +101878,7 @@ hZq apS eqF aph -avt +qXB ayL bty azS @@ -102288,7 +102392,7 @@ apS pRg hPG aph -avt +nca ayL abt pIj @@ -103058,7 +103162,7 @@ lfX pXI gYb qeP -kwN +sMs fKm ayW ayv @@ -107402,7 +107506,7 @@ abP cME cME cME -cME +cxk abp abp abp @@ -116414,7 +116518,7 @@ aaa aaa gXs tbG -kGS +aoq fVy alP anf @@ -116931,7 +117035,7 @@ aag aoq aoq alP -fCb +jzQ aUs aWC anf @@ -119833,7 +119937,7 @@ kOd hAT rgh wbN -nca +hAT piv bDb aaa @@ -120084,13 +120188,13 @@ tVa dmv iSr cTn -vtX +sUU piv cTn vtX piv kcH -qXB +vtX piv bDb aaa @@ -121363,7 +121467,7 @@ jaq uNH bDb ltQ -wDK +kGS eJq ltQ wDK diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 2ca728fbc28d..e653be0cba02 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -289,7 +289,7 @@ /obj/structure/closet/secure_closet/lethalshots name = "shotgun lethal rounds" - req_access = list(ACCESS_ARMORY) + req_access = list(ACCESS_SECURITY) icon_state = "tac" /obj/structure/closet/secure_closet/lethalshots/PopulateContents() @@ -297,12 +297,13 @@ for(var/i in 1 to 3) new /obj/item/storage/box/lethalshot(src) -//Yogs Start: Brig Pysh Closet +//Yogs Start: Brig Phys Closet /obj/structure/closet/secure_closet/physician name = "\improper brig physician's cabinet" - req_access = list(ACCESS_BRIG_PHYS) icon = 'yogstation/icons/obj/closet.dmi' icon_state = "physician" + + req_access = list(ACCESS_BRIG_PHYS) resistance_flags = FLAMMABLE max_integrity = 70 door_anim_time = 0 From f58f55f96ab0a6a4af3c1c6bedaa7fb9cbfa3ff7 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 19:02:26 +0200 Subject: [PATCH 23/48] ballin --- _maps/map_files/YogStation/YogStation.dmm | 205 +++++++++++----------- code/__DEFINES/access.dm | 2 +- 2 files changed, 104 insertions(+), 103 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index c336ca0d237d..d458045d328f 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -14631,12 +14631,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) -"cxk" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, -/obj/effect/mapping_helpers/airlock/access/any/security/general, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) "cxn" = ( /obj/structure/lattice, /obj/effect/landmark/carpspawn, @@ -25935,6 +25929,24 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"gtQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "gtZ" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel/dark, @@ -29239,19 +29251,20 @@ /turf/open/floor/plasteel, /area/engine/atmos/storage) "hAT" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_l"; - name = "Left side containment blast door" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - name = "Containment Pen"; - req_access_txt = "xenobiology" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/engine, -/area/science/xenobiology) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/storage/eva) "hBe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -33295,6 +33308,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "iQR" = ( @@ -35176,13 +35190,15 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/mix) -"jzQ" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 +"jzN" = ( +/obj/effect/turf_decal/trimline/secred/filled/corner/lower{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "jzU" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -44606,23 +44622,19 @@ /turf/open/floor/plasteel, /area/security/main) "nca" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_l"; + name = "Left side containment blast door" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + name = "Containment Pen"; + req_access_txt = "xenobiology" }, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/engine, +/area/science/xenobiology) "ncf" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -55320,23 +55332,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "qXB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/loading_area{ + dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen"; + req_access_txt = "xenobiology" }, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "qXS" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass{ @@ -59972,21 +59977,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"sIk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/storage/eva) "sIp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -60000,6 +59990,13 @@ }, /turf/open/space/basic, /area/space/nearstation) +"sIN" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "sIO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -60166,15 +60163,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) -"sMs" = ( -/obj/effect/turf_decal/trimline/secred/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "sMz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -60572,17 +60560,6 @@ }, /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/secondarydatacore) -"sUU" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "xenobiology" - }, -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "sVz" = ( /obj/structure/window/reinforced{ dir = 8 @@ -62868,6 +62845,12 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) +"tKS" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/bot, +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/turf/open/floor/plasteel/showroomfloor, +/area/security/main) "tLc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -65387,6 +65370,24 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/service) +"uJa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "uJc" = ( /obj/machinery/light{ dir = 8 @@ -67344,14 +67345,14 @@ /turf/open/floor/engine, /area/science/xenobiology) "vtX" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen"; req_access_txt = "xenobiology" }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "vuj" = ( @@ -101110,7 +101111,7 @@ aph lVQ ayL bts -sIk +hAT ttQ bKG bOU @@ -101878,7 +101879,7 @@ hZq apS eqF aph -qXB +uJa ayL bty azS @@ -102392,7 +102393,7 @@ apS pRg hPG aph -nca +gtQ ayL abt pIj @@ -103162,7 +103163,7 @@ lfX pXI gYb qeP -sMs +jzN fKm ayW ayv @@ -107506,7 +107507,7 @@ abP cME cME cME -cxk +tKS abp abp abp @@ -117035,7 +117036,7 @@ aag aoq aoq alP -jzQ +sIN aUs aWC anf @@ -119934,10 +119935,10 @@ wbN xZv rgh kOd -hAT +nca rgh wbN -hAT +nca piv bDb aaa @@ -120188,13 +120189,13 @@ tVa dmv iSr cTn -sUU +vtX piv cTn -vtX +qXB piv kcH -vtX +qXB piv bDb aaa diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 607252768cf6..e3885ef5d4fd 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -11,7 +11,7 @@ //--- COMMAND ---// -/// Command General Access, typically used for accessing the doors to the bridge, as well as being the general access that Tablet/Computer Programs check for "heads". +/// Command General Access, used for accessing the doors to the bridge, the communications console, and the general access that Tablet/Computer Programs check for "heads". #define ACCESS_COMMAND "command" /// Access to critical-to-function AI rooms and equipment such as the AI Core, AI Upload, AI mini-sat maintenance, turret controls, and foam dispensers. #define ACCESS_AI_MASTER "ai_master" From 81a38438718db1bba501e821ace710b224ba8b05 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 19:33:46 +0200 Subject: [PATCH 24/48] ballin --- _maps/map_files/YogStation/YogStation.dmm | 197 +++++++++++----------- _maps/map_files/generic/CentCom.dmm | 37 +--- _maps/map_files/mining/Jungleland.dmm | 6 - code/game/machinery/doors/door.dm | 4 + code/modules/mapping/access_helpers.dm | 2 +- code/modules/mapping/mapping_helpers.dm | 20 ++- icons/effects/mapping_helpers.dmi | Bin 11583 -> 11598 bytes 7 files changed, 125 insertions(+), 141 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index d458045d328f..f33b70baf4ab 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -2872,6 +2872,15 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"avf" = ( +/obj/effect/turf_decal/trimline/secred/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "avj" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -6175,7 +6184,6 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/plasteel/cult, /area/library) "aRR" = ( @@ -23941,6 +23949,24 @@ /obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel/dark, /area/bridge) +"fGp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "fGz" = ( /obj/machinery/camera{ c_tag = "Atmospherics East"; @@ -25929,24 +25955,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"gtQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/fore) "gtZ" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel/dark, @@ -29251,20 +29259,19 @@ /turf/open/floor/plasteel, /area/engine/atmos/storage) "hAT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_l"; + name = "Left side containment blast door" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + name = "Containment Pen"; + req_access_txt = "xenobiology" }, -/turf/open/floor/plasteel, -/area/ai_monitored/storage/eva) +/turf/open/floor/engine, +/area/science/xenobiology) "hBe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -35190,15 +35197,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/mix) -"jzN" = ( -/obj/effect/turf_decal/trimline/secred/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "jzU" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -38019,18 +38017,12 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "kGS" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "xenobiology" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_r"; - name = "Right side containment blast door" +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kHi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39864,6 +39856,19 @@ "lpv" = ( /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"lpP" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen"; + req_access_txt = "xenobiology" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_r"; + name = "Right side containment blast door" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/science/xenobiology) "lpU" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -40761,6 +40766,21 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"lLj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/storage/eva) "lLm" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -44622,19 +44642,23 @@ /turf/open/floor/plasteel, /area/security/main) "nca" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_l"; - name = "Left side containment blast door" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - name = "Containment Pen"; - req_access_txt = "xenobiology" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/engine, -/area/science/xenobiology) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "ncf" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -59990,13 +60014,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"sIN" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "sIO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -62845,12 +62862,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) -"tKS" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, -/obj/effect/mapping_helpers/airlock/access/any/security/general, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) "tLc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -65370,24 +65381,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/service) -"uJa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/fore) "uJc" = ( /obj/machinery/light{ dir = 8 @@ -101111,7 +101104,7 @@ aph lVQ ayL bts -hAT +lLj ttQ bKG bOU @@ -101879,7 +101872,7 @@ hZq apS eqF aph -uJa +fGp ayL bty azS @@ -102393,7 +102386,7 @@ apS pRg hPG aph -gtQ +nca ayL abt pIj @@ -103163,7 +103156,7 @@ lfX pXI gYb qeP -jzN +avf fKm ayW ayv @@ -107507,7 +107500,7 @@ abP cME cME cME -tKS +cME abp abp abp @@ -117036,7 +117029,7 @@ aag aoq aoq alP -sIN +kGS aUs aWC anf @@ -119935,10 +119928,10 @@ wbN xZv rgh kOd -nca +hAT rgh wbN -nca +hAT piv bDb aaa @@ -121468,7 +121461,7 @@ jaq uNH bDb ltQ -kGS +lpP eJq ltQ wDK diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index ae73c9146009..64e2b6c7a627 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -21417,7 +21417,6 @@ pixel_x = -4; pixel_y = 2 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "bUq" = ( @@ -21789,11 +21788,6 @@ icon_state = "title5" }, /area/centcom/testchamber) -"fxu" = ( -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/obj/structure/fans/tiny, -/turf/open/floor/plasteel, -/area/centcom/control) "fxK" = ( /obj/machinery/vending/modularpc, /turf/open/floor/plasteel/bluespace, @@ -22118,6 +22112,9 @@ /area/centcom) "ivD" = ( /obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, /turf/open/floor/plasteel, /area/centcom/control) "iCm" = ( @@ -22242,12 +22239,6 @@ icon_state = "info26" }, /area/centcom/testchamber) -"jQn" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/turf/open/floor/wood, -/area/centcom/control) "jQK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light, @@ -23644,22 +23635,6 @@ /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/control) -"wNb" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/turf/open/floor/plasteel/dark, -/area/centcom/control) "wNE" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom" @@ -73348,8 +73323,8 @@ aio aka akm akm -fxu -wNb +alT +aiC aiC amm amX @@ -74638,7 +74613,7 @@ akl akm akm akm -jQn +akl ivD aiC akm diff --git a/_maps/map_files/mining/Jungleland.dmm b/_maps/map_files/mining/Jungleland.dmm index e0c041e8f981..bbcba588ab8f 100644 --- a/_maps/map_files/mining/Jungleland.dmm +++ b/_maps/map_files/mining/Jungleland.dmm @@ -245,9 +245,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) @@ -397,9 +394,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 2993c9b8d9e2..37769ba4915c 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -477,6 +477,10 @@ /obj/machinery/door/morgue icon = 'icons/obj/doors/doormorgue.dmi' +/obj/machinery/door/morgue/curator + name = "Private Study" + req_access = list(ACCESS_LIBRARY) + /obj/machinery/door/get_dumping_location(obj/item/storage/source,mob/user) return null diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 4c5c03df610a..a9ed9424dbc9 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -1,5 +1,5 @@ /obj/effect/mapping_helpers/airlock/access - layer = DOOR_HELPER_LAYER + layer = DOOR_ACCESS_HELPER_LAYER icon_state = "access_helper" // These are mutually exclusive; can't have req_any and req_all diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index c63681caa002..9ea8905aee8c 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -95,7 +95,7 @@ return late ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_QDEL -//airlock helpers +// Airlock helpers /obj/effect/mapping_helpers/airlock layer = DOOR_HELPER_LAYER late = TRUE @@ -215,6 +215,24 @@ else airlock.req_access += list(ACCESS_INACCESSIBLE) + +// Windoor helpers +/obj/effect/mapping_helpers/windoor + layer = DOOR_ACCESS_HELPER_LAYER + late = TRUE + +/obj/effect/mapping_helpers/windoor/Initialize(mapload) + . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return + var/obj/machinery/door/window/windoor = locate(/obj/machinery/door/window) in loc + if(!windoor) + log_mapping("[src] failed to find an windoor at [AREACOORD(src)]") + else + payload(windoor) + qdel(src) + //needs to do its thing before spawn_rivers() is called INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index be1c58592c09aafe6e7092aeef90328d1b3f4930..97cac9c86adb3f127ac7fbeadd3fe80c945c29fd 100644 GIT binary patch delta 11261 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 literal 11583 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 CAmwQQ From 37df2da90082049ecf67f1cb7c727ab074c73a31 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 20:04:34 +0200 Subject: [PATCH 25/48] ballin --- icons/effects/mapping_helpers.dmi | Bin 11598 -> 14957 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 97cac9c86adb3f127ac7fbeadd3fe80c945c29fd..a17773c4fb0b35a3eaa76bb093d1d32541616920 100644 GIT binary patch literal 14957 zcmajGbzD?!_b)t12m+EyDIl$YG)N8|N_T^F2q+*8LrF+?gLHREOGpphDGdS=Lk%#@ z*?8aQ`8}U=KIeV^U~}!YuYK*c*0tih*4`7UtSE!~i2M-<1j3b*l~e_RP^f`F5GDpd zAz~|S08V^8)U}-@&7Djgtv@oYT2>t7jZaF&=7_F*Xui)^w0BmTL!P=4NdM ze?)+-WM_)(iv%5GQxjPhe$)%+;52t{5{%AdM};S85PQ8tdDK5UG`)CQGOCiRqQ572 z{MGzX#BR3lEjcspfWX?cPcLzP)mN4hrflV+SoKx%7nYdv;3s%p8SIj9Ukp7*KWt{^ zulwE@jLxm)j3jQmdh*a8#J?2$wfLfwu2FWEMuNvODV4?Hn48URIC+wg8>&2YMt)%i z)eo8YSd>wr!~u-tSbr2ln`Rv4pz>WA^%L#L98VF-J%8`d5#7TNfFtT2hOA6u{aVxN-AJTrcON#;B*wKJZe&@1*-Gg#2|vxT#3 zWdMm$GDp+!^U6Ucydl`IZSI^>p^6Z)r7?@zS{uIAOKL@*uOxmp`BBj)H{+a0C421z6D_(cCw6n=$rajxQQ@-cRLQXEYX z6RI-Vqc4MPKH%CIWs?8^?(Jtuyfx{cp<$YBvGcAcj2JJq?^70flm8Etd zP;^3E&b5GaSuUR5k?w2860DR+l+T3)kKqFcM~$#Hg5U85nQBqZqauE1g5cjGH)u&a zQ>bg(r0+9al1oqKTnsHlX3-~NQW<{UI@jYG>kMeKFq4HB-arqgwaQC9>wcFO}gTCHLRM2#) zl8hQSF(F)P99I9`VrygkaJJ0rnbhd43GfVOZd~uj(<2E?$w%mMTiIYm$}K)MT(nD#wM$ln>-j;?$P)*?{@;nKu%lFAez1Y{a%xjme>v_F1D1dndEhJg^Wg#WSJq7(k^z z)U$QZ~n;H|b!22UTRhjv`uUa#Emm5!F9)8!~uMbv#>xpV!FLfmOP^QFg zlIw*?yN2s#?yfRwgk7X5bw#dc*%PkcR==rCUIW^TQEMgyRE`EB7N!!+4M>>+_LPHT zw7n{XNLF*=(|2=G-D=8Gb1cvI7!%-2me*%Sk~7uf)F#xo4a!V;9!CD1-HD-6(zTc}gpt3E!NuSD88yN|`NX`*r>sdwh1-%doQDH;O9V?-LC9 z)V4wBc}7W02o5&tgY`80l&GEfj7)b@Pp}79!Cu}{ftKfc)AUES+one{4(n&b-J(5# z>J9wT?4)Iw7y*u(eO$F0(1(~0zjZ9ZwVhe;10qna0nW!oxgEqq!_842VFd8apGZrN zalYWp3jB5&g!k0gdRh3#xA7vo$uG|v>;6zK9e4UCJDn^(Yx&A<{xb_ivDJYgM80yI z8)qa5m0^vnEi)_oy^6#8=49icl-BKM?4)5K?JjazvJculb{ZubIEYN3WjQ;xxt*56Fcm?q9OD7sr3wVyBcrVE z__!g1%(}k@R`6kA%r{i1uGMW$*jDlcj3F%4mf&q6nr#qBiR*z8% z8tkcn!R=2f>XzuvPP&hUgMgT`c(6rA7# zz!Ftpa#QJJ-Ce$teemz*;w+e~hmVx;JpyTrP*(Q&eWgyV^n2++zEtQ}X= zAQOz|r^mGE^@DEjMWllYl6k*Lra$Z*eDgs(AvaR-W$B?eBYB{UlRw?sqXfvcOgv(b z3Pp05Q6BZzy0_w#ZW!gTSHT_m8z;!^Sm543k^Q+py@|l%ix+D6sa0Q-h{O+PEJmeH z7y}j~k?5d|oo;8oRz0!Z66`d3E(Vi}Hw1H2AWka(knDrXX1_DhIkySaA4Z>p8*QJn zvzUm6%0Adydl3@YnS`Pqj6Bq8PYbPyeUl3dT7EPGUYWX3?ZvelTzl|P^An18wWN$26Rto5E#4}0z3C7+^i(>+5D4uj2|1Hn zmGf>RSKew#S$kc-uH?It*!h~rb;aY-)#U z(X=M#)jBC#=B1g->+3j!)ry-+YtauATPGbMk6%4ty4!e@QI2>AqP}ca@r2I`5#6@8 zdGwt!jplwXBS3IDfN$Od%WMyV{{)^L5!pZVU3y6QNnv$=U&+N=@TkL{jg%{!>r(A_ z-fqgCA!-KlEO&>)V`{*PB!Nd4_)r1Ri{uaW5&6I>ZaOAJ%<>ce2HmSn9H46s^O74FYq&MGr9Yp}e41_8}0^ zyGdg55aEpYy)&xYYzF`hn)@Xq7%$7Vjassg&d(W>eWtvYCK_+<7$Z<#a7vJ1;?e*3 z^$XFvN)bPIU0@4Pxdq#qyY?+h>H~p3IpW;si9( zQtohxP+~wW2|wFBA=)I&#>fj@fQUfE1a8sytOOTZv=gg4>a+Qp4ML}Xe^0&Jk?}b( z+ZYfog;W3i2L_*pF)okYiz$n2Wif441zS2^`&?}NMDUelabxsYRLS&m(tF{^mM$zW zjA38o$I-D^AXDln(Q1vvSrJ^*Em}tZ7Yf{vKmRjrzw7CZz$$=0!GTR zE&BZ2M#Kgl{xD`=!u2k{agYY@O?;yBAjd7Q(1eJ23?~T!lHU3Gz^QN2@Pb|qHSnHQ z9Fyc>BS^vvv%t1{4d#qT2Ez4b?tSS;Q21vg+&##;GtUor@ zWfSI0QNEpQW==0Pcvd#+Hhcfcp!j`$Hrk3f2*&L*8j2ZO@T=9LKE%bz3|rLnSf!Ps z^tua!YvWf|Uh2#jgX_)U#pctOis~!KV)`M$;a$cI6naiC2Q*|prQk?#*fL_=kw0$o zatL*e%}7@l8Qw0kDkkN693AWr?s$UOYpht*zF$=yvSP5`o?h$NE%s7McgltLHs49r zX#ct}k!3XL0)t`ZXnU}UsdX2qEm4Tat;U&8t1f=*xNuJR0fcgl@?c+ zdzGEqyF}OT$8Z_X?^pW{f)ur?rb6^}{-SU8tA6Vp>|l-L_IA{%FXynV z8H?_#$WLEF%=(g#fUg0*U*`IroBb;P&pzzA{E1w&Ig2Vq%#blGetiootrSEZ? zxeL!HwvGv#g=BX4fRuluN(8K>-?;<+v~&wL++}P-p4kd*)it2aj2r+&vPhr4HnyGk9O zpU2OF?;~E}YO_7<F@Y_MUaxtk!n(_|M(!t0OQ)_F=q;@8LnJIaz7^tb=+M4pVv)mFOE7En!dK zeVng4d-Qg0VvJ>XFfmB;W*vs~J{a41i29Z=M_70ed7bAF)!spkAcu%uqwuz&gft;t z-*_Vvu44l=%EIYhEKHhTTo3rtICaqwsS~7BrQ)k`Pf_{-{yG3{xj&?~aN1yDF=&ZxuW?{jMJ zoin0?yV7l1&YY~XHe*u#HUe2+Lv~ggs9)Pd#Xl*`mHZE__w#lEeLr47_H%2_y!19^ z2Zz5sin4#JJkeN@C3*=7fhRZJA0(5e??yBtH=~C=`G$U za$}OEQ1)>J&LC_~8y~*9;F!Bz(fhf&y==u%kANATOyeee# z`P!QD?ovt`{un-*_nETxnx-$d-RbXBh=xsvUqkg>KfdGd;LImGbd!K(1f44Naz+LYUu~q^!SK*mH5N1HsYXDvhcN5Rxk%1SDuFX29y|tVp}#Gr z;tu4r)|VlS2PiLnUVh8Zm%2(-MLGW+L!rT5dvh>jbTUTqFyY2U*maSn+}kDL{Y}W` zHW=?Yp-0tWP)gS75y>mIp&AysLGD|Lp^(hV`g)BP68Su+l~#)6)GXJNmLdGWS@~3A zS4;v4dj|(Cp6r8z4{NETO-?%?rsg$xyVsU6J$=pwXljHu7JmTSyIr~~yxWFV>QKn+ ztt3s3Ig1O`D8+O%IX(q@&-G#bwsTR2c6r&UP!3j1>x340?<(SItOMo8R+zWbdE}({ zJleZD3oUDQCR9-kCc2Z#gvI!qd0YP~e+wd(m43N$^5Ah8U5QU!qRE6?P&%Vu@uM$v zD`sv^?-vtp;InA&6V)XXx2*0CPKlsd20k?Ru(qC3w_IxIyZIaEV1v?Oi9HL5XMWcF zYLvm~a)Z@R35RF;_d1$iEy+rhx^g=5_|qU&7R)lPoQiG4d`c*FtHW*Jo7<2qObI_8+>I@Yl{L(iR=6M^ikfw9T4-Xc}zFN zBo|)p-F~gapnQ`Jr~Q?&AMG`5ih9ogdXC0Es0%ycC0AZ`jZJ;b$jlvm(`>}T(6r0? zNbhIej>Vm@(9zrFC_F^kv_;ZWFWfN1VPK?6osE#L0!w46(c6syobZ4;KKvE;4_5B( zQeoxNc@{$FMp+sPnp((nor9DMM>4V)jzAkx8@Lk9{K@T`gJFR2766G~5=ab?Tr zyUp*wqkNF>=7Kq7CwdefBzo45-LoAU8pEnGINjyKDo)tv8i0ArKW zS*Q*rB*Vz2vmB?*KqlMW-Gj9o5xc?SrF1+2#*0_pt<~%>74o>5BT2D0FNO6&7AJmH~3rl-d$mr|%r#>(Ze+TTh9 zHSMYNsK$9$K`Jofg)O>y&qz9%C={3l;0eH%k8N(A=g1pQ_?MY}@eO_Ri0g&57RXUY z(AX;>&g!tQ2+q#g;FH@5*hYe9LE8syqf&-kt=EP+tdcvf{9@Gj(Lvmub^h%!42r`7 zv#5wuG3wi6s-hKP6~l=K@`_*7Q`*QwSaSHjAFh;EB-&?r?gV+X@qOMtv;=>6bEg}r z|6h%_hKU=>m+R*mE4F7mRPhY!rgZ%uE|aMf7NU5*>qdvf@Yge>fA=XX-ksLgjtH(? zPUgt&zkLneNTo;{-l7;BooqGaEo3Rc=k+gK1YUY&EJPxF~tE;;s zJN5PYc#qqy9YCLDMErqp&7ubGI0UMJ^hQX1vBbVY8=_Rw368}=oth`B((zPY2y23?Nc$@Ztp#8TdwrBBAE5F<~w%#mw z)eKIlsC@)b6YVu7M&po0xTO2zJ6EA~h1@YNqFi(La$-pgnpfD>SA%n(M8XGf3S$9y zA9YERca-#SGr-y!!8I{)ZCQ2d)ZTcPe-G~Nan`pcJiv`}8G0OSuZ>3!MTcvsRS*Su z7fUNZ8xR%h%`$oj`3pv?%T4dmXx`NQV*emrXCLEre4?*DvIO3|_$tS>^|)*gX%tg9 zrA7t^UyY28vS}_-IZV~6Egy@GoY6qpO4YAdvcdu6EAdc4akPHw*2L@sLK>bjbRIO5 zY|261_68r>xZ<$oUe*Hvw&9heJQE+da!EEqjtgT7D8}Tv;2bIKCnPO58~_-l6m=d} zFv>cT0PRv88=U0l9Pf@m!{$^w|G&WP_3lJ1fb@~UCW}4yfLQf+ty4c|GF;MgP!f#8 z#?Bcq_qwgDtZco#y?rAhBBC$hrd0feT&1nZicc+CfLK$*Zbq^lpfOYVfnV^TaNWlk z0W~B;_DYJQpYEQYU?^P}@x{|Dp*<=iTrg|9-8O*t7VWn&IXpprK2zsLVu$|? ze|K#n{+7y(CvaQZRQ}ex`}W1D#p`7)Z7wRHn@Ln?Ng0`{Jlp_4WA zx1shoL(du9FT}oPJ)7^b%Z*n*p!7@*(;!=h_?Q^Kdl{^)ty6iZqwe1@;8}>@Z?%|J z+zxXXxA(_vBn?Q^(4^?4bkR3+af{)HV{(0+AuJspBB!E290G8!3ZP!&uS)(brsGqw zThIB_*^)7-EsEzT6kluOf&e`>N^xF-OOhgKFa2bW?;aa1PW<+CoNL-%X?nkr#dZd1 zJKGdK(0~5cThufEttRcM09NBufTN#W7Q@lt+hYkCPdZ*SzGG=uFDI+o=uBO_w_N)vg?BsBHH*o*%kBkALLcUSz9ug%q%T! zx8W)|7UI&w!Lt+ceQRv8QIXxD$;$E{lRgg(IbI#v?jZ1IM{ZtFgw<992z}DQpz+gR z*qpB`sCV;a;*)%v`E!8n7t&xiBrSy=#f)9}u7lR^+KqW_>UNTFqgTA+y=dp>=g%GN z?4*2re5zyE{B#-~Fk!G${3z3@wHI(d-NcI7ID0Uu%e9@*SDF!JXQ@yiJZadAOT{7z zG;IJe96abaxVQl>aqWD1mug&RS{>YQ@RdeW*~&L+i=|up zB)Wv!CcHqzVEP1ke1knP?$Y2|%_6~X*w1OWFNkjY=$;=E1#@c>0|NsI6H(nBY@xn= z9yN-kqBlnO>BkhvJE9+)hR;xkdr`@_v)-mX_@xrgORvM0T*DZ4G_Lwb>mvQ<;wXD; z$Gp9+uCAE^>en*#wjrZvp9lcQi;irbAz~JOzS5MA#Xq#3NR7*{SN0ZaopDX8tE*cF z{!I7+CUkUkx;VbM`B~)NB=D3dGtqIt-uJ2i#`_`+aKEVD-m&ynQ?P3G}I>PSbL@ zk2%Xqa$Uw8fHWvnU!Xl9Sm$N%oChIOIgu$;^2J|L=jluir2~`wLhiwqI9XlQe9A5t;O%- z{i2dPp(n-cq{DRSRu^vNM|8mE_oayC<>fu2A|++A;7Po`_UOB-mGU3!J_Q#}RvB`? z?o-yeoUc3{NxkHWO3C7AWN|uuBir(T<$Y@LdoDSnK2kq(MzBjnAbAbB0%rl0%~Sz6h3bZI(~CzqJC zML;hos3+q3C;hG~@ZiO)N0HR*)>qd|$!QXu^QlM}du`~HZ=~zz&(Dwc_QZUAL{wE( zBQ4F%pTJHi2)NcgCy0Yw(y1OwhIBqy?=-HWiTx#y{kGEvAL{%}pHDKC7&Z#mwB?uM!<4z+iiRex4Is^YZMh=XQ2*WF!&c1D=?e$f;*E9t(_b z&JnYs3GWkjqKzd*RZYvG7O;C^$X`3e)KXlj`L4QDuHZAJg#aj$@7_X3N26x6zb`0% z0!-=zwlgZ@3BA6)jy z4yJmXRIXyR_{pxPU(^{V_4zw4F77mA8d$->tGJMB8U=R2K|p|uiwh!jbo5g=Y$vxj zCMKqHHYgJH$3PsT(r_wIX>tla7nOzaLF?@*;F~{#+XaXbg7oxTZW0ox)4rIX0NeV$ z0D3~T+_p9YPJwcX=9?slo06%K-ll8h$canBi98Y>?0-~ZXW8V@>@5N%T2zt#vwIa$ zvyDpK%M`yzgW*i{t}rGs5u;<(XxO3&b?uYXLAvM%uJGxKxhC#ap|v+askUpa1;5iW zdh(h%wSBt(?D3vo`Fdo%jc&pi#hjtmE3XlMiFGPbIrsKxpU+acRX)9+U9tB`mKk_I zR&3**Jmcl+AWjTE^XBk|OMUW&Pn~yNzf|g=&I4E7iM&SyyL!DU>uAzBxaQmZYJ}`& zbiv#gJONSuX_nB2(1}1MQ1#54#zfom(m2n+fkeXVBu0zR?m!G%iuf~G4PJE>KFfdJ zbzSeI3dVd|UhW?vs!TVB*cMj!+!QBtT`MTqCBx~XGxdl&J_fcQ2^E%RU2IEqUAIAb zqLmDys!>kZe&ow!j!jdw?Ww#+V6#Hq-1-W?vz{M)Iqz8hm{oD-=T8!NzWV)?LdeVH zVYvK*8C!o)uSH^GL&N&V+2^v`J8a~r*A}9cyVT1}30!O?5X@!Mw_6U81cIYkx+X?S zgCuFUv+g*jf%9!8*BN~iTXOI{@g4qI(zG+L3CT{56lkd#ziUfL`&8@Or^2I6k#p5_ zT9zRO$Y~iL8rRXAloFrqn5=$$q0uZ)lS)Y4H>`*i&6kapuhsCx?MvfdxMjX$g>qCD z7KY;DShcoGk09%0H9AhN$=#cOfdZm#Op-J+xUFNyK7qK^3P`cKUYWigxW4@<#Hvfe z@OAfO*>uW4cfU)LK)4;I-CWY1SRF#+(F*XQVKk%-P(@(=Q~9AHVZ12iB7QZMPwsPM~85EAJ?nZX9l)7=3z%9lLw` znsILFSu9YBaJc0TKu4K(Y(=CMnD8-WrL({*R-9~_2{0b2Tn4jk_(p_9*TITo`?l#+ z;M+l1zB;u~M;^t3lk9MFsbPI|)+DDL+^QHx%6$&~mk^66&miQMW<>R!Y8{MkPj4|$ z%gR!lxy;zfE9C*mqQHJ7PaI`law&NGD9!`s6)kNWu884#V3$yEwy2e4{Tt>q*bZ1% z9*+PSh`h3rBR>mi9aA6zE@a{C7#b^cUU3^P3mX}I8FqPF+zHl8At@b<5XqI!1oK>3 z+TOF9JIdsFm!nYS*8M%Aj$I25|KEr;#+tZwfSZq3 z;}~pXUZ*@sm?GVoCV!bc@#s#bJp8FeCYZW`X3U+X%^#`4oQqyb{|xmvrJC*w6LE_r z?Z6S!y(csbX1x(o(WzP*A<5C{Ep1C5BIKfmX~D(#9NB-|!OVPmrW3TDdgfn3u<9#c z|2@q;xlVmVKs1P~D*|SRex#BR+jV2ujEA!Wh+A#DJH%34F$Iq{6N}$mB>X=Y7PoW5 zQJNw+F*bPzNu$YdF8!@jq9?bzfp_|a(BN!yam6$|iJ`!BUaFu(EPgu?99E*!F0ZLO z7i@E!emigAaNwS^;oID2wL|s~x|C5U1q|LIlYria!K}w?s*Wy02>f5={V8nFKP-%rMN9&qf#6mr`x-yRt6Z{0D0+ zHaVf;q?)#Zj2>^zpN3X0ddt0uA?UWTE406)Pmx+*R4OM{r0cEHU9<+*t6B)Zw{{Sr zOP39QU*8Z1geJ~?ED9hLtx1~Tl-6gAr%@*8D9zo+Afix?vKg1h#I4k|ne4ftQ+^+- zQl`Cz!%@b#vliTXIzA2V5!jPBJr+o|1i)Ph%**oo);tH$yh)suv zv{XL-nwVRt3vCDKKLo$?%K_5b3o zR;!2pnHYXL_MgEJR!?ptckL7J@%)5C?NprzGq1ZGj68j2U2Kt!+#QfyBKj6R%(|T08^3)fharWW0U{VdrS9F_c*jC-WiCl@qo??&Jt|v zZ4);LLtk1O88AewoE81gq)mt}-E$_l&LxCa*>nYZmaM#-r)P_qh3>=X*3qo9ADSn4 z^4#8eF>71s!G=#*AB~^INCzcZ>bo{pwOd_l(oPCm_`GDn8$TU!_B6MY`X4 z*wb#dwmw@!JxiqqKCEcmZAwjDV28b<7H*W)HmbyWAZd|^J+Y{d3Z!&WTVsarhD2x~ z!z?75;_tX9S598qze9Mw_ikgr#LwJf^{C*hxWy2rP%<$I(uNU%?shKOc7G!;N%|h` zyPoB(|GbdaPg9{TgKV!U8X$_56!2$|t%WFTtLFyXQ_o0dR==wvucg393J8(`U}Nlx z?l?nKR2%%c@38@b*>&Zm7s8>T?wecR<12*E{ZpBYS!zXXZTF3FWZyjhqPX&`*gfH+ zF1GpbmQANKvDW@3bU^5oXszz)VDgZa7!i4S93P{nUjE-H<{qiq0*~5S`6Fg$F$?RJ zd-Z!Gh6n}z?6lNuQk7e&P9xzJLhk9tnlY8_U&|FX4e2lNH|(dd+lvv2BFF*A6@NTI;TLy*o@!i*%@SzZbS0!4gUo-2 ze`<;t<^dpSlWSj#6*^imx2H~FpRmUR^;3`Jg|d@=Q#?`V&;Q~VXjpQcgVj{W9zFI> z!-)Gu(o+mVkK%t*Gtx^d^WQw~wU@XjafY;qpNogCowI*LPE{Ip-)Hr9=WdMiqmG|} zA9DI&(o!4$lcWDh-QU7P(8P*z^n(^cH;Mrtmeda~0KU9bx_4*%oC1@cGI_qv_@RmK z8GJfTED?+DaS8u@(n#4KHEskul-4?*q-;5cT+Mn%MIj#YozEkV5EgEPNsFr;s}BP> zvXHJ4FBZ?8V6edii!L^qyr5M0ZUUbMs;VB*P=tmUnT@SUQ}rt*2|EQAK23CU02gd+ zmwbB*8(-Ka{@=&Fri<`W;6)PL%B~ib2R2r+M#@74k|oG69{2^e;&=7rH-d3^5Ph}B zmdhbxA!{86++K$tnblW>CAW(AFRc#9PXAzptvwRDajZm~6{}M)>#M&sD<>z}>*<9` zoIRLyEwG1MUQpm>gw3Ir>gt9mE;>yJ$)n4kEXgM+ZNrIq=-t{CaENI@JS+X zJxMOUJ54>={=dl9J}3V#vd7EUQ^wofhP6k?Bjly)m(flLaszs#8o)=%1!XhjTDg5K zx*9l~j5irC?$7lB<%B#^?Sy(9I39kwKLTT9mEz9;N!vI7Io334XdXjfQ|rS}FrbW_ z`Q0)5B;{*w2=Gio(2^sZ=hfIq#V~11L})YIwoRN{qv=sqdwrLr$xt0B?vrmk2X&*$ zzXa43udC6ll+lC|R|8KrAd~A^rG%$+el5W5x54RurD-avSxt^w^L3guTBEGjx6FhG z!we%IUUhhIz06Bh-?98dmQ7nI2g8gfyP06Bu8cvQ&p$PBI`Fr&@?=e_@-n84uI@|D zbWw$OtWrU0Mb@DV>Xy*g^uu17&q7ym)Nbyq^ZP$O;9(ut7dera?gY{kuSp4vv&(i==#rbpff|H+w!F z2Q+h9tf@n39}XspdjjhIQCtL_a$_29lNj8Obwg+pVm$PQ|F9Z6bFWa?MT|FA^!eE1 zHxwLHLANH#civ+yH^>`f<);eYDlJ7U6pDaXXARsGE70*QoA3PBI=Fl?;L^42T}z&& zXNa;OAc6a3Z<`iuo9^FyvO23Jj7g13v8M3tY%;#j*ehsh?yUzW4_dK!VQ%vq=-u;xnmt~1VZehMqKz;g*# zYYXfU#lA7U)cLRN0KF|grF=IGAQ+_1OL(8$Q2oe47~#&p`k$#)rq&kHHr@05m}aQR zBZMu-RvP51r?25DCy?dulQX+BfCJ8AlRg7E{(qlC9R&u47POM&EDAn@BxY@9#o63- z?h2)1Q>>r=7^`2XAA4tbk^4m9{#^7x_t0aPo~=~(ruzPV(6F~BODX|Ucz2JY32Dum zvb&XNs#P&v@x}181_TrD}ZP!tC%6#cy7g^#k9!Ax_JNmsfN z=vizxn+@P2Q3!wd`hIlb&Rqt&c1e>SflleWFB5e1rHRdfpE3w{krC2h^q}jTbF~>u ze=MDm2>j3!3MhBb~xi%G-(;{Pml191Ay@85e&c^uU> z5YdMH;mCht)8?wXC?jAd`nszij46q2d_ggsWzIPUfUa9Mld|!PaVWooT(NR{O?ar- zVzfzlo-(V+2N9{GI+B&cZ8dl53A$1L8Q^O5`|3;D-laZ=Erj&Q{4)q*23F4Dfj|da zc}=dq{T(!{DT)uHzhkJw2?}TAALC3m|nVsshN1$Z(7Oks0=5tlQO>NTXF$S`y7<6?h@q#EIcA!+2*zOJw zMha5WZ^2c8&I~6g-S$slooU}=iO^pthhk3Bg#b@b)m?Oq-OQK)FJqw*$D!4Txb(^G!cE98%smY8}r(rsB52VJklU zB*O8LC^jmCU>&=$qgvxl?C?5g&M}m|oFOH|@D*^SS!|Ol5!KH(?-u9mq6vi+XIH2m z8jw|a$~CsQg8?*~x;vN!aDN7bljE`1_0l8u2epI_gK8%*cye`AGuf;)1QTwS+#C!y zKJ$I3Sw#XhS67glv!3iOf|TEK)UvXt^&*dAWyt9~|nWlByh zbx&Z~vDa!dQiZ+JITP9usE|ZnoZc1c9tNqk6VQI2?@{sTpG=HOoJ0NA=#VFI3I6n_ zBe8nU8|e28CR!9czXbo>w|~RcM<%r|@%rUx(%A+7O$8xpGtwCeeP(IP*P68aF|g50 z-<5AcsXXr{tH*5x_sE>@*_trWXWO;@1Ca9E7I2mLv$47aZB{S`-QD?_cE*?j zdJy8Q9+mYOq&jp92tIPO?Fi|SWy8NnDtZ>hih2Mi1eYX>y`@p#jW1oH z6lLv`GVbi3w->~B{j(-^FG5yGx(fjy7@R^kWz}h4&>?rM=HxrVZa~gZDOIxQncF9V z+x7UNqp~f?LDI30bj3Kbws&6>+*x~$-_tEaN;$qszS!$UvG(o^8X}3RlFnIy$T5zN zew_I#GXcym(IvWw>%Z(kOufA?;{mzQOX106sC2OgWU>qirNips9a)0iWJ?;?Q_532gI8SWhR zs^z_uLJ`mcyRU0;a9+#H;2VkoS4p2ob=rt{v4s#2nRqBDthja)4k)Ph_||Ef6aj63 z^ZRY>(zbq}lYt%20Qfwh8%|AH4!wO2k6~HkH%myj5HG%(j(Rn6#ml*b@Q_=D>6U>(Z~L;*=QtP{ ziPV_lsI&fKagL0VxcPZPMyc_FVpddQ__RrRyXZi?<@f~ky)wkuvTgH56ARamwa~y} zWdh*HikJfX|GWM8-(5+4zHj&aE1Obf8#_i!lg;%Kl+Tp!DuK|}=yl&;+wxelS;X=u zo&U~DxKLF6y*~bRL?8p^(Z@EdUK@d&`%6vVZA4o;0oL(*`g_kwqhmV$&d-e17&7j6 z!=!i1g)x0FA>Dj{KmrIQ-#D<8$C=q#!vdMac?rWB>mJ Ds4c$5 literal 11598 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

*vP-j@WuF{wBY>ibhDdPH)0|(Ce*) z(i3HEWOv;TP7_ekZh#*JPgE@z>x9UfFiK`gDlyG0r4t z3IppR2PsVo3=3eW&SjOq{J$zOBwzhsm80H8^?!M=x#eY!WF12IN#KHQxr=l8UlS=z zfz@FRfh@Xy0+%V{kpC}7cK35|*-7sqvv_RR4D2AF4Lr&au`kJpVkuzG7OMWJLIj9J zVadaaV{8ghr7#jMKPe|k?oo9^;aRjA)!%x%QT<(sJI0&5VoO(MCS8$=XbP(<2M!p0 zpPyk`uUy^RAvvCP^+MwLIy`Gbe`puYG`^Nurc>*UbECwdBEI=S$pOxbm`;){k$=;T zTK<14c*H|5uq0{cVtmED*LirB6(d-a>AKiYCvb#x5db???)OPsShU>kLG?w+ z(#oen(aF!H4X2cu+5M#Zh8UPDpVmfYNs|odr{NTc%6rvN{L5HQ3xSt}!ZIEux%ie6 zQMC>HYL%B#vz_38rp@5{@tJ9SaE6~J^UZZn&;NU|vqMey1ZPO{y^wlN2HN?P5B3pp zBh8b||8EBUS7;*e3NVqoG)gki#xVMqDB6c7F!Vr#0ZiDxYD(^)KaW_-<^vY%8_eQH zuiJ-*V(wc-IVmTsoP>ZmBN*tqC_uj55XbyNx36-`r8K>SFZETz=sRUCeKUk^|3EkS zuDT8mRJZWH?%ZNIsUMc%z=;n7u}m~kT>z`aB~?=2%`ES}WKy|=1uhcDnfjC>+&>gz z6#}vF?!|kkKJMzZUoCv~FR=nRf!RjDz)LT!YyN}w#LMAZKLxy@Mi&JWMpOHLzDddp z0m2Iu|LpB0;WDfh;C$l+4;?N8FVb0z&ef-N;lHT#Ak97AP~t$)VMdYa+GKyLr{NM} zbWiQD)sya7^~r3DI~lB4Eo-Ql#CBNA%RQ&CmdR0dKV=x;t9uprJwP2a02kZavdwjE3Z>$$)+ac8Z4fRD4feUWT zdBEV7!fa6HxOHuQyQL!wF&Ch^v;f7{uJ0V25G0Lbx(iqdXiw797X1yrS(0X6Mc?nV zoADFATYd^UsMU^eW@MAI^2`MJoghv97bftn?vM|@$8$n6<2o5Yt~seYMwt;%JgTq> zvb~;F5B)x!yi9i|e8_F{1I0;8{$d#-PO9NE>wTO$9*OdqOHl^#+W`dl!6PBP0qf5R zs4s?YQGDm3TTb#dv);8ichFUG=re>9q-NYT5Mj?}%DoD@69!w>oTL?~AhMItl=}I} zz26wHZjq4t;OfhzXO)%pAt7v~F&a#9{Q>z|`iO);sR;a@4+8b5tt;2w0MpsW%IlZH z@^Cy4Le@m36D2t^p`7J_^=AaMf9g^Cv02iX1u~1^D-5aGdF?zw7(oQQgp(e%57aDMWzTyec6R-?dH* z3>rD&@o5Dzv-jP&l8m^nz)M#Y1c6$hX2IW2g$DUlxya=Igb8#H5mJ|rY7YLy=vKgT zy2`8%xk&-mb28Cnk=zhG+Jv4EA5}J0u82^KX8pIqWy>R=bAgE5TzQ}_Y)m{}2rO^d z7UgcQ1$js4v&c??*#K7G?z^ZezrYQw!et#1JD7D^uDHYJ zAtn_sDlRT9RSvLQlaozinVn6%4Tw%j4fQ?F5A3{o7b*cX?)L!L9AcoO_wLK#qwU2e v?!4i}7ZRuh;p31v4NCcV@CaM`6%;RK;KN&~f<4T4(f}oSHMuHTv*7;#bqWG! From c91ea2f18b250f5d93fdc45f402c33289ed7414c Mon Sep 17 00:00:00 2001 From: AMyriad Date: Mon, 29 Jul 2024 21:50:45 +0200 Subject: [PATCH 26/48] ballin ty baiom --- .../airlock_helpers.dm} | 10 +- .../mapping/access_helpers/windoor_helpers.dm | 861 ++++++++++++++++++ code/modules/mapping/mapping_helpers.dm | 34 +- icons/effects/mapping_helpers.dmi | Bin 14957 -> 16449 bytes yogstation.dme | 3 +- 5 files changed, 891 insertions(+), 17 deletions(-) rename code/modules/mapping/{access_helpers.dm => access_helpers/airlock_helpers.dm} (98%) create mode 100644 code/modules/mapping/access_helpers/windoor_helpers.dm diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers/airlock_helpers.dm similarity index 98% rename from code/modules/mapping/access_helpers.dm rename to code/modules/mapping/access_helpers/airlock_helpers.dm index a9ed9424dbc9..3aaa7873076f 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers/airlock_helpers.dm @@ -5,14 +5,14 @@ // These are mutually exclusive; can't have req_any and req_all /obj/effect/mapping_helpers/airlock/access/any/payload(obj/machinery/door/airlock/airlock) if(airlock.req_access != null) - log_mapping("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") else var/list/access_list = get_access() airlock.req_one_access += access_list /obj/effect/mapping_helpers/airlock/access/all/payload(obj/machinery/door/airlock/airlock) if(airlock.req_one_access != null) - log_mapping("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") else var/list/access_list = get_access() airlock.req_access += access_list @@ -23,8 +23,9 @@ //// HELPERS START - PLEASE KEEP EVERYTHING IN THE SAME ORDER AS IN ACCESS.DM THANKS + /// REQ ANY /// -// Applies onto req_one_access_txt (only requires ONE of the given accesses to open) +// Applies onto req_one_access (only requires ONE of the given accesses to open) //--- COMMAND ---// @@ -377,7 +378,8 @@ /// REQ ALL /// -// Applies onto req_access_txt (requires ALL of the given accesses to open) +// Applies onto req_access (requires ALL of the given accesses to open) +// Note: If a door only has one access req, - always - use this type //--- COMMAND ---// diff --git a/code/modules/mapping/access_helpers/windoor_helpers.dm b/code/modules/mapping/access_helpers/windoor_helpers.dm new file mode 100644 index 000000000000..f969f246df43 --- /dev/null +++ b/code/modules/mapping/access_helpers/windoor_helpers.dm @@ -0,0 +1,861 @@ +/obj/effect/mapping_helpers/windoor/access + layer = DOOR_ACCESS_HELPER_LAYER + icon_state = "windoor_access" + +// These are mutually exclusive; can't have req_any and req_all +/obj/effect/mapping_helpers/windoor/access/any/payload(obj/machinery/door/window/windoor) + if(windoor.req_access != null) + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + windoor.req_one_access += access_list + +/obj/effect/mapping_helpers/windoor/access/all/payload(obj/machinery/door/window/windoor) + if(windoor.req_one_access != null) + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + windoor.req_access += access_list + +/obj/effect/mapping_helpers/windoor/access/proc/get_access() + var/list/access = list() + return access + + +//// HELPERS START - PLEASE KEEP EVERYTHING IN THE SAME ORDER AS IN ACCESS.DM THANKS + +/// REQ ANY /// +// Applies onto req_one_access (only requires ONE of the given accesses to open) + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/windoor/access/any/command + icon_state = "windoor_access_com" + +/obj/effect/mapping_helpers/windoor/access/any/command/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_COMMAND + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/ai_master/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_MASTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/ai_sat/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_SAT + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/teleporter/get_access() + var/list/access_list = ..() + access_list += ACCESS_TELEPORTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/eva/get_access() + var/list/access_list = ..() + access_list += ACCESS_EVA + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/vault/get_access() + var/list/access_list = ..() + access_list += ACCESS_VAULT + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/captain/get_access() + var/list/access_list = ..() + access_list += ACCESS_CAPTAIN + return access_list + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/windoor/access/any/security + icon_state = "windoor_access_sec" + +/obj/effect/mapping_helpers/windoor/access/any/security/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURITY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/basic/get_access() + var/list/access_list = ..() + access_list += ACCESS_SEC_BASIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/brig/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/armory/get_access() + var/list/access_list = ..() + access_list += ACCESS_ARMORY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/detective/get_access() + var/list/access_list = ..() + access_list += ACCESS_DETECTIVE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/brig_phys/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/hos/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOS + return access_list + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/windoor/access/any/engineering + icon_state = "windoor_access_eng" + +/obj/effect/mapping_helpers/windoor/access/any/engineering/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINEERING + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/atmos/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOSPHERICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/maintenance/get_access() + var/list/access_list = ..() + access_list += ACCESS_MAINT_TUNNELS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/external/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/equipment/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINE_EQUIP + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction/get_access() + var/list/access_list = ..() + access_list += ACCESS_CONSTRUCTION + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/tech_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TECH_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/secure_tech/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURE_TECH + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/tcomms/get_access() + var/list/access_list = ..() + access_list += ACCESS_TCOMMS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/aux_base/get_access() + var/list/access_list = ..() + access_list += ACCESS_AUX_BASE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/ce/get_access() + var/list/access_list = ..() + access_list += ACCESS_CE + return access_list + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/windoor/access/any/medical + icon_state = "windoor_access_med" + +/obj/effect/mapping_helpers/windoor/access/any/medical/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_MEDICAL + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/surgery/get_access() + var/list/access_list = ..() + access_list += ACCESS_SURGERY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/paramedic/get_access() + var/list/access_list = ..() + access_list += ACCESS_PARAMEDIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/morgue/get_access() + var/list/access_list = ..() + access_list += ACCESS_MORGUE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/chemistry/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHEMISTRY + +/obj/effect/mapping_helpers/windoor/access/any/medical/cloning/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLONING + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/virology/get_access() + var/list/access_list = ..() + access_list += ACCESS_VIROLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/psychology/get_access() + var/list/access_list = ..() + access_list += ACCESS_PSYCHOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/cmo/get_access() + var/list/access_list = ..() + access_list += ACCESS_CMO + return access_list + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/windoor/access/any/supply + icon_state = "windoor_access_sup" + +/obj/effect/mapping_helpers/windoor/access/any/supply/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/cargo_bay/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO_BAY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/mining/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/mining_station/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING_STATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/materials/get_access() + var/list/access_list = ..() + access_list += ACCESS_MATERIALS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/qm/get_access() + var/list/access_list = ..() + access_list += ACCESS_QM + return access_list + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/windoor/access/any/science + icon_state = "windoor_access_sci" + +/obj/effect/mapping_helpers/windoor/access/any/science/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SCIENCE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/research/get_access() + var/list/access_list = ..() + access_list += ACCESS_RESEARCH + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/toxins/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/toxins_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/experimentation/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXPERIMENTATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/genetics/get_access() + var/list/access_list = ..() + access_list += ACCESS_GENETICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/robotics/get_access() + var/list/access_list = ..() + access_list += ACCESS_ROBOTICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/xenobio/get_access() + var/list/access_list = ..() + access_list += ACCESS_XENOBIOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/rnd_servers/get_access() + var/list/access_list = ..() + access_list += ACCESS_RND_SERVERS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/rd/get_access() + var/list/access_list = ..() + access_list += ACCESS_RD + return access_list + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/windoor/access/any/service + icon_state = "windoor_access_serv" + +/obj/effect/mapping_helpers/windoor/access/any/service/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SERVICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/theatre/get_access() + var/list/access_list = ..() + access_list += ACCESS_THEATRE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/chapel_office/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHAPEL_OFFICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/crematorium/get_access() + var/list/access_list = ..() + access_list += ACCESS_CREMATORIUM + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/library/get_access() + var/list/access_list = ..() + access_list += ACCESS_LIBRARY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/bar/get_access() + var/list/access_list = ..() + access_list += ACCESS_BAR + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/kitchen/get_access() + var/list/access_list = ..() + access_list += ACCESS_KITCHEN + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/hydroponics/get_access() + var/list/access_list = ..() + access_list += ACCESS_HYDROPONICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/janitor/get_access() + var/list/access_list = ..() + access_list += ACCESS_JANITOR + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/lawyer/get_access() + var/list/access_list = ..() + access_list += ACCESS_LAWYER + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + + +/// REQ ALL /// +// Applies onto req_access (requires ALL of the given accesses to open) +// Note: If a door only has one access req, - always - use this type + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/windoor/access/all/command + icon_state = "windoor_access_com" + +/obj/effect/mapping_helpers/windoor/access/all/command/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_COMMAND + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_MASTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_SAT + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/teleporter/get_access() + var/list/access_list = ..() + access_list += ACCESS_TELEPORTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/eva/get_access() + var/list/access_list = ..() + access_list += ACCESS_EVA + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/vault/get_access() + var/list/access_list = ..() + access_list += ACCESS_VAULT + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/captain/get_access() + var/list/access_list = ..() + access_list += ACCESS_CAPTAIN + return access_list + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/windoor/access/all/security + icon_state = "windoor_access_sec" + +/obj/effect/mapping_helpers/windoor/access/all/security/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURITY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/basic/get_access() + var/list/access_list = ..() + access_list += ACCESS_SEC_BASIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/brig/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/armory/get_access() + var/list/access_list = ..() + access_list += ACCESS_ARMORY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/detective/get_access() + var/list/access_list = ..() + access_list += ACCESS_DETECTIVE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/hos/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOS + return access_list + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/windoor/access/all/engineering + icon_state = "windoor_access_eng" + +/obj/effect/mapping_helpers/windoor/access/all/engineering/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINEERING + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOSPHERICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance/get_access() + var/list/access_list = ..() + access_list += ACCESS_MAINT_TUNNELS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/external/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINE_EQUIP + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/construction/get_access() + var/list/access_list = ..() + access_list += ACCESS_CONSTRUCTION + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/tech_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TECH_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/secure_tech/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURE_TECH + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/tcomms/get_access() + var/list/access_list = ..() + access_list += ACCESS_TCOMMS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/aux_base/get_access() + var/list/access_list = ..() + access_list += ACCESS_AUX_BASE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/ce/get_access() + var/list/access_list = ..() + access_list += ACCESS_CE + return access_list + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/windoor/access/all/medical + icon_state = "windoor_access_med" + +/obj/effect/mapping_helpers/windoor/access/all/medical/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_MEDICAL + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/surgery/get_access() + var/list/access_list = ..() + access_list += ACCESS_SURGERY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/paramedic/get_access() + var/list/access_list = ..() + access_list += ACCESS_PARAMEDIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/morgue/get_access() + var/list/access_list = ..() + access_list += ACCESS_MORGUE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHEMISTRY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/cloning/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLONING + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/virology/get_access() + var/list/access_list = ..() + access_list += ACCESS_VIROLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology/get_access() + var/list/access_list = ..() + access_list += ACCESS_PSYCHOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/cmo/get_access() + var/list/access_list = ..() + access_list += ACCESS_CMO + return access_list + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/windoor/access/all/supply + icon_state = "windoor_access_sup" + +/obj/effect/mapping_helpers/windoor/access/all/supply/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/cargo_bay/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO_BAY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/mining/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING_STATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/materials/get_access() + var/list/access_list = ..() + access_list += ACCESS_MATERIALS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/qm/get_access() + var/list/access_list = ..() + access_list += ACCESS_QM + return access_list + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/windoor/access/all/science + icon_state = "windoor_access_sci" + +/obj/effect/mapping_helpers/windoor/access/all/science/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SCIENCE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/research/get_access() + var/list/access_list = ..() + access_list += ACCESS_RESEARCH + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/toxins/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/toxins_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/experimentation/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXPERIMENTATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/genetics/get_access() + var/list/access_list = ..() + access_list += ACCESS_GENETICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/robotics/get_access() + var/list/access_list = ..() + access_list += ACCESS_ROBOTICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio/get_access() + var/list/access_list = ..() + access_list += ACCESS_XENOBIOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/rnd_servers/get_access() + var/list/access_list = ..() + access_list += ACCESS_RND_SERVERS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/rd/get_access() + var/list/access_list = ..() + access_list += ACCESS_RD + return access_list + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/windoor/access/all/service + icon_state = "windoor_access_serv" + +/obj/effect/mapping_helpers/windoor/access/all/service/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SERVICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/theatre/get_access() + var/list/access_list = ..() + access_list += ACCESS_THEATRE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHAPEL_OFFICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/crematorium/get_access() + var/list/access_list = ..() + access_list += ACCESS_CREMATORIUM + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/library/get_access() + var/list/access_list = ..() + access_list += ACCESS_LIBRARY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/bar/get_access() + var/list/access_list = ..() + access_list += ACCESS_BAR + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen/get_access() + var/list/access_list = ..() + access_list += ACCESS_KITCHEN + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics/get_access() + var/list/access_list = ..() + access_list += ACCESS_HYDROPONICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/janitor/get_access() + var/list/access_list = ..() + access_list += ACCESS_JANITOR + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/lawyer/get_access() + var/list/access_list = ..() + access_list += ACCESS_LAWYER + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + + +//--- RUINS ---// +// Only giving req all to non-station helpers to cut down on bloat, feel free to add req any in the future if needed + +/obj/effect/mapping_helpers/windoor/access/all/ruins + icon_state = "windoor_access_ruin" + +/obj/effect/mapping_helpers/windoor/access/all/ruins/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/command/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_COMMAND) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/security/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SECURITY) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/engineering/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_ENGINEERING) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/supply/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SUPPLY) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/science/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SCIENCE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/maintenance/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MAINTENANCE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic1/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC1) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic2/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC2) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic3/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC3) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic4/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC4) + return access_list + + +//--- ADMIN ---// + +/obj/effect/mapping_helpers/windoor/access/all/admin + icon_state = "windoor_access_adm" + +/obj/effect/mapping_helpers/windoor/access/all/admin/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_GENERAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/thunderdome/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_THUNDER) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/living/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_LIVING) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/storage/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_STORAGE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/teleporter/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_TELEPORTER) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/captain/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_CAPTAIN) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/bar/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_BAR) + return access_list + + +//--- SYNDICATE ---// + +/obj/effect/mapping_helpers/windoor/access/all/syndicate + icon_state = "windoor_access_syn" + +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/syndicate/leader/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE_LEADER) + return access_list diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 9ea8905aee8c..165dd4bdd382 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -218,20 +218,30 @@ // Windoor helpers /obj/effect/mapping_helpers/windoor - layer = DOOR_ACCESS_HELPER_LAYER - late = TRUE + layer = DOOR_ACCESS_HELPER_LAYER + late = TRUE /obj/effect/mapping_helpers/windoor/Initialize(mapload) - . = ..() - if(!mapload) - log_mapping("[src] spawned outside of mapload!") - return - var/obj/machinery/door/window/windoor = locate(/obj/machinery/door/window) in loc - if(!windoor) - log_mapping("[src] failed to find an windoor at [AREACOORD(src)]") - else - payload(windoor) - qdel(src) + . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return + var/success = FALSE + var/windoor_present = FALSE + for(var/obj/machinery/door/window/windoor in loc) + windoor_present = TRUE + if(windoor.dir != dir) + continue + payload(windoor) + success = TRUE + if(!success) + log_mapping("[src] failed to find a windoor at [AREACOORD(src)]") + if(windoor_present && !success) + log_mapping("[src] attempted to imprint access at [AREACOORD(src)] but found no valid windoors (windoor present but not matching dir)") + qdel(src) + +/obj/effect/mapping_helpers/windoor/proc/payload(obj/machinery/door/window/payload) + return //needs to do its thing before spawn_rivers() is called INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index a17773c4fb0b35a3eaa76bb093d1d32541616920..7a648263bb139241ff3a51e3a1c0a430f8bfca82 100644 GIT binary patch literal 16449 zcmaL9bwE__);2tZgwoxqG}0XdNGaXjsdRT3NSBIqOQ&?FlyrA1-Oa$vyc_+U^PclO z-~0VBGkf2A-}|n$)^%O$-Vm;;EQk4+>@f%g!h9(&tquYqNB|!iG!&qu$FleYI7#r; z)ODA(a9X2p%2K$hy*3veS88V3@D1fqlqIgXs8P${Cqg z>*_+p5==Y&agsd#-i$ox?K8i{c4}pNFVSC=f)(Rc?;J8S&JXgn3Uxb;`F*tCwrQH( zoJb;@J~CiCQ+&Ox*E!?k>6!D^42o|WPd*-QnKm|(RoZxvhmh+q%*x5$VB&lSwpE?U zIw}NDytLP^F-4la!rVIZjhLp*~QNnpcgv2`M+q}?HE_;{8N79o3Lt6Qjj7aaR zU3p2uiup5TY{4rzhd?{~QNmLKG_9OH1NvW4$dhWPG)s@9K4F_?$q+YGR&}|z#jbr& zcG@3*LCDh*cb zbPjF20q@gKksqZ!ai5Uy%SiVIsx4AKk+m@IwpIM58^tyctFdU_q=h4gZ4?Ah?OmXP zKs2D2(vq6qX@}{4-kO)`@KqZrb=Ifrc=8x8Skzy!ys!!wz;{E3|;$e8CtuFS8NY_7Mi^l+7{UsTV33~(~`=@LF+2fgbf;vW;^{{?iace z4MqVeje|iuYo3Q=R0emW9G=pnYFTc3i0Pxx#@p5N=b@ha%S9_MSngL-omd?A$Z^q- zixH3!rflJ%QrRpe?y|Zbbnp7*A^A(u3;J1ApOQ^ACM?u*d6n_Y%9Fg4c}` gYyMC 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 literal 14957 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 Ds4c$5 diff --git a/yogstation.dme b/yogstation.dme index 8db746d0d2cb..c110c94824bd 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2774,7 +2774,6 @@ #include "code\modules\lighting\lighting_source.dm" #include "code\modules\lighting\lighting_turf.dm" #include "code\modules\lighting\static_lighting_area.dm" -#include "code\modules\mapping\access_helpers.dm" #include "code\modules\mapping\mail_sort_helpers.dm" #include "code\modules\mapping\map_template.dm" #include "code\modules\mapping\mapping_helpers.dm" @@ -2783,6 +2782,8 @@ #include "code\modules\mapping\reader.dm" #include "code\modules\mapping\ruins.dm" #include "code\modules\mapping\verify.dm" +#include "code\modules\mapping\access_helpers\airlock_helpers.dm" +#include "code\modules\mapping\access_helpers\windoor_helpers.dm" #include "code\modules\mapping\space_management\multiz_helpers.dm" #include "code\modules\mapping\space_management\space_level.dm" #include "code\modules\mapping\space_management\space_reservation.dm" From 97c967698eb1499e39b364cf6f5489bf3798de3a Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 00:16:56 +0200 Subject: [PATCH 27/48] ballin here we go again --- .../AsteroidStation/AsteroidStation.dmm | 748 +++++++++++------- code/__DEFINES/layers.dm | 1 + code/game/machinery/doors/airlock.dm | 2 +- code/game/objects/items/RCD.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 3 +- code/game/objects/structures/fireaxe.dm | 2 + .../mapping/access_helpers/windoor_helpers.dm | 1 - code/modules/mapping/mapping_helpers.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- code/modules/research/rdconsole.dm | 2 +- .../shuttle_creation/shuttle_creator.dm | 2 +- icons/effects/mapping_helpers.dmi | Bin 16449 -> 16717 bytes .../code/game/objects/structures/fireaxe.dm | 2 +- 13 files changed, 494 insertions(+), 275 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index f56921851134..22a5e42ad04b 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -222,13 +222,13 @@ dir = 4 }, /obj/machinery/door/window{ - name = "High-Risk Modules"; - req_access_txt = "ai_master" + name = "High-Risk Modules" }, /obj/effect/spawner/lootdrop/aimodule_harmful, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "abV" = ( @@ -898,6 +898,9 @@ network = list("ss13","prison") }, /obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/security/prison) "aib" = ( @@ -1085,13 +1088,15 @@ "ajW" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 5"; - req_access_txt = "xenobiology" + name = "Containment Pen 5" }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "ajX" = ( @@ -1264,7 +1269,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = 25; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -1679,10 +1684,12 @@ /area/security/physician) "apj" = ( /obj/machinery/door/window/westleft{ - dir = 4; - req_access_txt = "chapel_office" + dir = 4 }, /obj/structure/closet/crate/coffin, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 + }, /turf/open/floor/wood, /area/chapel/office) "apm" = ( @@ -2095,13 +2102,15 @@ /area/maintenance/solars/port/fore) "asF" = ( /obj/machinery/door/window/eastleft{ - name = "Medical Delivery"; - req_access_txt = "medical" + name = "Medical Delivery" }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "asG" = ( @@ -2585,8 +2594,10 @@ }, /obj/machinery/door/window{ dir = 4; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plating, /area/chapel/office) @@ -3082,9 +3093,11 @@ /area/maintenance/disposal) "aBC" = ( /obj/machinery/door/window/westleft{ - req_access_txt = "captain"; name = "Captain's Desk Door" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "aBD" = ( @@ -3483,7 +3496,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/light_switch{ pixel_y = -23 @@ -4455,10 +4468,12 @@ "aMY" = ( /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" }, /obj/structure/closet/crate/coffin, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/wood, /area/chapel/office) "aNb" = ( @@ -4510,8 +4525,7 @@ "aNO" = ( /obj/machinery/door/window/westright{ dir = 1; - name = "Security Checkpoint"; - req_access_txt = "sec_basic" + name = "Security Checkpoint" }, /obj/structure/table/reinforced, /obj/item/paper, @@ -4519,6 +4533,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plating, /area/security/checkpoint/auxiliary) "aNQ" = ( @@ -4754,8 +4771,10 @@ "aPK" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -6653,13 +6672,15 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 1"; - req_access_txt = "xenobiology" + name = "Containment Pen 1" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "bpL" = ( @@ -6947,8 +6968,7 @@ dir = 1; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "ai_master" + name = "Upload Console Window" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -6960,6 +6980,9 @@ /obj/machinery/computer/upload/ai{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "bvo" = ( @@ -7628,14 +7651,14 @@ name = "Prison Wing Lockdown"; pixel_x = 8; pixel_y = -25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = 8; pixel_y = -35; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/light_switch{ pixel_x = -5; @@ -7805,7 +7828,7 @@ name = "Public Teleporter Access Control"; pixel_x = 5; pixel_y = 24; - req_access_txt = "teleporter" + req_access = list("teleporter") }, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -7940,8 +7963,10 @@ /obj/structure/table/optable, /obj/item/surgical_drapes, /obj/machinery/door/window/northleft{ - name = "Autopsy Desk"; - req_access_txt = "detective" + name = "Autopsy Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/detective{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) @@ -8830,6 +8855,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/storage) +"cbC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "cbF" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -9019,7 +9051,7 @@ name = "Toxins airlock control"; pixel_x = 8; pixel_y = 25; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -9028,7 +9060,7 @@ name = "Toxins airlock control"; pixel_x = 8; pixel_y = -25; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Mix to Space" @@ -9365,7 +9397,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 26; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/structure/closet/crate/freezer, /obj/machinery/light_switch{ @@ -9384,6 +9416,13 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"ciz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/security/prison) "ciE" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge" @@ -9430,8 +9469,7 @@ /area/bridge) "ciY" = ( /obj/machinery/door/window/westright{ - name = "Bar Window"; - req_access_txt = "bar" + name = "Bar Window" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -9440,6 +9478,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 8 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "ciZ" = ( @@ -9575,7 +9616,7 @@ name = "Psych Office Shutters Control"; pixel_x = -6; pixel_y = -25; - req_access_txt = "psychology" + req_access = list(ACCESS_PSYCHOLOGY) }, /obj/machinery/light_switch{ pixel_x = 9; @@ -10168,7 +10209,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -10177,7 +10218,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/closed/wall, /area/medical/medbay/central) @@ -10785,8 +10826,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 2"; - req_access_txt = "xenobiology" + name = "Containment Pen 2" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -11293,7 +11336,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -11404,7 +11447,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = -6; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/execution/transfer) @@ -11502,9 +11545,9 @@ "cQs" = ( /obj/effect/turf_decal/sand, /obj/machinery/door/window/southright{ - name = "Bar Door"; - req_access_txt = "bar" + name = "Bar Door" }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "cQC" = ( @@ -11956,14 +11999,14 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = -26; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio"; name = "Xenobiology Desk Shutters"; pixel_x = 7; pixel_y = -26; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/effect/turf_decal/stripes{ dir = 8 @@ -12797,7 +12840,7 @@ id = "barshutters"; name = "Bar Shutters Control"; pixel_y = 24; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /obj/machinery/firealarm{ dir = 8; @@ -12809,6 +12852,7 @@ /obj/structure/table, /obj/machinery/microwave, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/plasteel/white, /area/security/prison) "dlw" = ( @@ -13117,6 +13161,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_alone{ dir = 8 }, @@ -14377,7 +14424,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -14410,6 +14457,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 8 }, @@ -14529,8 +14579,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ dir = 4; - name = "Engineering Delivery"; - req_access_txt = "engineering" + name = "Engineering Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general{ + dir = 4 }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -14657,9 +14709,7 @@ /turf/open/floor/plasteel/white, /area/science/nanite) "dQR" = ( -/obj/machinery/door/window/eastright{ - req_access_txt = "armory" - }, +/obj/machinery/door/window/eastright, /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -14668,6 +14718,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "dQW" = ( @@ -14755,6 +14808,11 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"dSg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_corner, +/turf/open/floor/plasteel/cafeteria, +/area/security/prison) "dSi" = ( /obj/structure/chair/comfy/brown, /obj/structure/chair/comfy/brown, @@ -15343,7 +15401,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY)) }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -15351,7 +15409,7 @@ name = "Loading Doors"; pixel_x = -7; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/computer/cargo{ dir = 1 @@ -15724,8 +15782,7 @@ "egY" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15735,6 +15792,9 @@ pixel_x = -7; pixel_y = -4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "ehz" = ( @@ -16068,13 +16128,15 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "sec_basic" + name = "Security Delivery" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 6 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/processing) "elu" = ( @@ -17094,8 +17156,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - name = "Atmospherics Desk"; - req_access_txt = "atmospherics" + name = "Atmospherics Desk" }, /obj/item/paper_bin, /obj/item/pen, @@ -17116,6 +17177,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/atmos) "eBg" = ( @@ -18443,18 +18507,22 @@ /area/hallway/primary/starboard) "eUh" = ( /obj/machinery/door/window/westleft{ - name = "armoury desk"; - req_access_txt = "armory" + name = "armoury desk" }, /obj/machinery/door/window/eastleft{ - name = "armoury desk"; - req_access_txt = "security" + name = "armoury desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/armory{ pixel_x = 5; pixel_y = 10 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 8 + }, /turf/open/floor/plating, /area/security/warden) "eUk" = ( @@ -18647,7 +18715,7 @@ name = "Shutters Control Button"; pixel_x = -25; pixel_y = -26; - req_one_access_txt = "science;robotics" + req_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -19029,7 +19097,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_x = -26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -21240,9 +21308,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "fQl" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "armory" - }, +/obj/machinery/door/window/eastleft, /obj/effect/turf_decal/stripes{ dir = 1 }, @@ -21251,6 +21317,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "fQq" = ( @@ -21529,14 +21598,14 @@ name = "Toxins Mixing Room Access Console"; pixel_x = 6; pixel_y = -25; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/button/door{ id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -7; pixel_y = -24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -21788,10 +21857,10 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Kitchen Delivery"; - req_access_txt = "kitchen" + name = "Kitchen Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "fYr" = ( @@ -21814,8 +21883,7 @@ "fZg" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 3"; - req_access_txt = "xenobiology" + name = "Containment Pen 3" }, /obj/structure/cable{ icon_state = "1-2" @@ -21830,6 +21898,9 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "fZk" = ( @@ -21916,9 +21987,9 @@ /area/security/detectives_office) "gbo" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "security" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel, /area/security/courtroom) "gbp" = ( @@ -22664,10 +22735,10 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Bar Delivery"; - req_access_txt = "bar" + name = "Bar Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/plating, /area/crew_quarters/bar) "gnt" = ( @@ -23334,8 +23405,7 @@ pixel_y = -24 }, /obj/machinery/door/window/westleft{ - name = "Janitorial Delivery"; - req_access_txt = "janitor" + name = "Janitorial Delivery" }, /mob/living/simple_animal/cockroach{ desc = "Virtually unkillable."; @@ -23343,6 +23413,9 @@ sentience_type = 5; status_flags = 16 }, +/obj/effect/mapping_helpers/windoor/access/all/service/janitor{ + dir = 8 + }, /turf/open/floor/plasteel, /area/janitor) "gzD" = ( @@ -24126,7 +24199,7 @@ name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/structure/cable{ icon_state = "2-8" @@ -24136,7 +24209,7 @@ name = "Mech Bay Door Control"; pixel_x = -7; pixel_y = 24; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /turf/open/floor/plasteel/dark, /area/science/robotics/mechbay) @@ -24558,8 +24631,7 @@ "gQY" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 4"; - req_access_txt = "xenobiology" + name = "Containment Pen 4" }, /obj/structure/cable{ icon_state = "1-2" @@ -24574,6 +24646,9 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "gRa" = ( @@ -25552,8 +25627,7 @@ "hhu" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/item/deskbell/preset/delivery{ pixel_x = 8; @@ -25565,6 +25639,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "hhU" = ( @@ -25597,12 +25674,12 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "ai_master" + name = "Core Modules" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "hiw" = ( @@ -25654,8 +25731,7 @@ /obj/machinery/door/window/eastright{ base_state = "left"; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/chemistry{ @@ -25668,6 +25744,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 4 + }, /turf/open/floor/plating, /area/medical/chemistry) "hiX" = ( @@ -26130,7 +26209,7 @@ name = "Incinerator airlock control"; pixel_x = 22; pixel_y = 8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -26588,6 +26667,9 @@ /area/maintenance/port/fore) "hyg" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) "hyh" = ( @@ -26687,11 +26769,13 @@ "hzL" = ( /obj/machinery/door/window/eastright{ dir = 8; - name = "Garden Door"; - req_access_txt = "medical" + name = "Garden Door" }, /obj/structure/flora/ausbushes/ppflowers, /mob/living/simple_animal/butterfly, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 8 + }, /turf/open/floor/grass, /area/medical/medbay/aft) "hzX" = ( @@ -26990,8 +27074,7 @@ /area/janitor) "hCV" = ( /obj/machinery/door/window/northright{ - name = "Backup SMES Chamber"; - req_access_txt = "engine_equip" + name = "Backup SMES Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -26999,6 +27082,9 @@ /obj/structure/cable/yellow, /obj/machinery/power/terminal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "hCY" = ( @@ -27173,7 +27259,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -5; pixel_y = 3; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/machinery/button/ignition{ id = "testigniter"; @@ -27261,7 +27347,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; @@ -27269,7 +27355,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -27790,12 +27876,14 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 2"; - req_access_txt = "xenobiology" + name = "Containment Pen 2" }, /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "hPw" = ( @@ -28233,7 +28321,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -24; pixel_y = -7; - req_one_access_txt = "30;70" + req_access = list(ACCESS_AI_SAT) }, /obj/machinery/light_switch{ pixel_x = -24; @@ -28623,8 +28711,7 @@ "ifH" = ( /obj/machinery/door/window/southleft{ dir = 8; - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/structure/cable{ icon_state = "1-2" @@ -28642,6 +28729,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "ifU" = ( @@ -29576,8 +29666,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; @@ -29595,6 +29684,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "iuq" = ( @@ -30284,7 +30374,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = -25; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /turf/open/floor/plasteel{ icon_state = "cafeteria" @@ -31428,7 +31518,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = 24; - req_access_txt = "chapel_office" + req_access = list(ACCESS_CHAPEL_OFFICE) }, /obj/machinery/light{ dir = 1 @@ -31591,7 +31681,7 @@ name = "CMO Shutter Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/light_switch{ pixel_x = 35; @@ -31869,7 +31959,7 @@ name = "Privacy Shutters"; pixel_x = 6; pixel_y = -26; - req_access_txt = "detective" + req_access = list(ACCESS_DETECTIVE) }, /obj/machinery/light_switch{ pixel_x = -6; @@ -32535,12 +32625,13 @@ /turf/open/floor/plating, /area/maintenance/central) "jmo" = ( -/obj/machinery/door/window/northleft{ - req_access_txt = "toxins" - }, +/obj/machinery/door/window/northleft, /obj/effect/turf_decal/loading_area{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins{ + dir = 1 + }, /turf/open/floor/engine, /area/science/mixing) "jmp" = ( @@ -32696,7 +32787,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = -6; pixel_y = 25; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -33393,7 +33484,7 @@ id = "heads_meeting"; name = "Security Shutters"; pixel_y = 24; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/wood, /area/bridge/meeting_room) @@ -33527,7 +33618,7 @@ name = "Delivery Office Door"; pixel_x = -6; pixel_y = 7; - req_access_txt = "cargo" + req_access = list(ACCESS_CARGO) }, /obj/item/folder/yellow{ pixel_x = 6; @@ -35260,7 +35351,7 @@ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_y = 25; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/machinery/firealarm{ dir = 1; @@ -35692,8 +35783,10 @@ /area/crew_quarters/heads/captain) "knE" = ( /obj/machinery/door/window/northright{ - name = "Prize Corner"; - req_access_txt = "maintenance" + name = "Prize Corner" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 1 }, /turf/open/floor/eighties, /area/maintenance/starboard/fore) @@ -35965,7 +36058,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_x = -26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -36869,12 +36962,14 @@ /area/bridge) "kGy" = ( /obj/machinery/door/window/westleft{ - name = "Atmospherics Delivery"; - req_access_txt = "atmospherics" + name = "Atmospherics Delivery" }, /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/atmos) "kGE" = ( @@ -37112,7 +37207,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -8; pixel_y = -24; - req_one_access_txt = "30;70" + req_access = list(ACCESS_AI_SAT) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacoreserver) @@ -37431,8 +37526,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/southright{ dir = 1; - name = "Research and Development Desk"; - req_one_access_txt = "science;robotics" + name = "Research and Development Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -37450,6 +37544,12 @@ pixel_x = -10; pixel_y = -1 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/science/general{ + dir = 1 + }, /turf/open/floor/plating, /area/science/lab) "kQS" = ( @@ -38303,7 +38403,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 7; pixel_y = -23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/machinery/light_switch{ pixel_x = -23 @@ -39248,7 +39348,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "surgery" + req_access = list(ACCESS_SURGERY) }, /obj/machinery/button/holosign{ id = "surgery"; @@ -39714,13 +39814,15 @@ "lGG" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 3"; - req_access_txt = "xenobiology" + name = "Containment Pen 3" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "lGX" = ( @@ -40254,6 +40356,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle{ dir = 8 }, @@ -40314,9 +40419,9 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "psychology" + name = "Core Modules" }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology, /turf/open/floor/wood, /area/medical/psych) "lQG" = ( @@ -42084,14 +42189,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/light_switch{ pixel_x = -4; @@ -42608,7 +42713,7 @@ id = "Secure Storage"; pixel_x = -24; pixel_y = -26; - req_access_txt = "engine_equip" + req_access = list(ACCESS_ENGINE_EQUIP) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -42778,7 +42883,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -43553,14 +43658,14 @@ name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 8; - req_access_txt = "science" + req_access = list("science") }, /obj/machinery/button/door{ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 8; - req_access_txt = "science" + req_access = list("science") }, /obj/item/paper_bin{ pixel_x = -1; @@ -43613,7 +43718,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -43787,12 +43892,14 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/pen, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 8 + }, /turf/open/floor/plating, /area/science/robotics/lab) "mOX" = ( @@ -43886,7 +43993,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 26; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -44007,7 +44114,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -23; pixel_y = -23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -44265,12 +44372,10 @@ "mXJ" = ( /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Desk"; - req_access_txt = "armory" + name = "Armory Desk" }, /obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "sec_basic" + name = "Reception Desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/warden{ @@ -44281,6 +44386,10 @@ pixel_x = -9; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plating, /area/security/warden) "mXM" = ( @@ -44584,7 +44693,7 @@ name = "Telecommunications server shutters control"; pixel_x = 8; pixel_y = 23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -46979,7 +47088,7 @@ name = "Engineering Lockdown"; pixel_x = -8; pixel_y = 39; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -46987,21 +47096,21 @@ name = "Engineering Secure Storage"; pixel_x = -8; pixel_y = 26; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 7; pixel_y = 26; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_x = 7; pixel_y = 39; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -47371,7 +47480,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Bridge Delivery"; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/plasteel, /area/maintenance/central) @@ -47397,14 +47506,14 @@ name = "Telecommunications server shutters control"; pixel_x = 28; pixel_y = -2; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/button/door{ id = "bridge blast"; name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/structure/cable{ icon_state = "1-2" @@ -47544,9 +47653,7 @@ /turf/open/floor/carpet, /area/library) "nVU" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "brig_phys" - }, +/obj/machinery/door/window/southleft, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, @@ -47557,6 +47664,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/physician) "nVY" = ( @@ -48077,6 +48185,9 @@ wound_bonus = 0 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/prison) "ofT" = ( @@ -48214,7 +48325,7 @@ name = "Public Teleporter Access Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "teleporter" + req_access = list("teleporter") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, @@ -48637,8 +48748,10 @@ /area/science/xenobiology) "ooL" = ( /obj/machinery/door/window/westleft{ - name = "Atmospherics Canister Storage"; - req_access_txt = "atmospherics" + name = "Atmospherics Canister Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/engine/atmos) @@ -48936,8 +49049,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Xenobiology Desk"; - req_access_txt = "xenobiology" + name = "Xenobiology Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -48958,6 +49070,9 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = -10 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/plating, /area/science/xenobiology) "otj" = ( @@ -49039,8 +49154,7 @@ "ouM" = ( /obj/machinery/door/window/southleft{ dir = 4; - name = "Virology"; - req_access_txt = "virology" + name = "Virology" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -49048,6 +49162,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "ovj" = ( @@ -51330,14 +51447,14 @@ name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 6 @@ -51421,13 +51538,15 @@ "phj" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 1"; - req_access_txt = "xenobiology" + name = "Containment Pen 1" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "pht" = ( @@ -51705,7 +51824,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -52038,8 +52157,7 @@ "ppN" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ - name = "Emergency Storage"; - req_access_txt = "command" + name = "Emergency Storage" }, /obj/item/flashlight, /obj/item/storage/toolbox/emergency{ @@ -52054,6 +52172,9 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "ppQ" = ( @@ -52244,7 +52365,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_one_access_txt = "12" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -52359,8 +52480,9 @@ /area/quartermaster/sorting) "puc" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/window/eastright{ - req_access_txt = "hydroponics" +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 4 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -52455,8 +52577,7 @@ "pvD" = ( /obj/machinery/door/window{ dir = 8; - name = "SMES Chamber"; - req_access_txt = "engine_equip" + name = "SMES Chamber" }, /obj/structure/cable{ icon_state = "1-2" @@ -52467,6 +52588,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "pvM" = ( @@ -52871,10 +52995,15 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Research Division Delivery"; - req_one_access_txt = "science;robotics" + name = "Research Division Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/science/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/lab) "pBw" = ( @@ -53301,8 +53430,10 @@ }, /obj/machinery/door/window/southleft{ dir = 4; - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -53987,8 +54118,7 @@ "pUv" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 6"; - req_access_txt = "xenobiology" + name = "Containment Pen 6" }, /obj/structure/cable{ icon_state = "1-2" @@ -54003,6 +54133,9 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "pUz" = ( @@ -54016,8 +54149,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "hop" + name = "Head of Personnel's Desk" }, /obj/machinery/door/window/northleft{ dir = 8; @@ -54051,6 +54183,9 @@ /obj/item/storage/pencil_holder/crew{ pixel_y = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "pUG" = ( @@ -55079,7 +55214,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -55389,7 +55524,7 @@ name = "Shutters Control Button"; pixel_x = -6; pixel_y = 24; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) @@ -56361,7 +56496,7 @@ name = "Incinerator airlock control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -56874,6 +57009,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) "qQs" = ( @@ -58503,8 +58641,7 @@ "roD" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 5"; - req_access_txt = "xenobiology" + name = "Containment Pen 5" }, /obj/structure/cable{ icon_state = "1-2" @@ -58519,6 +58656,9 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "roK" = ( @@ -59830,7 +59970,7 @@ name = "Warehouse Door Control"; pixel_x = 1; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -60139,7 +60279,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = -7; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -60208,8 +60348,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ dir = 1; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -60219,6 +60358,9 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "rOt" = ( @@ -61263,11 +61405,11 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Monkey Pen"; - req_access_txt = "virology" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "sbX" = ( @@ -61403,13 +61545,15 @@ "scG" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 4"; - req_access_txt = "xenobiology" + name = "Containment Pen 4" }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "scH" = ( @@ -61491,7 +61635,6 @@ "sek" = ( /obj/machinery/door/window/westright{ dir = 4; - req_access_txt = "kitchen"; name = "Kitchen Window" }, /obj/structure/table/reinforced, @@ -61505,6 +61648,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "sem" = ( @@ -61826,12 +61972,11 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "slo" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "clerk" - }, +/obj/machinery/door/window/southleft, /obj/machinery/door/poddoor/shutters{ id = "giftshop" }, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plating, /area/clerk) "slv" = ( @@ -62138,12 +62283,14 @@ }, /obj/machinery/suit_storage_unit/command, /obj/machinery/door/window/northright{ - name = "Emergency Storage"; - req_access_txt = "command" + name = "Emergency Storage" }, /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "spX" = ( @@ -62623,12 +62770,14 @@ pixel_y = -3 }, /obj/machinery/door/window/northleft{ - name = "Emergency Storage"; - req_access_txt = "command" + name = "Emergency Storage" }, /obj/structure/window/reinforced{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "sxy" = ( @@ -62837,7 +62986,7 @@ id = "atmos"; name = "Atmospherics Lockdown"; pixel_y = 24; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -62961,7 +63110,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -25; - req_access_txt = "carsgo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -63645,14 +63794,14 @@ dir = 8 }, /obj/machinery/door/window{ - name = "Low-Risk Modules"; - req_access_txt = "ai_master" + name = "Low-Risk Modules" }, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "sLA" = ( @@ -63841,20 +63990,20 @@ name = "Left side containment blast doors"; pixel_x = -6; pixel_y = 30; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 6; pixel_y = 30; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = 39; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/plortrefinery, /turf/open/floor/plasteel/white, @@ -64226,13 +64375,15 @@ "sUV" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "sVg" = ( @@ -64706,7 +64857,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -65547,8 +65698,7 @@ "tpZ" = ( /obj/machinery/door/window{ dir = 1; - name = "Backup SMES Chamber"; - req_access_txt = "engine_equip" + name = "Backup SMES Chamber" }, /obj/structure/cable{ icon_state = "1-2" @@ -65556,6 +65706,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "tqf" = ( @@ -67347,13 +67500,13 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "tRA" = ( @@ -68866,7 +69019,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -69675,14 +69828,14 @@ idSelf = "telecomms_airlock_control"; pixel_x = 5; pixel_y = 25; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = -7; pixel_y = 23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -69812,8 +69965,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Engineering Desk"; - req_access_txt = "engineering" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = 8; @@ -69827,6 +69979,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general{ + dir = 1 + }, /turf/open/floor/plating, /area/engine/foyer) "uFp" = ( @@ -71014,8 +71172,7 @@ "vbw" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 1"; - req_access_txt = "xenobiology" + name = "Containment Pen 1" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; @@ -71027,6 +71184,9 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "vbB" = ( @@ -71873,8 +72033,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Genetics Desk"; - req_access_txt = "genetics" + name = "Genetics Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -71888,6 +72047,7 @@ pixel_x = 9; pixel_y = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics, /turf/open/floor/plating, /area/medical/genetics) "vse" = ( @@ -71974,7 +72134,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = 24; - req_one_access_txt = "30;70" + req_access = list(ACCESS_AI_SAT) }, /turf/open/floor/plasteel/dark, /area/science/server) @@ -72229,10 +72389,12 @@ }, /obj/item/scalpel, /obj/machinery/door/window/northright{ - name = "Autopsy Desk"; - req_access_txt = "detective" + name = "Autopsy Desk" }, /obj/item/paper/autopsy, +/obj/effect/mapping_helpers/windoor/access/all/security/detective{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "vwo" = ( @@ -72597,8 +72759,7 @@ "vCX" = ( /obj/machinery/door/window/southleft{ dir = 8; - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 8 @@ -72609,6 +72770,9 @@ /obj/effect/turf_decal/stripes{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "vCY" = ( @@ -72703,14 +72867,14 @@ "vFa" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Monkey Pen"; - req_access_txt = "genetics" + name = "Monkey Pen" }, /mob/living/carbon/monkey, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics, /turf/open/floor/grass, /area/medical/genetics) "vFj" = ( @@ -73249,13 +73413,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "vOS" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "library" - }, +/obj/machinery/door/window/southleft, /obj/machinery/camera{ c_tag = "Library North"; dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/library, /turf/open/floor/wood, /area/library) "vOX" = ( @@ -73322,12 +73485,14 @@ "vQU" = ( /obj/machinery/suit_storage_unit/command, /obj/machinery/door/window/northleft{ - name = "Emergency Storage"; - req_access_txt = "command" + name = "Emergency Storage" }, /obj/structure/window/reinforced{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "vQV" = ( @@ -73984,23 +74149,23 @@ name = "Public Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/button/door{ id = "robotics2"; name = "Science Shutters Control Button"; pixel_x = 26; pixel_y = 27; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/button/door{ desc = "A remote control switch for the robotics foyer."; id = "RoboticsFoyer"; name = "Robotics Doors Control"; normaldoorcontrol = 1; - pixel_x = 39; + pixel_x = 38; pixel_y = 27; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -74611,6 +74776,11 @@ /obj/structure/chair/stool, /turf/open/floor/carpet/purple, /area/maintenance/port/aft) +"wkg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_corner, +/turf/open/floor/plasteel, +/area/security/prison) "wkn" = ( /obj/structure/table/optable, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -74975,6 +75145,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 8 }, @@ -75451,6 +75624,9 @@ /area/hallway/primary/central) "wxr" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 8 }, @@ -75753,7 +75929,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -7; pixel_y = -24; - req_one_access_txt = "30;70" + req_access = list(ACCESS_AI_SAT) }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -75762,7 +75938,7 @@ name = "Secondary AI Core Access Console"; pixel_x = 6; pixel_y = -26; - req_one_access_txt = "30;70" + req_access = list(ACCESS_AI_SAT) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacoreserver) @@ -75809,7 +75985,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -76501,6 +76677,22 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"wKg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/security/prison) "wKv" = ( /obj/item/stack/sheet/cardboard, /obj/machinery/light_switch{ @@ -76514,6 +76706,22 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/prison) +"wKM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "wKR" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, @@ -77237,7 +77445,7 @@ id = "hosspace"; name = "Space Shutters Control"; pixel_y = 36; - req_access_txt = "hos" + req_access = list(ACCESS_SECURITY) }, /obj/item/paper_bin{ pixel_y = 5 @@ -77344,6 +77552,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "wWl" = ( @@ -78457,8 +78668,10 @@ /obj/machinery/shieldwallgen/xenobiologyaccess, /obj/machinery/door/window/southleft{ dir = 4; - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -78676,7 +78889,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 21; pixel_y = -4; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/item/radio/intercom{ freerange = 1; @@ -78693,8 +78906,7 @@ /obj/machinery/door/window/westleft{ dir = 1; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "ai_master" + name = "Cyborg Upload Console Window" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -78706,6 +78918,9 @@ /obj/machinery/computer/upload/borg{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "xvw" = ( @@ -78768,7 +78983,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "maintenance" + req_access = list(ACCESS_MAINT_TUNNELS) }, /obj/machinery/button/massdriver{ id = "trash"; @@ -78832,7 +79047,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_x = -26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison) @@ -79512,8 +79727,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/westleft{ dir = 2; - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 7; @@ -79523,6 +79737,7 @@ pixel_x = 9; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/office) "xIK" = ( @@ -80700,7 +80915,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = 6; pixel_y = 25; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /obj/effect/turf_decal/tile/darkgreen{ dir = 1 @@ -80727,7 +80942,7 @@ name = "Gift Shop External Shutters"; pixel_x = -5; pixel_y = 25; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /turf/open/floor/plasteel, /area/clerk) @@ -80986,6 +81201,9 @@ /area/engine/atmos/distro) "yek" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 8 }, @@ -117516,12 +117734,12 @@ xkT rsd ajQ dln -cNa -pWE +ciz +wKg ofo ahZ wtQ -hyg +dSg qQp hyg arQ @@ -118544,10 +118762,10 @@ msb msb aTD vvv -kUA -kUA -vim -kUA +wkg +cbC +wKM +cbC wWj wgJ aTD diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 9523a88a6a69..ade0d29210e7 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -185,6 +185,7 @@ #define CLOSED_BLASTDOOR_LAYER 3.13 // ABOVE DOORS #define ABOVE_OBJ_LAYER 3.2 #define ABOVE_WINDOW_LAYER 3.3 +#define WINDOW_HELPER_LAYER 3.31 // Keep above windows/windoors - see mapping_helpers.dm #define SIGN_LAYER 3.4 #define CORGI_ASS_PIN_LAYER 3.41 #define NOT_HIGH_OBJ_LAYER 3.5 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a2d3faf9ae2e..02fe326ce40b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -68,7 +68,7 @@ smoothing_groups = SMOOTH_GROUP_AIRLOCK FASTDMM_PROP(\ - pinned_vars = list("req_access_txt", "req_one_access_txt", "name")\ + pinned_vars = list("req_access", "req_one_access", "name")\ ) interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index f0ab2f890b99..1e2411717af1 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -20,7 +20,7 @@ RLD throw_range = 5 w_class = WEIGHT_CLASS_NORMAL materials = list(/datum/material/iron=100000) - req_access_txt = "11" + req_access = list(ACCESS_ENGINEERING) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF var/datum/effect_system/spark_spread/spark_system diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index e653be0cba02..fb4b429ee32c 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -197,8 +197,7 @@ /obj/structure/closet/secure_closet/evidence anchored = TRUE name = "Secure Evidence Closet" - req_access_txt = "0" - req_one_access_txt = list(ACCESS_ARMORY, ACCESS_DETECTIVE) + req_access = list(ACCESS_ARMORY, ACCESS_DETECTIVE) /obj/structure/closet/secure_closet/brig/PopulateContents() ..() diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index b50ecc86deb1..7a0b3c2d6d00 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -278,6 +278,8 @@ desc = "There is a small label that reads \"For Emergency use only\".
There are bolts under it's glass cover for easy disassembly using a wrench." icon = 'icons/obj/wallmounts.dmi' icon_state = "spareid" + + req_access = list(ACCESS_CAPTAIN) alert = TRUE armor = list(MELEE = 30, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 50) axe = FALSE diff --git a/code/modules/mapping/access_helpers/windoor_helpers.dm b/code/modules/mapping/access_helpers/windoor_helpers.dm index f969f246df43..603e6e8140e0 100644 --- a/code/modules/mapping/access_helpers/windoor_helpers.dm +++ b/code/modules/mapping/access_helpers/windoor_helpers.dm @@ -1,5 +1,4 @@ /obj/effect/mapping_helpers/windoor/access - layer = DOOR_ACCESS_HELPER_LAYER icon_state = "windoor_access" // These are mutually exclusive; can't have req_any and req_all diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 165dd4bdd382..49a71e0a3f66 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -218,7 +218,7 @@ // Windoor helpers /obj/effect/mapping_helpers/windoor - layer = DOOR_ACCESS_HELPER_LAYER + layer = WINDOW_HELPER_LAYER late = TRUE /obj/effect/mapping_helpers/windoor/Initialize(mapload) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 04971b98a560..4be3b0f3d602 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -60,7 +60,7 @@ active_power_usage = FALSE idle_power_usage = FALSE locked = TRUE - req_access_txt = "100" + req_access = list(ACCESS_CENT_GENERAL) state = EMITTER_WELDED use_power = FALSE diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 83ec3cd4069a..fd1d1df50a8a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -1159,7 +1159,7 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/robotics name = "Robotics R&D Console" req_access = null - req_access_txt = "29" + req_access = list(ACCESS_ROBOTICS) /obj/machinery/computer/rdconsole/robotics/Initialize(mapload) . = ..() diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm index 134628121236..91d300d32a46 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - req_access_txt = "11" + req_access = list(ACCESS_CONSTRUCTION) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF var/ready = TRUE diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 7a648263bb139241ff3a51e3a1c0a430f8bfca82..907a42f28812da9b0df88a9106e9db1b8354e5f5 100644 GIT binary patch literal 16717 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 CcQ@hy literal 16449 zcmaL9bwE__);2tZgwoxqG}0XdNGaXjsdRT3NSBIqOQ&?FlyrA1-Oa$vyc_+U^PclO z-~0VBGkf2A-}|n$)^%O$-Vm;;EQk4+>@f%g!h9(&tquYqNB|!iG!&qu$FleYI7#r; z)ODA(a9X2p%2K$hy*3veS88V3@D1fqlqIgXs8P${Cqg z>*_+p5==Y&agsd#-i$ox?K8i{c4}pNFVSC=f)(Rc?;J8S&JXgn3Uxb;`F*tCwrQH( zoJb;@J~CiCQ+&Ox*E!?k>6!D^42o|WPd*-QnKm|(RoZxvhmh+q%*x5$VB&lSwpE?U zIw}NDytLP^F-4la!rVIZjhLp*~QNnpcgv2`M+q}?HE_;{8N79o3Lt6Qjj7aaR zU3p2uiup5TY{4rzhd?{~QNmLKG_9OH1NvW4$dhWPG)s@9K4F_?$q+YGR&}|z#jbr& zcG@3*LCDh*cb zbPjF20q@gKksqZ!ai5Uy%SiVIsx4AKk+m@IwpIM58^tyctFdU_q=h4gZ4?Ah?OmXP zKs2D2(vq6qX@}{4-kO)`@KqZrb=Ifrc=8x8Skzy!ys!!wz;{E3|;$e8CtuFS8NY_7Mi^l+7{UsTV33~(~`=@LF+2fgbf;vW;^{{?iace z4MqVeje|iuYo3Q=R0emW9G=pnYFTc3i0Pxx#@p5N=b@ha%S9_MSngL-omd?A$Z^q- zixH3!rflJ%QrRpe?y|Zbbnp7*A^A(u3;J1ApOQ^ACM?u*d6n_Y%9Fg4c}` gYyMC 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 diff --git a/yogstation/code/game/objects/structures/fireaxe.dm b/yogstation/code/game/objects/structures/fireaxe.dm index 63e8b4e13df3..23bb30a2684c 100644 --- a/yogstation/code/game/objects/structures/fireaxe.dm +++ b/yogstation/code/game/objects/structures/fireaxe.dm @@ -4,7 +4,7 @@ /obj/structure/fireaxecabinet/bridge //bridge fireaxe has different access - req_one_access = list(ACCESS_CAPTAIN, ACCESS_CE) + req_access = list(ACCESS_COMMAND) /obj/structure/fireaxecabinet/Initialize(mapload)//<-- mirrored/overwritten proc . = ..() From 7441a3d385e927a927f367d611ac6b5bbe5ae843 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 01:32:42 +0200 Subject: [PATCH 28/48] ballin --- .../StationRuins/BoxStation/chapel1.dmm | 24 ++-- .../StationRuins/BoxStation/chapel2.dmm | 24 ++-- .../StationRuins/BoxStation/clerk_box.dmm | 11 +- _maps/RandomZLevels/VR/netmin_hub.dmm | 2 - _maps/RandomZLevels/VR/snowdin_VR.dmm | 7 +- _maps/RandomZLevels/VR/syndicate_trainer.dmm | 10 +- _maps/RandomZLevels/VR/vrhub.dmm | 16 +-- _maps/RandomZLevels/research.dmm | 19 ++- _maps/RandomZLevels/snowdin.dmm | 13 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 118 +++++++++--------- _maps/shuttles/cargo_birdboat.dmm | 4 +- _maps/shuttles/cargo_box.dmm | 4 +- _maps/shuttles/cargo_delta.dmm | 4 +- _maps/shuttles/cargo_gax.dmm | 4 +- _maps/shuttles/cargo_kilo.dmm | 4 +- _maps/shuttles/emergency_48641.dmm | 40 +++--- _maps/shuttles/emergency_cargo.dmm | 4 +- _maps/shuttles/emergency_octa.dmm | 2 +- _maps/shuttles/emergency_raven.dmm | 6 +- _maps/shuttles/emergency_russiafightpit.dmm | 4 +- _maps/shuttles/emergency_triage.dmm | 8 +- _maps/shuttles/infiltrator_basic.dmm | 26 ++-- _maps/shuttles/infiltrator_cutter.dmm | 21 ++-- _maps/shuttles/labour_box.dmm | 2 +- _maps/shuttles/labour_delta.dmm | 2 +- _maps/shuttles/labour_gax.dmm | 2 +- _maps/shuttles/labour_kilo.dmm | 2 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 14 +-- .../shuttles/ruin_syndicate_fighter_shiv.dmm | 10 +- _maps/shuttles/whiteship_miner.dmm | 3 +- _maps/templates/infiltrator_base.dmm | 51 +++----- _maps/templates/lazy_templates/chapel1.dmm | 25 ++-- _maps/templates/lazy_templates/chapel2.dmm | 22 ++-- _maps/templates/lazy_templates/clerk_box.dmm | 11 +- _maps/templates/shelter_2.dmm | 4 +- .../machinery/porta_turret/portable_turret.dm | 4 + code/modules/mapping/mapping_helpers.dm | 11 ++ icons/effects/mapping_helpers.dmi | Bin 16717 -> 17546 bytes 38 files changed, 278 insertions(+), 260 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm index eacddd661aac..f041d6f4066e 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm @@ -49,8 +49,7 @@ "dl" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -58,6 +57,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/chapel/main) "du" = ( @@ -492,8 +494,10 @@ "Gl" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -579,7 +583,8 @@ /area/template_noop) "Ny" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" + name = "Confession Booth (Chaplain)"; + req_access = list(ACCESS_CHAPEL_OFFICE) }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -587,7 +592,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "NG" = ( @@ -655,8 +659,10 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -856,7 +862,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = 24; - req_access_txt = "chapel_office" + req_access = list(ACCESS_CHAPEL_OFFICE) }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm index 59591bae9ce7..44506af81f1e 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm @@ -237,8 +237,7 @@ "kK" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -246,6 +245,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "kU" = ( @@ -508,13 +510,13 @@ /area/chapel/main) "Dj" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" + name = "Confession Booth (Chaplain)"; + req_access = list(ACCESS_CHAPEL_OFFICE) }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "Dq" = ( @@ -591,7 +593,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_y = 30; - req_access_txt = "chapel_office" + req_access = list(ACCESS_CHAPEL_OFFICE) }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -738,8 +740,10 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -869,8 +873,10 @@ "Sq" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm index 7219fef11622..20317e91a184 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm @@ -21,9 +21,7 @@ /turf/open/floor/plasteel, /area/clerk) "c" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "clerk" - }, +/obj/machinery/door/window/southleft, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -36,6 +34,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "d" = ( @@ -76,13 +75,15 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 26; - pixel_y = 24 + pixel_y = 24; + req_access = list(ACCESS_CLERK) }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; - pixel_y = 24 + pixel_y = 24; + req_access = list(ACCESS_CLERK) }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/RandomZLevels/VR/netmin_hub.dmm b/_maps/RandomZLevels/VR/netmin_hub.dmm index 097f54da8ffe..bc9dbee79d95 100644 --- a/_maps/RandomZLevels/VR/netmin_hub.dmm +++ b/_maps/RandomZLevels/VR/netmin_hub.dmm @@ -2772,7 +2772,6 @@ }, /obj/machinery/door/airlock/highsecurity{ name = "????"; - req_access_txt = "0" }, /turf/open/floor/plasteel/dark, /area/awaymission/vr/combat_robot_factory) @@ -6008,7 +6007,6 @@ "Wf" = ( /obj/machinery/door/airlock/highsecurity{ name = "Storage"; - req_access_txt = "0" }, /turf/open/floor/plasteel/dark, /area/awaymission/vr/scientist_raid) diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index a6ed7d6f9109..019d5947d2ee 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -1836,11 +1836,10 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post) "em" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/syndicate{ dir = 2; name = "Gateway APC"; pixel_y = -23; - req_access_txt = "syndicate" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6508,7 +6507,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7741,7 +7740,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access_txt = "construction" + req_access = list(ACCESS_CONSTRUCTION) }, /obj/machinery/button/ignition/indestructible{ id = "snowdin_turbine_ignitor"; diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm index ffbe4ff434a4..7aa03f5a61c6 100644 --- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm +++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm @@ -542,7 +542,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access_txt = "cent_specops" + req_access = list(ACCESS_CENT_SPECOPS) }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) @@ -695,9 +695,9 @@ /area/awaymission/centcomAway/cafe) "et" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "cent_captain" + name = "Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "eu" = ( @@ -1307,7 +1307,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1715,7 +1715,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/RandomZLevels/VR/vrhub.dmm b/_maps/RandomZLevels/VR/vrhub.dmm index 9fcac7bd34dd..c6e892272b24 100644 --- a/_maps/RandomZLevels/VR/vrhub.dmm +++ b/_maps/RandomZLevels/VR/vrhub.dmm @@ -1453,10 +1453,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/vr/syndicate) -"sy" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/indestructible/riveted, -/area/awaymission/vr/syndicate) "sG" = ( /obj/structure/closet/emcloset, /turf/open/floor/mineral/titanium/blue, @@ -2191,7 +2187,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2395,9 +2391,9 @@ /area/awaymission/vr/syndicate) "Jb" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "cent_captain" + name = "Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/mineral/titanium, /area/awaymission/vr/syndicate) "Jc" = ( @@ -2903,7 +2899,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3140,7 +3136,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access_txt = "cent_specops" + req_access = list(ACCESS_CENT_SPECOPS) }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/vr/syndicate) @@ -56840,7 +56836,7 @@ gz gz gz xA -sy +My xA xA yx diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index b8dab8f0b64f..7e64c0f17c69 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -2258,8 +2258,7 @@ /area/awaymission/research/interior/maint) "eQ" = ( /obj/machinery/door/window/northright{ - name = "Cell Door"; - req_access_txt = "sec_basic" + name = "Cell Door" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2267,6 +2266,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plasteel, /area/awaymission/research/interior/security) "eR" = ( @@ -3858,13 +3860,13 @@ /area/awaymission/research/interior/maint) "hE" = ( /obj/machinery/door/window/southright{ - name = "Cell Door"; - req_access_txt = "sec_basic" + name = "Cell Door" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel, /area/awaymission/research/interior/security) "hF" = ( @@ -5182,7 +5184,7 @@ icon_state = "0-2" }, /turf/open/floor/plating, -/area/awaymission/research/interior/dorm) +/area/awaymission/research/interior/maint) "kq" = ( /obj/machinery/door/airlock{ id_tag = "Dorm1"; @@ -5540,9 +5542,6 @@ dir = 8 }, /area/awaymission/research/interior/dorm) -"ln" = ( -/turf/open/floor/plasteel, -/area/space/nearstation) "lo" = ( /obj/structure/table/wood, /obj/structure/bedsheetbin, @@ -5857,7 +5856,7 @@ icon_state = "0-8" }, /turf/open/floor/plating, -/area/awaymission/research/interior/escapepods) +/area/awaymission/research/interior/maint) "ma" = ( /turf/closed/wall/r_wall, /area/awaymission/research/interior/escapepods) @@ -40585,7 +40584,7 @@ kr jn jF jF -ln +jF jF lL jk diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 963fee3d467f..3764de0e6322 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -1847,11 +1847,10 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post) "em" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/syndicate{ dir = 2; name = "Gateway APC"; - pixel_y = -23; - req_access_txt = "syndicate" + pixel_y = -23 }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1922,9 +1921,7 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/messhall) "et" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -6581,7 +6578,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "security" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7818,7 +7815,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access_txt = "construction" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/machinery/button/ignition{ id = "snowdin_turbine_ignitor"; diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 2336d8e5d9c9..8dbd47148a45 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -298,7 +298,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -344,7 +344,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/clothing/under/suit/female, /turf/open/floor/carpet{ @@ -381,7 +381,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -409,7 +409,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -1021,7 +1021,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/clothing/suit/apron, /obj/item/storage/bag/plants/portaseeder, @@ -1757,7 +1757,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 @@ -1780,7 +1780,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -2112,7 +2112,7 @@ "ev" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -2140,8 +2140,10 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Security Checkpoint"; - req_access_txt = "ruins_general" + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 8 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2283,8 +2285,10 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Security Checkpoint"; - req_access_txt = "ruins_general" + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 8 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2324,8 +2328,10 @@ base_state = "left"; dir = 4; icon_state = "left"; - name = "Hydroponics Desk"; - req_access_txt = "ruins_general" + name = "Hydroponics Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2487,8 +2493,10 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Hydroponics Desk"; - req_access_txt = "ruins_general" + name = "Hydroponics Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2869,8 +2877,10 @@ /obj/machinery/door/firedoor, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Hydroponics Desk"; - req_access_txt = "ruins_general" + name = "Hydroponics Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 1 }, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 @@ -3563,9 +3573,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "ho" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4172,9 +4180,9 @@ icon_state = "1-2" }, /obj/machinery/door/window{ - name = "Gateway Chamber"; - req_access_txt = "ruins_general" + name = "Gateway Chamber" }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -4575,7 +4583,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -4763,14 +4771,14 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "jy" = ( /obj/machinery/door/window/southright{ - name = "Bar Door"; - req_access_txt = "ruins_general" + name = "Bar Door" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -5117,7 +5125,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -5212,7 +5220,7 @@ /obj/item/clothing/under/suit/navy, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -5916,7 +5924,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -6600,7 +6608,7 @@ /obj/item/clothing/glasses/meson, /obj/structure/closet/secure_closet/engineering_personal{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -7940,14 +7948,14 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = 8; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/machinery/button/door{ desc = "A remote control-switch that controls the privacy shutters."; id = "UO45_rdprivacy"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -8377,7 +8385,7 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = -24; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -8970,7 +8978,7 @@ /area/awaymission/undergroundoutpost45/research) "qq" = ( /obj/machinery/vending/medical{ - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/white/side{ dir = 6; @@ -9164,8 +9172,7 @@ layer = 2.9 }, /obj/structure/closet/secure_closet/engineering_personal{ - req_access = null; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ @@ -9585,8 +9592,7 @@ locked = 1; name = "UO45 Engineering APC"; pixel_x = -25; - req_access = null; - req_access_txt = "ruins_general"; + req_access = list(ACCESS_RUINS_GENERAL); start_charge = 100 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -9616,7 +9622,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 6; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, @@ -9624,7 +9630,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -9640,7 +9646,7 @@ "rs" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -10104,14 +10110,16 @@ base_state = "left"; dir = 4; icon_state = "left"; - name = "Engineering Reception"; - req_access_txt = "ruins_general" + name = "Engineering Reception" }, /obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, /obj/item/pen, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -10182,7 +10190,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -10206,8 +10214,7 @@ icon_state = "mining"; locked = 0; name = "miner's equipment"; - req_access = null; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/gloves/fingerless, @@ -10556,10 +10563,12 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Engineering Reception"; - req_access_txt = "ruins_general" + name = "Engineering Reception" }, /obj/item/folder/red, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -10959,7 +10968,7 @@ name = "Privacy Shutters"; pixel_x = -24; pixel_y = 6; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -12270,9 +12279,7 @@ /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, -/obj/machinery/vending/engivend{ - req_access_txt = "0" - }, +/obj/machinery/vending/engivend, /obj/machinery/camera{ c_tag = "Engineering Foyer"; dir = 1; @@ -12964,8 +12971,7 @@ pixel_y = -24 }, /obj/structure/closet/secure_closet/miner{ - req_access = null; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ @@ -13156,7 +13162,7 @@ name = "Engineering Lockdown"; pixel_x = -6; pixel_y = -24; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -13164,7 +13170,7 @@ name = "Engineering Secure Storage"; pixel_x = 6; pixel_y = -24; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/neutral{ dir = 1 diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo_birdboat.dmm index 000f8fa8bba0..04442dd30516 100644 --- a/_maps/shuttles/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo_birdboat.dmm @@ -99,14 +99,14 @@ name = "Loading Doors"; pixel_x = 24; pixel_y = 8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/conveyor_switch/oneway{ id = "cargoshuttle" diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo_box.dmm index 38a103d77c56..88762a33abf4 100644 --- a/_maps/shuttles/cargo_box.dmm +++ b/_maps/shuttles/cargo_box.dmm @@ -42,14 +42,14 @@ name = "Loading Doors"; pixel_x = 24; pixel_y = 8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/light{ dir = 4 diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm index 361090d6b735..23a1fb6adbab 100644 --- a/_maps/shuttles/cargo_delta.dmm +++ b/_maps/shuttles/cargo_delta.dmm @@ -121,14 +121,14 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = 8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "cargoload"; name = "Loading Doors"; pixel_x = -24; pixel_y = -8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/shuttles/cargo_gax.dmm b/_maps/shuttles/cargo_gax.dmm index e6fd965096ef..63bd4e9b5d9e 100644 --- a/_maps/shuttles/cargo_gax.dmm +++ b/_maps/shuttles/cargo_gax.dmm @@ -111,14 +111,14 @@ name = "Loading Doors"; pixel_x = 24; pixel_y = 8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm index 37f5ba0fcee0..40983c1167e3 100644 --- a/_maps/shuttles/cargo_kilo.dmm +++ b/_maps/shuttles/cargo_kilo.dmm @@ -138,7 +138,7 @@ name = "Off Ramp Toggle"; pixel_x = -24; pixel_y = 6; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -146,7 +146,7 @@ name = "On Ramp Toggle"; pixel_x = -24; pixel_y = -6; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/supply) diff --git a/_maps/shuttles/emergency_48641.dmm b/_maps/shuttles/emergency_48641.dmm index d8913cec76d0..59d5e0122589 100644 --- a/_maps/shuttles/emergency_48641.dmm +++ b/_maps/shuttles/emergency_48641.dmm @@ -23,6 +23,12 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank, +/obj/machinery/button/door{ + id = "48641ragecageexit"; + name = "Rage Cage Exit Doors"; + pixel_x = 24; + req_access = req_access = list(ACCESS_CMO) + }, /turf/open/floor/plasteel, /area/shuttle/escape) "bB" = ( @@ -511,7 +517,7 @@ name = "Table Privacy Shutters"; pixel_x = -28; pixel_y = -5; - req_access_txt = "cmo" + req_access = req_access = list(ACCESS_CMO) }, /turf/open/floor/wood, /area/shuttle/escape) @@ -671,8 +677,7 @@ "wz" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -684,12 +689,14 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "wB" = ( /obj/machinery/door/window/westleft{ - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -697,6 +704,9 @@ /obj/effect/turf_decal/stripes{ dir = 10 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "xc" = ( @@ -799,18 +809,6 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/wood, /area/shuttle/escape) -"Bw" = ( -/obj/machinery/shieldgen{ - anchored = 1 - }, -/obj/machinery/button/door{ - id = "48641ragecageexit"; - name = "Rage Cage Exit Doors"; - pixel_x = 24; - req_access_txt = "cmo" - }, -/turf/open/floor/plasteel, -/area/shuttle/escape) "Bz" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1049,8 +1047,7 @@ "Jg" = ( /obj/machinery/door/window/westleft{ dir = 4; - name = "Bridge"; - req_access_txt = "command" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1058,6 +1055,9 @@ /obj/effect/turf_decal/stripes{ dir = 6 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "JO" = ( @@ -1699,7 +1699,7 @@ nD tp KX eC -Bw +Hb bq Lp yw diff --git a/_maps/shuttles/emergency_cargo.dmm b/_maps/shuttles/emergency_cargo.dmm index ef817efca6ab..afdb5e4fc774 100644 --- a/_maps/shuttles/emergency_cargo.dmm +++ b/_maps/shuttles/emergency_cargo.dmm @@ -825,14 +825,14 @@ name = "Cockpit Window Blast Doors"; pixel_x = 26; pixel_y = 32; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/button/door{ id = "ock_cargo_door"; name = "Cargo Airlock Blast Doors"; pixel_x = 39; pixel_y = 32; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_octa.dmm b/_maps/shuttles/emergency_octa.dmm index 2d15fea47a75..bb0660ca8055 100644 --- a/_maps/shuttles/emergency_octa.dmm +++ b/_maps/shuttles/emergency_octa.dmm @@ -598,7 +598,7 @@ name = "Cockpit Window Blast Doors"; pixel_x = -7; pixel_y = 32; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index e8831ac64623..a01ea3e18287 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -39,7 +39,7 @@ id = "escape_cockpit_windows"; name = "Cockpit Window Blast Doors"; pixel_x = -7; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) @@ -267,7 +267,7 @@ id = "escape_cockpit_blast"; name = "Cockpit Airlock Blast Doors"; pixel_y = -26; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/effect/turf_decal/raven/two, /turf/open/floor/plasteel/dark, @@ -2290,7 +2290,7 @@ pixel_x = 5; pixel_y = 32; req_access = null; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index 6a6165b09ffd..b52821630967 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -100,7 +100,7 @@ name = "window shutters"; pixel_x = 26; pixel_y = -6; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/structure/chair/comfy/shuttle, /obj/machinery/button/door{ @@ -108,7 +108,7 @@ name = "release bears"; pixel_x = 26; pixel_y = 6; - req_access_txt = "captain" + req_access = list(ACCESS_CAPTAIN) }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_triage.dmm b/_maps/shuttles/emergency_triage.dmm index fcc8971f06e3..4be42888f2aa 100644 --- a/_maps/shuttles/emergency_triage.dmm +++ b/_maps/shuttles/emergency_triage.dmm @@ -521,9 +521,9 @@ /obj/item/storage/firstaid/advanced{ pixel_y = 10 }, -/obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "security" - }, +/obj/machinery/door/window/brigdoor/southright, +/obj/effect/mapping_helpers/windoor/access/any/security/general, +/obj/effect/mapping_helpers/windoor/access/any/security/brig_phys, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "El" = ( @@ -790,7 +790,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/closet/secure_closet{ name = "Plasmaman Supplies Locker"; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/plasmaman, diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 26a405a8afd6..3104e8876e69 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -110,7 +110,7 @@ name = "Cockpit View Control"; pixel_x = 32; pixel_y = 32; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) @@ -462,7 +462,7 @@ id = "smindicate"; name = "external door control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/docking_port/mobile{ dheight = 1; @@ -933,13 +933,15 @@ "bZ" = ( /obj/machinery/door/window{ dir = 1; - name = "Surgery"; - req_access_txt = "syndicate" + name = "Surgery" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/medical) "ca" = ( @@ -1037,13 +1039,15 @@ "ch" = ( /obj/machinery/door/window{ dir = 1; - name = "Technological Storage"; - req_access_txt = "syndicate" + name = "Technological Storage" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/armory) "ci" = ( @@ -1343,8 +1347,7 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Mass Driver"; - req_access_txt = "syndicate" + name = "Mass Driver" }, /obj/machinery/computer/pod/old{ density = 0; @@ -1352,8 +1355,11 @@ icon_state = "airlock_control_standby"; id = "syndiedriver"; name = "Mass Driver Controller"; - pixel_x = -41; - pixel_y = 8 + pixel_x = -24; + req_access = req_access = list(ACCESS_SYNDICATE) + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) diff --git a/_maps/shuttles/infiltrator_cutter.dmm b/_maps/shuttles/infiltrator_cutter.dmm index 31e12fcfcf25..dcd8fd9331d4 100644 --- a/_maps/shuttles/infiltrator_cutter.dmm +++ b/_maps/shuttles/infiltrator_cutter.dmm @@ -143,7 +143,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = 25; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -498,8 +498,7 @@ dir = 8 }, /obj/machinery/door/window/southleft{ - name = "Weapon Storage"; - req_access_txt = "syndicate" + name = "Weapon Storage" }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -512,6 +511,7 @@ /obj/item/grenade/plastic/c4{ pixel_x = 13 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/yogs/stealthcruiser) "bq" = ( @@ -519,8 +519,7 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Weapon Storage"; - req_access_txt = "syndicate" + name = "Weapon Storage" }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -533,6 +532,7 @@ /obj/item/grenade/flashbang{ pixel_x = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/yogs/stealthcruiser) "br" = ( @@ -694,7 +694,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -25; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -912,14 +912,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/turretid{ - icon_state = "control_kill"; +/obj/machinery/turretid/syndicate{ lethal = 1; locked = 1; pixel_x = 30; - pixel_y = -33; - req_access = null; - req_access_txt = "syndicate" + pixel_y = -33 }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) @@ -1017,7 +1014,7 @@ name = "Bridge Blast Door Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 0e27f6417d1c..bb24ad37e89c 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -38,7 +38,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 1f4d4a0e3f09..856553cd24a1 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -45,7 +45,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, diff --git a/_maps/shuttles/labour_gax.dmm b/_maps/shuttles/labour_gax.dmm index 7f26b98936bd..d0d59a66e6ce 100644 --- a/_maps/shuttles/labour_gax.dmm +++ b/_maps/shuttles/labour_gax.dmm @@ -20,7 +20,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "security" + req_access = list(SECURITY) }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index e91bb3f18d77..9bdc2d781b92 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -40,7 +40,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral, diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index 65134beadd7f..c7af19b3f626 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -102,7 +102,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = -6; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -213,7 +213,7 @@ name = "Bridge Blast Door Control"; pixel_x = -16; pixel_y = 5; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/button/door{ id = "caravansyndicate3_bolt_bridge"; @@ -221,7 +221,7 @@ normaldoorcontrol = 1; pixel_x = -16; pixel_y = -5; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, @@ -347,7 +347,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -454,16 +454,14 @@ /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) "Ij" = ( -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ ailock = 1; control_area = null; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Shuttle turret control"; pixel_y = 34; - req_access_txt = "syndicate"; - req_access = null + req_access = list(ACCESS_SYNDICATE) }, /obj/structure/chair/comfy/shuttle{ dir = 4 diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 805343bf7892..a56500974257 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -27,8 +27,7 @@ dir = 8; name = "Syndicate Fighter APC"; pixel_x = -25; - req_access_txt = "syndicate"; - req_access = list("syndicate") + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/computer/security{ dir = 1; @@ -73,17 +72,14 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ ailock = 1; control_area = null; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Shuttle turret control"; pixel_x = 32; pixel_y = -28; - req_access = null; - req_access_txt = "syndicate" }, /mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{ environment_smash = 0 @@ -116,7 +112,7 @@ name = "External Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/whiteship_miner.dmm b/_maps/shuttles/whiteship_miner.dmm index 3856f3655387..655394274916 100644 --- a/_maps/shuttles/whiteship_miner.dmm +++ b/_maps/shuttles/whiteship_miner.dmm @@ -1128,8 +1128,7 @@ }, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = -28; - req_access_txt = null + pixel_x = -28 }, /turf/open/floor/plasteel/showroomfloor, /area/shuttle/abandoned) diff --git a/_maps/templates/infiltrator_base.dmm b/_maps/templates/infiltrator_base.dmm index 816d98270792..7b5038d0e23f 100644 --- a/_maps/templates/infiltrator_base.dmm +++ b/_maps/templates/infiltrator_base.dmm @@ -168,9 +168,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 9 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -290,9 +289,8 @@ /area/yogs/infiltrator_base) "aH" = ( /obj/structure/chair/stool, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ pixel_y = 24; - req_access = list("syndicate") }, /obj/effect/landmark/start/infiltrator, /obj/effect/turf_decal/tile/bar, @@ -589,9 +587,8 @@ /turf/open/floor/carpet/black, /area/yogs/infiltrator_base) "bn" = ( -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/bed, /obj/item/bedsheet/black, @@ -678,19 +675,14 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 8; - icon_state = "alarm0"; - pixel_x = 24; - req_access = list("syndicate") + pixel_x = 24 }, -/obj/machinery/turretid{ - icon_state = "control_kill"; +/obj/machinery/turretid/syndicate{ lethal = 1; locked = 1; pixel_y = 28; - req_access_txt = "syndicate"; - req_access = null }, /turf/open/floor/plasteel/dark/side{ dir = 5 @@ -741,9 +733,8 @@ /area/yogs/infiltrator_base/jail) "bE" = ( /obj/structure/bed, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -759,9 +750,8 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -1097,9 +1087,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -1161,11 +1150,9 @@ /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cs" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; - icon_state = "alarm0"; - pixel_x = -24; - req_access = list("syndicate") + pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -1216,10 +1203,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate"); - req_access_txt = "0" +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) diff --git a/_maps/templates/lazy_templates/chapel1.dmm b/_maps/templates/lazy_templates/chapel1.dmm index 6f38bd6d1914..225a5371f424 100644 --- a/_maps/templates/lazy_templates/chapel1.dmm +++ b/_maps/templates/lazy_templates/chapel1.dmm @@ -49,8 +49,7 @@ "dl" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" }, /obj/machinery/mass_driver{ dir = 4; @@ -60,6 +59,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plating, /area/chapel/main) "du" = ( @@ -496,8 +498,10 @@ "Gl" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -583,7 +587,8 @@ /area/template_noop) "Ny" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" + name = "Confession Booth (Chaplain)"; + req_access = list(ACCESS_CHAPEL_OFFICE) }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -591,7 +596,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "NG" = ( @@ -651,8 +655,10 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -851,7 +857,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_x = 24 + pixel_x = 24; + req_access = list(ACCESS_CHAPEL_OFFICE) }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/templates/lazy_templates/chapel2.dmm b/_maps/templates/lazy_templates/chapel2.dmm index 599410335362..38aa49c987ae 100644 --- a/_maps/templates/lazy_templates/chapel2.dmm +++ b/_maps/templates/lazy_templates/chapel2.dmm @@ -233,8 +233,7 @@ "kK" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" }, /obj/machinery/mass_driver{ dir = 4; @@ -245,6 +244,9 @@ dir = 8 }, /obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plating, /area/chapel/office) "kU" = ( @@ -508,13 +510,13 @@ /area/chapel/main) "Dj" = ( /obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" + name = "Confession Booth (Chaplain)"; + req_access = list(ACCESS_CHAPEL_OFFICE) }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/main) "Dq" = ( @@ -742,8 +744,10 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -873,8 +877,10 @@ "Sq" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) diff --git a/_maps/templates/lazy_templates/clerk_box.dmm b/_maps/templates/lazy_templates/clerk_box.dmm index 1fbce40e3469..5f895f4c8ac3 100644 --- a/_maps/templates/lazy_templates/clerk_box.dmm +++ b/_maps/templates/lazy_templates/clerk_box.dmm @@ -21,9 +21,7 @@ /turf/open/floor/plasteel, /area/clerk) "c" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "clerk" - }, +/obj/machinery/door/window/southleft, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -36,6 +34,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "d" = ( @@ -76,13 +75,15 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 26; - pixel_y = 24 + pixel_y = 24; + req_access = list(ACCESS_CLERK) }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; - pixel_y = 24 + pixel_y = 24; + req_access = list(ACCESS_CLERK) }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index 5d3bb107fd79..b8cb751c2a8a 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -146,8 +146,8 @@ alert = 0; desc = "A display case containing an expensive forgery, probably."; pixel_y = -4; - req_access_txt = "mining"; - start_showpiece_type = /obj/item/fakeartefact + start_showpiece_type = /obj/item/fakeartefact; + req_access = list(ACCESS_MINING) }, /turf/open/floor/carpet/black, /area/survivalpod) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index eae0a9d64719..9570f4e72f4f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -954,6 +954,10 @@ icon_state = "control_kill" else icon_state = "control_stun" + +/obj/machinery/turretid/syndicate // Please use this when making syndicate bases so we don't have to keep varediting it + icon_state = "control_kill" + req_access = list(ACCESS_SYNDICATE) /obj/item/wallframe/turret_control name = "turret control frame" diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 49a71e0a3f66..e5ea45844ed0 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -243,6 +243,17 @@ /obj/effect/mapping_helpers/windoor/proc/payload(obj/machinery/door/window/payload) return +/obj/effect/mapping_helpers/windoor/inaccessible + name = "windoor inaccessible helper" + icon_state = "windoor_inaccessible" + +/obj/effect/mapping_helpers/windoor/inaccessible/payload(obj/machinery/door/window/windoor) + if(windoor.req_one_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!") + else + windoor.req_access += list(ACCESS_INACCESSIBLE) + + //needs to do its thing before spawn_rivers() is called INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 907a42f28812da9b0df88a9106e9db1b8354e5f5..b65a48e6fd403d4fb454b9d1e3accb34ea7a5195 100644 GIT binary patch literal 17546 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 CcQ@hy From 631b8f6d3b90374d63155f5600a450cfdfc79d34 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 02:32:25 +0200 Subject: [PATCH 29/48] ballin --- .../IceRuins/icemoon_surface_inn.dmm | 7 +- .../IceRuins/icemoon_surface_syndicate.dmm | 93 +++++------ .../JungleRuins/jungleland_jungle_sinden.dmm | 3 +- .../jungleland_swamp_syndicatestation.dmm | 58 +++---- _maps/RandomRuins/JungleRuins/miningbase.dmm | 14 +- .../LavaRuins/lavaland_biodome_beach.dmm | 2 +- .../lavaland_surface_biodome_winter_inn.dmm | 3 +- .../lavaland_surface_cursedtoyshop.dmm | 1 - .../lavaland_surface_gas_station.dmm | 10 +- .../lavaland_surface_syndicate_base1.dmm | 85 +++++----- _maps/RandomRuins/LavaRuins/miningbase.dmm | 14 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 16 +- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 4 +- .../SpaceRuins/crashedclownship.dmm | 2 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 6 +- _maps/RandomRuins/SpaceRuins/gameroom.dmm | 5 +- .../SpaceRuins/listeningstation.dmm | 40 ++--- .../SpaceRuins/mrow_thats_right.dmm | 16 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +- _maps/RandomRuins/SpaceRuins/spacebar.dmm | 13 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 29 ++-- .../BoxStation/engine_reactor.dmm | 4 +- .../BoxStation/engine_singulo_tesla.dmm | 8 +- .../StationRuins/BoxStation/engine_sm.dmm | 2 +- .../StationRuins/BoxStation/engine_teg.dmm | 4 +- .../StationRuins/BoxStation/transfer1.dmm | 2 +- .../StationRuins/BoxStation/transfer10.dmm | 2 +- .../StationRuins/BoxStation/transfer2.dmm | 2 +- .../StationRuins/BoxStation/transfer3.dmm | 4 +- .../StationRuins/BoxStation/transfer4.dmm | 2 +- .../StationRuins/BoxStation/transfer5.dmm | 2 +- .../StationRuins/BoxStation/transfer6.dmm | 4 +- .../StationRuins/BoxStation/transfer7.dmm | 4 +- .../StationRuins/BoxStation/transfer8.dmm | 2 +- .../StationRuins/BoxStation/transfer9.dmm | 2 +- .../StationRuins/MetaStation/meta_reactor.dmm | 4 +- .../MetaStation/meta_singulo_tesla.dmm | 8 +- .../StationRuins/MetaStation/meta_sm.dmm | 2 +- .../StationRuins/MetaStation/meta_teg.dmm | 4 +- .../StationRuins/maint/5x3/5x3_magicroom.dmm | 2 +- _maps/RandomZLevels/Cabin.dmm | 6 +- _maps/RandomZLevels/VR/netmin_hub.dmm | 3 +- _maps/RandomZLevels/moonoutpost19.dmm | 44 +++--- _maps/map_files/DonutStation/DonutStation.dmm | 47 +++--- _maps/map_files/GaxStation/GaxStation.dmm | 32 ++-- _maps/map_files/generic/CentCom.dmm | 147 ++++++++++-------- _maps/map_files/mining/Jungleland.dmm | 2 +- _maps/map_files/mining/Lavaland.dmm | 2 +- _maps/shuttles/emergency_cere.dmm | 4 +- _maps/shuttles/emergency_kilo.dmm | 3 +- _maps/shuttles/emergency_raven.dmm | 6 +- 51 files changed, 404 insertions(+), 381 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm index 82852d57b293..c873eec18191 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm @@ -224,7 +224,7 @@ name = "Inn Front door Shutter"; pixel_x = 6; pixel_y = -24; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /turf/open/floor/wood/broken/two, /area/ruin/powered/inn) @@ -374,13 +374,12 @@ /turf/open/floor/wood/broken/five, /area/ruin/powered/inn) "mW" = ( -/obj/machinery/door/window/southright{ - req_access_txt = "bar" - }, +/obj/machinery/door/window/southright, /obj/machinery/light/small{ dir = 4 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/inn) "nd" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm index 11576ba88fbe..984e08846bd1 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm @@ -214,7 +214,7 @@ id = "icemoon_syndicate_canteen_windows"; name = "Canteen Shutters"; pixel_y = 24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/oven, /turf/open/floor/plasteel/cafeteria, @@ -2175,8 +2175,7 @@ /obj/structure/table/glass, /obj/machinery/door/window/northleft{ dir = 2; - name = "First-Aid Supplies"; - req_access_txt = "syndicate" + name = "First-Aid Supplies" }, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular{ @@ -2187,6 +2186,7 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "lR" = ( @@ -2241,8 +2241,7 @@ /area/ruin/syndicate_icemoon/command) "mc" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/spawner/lootdrop/donkpockets, /obj/effect/spawner/lootdrop/donkpockets, @@ -2287,7 +2286,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -2325,14 +2324,15 @@ /obj/item/paper_bin, /obj/structure/table/reinforced, /obj/item/pen, -/obj/machinery/door/window/brigdoor/northleft{ - req_access_txt = "syndicate_leader" - }, +/obj/machinery/door/window/brigdoor/northleft, /obj/machinery/door/window, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/leader{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/command) "mm" = ( @@ -2524,8 +2524,7 @@ /area/ruin/syndicate_icemoon/research) "np" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/storage/box/ingredients/american, /obj/item/storage/box/ingredients/delights, @@ -2730,8 +2729,7 @@ icon_state = "4-8" }, /obj/machinery/door/window/eastright{ - name = "Kitchen"; - req_access_txt = "syndicate" + name = "Kitchen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -2740,6 +2738,9 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood/corner/thin, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/syndicate_icemoon/canteen) "oI" = ( @@ -2778,7 +2779,9 @@ dir = 8 }, /obj/machinery/door/window{ - req_access_txt = "syndicate"; + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 8 }, /turf/open/floor/engine, @@ -2883,7 +2886,7 @@ /obj/structure/closet/crate/secure/gear{ desc = "A secure gear crate. A faded note on it reads 'CHAIR NOT INCLUDED'."; name = "electric chair kit crate"; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/screwdriver/nuke, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3629,7 +3632,9 @@ dir = 4 }, /obj/machinery/door/window{ - req_access_txt = "syndicate"; + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 4 }, /turf/open/floor/engine, @@ -3716,7 +3721,7 @@ /area/ruin/syndicate_icemoon/hallway) "ub" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -3986,7 +3991,7 @@ /area/ruin/syndicate_icemoon/medical) "vR" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); desc = "An old, dusty crate." }, /obj/item/clothing/gloves/color/captain/centcom/admiral{ @@ -4201,7 +4206,7 @@ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; pixel_y = -24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -4309,7 +4314,9 @@ }, /obj/machinery/light, /obj/machinery/door/window{ - req_access_txt = "syndicate"; + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 4 }, /turf/open/floor/engine, @@ -4398,7 +4405,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, @@ -4567,7 +4574,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "syndicate_leader"; + req_access = list(ACCESS_SYNDICATE_LEADER); specialfunctions = 4; pixel_x = 6 }, @@ -4585,7 +4592,7 @@ id = "syndicate_icemoon_bridge_windows"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "syndicate_leader"; + req_access = list(ACCESS_SYNDICATE_LEADER); specialfunctions = 4; pixel_x = -6 }, @@ -5025,7 +5032,7 @@ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; pixel_y = 24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -5049,7 +5056,7 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_access"; name = "Reactor Access"; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) @@ -5124,7 +5131,7 @@ "Bt" = ( /obj/machinery/button/door{ id = "syndieicemoon_observatory_shutters"; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); name = "Observatory Shutters"; pixel_x = -24 }, @@ -5673,7 +5680,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -5881,7 +5888,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access_txt = list("syndicate_leader") + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -6837,8 +6844,7 @@ /area/ruin/syndicate_icemoon/hallway) "JZ" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/light/small, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -6904,7 +6910,6 @@ id = "syndie_icemoon_surgery_holo"; name = "Surgery Holosign"; pixel_x = 24; - req_access_txt = "syndicate"; pixel_y = -3 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6918,7 +6923,7 @@ name = "Window Shutters"; pixel_x = 24; pixel_y = 6; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) @@ -7313,7 +7318,7 @@ id = "syndicate_icemoon_dorms_window"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); pixel_x = -6 }, /obj/effect/turf_decal/siding/wood, @@ -7547,15 +7552,13 @@ /area/icemoon/surface/outdoors) "OA" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/gun/syringe/rapidsyringe, /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/siding/blue{ dir = 10 @@ -7728,7 +7731,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access_txt = "syndicate_leader"; + req_access = list(ACCESS_SYNDICATE_LEADER); specialfunctions = 4 }, /turf/open/floor/circuit/red/anim, @@ -7947,7 +7950,7 @@ info = "Please be advised that the firing pins in your standard-issue SMG and the research team's rifles are designed to explode if removed. DO NOT TRY TO REMOVE THEM." }, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/box/white, /obj/item/gun/ballistic/shotgun/doublebarrel, @@ -8170,12 +8173,14 @@ "Sj" = ( /obj/machinery/door/window/eastright{ name = "Bar"; - req_access_txt = "syndicate"; dir = 1 }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "Sl" = ( @@ -8752,7 +8757,7 @@ id = "syndicate_icemoon_hop_shutters"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4; pixel_x = -6 }, @@ -9015,7 +9020,7 @@ id = "syndicate_icemoon_powerstation_windows"; name = "Window Shutters"; pixel_x = 24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -9037,7 +9042,7 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_vent"; name = "Reactor Vent"; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/sealant{ pixel_x = 12 @@ -9351,7 +9356,7 @@ id = "syndieicemoon_brig_cell"; name = "Cell Lockdown"; pixel_x = 24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 6 diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm index f60f86414540..4fe31492aff7 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm @@ -542,8 +542,7 @@ /area/ruin/powered/sinden) "HD" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /obj/item/storage/firstaid/regular, /obj/item/stack/spacecash/c200, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm index 95c9db789bfc..33ce0b196b6b 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm @@ -641,9 +641,9 @@ "fU" = ( /obj/machinery/door/window/brigdoor/westleft{ dir = 2; - name = "Disposals Conveyor"; - req_access_txt = "syndicate" + name = "Disposals Conveyor" }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "gb" = ( @@ -724,14 +724,14 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 36; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); pixel_x = -6 }, /obj/machinery/button/door{ id = "lavalandsyndi_centralwindows"; name = "Exterior Windows Blast Door Control"; pixel_y = 36; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); pixel_x = 6 }, /obj/item/radio/intercom{ @@ -901,7 +901,7 @@ "ja" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -1642,12 +1642,14 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Bar"; - req_access_txt = "syndicate" + name = "Bar" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 8 }, /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) @@ -1719,8 +1721,10 @@ /area/ruin/powered/syndicate_lava_base/engineering) "qc" = ( /obj/machinery/door/window/eastright{ - name = "Kitchen"; - req_access_txt = "syndicate" + name = "Kitchen" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/syndicate_lava_base/bar) @@ -2587,7 +2591,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/structure/chair/office/dark{ dir = 1 @@ -3178,7 +3182,7 @@ id = "syndie_lavaland_exitdoors"; name = "Central External Airlock Blast Door Control"; pixel_y = -24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/structure/safe/floor, /obj/item/reagent_containers/food/drinks/bottle/vodka, @@ -3395,8 +3399,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Ft" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, @@ -3492,7 +3495,7 @@ "Gs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -3543,7 +3546,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/engine, /area/ruin/powered/syndicate_lava_base/chemistry) @@ -4506,8 +4509,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Pk" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/spawner/lootdrop/donkpockets, /obj/item/storage/box/ingredients/vegetarian, @@ -4800,8 +4802,10 @@ "Sb" = ( /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Isolation Pen"; - req_access_txt = "syndicate" + name = "Isolation Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) @@ -4832,7 +4836,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -4872,8 +4876,7 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -5326,8 +5329,7 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -5436,8 +5438,10 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/door/window/brigdoor{ dir = 8; - name = "Cell"; - req_access_txt = "syndicate" + name = "Cell" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 8 }, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index 1ccde2827054..8862fe8ef742 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -2742,18 +2742,20 @@ /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "Ji" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "mining_station" - }, -/obj/machinery/door/window/westleft{ - req_access_txt = "mining_station" - }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "Jt" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 35e82fe817e4..0fd1ccc1b8a2 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -154,7 +154,7 @@ /area/ruin/powered/beach) "aF" = ( /obj/machinery/vending/boozeomat{ - req_access_txt = "0"; + req_access = null; set_obj_flags = "EMAGGED" }, /turf/open/floor/wood, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm index a65f0839177b..c2cba30e83bc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm @@ -568,8 +568,7 @@ /area/ruin/powered/inn) "Kt" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "0" + req_access = null }, /obj/item/storage/box/donkpockets, /obj/item/reagent_containers/food/condiment/enzyme, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm index 292c36fd8200..87679c891d72 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm @@ -589,7 +589,6 @@ "bm" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - req_access_txt = "0"; use_power = 0 }, /turf/closed/wall/mineral/wood, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm index 0aeb4bb8cfd8..a0042c62d93e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm @@ -14,7 +14,7 @@ }, /obj/structure/closet/crate/secure{ name = "Emergency Supplies Crate"; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, @@ -236,13 +236,13 @@ /area/ruin/powered/gasstation) "iq" = ( /obj/machinery/door/window{ - req_access = null; - req_access_txt = "clerk" + req_access = null }, /obj/machinery/door/poddoor/shutters/preopen{ id = "cashiershutters"; name = "Cashier Shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "ir" = ( @@ -632,7 +632,7 @@ /obj/machinery/button/door{ id = "cashiershutters"; name = "Cashier Lockdown"; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) @@ -781,7 +781,7 @@ /obj/machinery/button/door{ id = "gasstation"; name = "Gas Station Lockdown"; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 58deb21db784..b8c959f26b79 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -208,10 +208,7 @@ /obj/effect/turf_decal/siding/purple{ dir = 8 }, -/obj/machinery/mineral/ore_redemption{ - req_access = null; - req_access_txt = "syndicate" - }, +/obj/machinery/mineral/ore_redemption, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) "bE" = ( @@ -575,7 +572,7 @@ /area/ruin/powered/syndicate_lava_base/arrivals) "ej" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -772,7 +769,7 @@ /obj/machinery/button/door{ id = "lavalandsyndi_virology"; name = "Virology Blast Door Control"; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/storage/box/monkeycubes, /obj/effect/turf_decal/siding/green{ @@ -784,8 +781,7 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -1234,8 +1230,7 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/airalarm/syndicate{ dir = 4; @@ -1565,8 +1560,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "hr" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/airalarm/syndicate{ dir = 1; @@ -1856,7 +1850,7 @@ id = "syndicate_lavaland_vault_windows"; name = "Vault Window Shutters"; pixel_y = -24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) @@ -1881,7 +1875,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /turf/open/floor/mineral/plastitanium, @@ -2020,7 +2014,7 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -2064,7 +2058,7 @@ id = "lavalandsyndi_chemistry"; name = "Chemistry Blast Door Control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/chem_master, /obj/effect/turf_decal/siding/purple{ @@ -2086,7 +2080,7 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/siding/red{ dir = 1 @@ -2847,7 +2841,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -3003,7 +2997,7 @@ }, /obj/effect/turf_decal/tile/bar, /obj/structure/closet/syndicate{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/ammo_casing/shotgun/beanbag, @@ -3305,8 +3299,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "lT" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -3445,7 +3438,7 @@ name = "syndicate commander's gloves" }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plating/lavaland_baseturf, /area/ruin/powered/syndicate_lava_base/engineering) @@ -3651,7 +3644,7 @@ /obj/item/circuitboard/machine/clonescanner, /obj/structure/closet/crate/secure/medical{ desc = "A crate with a lock on it, painted in the scheme of the station's doctors. This one is marked to contain prototype circuitry and clearly hasn't been touched in years."; - req_access_txt = "syndicate_leader" + req_access = list(ACCESS_SYNDICATE_LEADER) }, /obj/item/paper{ info = "You have been assigned to test an old cloner system provided to us by one of our research stations. Your monkeys should make excellent DNA sources. Do not clone too many crew, and be prepared to treat genetic defects and cellular damage." @@ -3868,8 +3861,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access_txt = "syndicate"; - specialfunctions = 4 + req_access = list(ACCESS_SYNDICATE)specialfunctions=4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -3930,7 +3922,7 @@ id = "lavalandsyndi_arrivals"; name = "Arrivals Blast Door Control"; pixel_y = -26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -3961,7 +3953,7 @@ id = "lavalandsyndi_medsci"; name = "Medical Bay Shutters"; pixel_y = 24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -4366,7 +4358,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/mineral/plastitanium, @@ -4377,7 +4369,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -4391,12 +4383,14 @@ id = "syndielavaland_disposals" }, /obj/machinery/door/window/brigdoor/westleft{ - name = "Disposals Conveyor"; - req_access_txt = "syndicate" + name = "Disposals Conveyor" }, /obj/structure/sign/warning/deathsposal{ pixel_x = 32 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "rK" = ( @@ -4501,8 +4495,7 @@ /area/ruin/powered/syndicate_lava_base/medbay) "tZ" = ( /obj/machinery/door/window/brigdoor{ - name = "Isolation Pen"; - req_access_txt = "syndicate" + name = "Isolation Pen" }, /obj/machinery/light{ dir = 1; @@ -4512,6 +4505,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "ua" = ( @@ -4590,8 +4584,7 @@ /area/ruin/powered/syndicate_lava_base/main) "uT" = ( /obj/machinery/door/window/northleft{ - name = "Bar"; - req_access_txt = "syndicate" + name = "Bar" }, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4607,6 +4600,9 @@ /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "uX" = ( @@ -5020,7 +5016,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -5476,7 +5472,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -5490,16 +5486,13 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) "Gv" = ( -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ ailock = 1; control_area = "/area/ruin/powered/syndicate_lava_base/main"; dir = 1; - icon_state = "control_kill"; lethal = 1; name = "Base turret controls"; - pixel_y = 30; - req_access = null; - req_access_txt = "syndicate" + pixel_y = 30 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -5957,7 +5950,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -6644,8 +6637,7 @@ dir = 4 }, /obj/machinery/door/window/eastright{ - name = "Kitchen"; - req_access_txt = "syndicate" + name = "Kitchen" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -6653,6 +6645,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/syndicate_lava_base/bar) "Wf" = ( diff --git a/_maps/RandomRuins/LavaRuins/miningbase.dmm b/_maps/RandomRuins/LavaRuins/miningbase.dmm index e89e62a772a0..598f0bef22d7 100644 --- a/_maps/RandomRuins/LavaRuins/miningbase.dmm +++ b/_maps/RandomRuins/LavaRuins/miningbase.dmm @@ -2736,18 +2736,20 @@ /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "Ji" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "mining_station" - }, -/obj/machinery/door/window/westleft{ - req_access_txt = "mining_station" - }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "Jt" = ( diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 57cb5cef7460..0e1d61200f03 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -1412,8 +1412,10 @@ /area/ruin/space/derelict/singularity_engine) "eB" = ( /obj/machinery/door/window/eastleft{ - name = "Heads of Staff"; - req_access_txt = "ruins_command" + name = "Heads of Staff" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/command{ + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) @@ -1642,10 +1644,10 @@ "fp" = ( /obj/machinery/door/window{ dir = 2; - name = "Captain's Quarters"; - req_access_txt = "ruins_command" + name = "Captain's Quarters" }, /obj/structure/grille, +/obj/effect/mapping_helpers/windoor/access/all/ruins/command, /turf/open/floor/plating/airless, /area/ruin/space/derelict/bridge) "fq" = ( @@ -2585,10 +2587,12 @@ id = "derelict_gun" }, /obj/machinery/door/window{ - dir = 4; - req_access_txt = "ruins_general" + dir = 4 }, /obj/structure/closet/crate/coffin, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/derelict/medical/chapel) "iL" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 3bf27aeb68a6..2093355551c3 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -181,9 +181,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Bio Containment"; - req_one_access_txt = "47" + name = "Bio Containment" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "aE" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 1b487c05976a..6a1da4a31747 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -44,7 +44,7 @@ "k" = ( /obj/structure/closet/secure_closet{ name = "clown locker"; - req_access_txt = "theatre" + req_access = list(ACCESS_THEATRE) }, /obj/item/clothing/shoes/clown_shoes/banana_shoes, /obj/effect/spawner/lootdrop/maintenance/two, diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 4acf92745317..d6466f769168 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -2152,20 +2152,20 @@ name = "exterior blast door access"; pixel_x = -24; pixel_y = -8; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/machinery/button/door{ id = "bunkerinterior"; name = "interior blast door access"; pixel_x = -24; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/machinery/button/door{ id = "bunkershutter"; name = "hallway shutter toggle"; pixel_x = -24; pixel_y = 8; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/machinery/computer/security/telescreen{ dir = 1; diff --git a/_maps/RandomRuins/SpaceRuins/gameroom.dmm b/_maps/RandomRuins/SpaceRuins/gameroom.dmm index 1a7bdfd4d885..5aae569feb45 100644 --- a/_maps/RandomRuins/SpaceRuins/gameroom.dmm +++ b/_maps/RandomRuins/SpaceRuins/gameroom.dmm @@ -251,7 +251,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = 23; pixel_y = -21; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/gaming) @@ -594,7 +594,6 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -32; - req_access_txt = "0"; use_power = 0 }, /turf/open/floor/carpet, @@ -918,7 +917,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = -22; pixel_y = -21; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powered/gaming) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 74e23ee1caa4..30f7c620d03c 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -337,7 +337,7 @@ id = "lpost_privacy_left"; name = "Privacy Shutters"; pixel_y = 23; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -482,7 +482,7 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4; pixel_x = -3 }, @@ -960,7 +960,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_y = -24; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/critter, @@ -1083,8 +1083,7 @@ /area/ruin/space/has_grav/listeningstation/hallway) "iO" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -1098,7 +1097,7 @@ id = "lpost_privacy_right"; name = "Privacy Shutters"; pixel_y = 23; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -1114,8 +1113,7 @@ /area/ruin/space/has_grav/listeningstation/telecomms) "jn" = ( /obj/machinery/door/window/northright{ - name = "Document Storage"; - req_access_txt = "syndicate" + name = "Document Storage" }, /obj/item/paper/monitorkey, /obj/effect/decal/cleanable/dirt, @@ -1137,6 +1135,9 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "jo" = ( @@ -1691,8 +1692,7 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) @@ -2073,8 +2073,7 @@ pixel_y = 23 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/snacks/meat/slab, @@ -2365,7 +2364,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_x = -24; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); pixel_y = 6 }, /turf/open/floor/plasteel/dark, @@ -2851,8 +2850,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "QE" = ( /obj/machinery/door/window/northleft{ - name = "Telecommunications"; - req_access_txt = "syndicate" + name = "Telecommunications" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2861,6 +2859,9 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "QO" = ( @@ -2990,8 +2991,7 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = null; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/machinery/light/small{ brightness = 3; @@ -3043,11 +3043,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/window/survival_pod{ - name = "Showcase and Self-Destruct Access"; - req_access_txt = "syndicate" + name = "Showcase and Self-Destruct Access" }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "TO" = ( @@ -3150,7 +3150,7 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_x = 24; - req_access_txt = "syndicate"; + req_access = list(ACCESS_SYNDICATE); specialfunctions = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index 3f88163ea519..7728da275271 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -162,10 +162,10 @@ name = "kitty protection door" }, /obj/machinery/door/window{ - name = "kitty door"; - req_access_txt = "ruins_general" + name = "kitty door" }, /obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aB" = ( @@ -293,12 +293,14 @@ name = "kitty protection door" }, /obj/machinery/door/window/westleft{ - name = "kitty door"; - req_access_txt = "ruins_general" + name = "kitty door" }, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aR" = ( @@ -619,10 +621,12 @@ name = "kitty protection door" }, /obj/machinery/door/window/northleft{ - name = "kitty door"; - req_access_txt = "ruins_general" + name = "kitty door" }, /obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 1 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bJ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index fde0baf80584..c6bb60851216 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2362,7 +2362,7 @@ /obj/item/assembly/flash/handheld, /obj/item/storage/box/firingpins, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "ruins_security" + req_access = list(ACCESS_RUINS_SECURITY) }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -8835,7 +8835,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/engineering{ name = "plasma tank crate"; - req_access_txt = "ruins_engineering" + req_access = list(ACCESS_RUINS_ENGINEERING) }, /obj/item/tank/internals/plasma/full, /obj/item/tank/internals/plasma/full, diff --git a/_maps/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/RandomRuins/SpaceRuins/spacebar.dmm index ab8d9849e66f..b65c125b7ca4 100644 --- a/_maps/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacebar.dmm @@ -85,8 +85,7 @@ "aU" = ( /obj/structure/disposalpipe/segment, /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -385,8 +384,7 @@ pixel_y = 32 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -828,8 +826,7 @@ /area/ruin/space/has_grav/powered/spacebar) "Gk" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = null; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /obj/structure/window{ dir = 4 @@ -1032,7 +1029,7 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -32; - req_access_txt = "0"; + req_access = null; use_power = 0 }, /turf/open/floor/plasteel, @@ -1118,7 +1115,7 @@ name = "Bar Shutters Control"; pixel_x = 25; pixel_y = 24; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/spacebar) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index b985b166ea21..077bb8ce4674 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -2159,8 +2159,7 @@ /area/ruin/space/has_grav/hotel/bar) "fE" = ( /obj/machinery/vending/boozeomat{ - req_access_txt = "ruins_general"; - req_access = null + req_access = list(ACCESS_RUINS_GENERAL) }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -2573,8 +2572,7 @@ /area/ruin/space/has_grav/hotel/bar) "gC" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access_txt = "ruins_general"; - req_access = null + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2661,8 +2659,7 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access_txt = "ruins_general"; - req_access = null + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2837,8 +2834,7 @@ /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3109,7 +3105,7 @@ /area/ruin/space/has_grav/hotel/custodial) "hT" = ( /obj/machinery/vending/dinnerware{ - req_access_txt = "ruins_general" + req_access = list(ACCESS_RUINS_GENERAL) }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3989,8 +3985,7 @@ dir = 4; icon_state = "rightsecure"; name = "Cell Door"; - req_access = null; - req_access_txt = "ruins_security" + req_access = null }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -4002,6 +3997,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/security{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) "kC" = ( @@ -4479,8 +4477,7 @@ /area/ruin/space/has_grav/hotel/security) "lT" = ( /obj/structure/closet/secure_closet/security{ - req_access = null; - req_access_txt = "ruins_security" + req_access = list(ACCESS_RUINS_SECURITY) }, /obj/item/gun/energy/laser/scatter/shotty, /obj/item/clothing/head/helmet/justice, @@ -5039,8 +5036,10 @@ dir = 4; icon_state = "right"; layer = 3; - name = "Hotel Bar Access"; - req_access_txt = "ruins_general" + name = "Hotel Bar Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/bar) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm index 346c6cf577ed..76e5841e6a8b 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm @@ -822,7 +822,7 @@ /obj/machinery/button/door{ id = "reactorcore"; name = "Core Access"; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -1196,7 +1196,7 @@ /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel/dark, /area/engine/engineering) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm index 5ed3477960ef..8f28221dc879 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm @@ -247,7 +247,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -337,7 +337,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/engine, /area/engine/engineering) @@ -352,7 +352,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -601,7 +601,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /mob/living/simple_animal/opossum/poppy, /turf/open/floor/engine, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm index feb4225e9cb1..c90986915c0b 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm @@ -196,7 +196,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index 00291a2d1a0c..d5d3c40dc4d4 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -179,7 +179,7 @@ name = "Hot Chamber Vent"; pixel_x = -26; pixel_y = 8; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /mob/living/simple_animal/opossum/poppy, /obj/structure/chair/office/dark{ @@ -807,7 +807,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_x = 26; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/structure/lattice/catwalk, /turf/template_noop, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm index 8a7047c4ce99..4880c8ee848d 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm @@ -69,7 +69,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm index 98671e91be56..ec17dddf2bf5 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm @@ -243,7 +243,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm index 7baa8b71c36c..fdace3ab1150 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm @@ -115,7 +115,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm index a7cf16f08546..253e076344e1 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm @@ -74,7 +74,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -95,7 +95,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm index 732cc28d3293..c163fd14348f 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm @@ -128,7 +128,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm index 1478a16312eb..e617fcfaf9ee 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm @@ -108,7 +108,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm index 26abccddbb10..3cb88ff59684 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm @@ -362,7 +362,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -383,7 +383,7 @@ name = "Crush"; pixel_x = 25; pixel_y = -15; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel/dark, /area/template_noop) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm index f9c04c5facbe..c57a6b90dedd 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm @@ -173,7 +173,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -199,7 +199,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm index 5be52b0cbd2c..b10137da0bb5 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm @@ -91,7 +91,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm index 114ad20d519f..eff958a2b1ea 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm @@ -95,7 +95,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm index bc6a20255059..f06205aa856f 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm @@ -1066,13 +1066,13 @@ id = "reactorcore"; name = "Core Access"; pixel_y = -2; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; pixel_y = 8; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm index 997bc7c9c017..be332cf22b07 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm @@ -278,7 +278,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = -24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -440,7 +440,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/engine, /area/engine/engineering) @@ -571,7 +571,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -735,7 +735,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/engine, /area/engine/engineering) diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm index 1d9bf888d0de..8fdcb48996eb 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm @@ -1507,7 +1507,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/stripes/line{ dir = 4 diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm index 0bddc0553ef0..00ff6d05c8eb 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm @@ -200,7 +200,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_y = 22; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/structure/lattice/catwalk, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -891,7 +891,7 @@ name = "Hot Chamber Vent"; pixel_x = -7; pixel_y = -24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/ignition{ id = "teghotburn"; diff --git a/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm index 02af2ad0c7b2..23b8da7530ca 100644 --- a/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm +++ b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm @@ -44,7 +44,7 @@ /area/template_noop) "Y" = ( /obj/machinery/vending/autodrobe{ - req_access_txt = "0" + req_access = null }, /turf/open/floor/carpet/black, /area/template_noop) diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm index 61398771ada7..b127ff490f1d 100644 --- a/_maps/RandomZLevels/Cabin.dmm +++ b/_maps/RandomZLevels/Cabin.dmm @@ -356,7 +356,7 @@ /area/awaymission/cabin) "bl" = ( /obj/machinery/vending/autodrobe{ - req_access_txt = "0" + req_access = null }, /turf/open/floor/wood, /area/awaymission/cabin) @@ -495,9 +495,7 @@ /turf/open/floor/wood, /area/awaymission/cabin) "bN" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/awaymission/cabin) "bO" = ( diff --git a/_maps/RandomZLevels/VR/netmin_hub.dmm b/_maps/RandomZLevels/VR/netmin_hub.dmm index bc9dbee79d95..ff6b12e1c074 100644 --- a/_maps/RandomZLevels/VR/netmin_hub.dmm +++ b/_maps/RandomZLevels/VR/netmin_hub.dmm @@ -3450,8 +3450,7 @@ /area/awaymission/vr/scientist_raid) "Cn" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_one_access_txt = "0" + name = "Engineering" }, /turf/open/floor/plasteel, /area/awaymission/vr/abandoned_mine) diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 11a6dd993614..b6612cac70f9 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -602,8 +602,7 @@ "bs" = ( /obj/machinery/door/window{ dir = 1; - name = "Gateway Access"; - req_access_txt = "syndicate" + name = "Gateway Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -611,6 +610,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1784,7 +1786,7 @@ /area/awaymission/moonoutpost19/syndicate) "dr" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/ammo_box/magazine/m10mm{ icon_state = "9x19p-8" @@ -1809,7 +1811,7 @@ "dt" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "syndicate" + req_access = list(ACCESS_SYNDICATE) }, /obj/item/stack/spacecash/c50, /turf/open/floor/wood{ @@ -2381,7 +2383,7 @@ name = "Containment Chamber Blast Doors"; pixel_x = 4; pixel_y = -2; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/machinery/button/ignition{ id = "awayxenobio"; @@ -2972,7 +2974,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/clothing/suit/armor/vest, /obj/item/reagent_containers/spray/pepper, @@ -3490,7 +3492,7 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_x = -25; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/machinery/light/small{ dir = 8 @@ -3740,7 +3742,7 @@ /area/awaymission/moonoutpost19/hive) "hm" = ( /obj/machinery/vending/medical{ - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /turf/open/floor/plasteel/white/side{ dir = 2; @@ -3783,7 +3785,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/storage/backpack/satchel/tox, /obj/item/clothing/gloves/color/latex, @@ -4299,13 +4301,13 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_y = 8; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/machinery/button/door{ id = "AwayRD"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -4621,9 +4623,7 @@ /turf/closed/wall/rust, /area/awaymission/moonoutpost19/arrivals) "iU" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -5614,7 +5614,7 @@ "kU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/clothing/under/suit/navy, /turf/open/floor/carpet{ @@ -6167,7 +6167,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -6182,7 +6182,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, @@ -6197,7 +6197,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, @@ -6545,7 +6545,7 @@ "nb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/clothing/under/rank/civilian/assistantformal, /turf/open/floor/carpet{ @@ -6954,7 +6954,7 @@ "nT" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/clothing/under/suit/burgundy, /turf/open/floor/carpet{ @@ -7080,7 +7080,7 @@ icon_state = "science"; locked = 0; name = "scientist's locker"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/clothing/suit/toggle/labcoat, /turf/open/floor/plasteel{ @@ -7093,7 +7093,7 @@ icon_state = "science"; locked = 1; name = "scientist's locker"; - req_access_txt = "ruins_maintenance" + req_access = list(ACCESS_RUINS_MAINTENANCE) }, /obj/item/clothing/suit/toggle/labcoat, /obj/item/tank/internals/air, diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 0c4cdb9df3d8..0b9dd008a350 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -1869,7 +1869,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = 22; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -1878,7 +1878,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = -21; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -2808,7 +2808,7 @@ name = "Mech Bay Door Control"; pixel_x = 24; pixel_y = -6; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/light_switch{ pixel_x = 24; @@ -4959,7 +4959,7 @@ name = "Privacy Shutter Controls"; pixel_x = -24; pixel_y = 8; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5439,7 +5439,7 @@ }, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ pixel_y = 28; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5949,21 +5949,21 @@ id = "xenobio_main"; name = "Main containment blast doors"; pixel_x = -32; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = -32; pixel_y = 10; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio_l"; name = "Left side containment blast doors"; pixel_x = -32; pixel_y = -10; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/disposal/bin{ name = "sample disposal unit" @@ -6922,14 +6922,14 @@ name = "Secure Storage Control"; pixel_x = -8; pixel_y = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ id = "enginepashutter"; name = "Particle Accelerator Shutter Control"; pixel_x = 2; pixel_y = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer"; @@ -7422,14 +7422,14 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -7460,7 +7460,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -7854,7 +7854,7 @@ name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = 10; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) @@ -8122,7 +8122,7 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/carpet, /area/bridge) @@ -8991,14 +8991,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = -25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = -25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/light_switch{ pixel_x = -4; @@ -12685,14 +12685,14 @@ name = "Cell Shutters"; pixel_x = -7; pixel_y = 30; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 7; pixel_y = 30; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -14518,7 +14518,7 @@ name = "Secure Storage Control"; pixel_x = 7; pixel_y = 25; - req_access_txt = "engine_equip" + req_access = list(ACCESS_ENGINE_EQUIP) }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 @@ -24231,8 +24231,7 @@ /area/tcommsat/server) "kal" = ( /obj/machinery/door/airlock/hatch{ - name = "TeleSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "TeleSat Space Access Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -30341,7 +30340,7 @@ /obj/machinery/door/window/eastleft{ dir = 8; name = "Research Desk"; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /obj/machinery/door/poddoor/shutters/preopen{ id = "researchprivate"; @@ -49780,7 +49779,7 @@ name = "Desk Privacy Shutters Control"; pixel_x = 24; pixel_y = -4; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index c8439b648d45..6f0afdbd9cc6 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -9592,8 +9592,7 @@ "eyp" = ( /obj/machinery/door/window/southright{ dir = 8; - name = "Bar Door"; - req_one_access_txt = "bar" + name = "Bar Door" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9601,6 +9600,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "eyx" = ( @@ -27358,9 +27360,7 @@ /turf/open/floor/plasteel, /area/security/processing) "ngZ" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12:36" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -38802,7 +38802,7 @@ /obj/machinery/door/window/southright{ dir = 8; name = "Research and Development Desk"; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -43647,7 +43647,7 @@ name = "Shutters Control Button"; pixel_x = -7; pixel_y = -24; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -49816,13 +49816,11 @@ "ydm" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Kitchen Window"; - req_one_access_txt = "hydroponics;kitchen" + name = "Kitchen Window" }, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Hydroponics Window"; - req_one_access_txt = "hydroponics;kitchen" + name = "Hydroponics Window" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49830,6 +49828,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/any/service/hydroponics{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/hydroponics{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/kitchen{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/kitchen{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "yds" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 64e2b6c7a627..4ff45c87bf2e 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -117,9 +117,8 @@ /area/yogs/infiltrator_base) "ada" = ( /obj/structure/bed, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1614,7 +1613,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = -5; - req_access_txt = "cent_storage" + req_access = list(ACCESS_CENT_STORAGE) }, /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor2"; @@ -1622,7 +1621,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = 5; - req_access_txt = "cent_storage" + req_access = list(ACCESS_CENT_STORAGE) }, /obj/machinery/computer/cargo{ dir = 4 @@ -3626,8 +3625,7 @@ "anQ" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "cent_general" + name = "CentCom Stand" }, /obj/machinery/firealarm{ dir = 4; @@ -3643,13 +3641,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general, /turf/open/floor/plasteel/dark, /area/centcom/control) "anR" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "cent_general" + name = "CentCom Stand" }, /obj/machinery/firealarm{ dir = 8; @@ -3665,6 +3663,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general, /turf/open/floor/plasteel/dark, /area/centcom/control) "anS" = ( @@ -4469,8 +4468,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "cent_storage" + name = "CentCom Customs" }, /obj/item/clipboard, /obj/item/folder/yellow, @@ -4482,6 +4480,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/storage{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/supply) "apm" = ( @@ -7524,11 +7525,13 @@ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "cent_general" + name = "CentCom Customs" }, /obj/machinery/door/window, /obj/effect/turf_decal/bot, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/control) "ave" = ( @@ -7649,9 +7652,8 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -7758,7 +7760,7 @@ name = "Hanger Bay Shutters"; pixel_x = -8; pixel_y = 24; - req_access_txt = "cent_general" + req_access = list(ACCESS_CENT_GENERAL) }, /obj/machinery/button/door/indestructible{ id = "XCCsec3"; @@ -8035,8 +8037,10 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Commander's Desk"; - req_access_txt = "syndicate_leader" + name = "Commander's Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/leader{ + dir = 4 }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) @@ -8129,7 +8133,7 @@ id = "XCCFerry"; name = "Hanger Bay Shutters"; pixel_y = 24; - req_access_txt = "cent_general" + req_access = list(ACCESS_CENT_GENERAL) }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8664,7 +8668,7 @@ id = "XCCsec1"; name = "CC Shutter 1 Control"; pixel_y = -24; - req_access_txt = "cent_general" + req_access = list(ACCESS_CENT_GENERAL) }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -10521,40 +10525,53 @@ /area/centcom/evac) "aBN" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/storage/fancy/donut_box, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "cent_general" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/evac) "aBO" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/folder/red, /obj/item/pen/red, /obj/structure/window/reinforced{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/evac) "aBP" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "cent_general" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/evac) "aBQ" = ( @@ -11647,8 +11664,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "cent_general" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor/border_only{ @@ -11657,6 +11673,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDI" = ( @@ -11667,8 +11686,7 @@ base_state = "rightsecure"; dir = 8; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "cent_medical" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor/border_only{ @@ -11677,6 +11695,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/medical{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDJ" = ( @@ -12416,11 +12437,11 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; icon_state = "rightsecure"; - name = "Thunderdome Booth"; - req_access_txt = "cent_captain" + name = "Thunderdome Booth" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/admin/captain, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aFs" = ( @@ -15053,7 +15074,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomehea"; name = "Heavy Supply Control"; - req_access_txt = "cent_thunder" + req_access = list(ACCESS_CENT_THUNDER) }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15072,7 +15093,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdome"; name = "Main Blast Doors Control"; - req_access_txt = "cent_thunder" + req_access = list(ACCESS_CENT_THUNDER) }, /obj/structure/table/reinforced, /obj/machinery/light, @@ -15092,7 +15113,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomegen"; name = "General Supply Control"; - req_access_txt = "cent_thunder" + req_access = list(ACCESS_CENT_THUNDER) }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15282,12 +15303,14 @@ /area/centcom/evac) "aKS" = ( /obj/machinery/door/window/northright{ - name = "Security Desk"; - req_access_txt = "security" + name = "Security Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) "aKT" = ( @@ -15329,19 +15352,15 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 8; - icon_state = "alarm0"; - pixel_x = 24; - req_access = list("syndicate") + pixel_x = 24 }, -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ icon_state = "control_kill"; lethal = 1; locked = 1; - pixel_y = 28; - req_access_txt = "syndicate"; - req_access = null + pixel_y = 28 }, /turf/open/floor/plasteel/dark/side{ dir = 5 @@ -16491,9 +16510,8 @@ /turf/open/floor/plasteel, /area/centcom/testchamber) "aOh" = ( -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/bed, /obj/item/bedsheet/black, @@ -16914,9 +16932,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 9 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -17752,10 +17769,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate"); - req_access_txt = "0" +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) @@ -19623,11 +19638,9 @@ /turf/open/floor/plasteel, /area/centcom/evac) "aWf" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; - icon_state = "alarm0"; - pixel_x = -24; - req_access = list("syndicate") + pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -20914,9 +20927,8 @@ /area/yogs/infiltrator_base) "aZu" = ( /obj/structure/chair/stool, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/landmark/start/infiltrator, /obj/effect/turf_decal/tile/bar, @@ -21557,9 +21569,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list("syndicate") +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -23411,7 +23422,7 @@ /obj/machinery/button/door{ id = "nukie_leader_dorm_windows"; name = "Window Shutters"; - req_access_txt = "syndicate_leader" + req_access = list(ACCESS_SYNDICATE_LEADER) }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) diff --git a/_maps/map_files/mining/Jungleland.dmm b/_maps/map_files/mining/Jungleland.dmm index bbcba588ab8f..bd6c8c15514f 100644 --- a/_maps/map_files/mining/Jungleland.dmm +++ b/_maps/map_files/mining/Jungleland.dmm @@ -490,7 +490,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 diff --git a/_maps/map_files/mining/Lavaland.dmm b/_maps/map_files/mining/Lavaland.dmm index 7a509b0c0cad..b5b792741bfd 100644 --- a/_maps/map_files/mining/Lavaland.dmm +++ b/_maps/map_files/mining/Lavaland.dmm @@ -2968,7 +2968,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index f40915bbd0ff..c00bd3742bde 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -1447,8 +1447,7 @@ /area/shuttle/escape) "cP" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room"; - req_one_access_txt = "10;24" + name = "Engine Room" }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -1464,6 +1463,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/shuttle/escape) "cQ" = ( diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index cf295697c945..d642b5830423 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -583,8 +583,7 @@ /area/shuttle/escape) "bb" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_one_access_txt = "63" + name = "Emergency Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index a01ea3e18287..2552d88418c6 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -580,8 +580,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary"; - req_one_access_txt = "2;19" + name = "Escape Shuttle Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -589,6 +588,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "bp" = ( @@ -2289,7 +2290,6 @@ lethal = 1; pixel_x = 5; pixel_y = 32; - req_access = null; req_access = list(ACCESS_COMMAND) }, /turf/open/floor/plasteel/dark, From 0518e8029588d80865616315d5166a2596896f04 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 02:53:51 +0200 Subject: [PATCH 30/48] ballin --- .../AsteroidStation/AsteroidStation.dmm | 20 ++---- _maps/map_files/DonutStation/DonutStation.dmm | 41 ++++++----- _maps/map_files/GaxStation/GaxStation.dmm | 10 +-- _maps/map_files/IceMeta/IceMeta.dmm | 21 ++---- _maps/map_files/YogStation/YogStation.dmm | 72 +++++++++++-------- code/game/machinery/doors/door.dm | 4 ++ 6 files changed, 83 insertions(+), 85 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 22a5e42ad04b..16e3db4f5ee0 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -3792,16 +3792,13 @@ /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness) "aGy" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/main) "aGA" = ( @@ -29445,8 +29442,7 @@ /area/security/prison) "irl" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -42496,9 +42492,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "mvr" = ( -/obj/machinery/door/morgue{ - name = "Private Study" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -42511,7 +42504,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/library, +/obj/machinery/door/morgue/curator, /turf/open/floor/carpet, /area/library) "mvN" = ( @@ -49344,10 +49337,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "oyn" = ( -/obj/machinery/door/airlock{ - name = "Hydroponics Maintenance"; - req_one_access_txt = "0" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -49355,6 +49344,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/door/airlock/maintenance{ + name = "Hydroponics Maintenance" + }, /turf/open/floor/plating, /area/maintenance/port/fore) "oyo" = ( diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 0b9dd008a350..936286e56299 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -5249,7 +5249,6 @@ "caS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -5261,6 +5260,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/aft) "cbl" = ( @@ -13415,7 +13415,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_x = 24; - req_one_access_txt = "32;47;48" + req_access = list(ACCESS_AUX_BASE) }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) @@ -18892,10 +18892,7 @@ /turf/open/floor/wood, /area/lawoffice) "hLQ" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/main) "hLW" = ( @@ -21916,8 +21913,7 @@ /area/tcommsat/computer) "jhB" = ( /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "AISat External Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/barricade/wooden, @@ -30339,8 +30335,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Research Desk"; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + name = "Research Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "researchprivate"; @@ -30359,6 +30354,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/science/general{ + dir = 8 + }, /turf/open/floor/plating, /area/science/lab) "mFd" = ( @@ -38398,16 +38399,13 @@ /turf/open/floor/plasteel, /area/engine/atmos) "pZj" = ( -/obj/machinery/door/morgue{ - name = "Private Study" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/service/library, +/obj/machinery/door/morgue/curator, /turf/open/floor/engine/cult, /area/library) "pZt" = ( @@ -39359,8 +39357,7 @@ /area/maintenance/aft) "qrg" = ( /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "AISat External Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/barricade/wooden, @@ -52970,13 +52967,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/aft) "wcC" = ( @@ -56067,9 +56062,13 @@ /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/turret_protected/ai) "xnG" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/aft) "xnI" = ( diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 6f0afdbd9cc6..188b942bac68 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -6678,14 +6678,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "dhw" = ( -/obj/machinery/door/morgue{ - name = "Private Study" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/service/library, +/obj/machinery/door/morgue/curator, /turf/open/floor/plating, /area/library) "dhK" = ( @@ -15865,16 +15862,13 @@ /turf/open/floor/wood, /area/library) "hvc" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/main) "hvC" = ( diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 1d8c749cefbb..1bd15fdae975 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -9824,14 +9824,11 @@ }, /area/maintenance/port/fore) "cUk" = ( -/obj/machinery/door/morgue{ - name = "Private Study" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/access/all/service/library, +/obj/machinery/door/morgue/curator, /turf/open/floor/engine/cult, /area/library) "cUo" = ( @@ -18741,7 +18738,7 @@ id = "research_shutters"; name = "research shutters control"; pixel_x = 28; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -46826,16 +46823,15 @@ /turf/open/floor/plasteel, /area/security/checkpoint/customs) "nxL" = ( -/obj/machinery/door/morgue{ - name = "Relic Closet" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/obj/machinery/door/morgue/chaplain{ + name = "Relic Closet" + }, /turf/open/floor/plasteel/cult, /area/chapel/office) "nyc" = ( @@ -48605,16 +48601,13 @@ /turf/open/floor/circuit/green/telecomms, /area/ai_monitored/secondarydatacore) "nWM" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/office) "nWO" = ( @@ -68252,7 +68245,7 @@ name = "research shutters control"; pixel_x = -26; pixel_y = -26; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /obj/effect/turf_decal/stripes/line{ dir = 1 diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index f33b70baf4ab..ab613610178e 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -1056,8 +1056,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Security Delivery"; - req_one_access_txt = "security;detective" + name = "Security Delivery" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1072,6 +1071,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/main) "ahg" = ( @@ -3013,13 +3018,13 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "awr" = ( @@ -6177,13 +6182,11 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "aRQ" = ( -/obj/machinery/door/morgue{ - name = "Private Study" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/morgue/curator, /turf/open/floor/plasteel/cult, /area/library) "aRR" = ( @@ -9043,7 +9046,7 @@ name = "Shutters Control Button"; pixel_x = 24; pixel_y = -24; - req_one_access_txt = "29;75" + req_access = list(ACCESS_ROBOTICS) }, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -19953,7 +19956,7 @@ name = "Shutters Control Button"; pixel_x = -6; pixel_y = 25; - req_one_access_txt = "29;75" + req_access = list(ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 9 @@ -20326,8 +20329,7 @@ "evC" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southright{ - name = "Research and Development Desk"; - req_one_access_txt = "science;robotics" + name = "Research and Development Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -20344,6 +20346,8 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics, +/obj/effect/mapping_helpers/windoor/access/any/science/general, /turf/open/floor/plating, /area/science/lab) "evD" = ( @@ -25490,10 +25494,15 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Research Division Delivery"; - req_one_access_txt = "science;robotics" + name = "Research Division Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/science/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/lab) "gji" = ( @@ -35839,8 +35848,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -35858,6 +35866,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "jOd" = ( @@ -36686,8 +36695,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 2; - name = "Engineering Desk"; - req_access_txt = "engineering" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = -6; @@ -36700,6 +36708,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general, /turf/open/floor/plating, /area/engine/foyer) "khi" = ( @@ -37675,13 +37685,13 @@ name = "bar shutters" }, /obj/machinery/door/window/southright{ - name = "Bar Door"; - req_one_access_txt = "25;28" + name = "Bar Door" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "kAg" = ( @@ -39571,8 +39581,7 @@ /area/crew_quarters/kitchen) "llu" = ( /obj/machinery/door/window{ - name = "SMES Chamber"; - req_access_txt = "engine_equip" + name = "SMES Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39587,6 +39596,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "llx" = ( @@ -44256,7 +44266,7 @@ name = "Research Lab Shutters Control"; pixel_x = -6; pixel_y = 24; - req_one_access_txt = "science;robotics" + req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -59897,8 +59907,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics2"; @@ -59916,6 +59925,9 @@ pixel_x = 9; pixel_y = -4 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "sGY" = ( @@ -64434,8 +64446,7 @@ "uqN" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -64451,6 +64462,9 @@ pixel_x = -6; pixel_y = -10 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/office) "uqW" = ( @@ -70560,8 +70574,7 @@ /area/hallway/secondary/entry) "wzQ" = ( /obj/machinery/door/window/westleft{ - name = "Delivery Desk"; - req_access_txt = "cargo" + name = "Delivery Desk" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -70574,6 +70587,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "wAc" = ( diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 37769ba4915c..fa2fdd6e1a51 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -481,6 +481,10 @@ name = "Private Study" req_access = list(ACCESS_LIBRARY) +/obj/machinery/door/morgue/chaplain + name = "Confession Booth (Chaplain)" + req_access = list(ACCESS_CHAPEL_OFFICE) + /obj/machinery/door/get_dumping_location(obj/item/storage/source,mob/user) return null From f60377768a97b3333eafc5807f0f0e5fdfc24fca Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 03:03:24 +0200 Subject: [PATCH 31/48] ballin --- _maps/map_files/IceMeta/IceMeta.dmm | 115 ++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 31 deletions(-) diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 1bd15fdae975..1f32e36460a2 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -44,8 +44,7 @@ }, /obj/machinery/door/window/eastright{ dir = 2; - name = "Research and Development Desk"; - req_one_access_txt = "science;robotics" + name = "Research and Development Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; @@ -60,6 +59,8 @@ pixel_y = 7 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics, +/obj/effect/mapping_helpers/windoor/access/any/science/general, /turf/open/floor/plating, /area/science/lab) "aaU" = ( @@ -3676,7 +3677,7 @@ name = "Warehouse Door Control"; pixel_x = 24; pixel_y = 28; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -4002,7 +4003,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = -5; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -4010,7 +4011,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = 5; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/computer/cargo{ dir = 4 @@ -10186,6 +10187,9 @@ /area/crew_quarters/heads/hor) "cZx" = ( /obj/machinery/chem_dispenser, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/wood, /area/medical/psych) "cZB" = ( @@ -10905,13 +10909,21 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ dir = 8; - name = "Genetics Desk"; - req_access_txt = "genetics" + name = "Genetics Desk" }, /obj/item/deskbell/preset/genetics{ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/genetics) "dmh" = ( @@ -13348,7 +13360,7 @@ name = "Warehouse Door Control"; pixel_x = -24; pixel_y = 28; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -32691,8 +32703,7 @@ "jBg" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ - name = "Research and Development Desk"; - req_one_access_txt = "science;robotics" + name = "Research and Development Desk" }, /obj/item/folder/white{ pixel_x = 4; @@ -32717,6 +32728,12 @@ pixel_x = -7; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/science/general{ + dir = 4 + }, /turf/open/floor/plating, /area/science/lab) "jBl" = ( @@ -42166,6 +42183,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/medical) +"mjN" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/bot, +/obj/machinery/door/window/brigdoor/security/holding{ + id = "Holding Cell"; + name = "Holding Cell" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/main) "mjX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -46113,14 +46139,19 @@ }, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Research and Development Deliveries"; - req_one_access_txt = "science;robotics" + name = "Research and Development Deliveries" }, /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/science/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/lab) "noz" = ( @@ -51165,13 +51196,15 @@ "oGR" = ( /obj/machinery/door/window/westright{ dir = 1; - name = "Atmospherics Access"; - req_access_txt = "atmospherics" + name = "Atmospherics Access" }, /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/turf_decal/loading_area, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "oGY" = ( @@ -52590,8 +52623,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - name = "Engineering Desk"; - req_one_access_txt = "32;19" + name = "Engineering Desk" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -52604,6 +52636,18 @@ pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/foyer) "phd" = ( @@ -52665,9 +52709,7 @@ }, /obj/machinery/door/window/brigdoor/security/holding{ id = "Holding Cell"; - name = "Holding Cell"; - req_one_access_txt = "security;detective"; - req_one_access = null + name = "Holding Cell" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -53249,7 +53291,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -57677,6 +57719,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/wood, /area/medical/psych) "qFI" = ( @@ -64944,6 +64989,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/wood, /area/medical/psych) "sKP" = ( @@ -68571,8 +68617,7 @@ /area/medical/medbay/aft) "tKR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Warehouse Maintenance"; - req_one_access_txt = "31;48" + name = "Cargo Bay Warehouse Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -70290,13 +70335,18 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Security Delivery"; - req_one_access_txt = "security;detective" + name = "Security Delivery" }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/main) "ujO" = ( @@ -72615,8 +72665,7 @@ /obj/item/pen, /obj/machinery/door/window/northleft{ dir = 2; - name = "Atmospherics Desk"; - req_access_txt = "atmospherics" + name = "Atmospherics Desk" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -72628,6 +72677,11 @@ }, /obj/item/storage/pencil_holder/crew, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos) "uPS" = ( @@ -76956,8 +77010,7 @@ /area/engine/atmos/distro) "waV" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Access"; - req_one_access_txt = "10;32" + name = "MiniSat Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -77517,7 +77570,7 @@ name = "Psych Office Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access_txt = psychology + req_access = list(ACCESS_PSYCHOLOGY) }, /obj/machinery/light_switch{ pixel_x = 8; @@ -83495,7 +83548,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = 24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -245029,7 +245082,7 @@ loB lkw une rER -rmt +mjN nwn xvh iSo From f880e52ea23137ce56dd9d84c11d8a0e220c2b17 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 11:23:56 +0200 Subject: [PATCH 32/48] ballin --- .../StationRuins/GaxStation/ai_whale.dmm | 15 +- _maps/map_files/DonutStation/DonutStation.dmm | 310 ++++++++----- _maps/map_files/GaxStation/GaxStation.dmm | 417 +++++++++++------- 3 files changed, 458 insertions(+), 284 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm index fb3b6764b20f..5aef6935f95e 100644 --- a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm +++ b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm @@ -1677,13 +1677,15 @@ idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/camera{ c_tag = "MiniSat Antechamber"; @@ -2588,7 +2590,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2732,7 +2735,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/turret_protected/ai) @@ -2829,7 +2833,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/light{ dir = 1 diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 936286e56299..95eb58914d1c 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -6988,8 +6988,7 @@ "cLl" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Engineering Desk"; - req_access_txt = "engineering" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = -8; @@ -6999,6 +6998,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general{ + dir = 1 + }, /turf/open/floor/plating, /area/engine/engineering) "cLs" = ( @@ -7129,8 +7134,10 @@ }, /obj/machinery/door/window/southleft{ dir = 8; - name = "Virology"; - req_access_txt = "virology" + name = "Virology" + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -7973,8 +7980,7 @@ "dfT" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ - name = "Atmospherics Desk"; - req_access_txt = "atmospherics" + name = "Atmospherics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7985,6 +7991,7 @@ pixel_y = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos) "dfZ" = ( @@ -9473,9 +9480,9 @@ name = "Left side containment blast door" }, /obj/machinery/door/window/southleft{ - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "dKY" = ( @@ -10476,12 +10483,14 @@ /obj/machinery/door/window/westleft{ dir = 1; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "ai_master" + name = "Cyborg Upload Console Window" }, /obj/machinery/computer/upload/borg{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "ehx" = ( @@ -13578,8 +13587,10 @@ }, /obj/machinery/door/window/westleft{ dir = 1; - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 1 }, /turf/open/floor/plating, /area/quartermaster/office) @@ -14856,7 +14867,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/engine, /area/engine/engineering) @@ -15767,8 +15778,7 @@ "guO" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15778,6 +15788,9 @@ pixel_x = -8; pixel_y = -4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "guQ" = ( @@ -16303,8 +16316,10 @@ "gHs" = ( /obj/machinery/door/window/brigdoor/northright{ name = "Filing Room"; - opacity = 1; - req_access_txt = "psychologist" + opacity = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology{ + dir = 1 }, /turf/open/floor/wood, /area/medical/psych) @@ -16697,9 +16712,9 @@ /area/crew_quarters/heads/hos) "gQb" = ( /obj/machinery/door/window/southleft{ - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/plasteel, /area/science/xenobiology) "gQi" = ( @@ -17021,7 +17036,7 @@ id = "robotics2"; name = "Shutters Control Button"; pixel_y = 24; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/light_switch{ pixel_x = -8; @@ -17660,12 +17675,14 @@ /area/medical/morgue) "hlb" = ( /obj/machinery/door/window/northleft{ - req_access_txt = "library"; name = "Library Desk Door" }, /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 1 + }, /turf/open/floor/carpet, /area/library) "hld" = ( @@ -18196,8 +18213,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "roboticsprivacy"; @@ -18213,6 +18229,9 @@ pixel_x = 6; pixel_y = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 8 + }, /turf/open/floor/plating, /area/science/robotics/lab) "hwZ" = ( @@ -18727,8 +18746,10 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Secure Board Storage"; - req_access_txt = "ai_master" + name = "Secure Board Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -18805,12 +18826,12 @@ /obj/machinery/door/window/northright{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "hIY" = ( @@ -19134,7 +19155,7 @@ name = "Disposal Vent Control"; pixel_x = -8; pixel_y = -23; - req_access_txt = "maintenance" + req_access = list(ACCESS_MAINT_TUNNELS) }, /obj/structure/window/reinforced/spawner/east, /obj/structure/railing/corner{ @@ -19295,14 +19316,16 @@ /area/crew_quarters/kitchen) "hWs" = ( /obj/machinery/door/window/northleft{ - name = "Checkpoint Desk"; - req_access_txt = "sec_basic" + name = "Checkpoint Desk" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plating, /area/security/checkpoint) "hWu" = ( @@ -20871,12 +20894,14 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Captain's Desk Door"; - req_access_txt = "captain" + name = "Captain's Desk Door" }, /obj/machinery/camera{ c_tag = "Bridge - Captain's Office" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "iLy" = ( @@ -22611,7 +22636,7 @@ name = "Privacy Shutters"; pixel_x = -28; pixel_y = 5; - req_access_txt = "detective" + req_access = list(ACCESS_DETECTIVE) }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) @@ -23102,8 +23127,9 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/door/window/northleft{ - req_access_txt = "toxins" +/obj/machinery/door/window/northleft, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins{ + dir = 1 }, /turf/open/floor/plasteel, /area/science/research) @@ -23721,7 +23747,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -24003,8 +24029,7 @@ "jVI" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; @@ -24016,12 +24041,17 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "jVO" = ( /obj/machinery/door/window/eastright{ - name = "Robotics Surgery"; - req_access_txt = "robotics" + name = "Robotics Surgery" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) @@ -26933,8 +26963,7 @@ "lkV" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26946,6 +26975,9 @@ pixel_x = -8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 4 + }, /turf/open/floor/plating, /area/medical/chemistry) "lla" = ( @@ -27162,8 +27194,10 @@ /area/crew_quarters/kitchen) "lpx" = ( /obj/machinery/door/window/eastright{ - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -27251,13 +27285,15 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "hop" + name = "Head of Personnel's Desk" }, /obj/machinery/door/window/northleft{ dir = 8; name = "Reception Window" }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) "lqH" = ( @@ -27365,7 +27401,7 @@ name = "Desk Shutters"; pixel_x = -7; pixel_y = -25; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -27389,7 +27425,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -29256,13 +29292,15 @@ /area/quartermaster/miningdock) "mkT" = ( /obj/machinery/door/window/northleft{ - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_r"; name = "Right side containment blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/engine, /area/science/xenobiology) "mkY" = ( @@ -29288,8 +29326,10 @@ name = "Right side containment blast door" }, /obj/machinery/door/window/northleft{ - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 }, /turf/open/floor/engine, /area/science/xenobiology) @@ -29317,14 +29357,14 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/machinery/button/door{ id = "rnd2"; name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 5; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/item/toy/figure/rd, /turf/open/floor/carpet/purple, @@ -31286,7 +31326,7 @@ name = "Virology Access Button"; pixel_x = -28; pixel_y = 8; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31947,7 +31987,7 @@ name = "Cell 2 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -32456,7 +32496,7 @@ name = "Virology Access Console"; pixel_x = 22; pixel_y = 8; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 6 @@ -32603,12 +32643,14 @@ }, /obj/machinery/door/window/northright{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 6 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "nCa" = ( @@ -32850,13 +32892,13 @@ /area/quartermaster/office) "nGX" = ( /obj/machinery/door/window/southleft{ - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; name = "Left side containment blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "nHe" = ( @@ -32967,12 +33009,12 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "nIK" = ( @@ -33999,8 +34041,10 @@ /area/security/courtroom) "ocx" = ( /obj/machinery/door/window/northleft{ - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -34415,7 +34459,7 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -4; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/item/deskbell/preset/med{ pixel_x = 7; @@ -34554,8 +34598,10 @@ layer = 2.9 }, /obj/machinery/door/window/eastleft{ - name = "Bar Access"; - req_access_txt = "bar" + name = "Bar Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -34649,8 +34695,10 @@ /area/hallway/primary/central) "orH" = ( /obj/machinery/door/window/eastleft{ - name = "Bar Access"; - req_access_txt = "bar" + name = "Bar Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 4 }, /turf/open/floor/carpet/black, /area/crew_quarters/bar) @@ -35726,7 +35774,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = 24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/light{ dir = 1 @@ -35737,7 +35785,7 @@ name = "Loading Doors"; pixel_x = -7; pixel_y = 24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/camera{ c_tag = "Cargo - Docking Bay North" @@ -35752,7 +35800,7 @@ /obj/machinery/button/door{ id = "xenocontainment"; name = "Xenobiology Containment Control"; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -35835,17 +35883,21 @@ "oVa" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/eastright{ - name = "Armory Desk"; - req_access_txt = "armory" + name = "Armory Desk" }, /obj/machinery/door/window/westright{ - name = "Armory Desk"; - req_access_txt = "sec_basic" + name = "Armory Desk" }, /obj/item/deskbell/preset/armory{ pixel_x = -4; pixel_y = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 4 + }, /turf/open/floor/plating, /area/security/warden) "oVc" = ( @@ -37626,7 +37678,7 @@ name = "disposals shutter control"; pixel_x = -5; pixel_y = -25; - req_access_txt = "cargo" + req_access = list(ACCESS_CARGO) }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -38304,10 +38356,12 @@ /obj/machinery/light, /obj/machinery/door/window/northleft{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "pXq" = ( @@ -38448,7 +38502,7 @@ }, /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_x = 28; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -39849,8 +39903,7 @@ base_state = "right"; dir = 0; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "ai_master" + name = "Core Modules" }, /obj/structure/window/reinforced{ dir = 4 @@ -39862,6 +39915,7 @@ /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_harmless, /obj/item/aiModule/core/freeformcore, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "qBl" = ( @@ -39933,7 +39987,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -40210,7 +40264,7 @@ name = "Cell 1 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -42226,9 +42280,9 @@ /area/medical/genetics) "rDI" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "sec_basic" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "rDM" = ( @@ -42338,13 +42392,15 @@ "rGq" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/northleft{ - name = "Armory Desk"; - req_access_txt = "armory" + name = "Armory Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plating, /area/ai_monitored/security/armory) "rGD" = ( @@ -42405,13 +42461,15 @@ "rIh" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "rIj" = ( @@ -42887,8 +42945,10 @@ /area/security/processing) "rRZ" = ( /obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - req_access_txt = "genetics" + name = "Monkey Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 }, /turf/open/floor/grass, /area/medical/genetics) @@ -42990,7 +43050,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; - req_access_txt = "experimentation" + req_access = list(ACCESS_EXPERIMENTATION) }, /turf/open/floor/plasteel/white, /area/science/explab) @@ -43712,7 +43772,7 @@ name = "Chemistry Privacy Toggle"; pixel_x = -26; pixel_y = 24; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/effect/landmark/start/chemist, /turf/open/floor/plasteel/white, @@ -45004,7 +45064,7 @@ name = "Bar Shutters Control"; pixel_x = -4; pixel_y = 33; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -46069,13 +46129,15 @@ /area/engine/atmos) "tkH" = ( /obj/machinery/door/window/westleft{ - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "xenocontainment"; name = "containment chamber blastdoor" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "tlj" = ( @@ -46543,8 +46605,7 @@ "tub" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/item/deskbell/preset/sec{ pixel_x = -5; @@ -46560,6 +46621,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "tum" = ( @@ -46748,7 +46812,7 @@ name = "Desk Privacy Shutters Control"; pixel_x = 4; pixel_y = 24; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 5 @@ -47103,7 +47167,7 @@ name = "Surgery shutters"; pixel_x = -24; pixel_y = 6; - req_access_txt = "surgery" + req_access = list(ACCESS_SURGERY) }, /obj/machinery/button/holosign{ id = "surgery_b"; @@ -47538,7 +47602,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -47766,7 +47830,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access_txt = "psychology" + req_access = list(ACCESS_PSYCHOLOGY) }, /obj/effect/landmark/start/yogs/psychiatrist, /turf/open/floor/carpet, @@ -48161,8 +48225,10 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Secure Board Storage"; - req_access_txt = "ai_master" + name = "Secure Board Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -48196,7 +48262,7 @@ name = "Armory Shutters"; pixel_x = -5; pixel_y = -25; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /obj/machinery/light_switch{ pixel_x = 8; @@ -48787,7 +48853,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "paramedic" + req_access = list(ACCESS_PARAMEDIC) }, /obj/machinery/computer/med_data{ dir = 8 @@ -50775,14 +50841,14 @@ name = "Gift Shop Internal Shutters"; pixel_x = 26; pixel_y = 24; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; pixel_y = 24; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /obj/structure/table/wood, /obj/machinery/power/apc{ @@ -53853,12 +53919,14 @@ dir = 1; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "ai_master" + name = "Upload Console Window" }, /obj/machinery/computer/upload/ai{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "wwU" = ( @@ -53887,8 +53955,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/southright{ - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistryshutter"; @@ -53898,6 +53965,7 @@ pixel_x = 8; pixel_y = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry, /turf/open/floor/plating, /area/medical/chemistry) "wxH" = ( @@ -54506,7 +54574,7 @@ id = "lawyerprivate"; pixel_x = 24; pixel_y = -8; - req_access_txt = "lawyer" + req_access = list(ACCESS_LAWYER) }, /turf/open/floor/wood, /area/lawoffice) @@ -55245,7 +55313,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = -24; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57523,8 +57591,10 @@ network = list("ss13","Secure") }, /obj/machinery/door/window/eastright{ - name = "Secure Board Storage"; - req_access_txt = "secure_tech" + name = "Secure Board Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/secure_tech{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -86068,7 +86138,7 @@ bHj bHj bHj xSu -ylr +xSu akr rhx oDt @@ -86322,7 +86392,7 @@ xSu bHj bHj bHj -xSu +akr akr kal akr diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 188b942bac68..75df3b315cb5 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -545,34 +545,34 @@ name = "CMO Privacy Shutters Control"; pixel_x = 23; pixel_y = -10; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/button/door{ id = "cloning_shutters"; name = "cloning shutters"; pixel_x = 33; pixel_y = 10; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/button/door{ id = "genetics_shutters"; name = "genetics shutters"; pixel_x = 33; pixel_y = -10; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/button/door{ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_x = 36; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; pixel_x = 23; pixel_y = 10; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) @@ -2098,8 +2098,10 @@ /obj/machinery/door/window/eastright{ base_state = "left"; icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "sec_basic" + name = "Security Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 4 }, /turf/open/floor/plasteel, /area/security/processing) @@ -2272,8 +2274,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Isolation B"; - req_access_txt = "virology" + name = "Isolation B" }, /obj/effect/turf_decal/trimline/green/filled/line/lower, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2282,6 +2283,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "bdl" = ( @@ -4072,7 +4076,7 @@ name = "Virology Access Console"; pixel_x = -23; pixel_y = 24; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/structure/disposalpipe/segment{ dir = 10 @@ -4717,14 +4721,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -4764,7 +4768,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = 1; pixel_y = 23; - req_access_txt = "clerk" + req_access = list(ACCESS_CLERK) }, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/five, @@ -5072,12 +5076,14 @@ /obj/machinery/door/window/westleft{ dir = 4; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "ai_master" + name = "Cyborg Upload Console Window" }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "cyn" = ( @@ -5086,7 +5092,7 @@ name = "Disposal Vent Control"; pixel_x = 4; pixel_y = -25; - req_access_txt = "maintenance" + req_access = list(ACCESS_MAINT_TUNNELS) }, /obj/machinery/button/massdriver{ id = "trash"; @@ -5645,9 +5651,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/northleft{ - req_access_txt = "security"; name = "Brig Desk" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/security/brig) "cIZ" = ( @@ -6518,7 +6526,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/machinery/chem_master, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ @@ -6860,7 +6868,7 @@ name = "Armory Shutters"; pixel_x = -24; pixel_y = 7; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -6984,8 +6992,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -6999,6 +7006,7 @@ pixel_x = 8; pixel_y = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry, /turf/open/floor/plating, /area/medical/chemistry) "dmY" = ( @@ -7354,7 +7362,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 24; - req_access_txt = "eva" + req_access = list(ACCESS_EVA) }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -7991,7 +7999,7 @@ name = "Privacy Shutters"; pixel_x = 25; pixel_y = 8; - req_access_txt = "sec_basic" + req_access = list(ACCESS_SEC_BASIC) }, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine{ @@ -8684,8 +8692,7 @@ /obj/machinery/door/window/northright{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/toxin{ @@ -8697,6 +8704,9 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "efl" = ( @@ -9765,7 +9775,7 @@ name = "Secure Storage Toggle"; pixel_x = -8; pixel_y = -23; - req_access_txt = "engine_equip" + req_access = list(ACCESS_ENGINE_EQUIP) }, /obj/structure/closet/radiation{ anchored = 1 @@ -10110,7 +10120,7 @@ name = "Warehouse Door Control"; pixel_x = -25; pixel_y = 7; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/camera{ c_tag = "Cargo Bay East"; @@ -10180,7 +10190,7 @@ normaldoorcontrol = 1; pixel_x = -6; pixel_y = -2; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/item/storage/pencil_holder/crew, /turf/open/floor/plasteel/white, @@ -10816,7 +10826,7 @@ name = "Incinerator Access Console"; pixel_x = -24; pixel_y = -6; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -11287,8 +11297,7 @@ "flO" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11296,6 +11305,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hydroponics) "fme" = ( @@ -11567,7 +11579,7 @@ name = "Kitchen Shutters Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -11862,7 +11874,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 1; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, @@ -13195,8 +13207,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ dir = 2; - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -13210,6 +13221,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/office) "gfF" = ( @@ -14165,7 +14177,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 11; pixel_y = -22; - req_access_txt = "rnd_servers" + req_access = list(ACCESS_RND_SERVERS) }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_exterior"; @@ -14173,7 +14185,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "rnd_servers" + req_access = list(ACCESS_RND_SERVERS) }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -14181,7 +14193,7 @@ idSelf = "secondary_aicore_controller"; name = "Secondary AI Core Access Console"; pixel_y = -24; - req_access_txt = "rnd_servers" + req_access = list(ACCESS_RND_SERVERS) }, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) @@ -14699,7 +14711,7 @@ name = "Loading Doors"; pixel_x = -8; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor"; @@ -14707,7 +14719,7 @@ name = "Loading Doors"; pixel_x = 8; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -14837,7 +14849,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 7; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -15236,7 +15248,7 @@ /obj/machinery/button/door{ id = "teleshutter"; name = "Teleporter Shutter Control"; - req_access_txt = "teleporter" + req_access = list(ACCESS_TELEPORTER) }, /turf/closed/wall/r_wall, /area/teleporter) @@ -15265,8 +15277,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/fire{ @@ -15278,6 +15289,9 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "hjv" = ( @@ -16763,7 +16777,7 @@ name = "Toxins airlock control"; pixel_x = 24; pixel_y = 24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -16772,7 +16786,7 @@ name = "Toxins airlock control"; pixel_x = -24; pixel_y = 24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -17065,8 +17079,10 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen 2"; - req_access_txt = "xenobiology" + name = "Containment Pen 2" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -17525,7 +17541,7 @@ name = "privacy shutters"; pixel_x = -22; pixel_y = 23; - req_access_txt = "paramedic" + req_access = list(ACCESS_PARAMEDIC) }, /turf/open/floor/plasteel/white, /area/medical/paramedic) @@ -17672,8 +17688,10 @@ }, /obj/machinery/door/window/southleft{ dir = 8; - name = "Virology"; - req_access_txt = "virology" + name = "Virology" + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -18009,8 +18027,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/o2{ @@ -18025,6 +18042,9 @@ /obj/structure/sign/departments/medbay/alt{ pixel_x = -33 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "iwN" = ( @@ -18086,7 +18106,7 @@ name = "Desk Shutters"; pixel_x = -26; pixel_y = 6; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/structure/cable{ icon_state = "1-2" @@ -18366,7 +18386,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 10; pixel_y = -22; - req_access_txt = "rnd_servers" + req_access = list(ACCESS_RND_SERVERS) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -18555,7 +18575,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -18655,7 +18675,7 @@ name = "Shutters Control Button"; pixel_x = -26; pixel_y = 4; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/camera{ c_tag = "Robotics Lab - South"; @@ -18831,7 +18851,7 @@ name = "Virology Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/machinery/doorButtons/access_button{ idDoor = "virology_airlock_interior"; @@ -18839,7 +18859,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 10; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -19089,12 +19109,12 @@ dir = 2; icon_state = "right"; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "brig_phys" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/brig) "iXH" = ( @@ -19418,7 +19438,7 @@ id = "medpriv_shutters"; name = "medbay storage shutters"; pixel_x = -24; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -19915,8 +19935,10 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Containment Pen 2"; - req_access_txt = "xenobiology" + name = "Containment Pen 2" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -20069,8 +20091,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -20084,6 +20105,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "jAf" = ( @@ -21059,6 +21083,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle, /area/hallway/secondary/entry) "jXr" = ( @@ -21202,6 +21229,9 @@ /obj/effect/turf_decal/trimline/white/filled/line/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "kbY" = ( @@ -21403,7 +21433,7 @@ name = "Bridge Blast Door Control"; pixel_x = -7; pixel_y = -34; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/structure/chair/comfy/black{ dir = 4; @@ -21921,7 +21951,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "surgery" + req_access = list(ACCESS_SURGERY) }, /obj/machinery/button/holosign{ id = "surgery"; @@ -22185,8 +22215,7 @@ }, /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22194,6 +22223,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plating, /area/chapel/office) "kEF" = ( @@ -23618,8 +23650,7 @@ "lmr" = ( /obj/machinery/door/window/westleft{ dir = 1; - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/hydroponics{ @@ -23630,6 +23661,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "lmw" = ( @@ -25543,9 +25577,9 @@ "mki" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Atmospherics Canister Storage"; - req_access_txt = "atmospherics" + name = "Atmospherics Canister Storage" }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos, /turf/open/floor/plasteel/dark, /area/engine/atmos/storage) "mko" = ( @@ -26397,7 +26431,7 @@ name = "Space Shutters Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/light_switch{ pixel_x = -24; @@ -27271,13 +27305,15 @@ "neu" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; name = "security shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "new" = ( @@ -28115,8 +28151,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ dir = 2; - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -28126,6 +28161,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/office) "nzI" = ( @@ -28202,7 +28238,7 @@ name = "cloning shutters"; pixel_x = -25; pixel_y = 9; - req_access_txt = "cloning;genetics" + req_access = list(ACCESS_CLONING) }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) @@ -29192,7 +29228,7 @@ name = "Bar Shutters Control"; pixel_x = -8; pixel_y = 22; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) @@ -30650,8 +30686,7 @@ }, /obj/machinery/door/window/westleft{ dir = 2; - name = "Paramedic Desk"; - req_access_txt = "paramedic" + name = "Paramedic Desk" }, /obj/item/deskbell/preset/paramedic{ pixel_x = 9; @@ -30661,6 +30696,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "oQr" = ( @@ -30714,6 +30750,9 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "oRt" = ( @@ -31381,14 +31420,16 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Engineering Desk"; - req_access_txt = "engineering" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = 8; pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/foyer) "pjL" = ( @@ -31509,7 +31550,7 @@ name = "privacy shutters"; pixel_x = -55; pixel_y = 6; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/open/floor/plasteel/white, /area/medical/storage) @@ -31965,7 +32006,7 @@ name = "E.V.A. Storage Shutter Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "eva" + req_access = list(ACCESS_EVA) }, /obj/machinery/light_switch{ pixel_x = -24; @@ -32079,8 +32120,7 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "ai_master" + name = "Core Modules" }, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/ai_monitored/turret_protected/ai_upload"; @@ -32099,6 +32139,7 @@ /obj/effect/spawner/lootdrop/aimodule_harmless, /obj/item/aiModule/core/freeformcore, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "pBa" = ( @@ -32478,8 +32519,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "hop" + name = "Head of Personnel's Desk" }, /obj/machinery/flasher{ id = "hopflash"; @@ -32493,6 +32533,9 @@ pixel_x = -8; pixel_y = -4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) "pKU" = ( @@ -33823,8 +33866,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 8; - name = "Atmospherics Desk"; - req_access_txt = "atmospherics" + name = "Atmospherics Desk" }, /obj/item/deskbell/preset/atmos{ pixel_x = 8; @@ -33838,6 +33880,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/atmos/storage) "qnX" = ( @@ -34284,7 +34329,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/light_switch{ pixel_x = -24; @@ -34438,7 +34483,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = -24; - req_access_txt = "chapel_office"; + req_access = list(ACCESS_CHAPEL_OFFICE); pixel_y = -4 }, /turf/open/floor/plating, @@ -34683,7 +34728,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34730,7 +34775,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ id = "outerbrig"; @@ -34738,7 +34783,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/structure/cable{ icon_state = "1-2" @@ -34784,6 +34829,9 @@ /turf/open/floor/plasteel, /area/security/prison) "qSn" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 1 }, @@ -34898,7 +34946,7 @@ name = "Incinerator airlock control"; pixel_x = 22; pixel_y = -10; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -34928,8 +34976,7 @@ "qVY" = ( /obj/machinery/door/window/southleft{ dir = 1; - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/effect/turf_decal/loading_area, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -34937,6 +34984,9 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "qWh" = ( @@ -35026,8 +35076,7 @@ /obj/machinery/door/window/northright{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/brute{ @@ -35039,6 +35088,9 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "qZz" = ( @@ -35926,8 +35978,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35945,6 +35996,7 @@ pixel_x = -10; pixel_y = 12 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "rsW" = ( @@ -36017,7 +36069,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = 10; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -36066,8 +36118,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ dir = 1; - name = "Security Checkpoint"; - req_access_txt = "sec_basic" + name = "Security Checkpoint" }, /obj/item/paper_bin{ pixel_x = 1; @@ -36078,6 +36129,9 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plating, /area/security/checkpoint/customs) "rvK" = ( @@ -36269,8 +36323,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Isolation A"; - req_access_txt = "virology" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -36278,6 +36331,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "rBc" = ( @@ -36768,8 +36824,7 @@ /area/medical/medbay/central) "rNW" = ( /obj/machinery/door/window/southleft{ - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -36777,6 +36832,7 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "rOc" = ( @@ -37382,7 +37438,7 @@ name = "Warehouse Door Control"; pixel_x = 25; pixel_y = 7; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -37548,7 +37604,7 @@ name = "genetics shutters"; pixel_x = -25; pixel_y = 9; - req_access_txt = "genetics" + req_access = list(ACCESS_GENETICS) }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -38100,13 +38156,13 @@ "sus" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Monkey Pen"; - req_access_txt = "genetics" + name = "Monkey Pen" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "suz" = ( @@ -38252,8 +38308,10 @@ /obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/door/window/southleft{ - dir = 8; - req_access_txt = "virology" + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 }, /turf/open/floor/grass, /area/medical/virology) @@ -38795,8 +38853,7 @@ "sOU" = ( /obj/machinery/door/window/southright{ dir = 8; - name = "Research and Development Desk"; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + name = "Research and Development Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -38817,6 +38874,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 8 + }, /turf/open/floor/plating, /area/science/lab) "sPf" = ( @@ -39279,14 +39339,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; pixel_y = -2; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/structure/chair/office/dark, /turf/open/floor/plasteel/showroomfloor, @@ -39311,7 +39371,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -39491,7 +39551,7 @@ name = "disposals shutter control"; pixel_x = -24; pixel_y = 9; - req_access_txt = "cargo" + req_access = list(ACCESS_CARGO) }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -40203,7 +40263,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -40342,8 +40402,7 @@ "tCk" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -40351,6 +40410,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hydroponics) "tCL" = ( @@ -41447,14 +41509,14 @@ name = "Turbine Vent Control"; pixel_x = -25; pixel_y = 8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = -25; pixel_y = -9; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -42032,6 +42094,13 @@ }, /turf/open/space/basic, /area/solar/port/aft) +"uwC" = ( +/obj/effect/turf_decal/trimline/white/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "uwH" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 @@ -42434,8 +42503,10 @@ "uGY" = ( /obj/machinery/door/window/northright{ dir = 4; - name = "Library Desk Door"; - req_access_txt = "library" + name = "Library Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 4 }, /turf/open/floor/wood, /area/library) @@ -43193,8 +43264,7 @@ /area/hallway/primary/central) "uZq" = ( /obj/machinery/door/window/southleft{ - name = "Armory"; - req_access_txt = "armory" + name = "Armory" }, /obj/structure/cable{ icon_state = "1-2" @@ -43204,6 +43274,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "uZr" = ( @@ -43408,6 +43479,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"vdy" = ( +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "vdK" = ( /obj/machinery/light_switch{ pixel_x = 24; @@ -43526,7 +43601,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = 5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/structure/table/optable, /obj/item/storage/backpack/duffelbag/sec/surgery{ @@ -44052,14 +44127,16 @@ "vrw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/item/restraints/handcuffs, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; name = "security shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "vry" = ( @@ -44140,7 +44217,7 @@ id = "armory_eva"; name = "Armory Shutters"; pixel_x = 24; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -44790,7 +44867,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = 8; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/item/paper_bin{ pixel_x = 4; @@ -44920,9 +44997,9 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Armory"; - req_access_txt = "armory" + name = "Armory" }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "vNF" = ( @@ -44987,12 +45064,14 @@ dir = 4; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "ai_master" + name = "Upload Console Window" }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "vPc" = ( @@ -45340,6 +45419,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"vZA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "vZM" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner/lower{ dir = 4 @@ -46055,7 +46143,7 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_y = -24; - req_access_txt = "detective" + req_access = list(ACCESS_DETECTIVE) }, /turf/open/floor/wood, /area/security/detectives_office) @@ -46148,12 +46236,14 @@ "wte" = ( /obj/machinery/door/window/southleft{ dir = 8; - name = "Mass Driver Door"; - req_access_txt = "toxins" + name = "Mass Driver Door" }, /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/mixing) "wtt" = ( @@ -46291,8 +46381,10 @@ /obj/machinery/door/firedoor/border_only, /obj/item/storage/pencil_holder/crew, /obj/machinery/door/window/northright{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plating, /area/security/brig) @@ -46694,8 +46786,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Genetics Desk"; - req_access_txt = "genetics" + name = "Genetics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "genetics_shutters"; @@ -46705,6 +46796,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/genetics) "wIy" = ( @@ -47611,8 +47705,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "brig_phys" + red_alert_access = 1 }, /obj/structure/closet/crate/freezer/blood, /obj/machinery/iv_drip, @@ -47624,6 +47717,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/brig) "xeH" = ( @@ -47763,18 +47857,20 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Desk"; - req_access_txt = "armory" + name = "Armory Desk" }, /obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "sec_basic" + name = "Reception Desk" }, /obj/item/deskbell/preset/warden{ pixel_x = 10; pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plating, /area/security/warden) "xhD" = ( @@ -48290,6 +48386,9 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "xus" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 1 }, @@ -48731,7 +48830,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "rnd_servers" + req_access = list(ACCESS_RND_SERVERS) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -92722,7 +92821,7 @@ vvd vmy vvd qSn -nPi +uwC vvd atx pnP @@ -92979,7 +93078,7 @@ qub wcy lzE jWH -lzE +vZA oAE nVD kMw @@ -93236,7 +93335,7 @@ mPt vvd vvd xus -vvd +vdy rRY atx pnP From 4bbc2820fc5a58421c18e81853998bcaddb68317 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 12:12:07 +0200 Subject: [PATCH 33/48] ballin --- .../AsteroidStation/AsteroidStation.dmm | 11 +- _maps/map_files/DonutStation/DonutStation.dmm | 8 +- _maps/map_files/GaxStation/GaxStation.dmm | 17 +- _maps/map_files/IceMeta/IceMeta.dmm | 27 +- _maps/map_files/YogStation/YogStation.dmm | 245 ++++++++++-------- 5 files changed, 180 insertions(+), 128 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 16e3db4f5ee0..44e269a85be3 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -4530,7 +4530,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/mapping_helpers/windoor/access/all/security/basic{ +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ dir = 1 }, /turf/open/floor/plating, @@ -33196,7 +33199,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "juW" = ( @@ -72399,7 +72403,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "vwp" = ( diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 95eb58914d1c..fc55ae7d5449 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -19323,7 +19323,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/windoor/access/all/security/basic{ +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ dir = 1 }, /turf/open/floor/plating, @@ -35599,7 +35602,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint) "oOW" = ( diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 75df3b315cb5..67c676406228 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -14105,7 +14105,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/department/bridge) "gCc" = ( @@ -24384,7 +24385,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "lEH" = ( @@ -31762,7 +31764,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "pqj" = ( @@ -32403,7 +32406,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "pHQ" = ( @@ -36129,7 +36133,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/windoor/access/all/security/basic{ +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ dir = 1 }, /turf/open/floor/plating, diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 1f32e36460a2..0db2c723c681 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -480,11 +480,16 @@ }, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Security Desk"; - req_access_txt = "sec_basic" + name = "Security Desk" }, /obj/item/folder/red, /obj/item/pen, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "agB" = ( @@ -37284,6 +37289,12 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/table/reinforced, /obj/item/paper, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/hallway/primary/port) "kPy" = ( @@ -40037,7 +40048,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "lHV" = ( @@ -49194,7 +49206,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "oeF" = ( @@ -56039,8 +56052,7 @@ "qic" = ( /obj/machinery/door/window/brigdoor{ name = "Arrivals Security Checkpoint"; - pixel_y = -8; - req_access_txt = "sec_basic" + pixel_y = -8 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, /mob/living/simple_animal/crab/kreb{ @@ -76436,7 +76448,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/port/fore) "vTj" = ( diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index ab613610178e..ec77ff2846e3 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -354,14 +354,14 @@ name = "Cell 5 Blast Door Control"; pixel_x = -28; pixel_y = 8; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "cell4 blast"; name = "Cell 4 Blast Door Control"; pixel_x = -28; pixel_y = -8; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison) @@ -2793,14 +2793,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; pixel_y = -2; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -5133,7 +5133,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "aKY" = ( @@ -6338,8 +6339,10 @@ "aTc" = ( /obj/machinery/door/window/northright{ dir = 8; - name = "Library Desk Door"; - req_access_txt = "library" + name = "Library Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 8 }, /turf/open/floor/wood, /area/library) @@ -7695,13 +7698,15 @@ "bfo" = ( /obj/machinery/door/window/eastright{ dir = 1; - name = "Bridge Delivery"; - req_access_txt = "command" + name = "Bridge Delivery" }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/bridge/meeting_room) "bfr" = ( @@ -10972,7 +10977,8 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/port/fore) "bHo" = ( @@ -12446,8 +12452,7 @@ "bWn" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/eastleft{ - dir = 8; - req_access_txt = "genetics" + dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "genedesk"; @@ -12463,6 +12468,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/genetics) "bWr" = ( @@ -13156,14 +13164,19 @@ /obj/item/paper, /obj/machinery/door/window/westright{ dir = 1; - name = "Security Checkpoint"; - req_access_txt = "sec_basic" + name = "Security Checkpoint" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/hallway/secondary/entry) "cfY" = ( @@ -15333,10 +15346,12 @@ /area/science/robotics/lab) "cIg" = ( /obj/machinery/door/window/eastright{ - name = "Hydroponics Delivery"; - req_access_txt = "hydroponics" + name = "Hydroponics Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hydroponics) "cIh" = ( @@ -19259,9 +19274,9 @@ dir = 8 }, /obj/machinery/door/window/southleft{ - name = "Kitchen Delivery"; - req_access_txt = "kitchen" + name = "Kitchen Delivery" }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "ecK" = ( @@ -20101,8 +20116,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ dir = 8; - name = "Bar Delivery"; - req_access_txt = "bar" + name = "Bar Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -22631,9 +22648,9 @@ /obj/effect/turf_decal/ramp_middle, /obj/machinery/door/window/northleft{ dir = 2; - name = "Captain's Desk Door"; - req_access_txt = "captain" + name = "Captain's Desk Door" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/crew_quarters/heads/captain) "fiE" = ( @@ -23916,8 +23933,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -23927,6 +23943,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/chemistry) "fFW" = ( @@ -27498,13 +27517,13 @@ /area/janitor) "gVS" = ( /obj/machinery/door/window/southleft{ - name = "Virology"; - req_access_txt = "virology" + name = "Virology" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "gWj" = ( @@ -29267,20 +29286,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/storage) -"hAT" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_l"; - name = "Left side containment blast door" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - name = "Containment Pen"; - req_access_txt = "xenobiology" - }, -/turf/open/floor/engine, -/area/science/xenobiology) "hBe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -30888,13 +30893,15 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ dir = 1; - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "ibx" = ( @@ -32224,8 +32231,7 @@ /obj/structure/table/glass, /obj/machinery/door/window/northright{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/item/storage/firstaid/fire{ pixel_x = 3; @@ -32237,6 +32243,9 @@ pixel_y = -3 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "iyy" = ( @@ -34803,7 +34812,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison/hallway) @@ -36001,9 +36010,9 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Captain's Desk Door"; - req_access_txt = "captain" + name = "Captain's Desk Door" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide2, /area/crew_quarters/heads/captain) "jRq" = ( @@ -36169,7 +36178,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/service) "jVe" = ( @@ -38401,7 +38411,7 @@ name = "Visitation Shutters"; pixel_x = -6; pixel_y = 36; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "visitorflash"; @@ -39869,14 +39879,16 @@ "lpP" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_r"; name = "Right side containment blast door" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "lpU" = ( @@ -40119,8 +40131,7 @@ /area/ai_monitored/storage/satellite) "lvD" = ( /obj/machinery/door/window/southleft{ - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -40128,6 +40139,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "lvP" = ( @@ -40698,8 +40710,7 @@ "lIR" = ( /obj/machinery/door/window/southleft{ dir = 1; - name = "Test Chamber"; - req_access_txt = "xenobiology" + name = "Test Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; @@ -40709,6 +40720,9 @@ dir = 1 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/engine, /area/science/xenobiology) "lJt" = ( @@ -42920,8 +42934,7 @@ "mzr" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -42931,6 +42944,9 @@ pixel_x = -8; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "mzu" = ( @@ -43280,8 +43296,7 @@ /area/tcommsat/server) "mEa" = ( /obj/machinery/door/window/brigdoor/eastright{ - dir = 2; - req_access_txt = "xenobiology" + dir = 2 }, /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -43302,6 +43317,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "mEe" = ( @@ -50928,7 +50944,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_y = -26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison) @@ -51791,8 +51807,7 @@ /obj/structure/table/glass, /obj/machinery/door/window/northleft{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/item/storage/firstaid/toxin{ pixel_x = 3; @@ -51804,6 +51819,9 @@ pixel_y = -3 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "pKz" = ( @@ -52747,8 +52765,7 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "Monkey Pen"; - req_access_txt = "virology" + name = "Monkey Pen" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52766,6 +52783,9 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "qbH" = ( @@ -54923,8 +54943,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "hop" + name = "Head of Personnel's Desk" }, /obj/machinery/flasher{ id = "hopflash"; @@ -54944,6 +54963,9 @@ pixel_x = -6; pixel_y = -5 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "qQa" = ( @@ -55365,17 +55387,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"qXB" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "xenobiology" - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "qXS" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass{ @@ -58933,8 +58944,10 @@ }, /obj/machinery/door/window/brigdoor/northright{ name = "Filing Room"; - opacity = 1; - req_access_txt = "psychology" + opacity = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology{ + dir = 1 }, /turf/open/floor/wood, /area/medical/psych) @@ -61295,7 +61308,7 @@ id = "xenodesk"; name = "Xenobiology Desk Shutters Control"; pixel_x = -28; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 9 @@ -62405,7 +62418,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; - req_access_txt = "experimentation" + req_access = list(ACCESS_EXPERIMENTATION) }, /turf/open/floor/plasteel/white, /area/science/explab) @@ -64368,8 +64381,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/eastright{ dir = 1; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -64379,6 +64391,9 @@ pixel_x = -8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "upb" = ( @@ -64497,7 +64512,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_y = -26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison) @@ -64888,7 +64903,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -23; pixel_y = 6; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/machinery/camera{ c_tag = "Telecomms Server Room Access"; @@ -65368,7 +65383,7 @@ name = "Privacy Shutters"; pixel_x = -6; pixel_y = 8; - req_access_txt = "detective" + req_access = list(ACCESS_DETECTIVE) }, /turf/open/floor/carpet, /area/security/detectives_office) @@ -65509,7 +65524,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_y = -26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison) @@ -65677,7 +65692,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/effect/turf_decal/trimline/neutral/filled/line/lower{ @@ -65714,7 +65729,7 @@ id = "viropen"; name = "Monkey Pen Shutters"; pixel_x = -24; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -67062,8 +67077,10 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67352,13 +67369,16 @@ /turf/open/floor/engine, /area/science/xenobiology) "vtX" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, /obj/machinery/door/window/northleft{ dir = 4; name = "Containment Pen"; req_access_txt = "xenobiology" }, -/obj/effect/turf_decal/loading_area{ - dir = 8 +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67669,7 +67689,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = 24; - req_access_txt = "aux_base" + req_access = list(ACCESS_AUX_BASE) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -68163,7 +68183,7 @@ name = "Biohazard Shutter Control"; pixel_x = 6; pixel_y = 8; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/item/storage/pencil_holder/crew/fancy{ pixel_x = -8; @@ -68252,7 +68272,7 @@ name = "Incinerator airlock control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -68595,7 +68615,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -69606,7 +69626,7 @@ name = "CMO Privacy Shutters Control"; pixel_x = 7; pixel_y = 24; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -70712,8 +70732,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/engine, /area/science/xenobiology) @@ -71133,7 +71155,7 @@ name = "Cell 6 Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel, /area/security/prison) @@ -74360,17 +74382,18 @@ /turf/open/floor/plasteel, /area/security/main) "xZv" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - name = "Containment Pen"; - req_access_txt = "xenobiology" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; name = "Left side containment blast door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "xZC" = ( @@ -119944,10 +119967,10 @@ wbN xZv rgh kOd -hAT +xZv rgh wbN -hAT +xZv piv bDb aaa @@ -120201,10 +120224,10 @@ cTn vtX piv cTn -qXB +vtX piv kcH -qXB +vtX piv bDb aaa From eebca9f08e12ff14d3eada58cc99b04e8b49d09a Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 12:40:36 +0200 Subject: [PATCH 34/48] ballin --- _maps/map_files/YogStation/YogStation.dmm | 423 +++++++++++++--------- 1 file changed, 251 insertions(+), 172 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index ec77ff2846e3..a301fa029c17 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -1227,10 +1227,10 @@ /area/engine/foyer) "aiw" = ( /obj/machinery/door/window/southleft{ - name = "Engineering Delivery"; - req_access_txt = "engineering" + name = "Engineering Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general, /turf/open/floor/plasteel, /area/maintenance/port/aft) "aiy" = ( @@ -1400,9 +1400,9 @@ /area/crew_quarters/heads/hos) "ajR" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "security" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "ajX" = ( @@ -2319,8 +2319,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Prison Security Post"; - req_access_txt = "brig" + name = "Prison Security Post" }, /obj/structure/cable{ icon_state = "4-8" @@ -2331,6 +2330,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "aqO" = ( @@ -4133,7 +4133,7 @@ name = "Desk Shutters"; pixel_x = -26; pixel_y = 6; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/flasher{ id = "brigentry"; @@ -4504,8 +4504,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/window{ dir = 8; - name = "High-Risk Modules"; - req_access_txt = "ai_master" + name = "High-Risk Modules" }, /obj/item/aiModule/supplied/oxygen, /obj/item/aiModule/supplied/protectStation, @@ -4513,6 +4512,9 @@ /obj/item/aiModule/reset/purge, /obj/item/aiModule/supplied/quarantine, /obj/effect/spawner/lootdrop/aimodule_harmful, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 8 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aHl" = ( @@ -5478,7 +5480,7 @@ name = "Privacy Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /obj/machinery/camera{ c_tag = "Kitchen South"; @@ -7889,7 +7891,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -9261,8 +9263,10 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plating, /area/security/brig) @@ -10851,7 +10855,7 @@ name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = 10; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -11239,10 +11243,10 @@ /area/science/mixing) "bKf" = ( /obj/machinery/door/window/southleft{ - name = "Mass Driver Door"; - req_access_txt = "toxins" + name = "Mass Driver Door" }, /obj/effect/turf_decal/loading_area, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "bKr" = ( @@ -12834,7 +12838,7 @@ normaldoorcontrol = 1; pixel_x = 26; pixel_y = 26; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; @@ -12845,7 +12849,7 @@ name = "Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -13003,13 +13007,15 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - name = "Atmospherics Delivery"; - req_access_txt = "atmospherics" + name = "Atmospherics Delivery" }, /obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos/foyer) "cek" = ( @@ -13318,7 +13324,7 @@ name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = -7; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -13841,8 +13847,7 @@ /area/maintenance/starboard/aft) "cna" = ( /obj/machinery/door/window/eastleft{ - name = "Medical Delivery"; - req_access_txt = "medical" + name = "Medical Delivery" }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -13851,6 +13856,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cnh" = ( @@ -14070,7 +14078,7 @@ name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/light_switch{ pixel_x = -6; @@ -15019,7 +15027,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/effect/turf_decal/trimline/chemorange/warning/lower, /obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ @@ -15237,8 +15245,7 @@ /obj/structure/rack, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, /obj/item/gun/energy/disabler{ pixel_x = -4; @@ -15264,6 +15271,9 @@ pixel_x = 2; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "cGS" = ( @@ -16195,7 +16205,7 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 28; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -17160,7 +17170,7 @@ name = "Space Shutters Control"; pixel_x = -26; pixel_y = 34; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) @@ -17487,7 +17497,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "surgery" + req_access = list(ACCESS_SURGERY) }, /obj/machinery/button/holosign{ id = "surgery"; @@ -18491,7 +18501,7 @@ id = "captain blast"; name = "Privacy Shutters Control"; pixel_x = 5; - req_access_txt = "captain" + req_access = list(ACCESS_CAPTAIN) }, /turf/open/floor/stone, /area/crew_quarters/heads/captain) @@ -18617,14 +18627,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/light_switch{ pixel_x = -4; @@ -19321,7 +19331,7 @@ name = "Counter Shutters Control"; pixel_x = -25; pixel_y = 24; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /obj/machinery/light_switch{ pixel_x = -25; @@ -19332,7 +19342,7 @@ name = "Window Shutters Control"; pixel_x = -25; pixel_y = 32; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -19448,7 +19458,7 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/recharger/wallrecharger{ pixel_x = -22; @@ -19622,7 +19632,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "paramedic" + req_access = list(ACCESS_PARAMEDIC) }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -20302,8 +20312,7 @@ /area/ai_monitored/storage/satellite) "evg" = ( /obj/machinery/door/window/southleft{ - name = "Armory"; - req_access_txt = "armory" + name = "Armory" }, /obj/effect/turf_decal/stripes{ dir = 10 @@ -20317,6 +20326,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "evq" = ( @@ -22335,12 +22345,14 @@ dir = 1; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "ai_master" + name = "Upload Console Window" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "fer" = ( @@ -22513,7 +22525,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -22530,7 +22542,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/item/folder/white{ pixel_x = 4; @@ -24206,14 +24218,14 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/button/door{ id = "tcomms_bridge"; name = "Telecommunications Shutter Control"; pixel_x = 28; pixel_y = -2; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/structure/chair/comfy/black{ dir = 1; @@ -25819,8 +25831,7 @@ "gqZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Hydroponics Window"; - req_access_txt = "hydroponics" + name = "Hydroponics Window" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -25828,12 +25839,17 @@ }, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Kitchen Window"; - req_access_txt = "kitchen" + name = "Kitchen Window" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 8 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "gri" = ( @@ -26013,8 +26029,7 @@ name = "security shutters" }, /obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/item/restraints/handcuffs, /obj/item/radio/off, @@ -26024,6 +26039,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "gus" = ( @@ -26159,7 +26177,7 @@ id = "Shuttle Construction Storage"; name = "Shuttle Construction Storage"; pixel_x = 24; - req_access_txt = "aux_base" + req_access = list(ACCESS_AUX_BASE) }, /obj/effect/turf_decal/delivery, /obj/structure/closet/emcloset, @@ -26226,7 +26244,7 @@ name = "Biohazard Shutter Control"; pixel_x = 29; pixel_y = -4; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -26329,7 +26347,7 @@ name = "Counter Shutters Control"; pixel_x = -27; pixel_y = -5; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -26490,8 +26508,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - name = "Atmospherics Desk"; - req_access_txt = "atmospherics" + name = "Atmospherics Desk" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -26510,6 +26527,9 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/atmos/foyer) "gFf" = ( @@ -27414,7 +27434,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -28519,8 +28539,10 @@ /obj/item/clothing/suit/armor/laserproof, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -28595,7 +28617,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/structure/cable{ icon_state = "1-2" @@ -29939,7 +29961,7 @@ name = "Armory Shutters"; pixel_x = 23; pixel_y = -22; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -30038,9 +30060,9 @@ max_integrity = 350 }, /obj/machinery/door/window/brigdoor{ - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "hOu" = ( @@ -30087,7 +30109,7 @@ name = "Privacy Shutters"; pixel_x = -9; pixel_y = -20; - req_access_txt = "lawyer" + req_access = list(ACCESS_LAWYER) }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -31057,8 +31079,10 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "SMES Access"; - req_access_txt = "engine_equip" + name = "SMES Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) @@ -31715,7 +31739,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -32645,14 +32669,14 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 10; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 24; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -32660,7 +32684,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = -10; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) @@ -32910,7 +32934,7 @@ id = "cmo"; name = "CMO Privacy Shutters Control"; pixel_y = 28; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) @@ -33076,8 +33100,10 @@ dir = 4 }, /obj/machinery/door/window/brigdoor/northright{ - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -33854,7 +33880,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access_txt = "engine_equip" + req_access = list(ACCESS_ENGINE_EQUIP) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -34318,8 +34344,10 @@ /obj/effect/turf_decal/bot_red, /obj/structure/closet/secure_closet/lethalshots, /obj/machinery/door/window/brigdoor/northright{ - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -34608,8 +34636,10 @@ /area/science/lab) "joA" = ( /obj/machinery/door/window/brigdoor/westleft{ - name = "AI Satellite Access"; - req_access_txt = "ai_sat" + name = "AI Satellite Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -35066,8 +35096,10 @@ "jwf" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/westleft{ - name = "Janitorial Delivery"; - req_access_txt = "janitor" + name = "Janitorial Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/janitor{ + dir = 8 }, /turf/open/floor/plasteel, /area/maintenance/aft) @@ -36334,8 +36366,7 @@ "jXL" = ( /obj/machinery/button/holosign{ pixel_x = -7; - pixel_y = -8; - req_access_txt = "medical" + pixel_y = -8 }, /turf/closed/wall/r_wall, /area/crew_quarters/heads/cmo) @@ -37602,14 +37633,14 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -37945,8 +37976,10 @@ max_integrity = 350 }, /obj/machinery/door/window/brigdoor/northright{ - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -39004,7 +39037,7 @@ name = "disposals shutter control"; pixel_x = -24; pixel_y = 9; - req_access_txt = "cargo" + req_access = list(ACCESS_CARGO) }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -39486,8 +39519,7 @@ name = "security shutters" }, /obj/machinery/door/window/eastleft{ - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -39500,6 +39532,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "lkd" = ( @@ -39512,7 +39547,7 @@ id = "testlab"; name = "Test Chamber Blast Doors"; pixel_y = -4; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -42035,7 +42070,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ id = "outerbrig"; @@ -42043,7 +42078,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/structure/cable{ icon_state = "1-2" @@ -42202,7 +42237,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -42975,7 +43010,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -43451,13 +43486,15 @@ }, /obj/machinery/door/window/southleft{ dir = 1; - name = "Brig Desk"; - req_access_txt = "security" + name = "Brig Desk" }, /obj/item/deskbell/preset/sec{ pixel_x = 9; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/security/brig) "mGG" = ( @@ -43663,7 +43700,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = 25; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/effect/turf_decal/trimline/chemorange/warning/lower{ dir = 4 @@ -44497,7 +44534,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -7; pixel_y = 23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "telecomms_airlock_exterior"; @@ -44505,7 +44542,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 5; pixel_y = 25; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44746,7 +44783,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "maintenance" + req_access = list(ACCESS_MAINT_TUNNELS) }, /obj/machinery/button/massdriver{ id = "trash"; @@ -44780,7 +44817,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -45106,13 +45143,15 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "ai_master" + name = "Core Modules" }, /obj/item/aiModule/core/full/asimov, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_harmless, /obj/item/aiModule/core/freeformcore, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "nkL" = ( @@ -46645,7 +46684,7 @@ id = "tcomms"; name = "Telecommunications Shutter Control"; pixel_y = -27; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/structure/cable{ @@ -46931,7 +46970,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -48396,7 +48435,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/virology{ @@ -48901,7 +48940,7 @@ id = "genedesk"; name = "Genetics Desk Shutters Control"; pixel_x = 28; - req_access_txt = "genetics" + req_access = list(ACCESS_GENETICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -49118,14 +49157,14 @@ name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/button/door{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/effect/turf_decal/stripes/corner{ @@ -49278,12 +49317,14 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "brig_phys" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "oOo" = ( @@ -49366,7 +49407,7 @@ id = "heads_meeting"; name = "Security Shutters"; pixel_y = 24; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/wood, /area/bridge/meeting_room) @@ -49805,8 +49846,7 @@ dir = 4; icon_state = "right"; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "brig_phys" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -49815,6 +49855,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "oZY" = ( @@ -50587,7 +50630,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = 24; - req_access_txt = "teleporter" + req_access = list(ACCESS_TELEPORTER) }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -51067,20 +51110,20 @@ name = "Left side containment blast doors"; pixel_x = -7; pixel_y = -24; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 7; pixel_y = -24; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = -34; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -51917,7 +51960,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -53014,7 +53057,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = -8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -53022,7 +53065,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = 8; - req_access_txt = "cargo_bay" + req_access = list(ACCESS_CARGO_BAY) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53400,7 +53443,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access_txt = "psychology" + req_access = list(ACCESS_PSYCHOLOGY) }, /turf/open/floor/carpet, /area/medical/psych) @@ -54694,6 +54737,19 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"qLy" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "qLJ" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ @@ -55465,7 +55521,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -23; pixel_y = -23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -57138,12 +57194,14 @@ /obj/machinery/door/window/westleft{ dir = 1; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "ai_master" + name = "Cyborg Upload Console Window" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "rGe" = ( @@ -57220,7 +57278,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = -24; - req_access_txt = "teleporter" + req_access = list(ACCESS_TELEPORTER) }, /turf/open/floor/plating, /area/teleporter) @@ -57645,12 +57703,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Desk"; - req_access_txt = "armory" + name = "Armory Desk" }, /obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "sec_basic" + name = "Reception Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -57668,6 +57724,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plating, /area/security/warden) "rOu" = ( @@ -58040,7 +58100,7 @@ name = "Toxins airlock control"; pixel_x = 24; pixel_y = 24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -58049,7 +58109,7 @@ name = "Toxins airlock control"; pixel_x = -24; pixel_y = 24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -58324,7 +58384,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/machinery/light_switch{ pixel_x = -4; @@ -58591,8 +58651,7 @@ /area/engine/engineering) "sfg" = ( /obj/machinery/door/window/westleft{ - name = "Atmospherics Canister Storage"; - req_access_txt = "atmospherics" + name = "Atmospherics Canister Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -58600,6 +58659,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos/foyer) "sfl" = ( @@ -58637,8 +58699,10 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -61195,12 +61259,14 @@ /obj/item/gun/ballistic/shotgun/automatic/breaching, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, /obj/machinery/camera/motion/armory{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "teC" = ( @@ -61580,7 +61646,7 @@ name = "South Research Lab Shutter Control"; pixel_x = -23; pixel_y = 1; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 10 @@ -61905,12 +61971,10 @@ /area/medical/virology) "trN" = ( /obj/machinery/door/window/eastleft{ - name = "armory desk"; - req_access_txt = "security" + name = "armory desk" }, /obj/machinery/door/window/westleft{ - name = "armory desk"; - req_access_txt = "armory" + name = "armory desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/armory{ @@ -61923,6 +61987,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/security/armory) "tsh" = ( @@ -63440,12 +63510,14 @@ "tUH" = ( /obj/machinery/door/window/westleft{ dir = 4; - name = "Monkey Pen"; - req_access_txt = "genetics" + name = "Monkey Pen" }, /mob/living/carbon/monkey{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 4 + }, /turf/open/floor/grass, /area/medical/genetics) "tUK" = ( @@ -64024,8 +64096,7 @@ /area/medical/storage) "ugn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Permabrig Maintenance"; - req_access_txt = "sec_basic" + name = "Permabrig Maintenance" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -64037,6 +64108,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "ugz" = ( @@ -64896,7 +64968,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 7; pixel_y = -23; - req_access_txt = "tcomms" + req_access = list(ACCESS_TCOMMS) }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_interior"; @@ -64964,8 +65036,7 @@ "uBw" = ( /obj/machinery/door/window/eastright{ dir = 8; - name = "Holding Cell"; - req_access_txt = "brig" + name = "Holding Cell" }, /obj/structure/cable{ icon_state = "4-8" @@ -64975,6 +65046,9 @@ pixel_x = 6; pixel_y = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "uBx" = ( @@ -65548,13 +65622,15 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, /obj/structure/window/reinforced{ dir = 4; max_integrity = 350 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "uLO" = ( @@ -66836,8 +66912,10 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -67374,8 +67452,7 @@ }, /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen"; - req_access_txt = "xenobiology" + name = "Containment Pen" }, /obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ dir = 4 @@ -67627,9 +67704,9 @@ dir = 8 }, /obj/machinery/door/window/brigdoor{ - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "vxS" = ( @@ -68793,9 +68870,9 @@ pixel_y = -3 }, /obj/machinery/door/window/brigdoor{ - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "vRA" = ( @@ -69238,7 +69315,7 @@ name = "Space Shutters Control"; pixel_x = -1; pixel_y = 23; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -71051,7 +71128,7 @@ name = "Incinerator airlock control"; pixel_x = 22; pixel_y = 8; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -73145,8 +73222,7 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Armory"; - req_access_txt = "armory" + name = "Armory" }, /obj/effect/turf_decal/stripes{ dir = 6 @@ -73161,6 +73237,7 @@ /obj/machinery/light_switch{ pixel_x = 23 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "xBb" = ( @@ -73681,11 +73758,13 @@ /obj/structure/rack, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "security" + name = "Armory Door" }, /obj/item/card/id/departmental_budget/sec, /obj/item/reagent_containers/syringe/lethal/execution, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "xJQ" = ( @@ -74083,7 +74162,7 @@ id = "phoenixwright"; name = "Lawyer Shutters"; pixel_x = -23; - req_access_txt = "lawyer" + req_access = list(ACCESS_LAWYER) }, /turf/open/floor/wood, /area/lawoffice) @@ -74797,7 +74876,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -74806,7 +74885,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) @@ -120221,10 +120300,10 @@ tVa dmv iSr cTn -vtX +qLy piv cTn -vtX +qLy piv kcH vtX From 303145f4d215b80e98ba57817953bf1813e70326 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 15:34:38 +0200 Subject: [PATCH 35/48] ballin --- .../IceRuins/icemoon_surface_syndicate.dmm | 2 +- _maps/RandomRuins/JungleRuins/miningbase.dmm | 2 +- .../lavaland_surface_syndicate_base1.dmm | 2 +- _maps/RandomRuins/LavaRuins/miningbase.dmm | 2 +- .../SpaceRuins/listeningstation.dmm | 2 +- _maps/RandomZLevels/TheBeach.dmm | 2 +- .../AsteroidStation/AsteroidStation.dmm | 4 +- _maps/map_files/IceMeta/IceMeta.dmm | 713 ++++++++++-------- _maps/map_files/YogStation/YogStation.dmm | 2 +- _maps/map_files/generic/CentCom.dmm | 42 +- code/__DEFINES/access.dm | 4 +- 11 files changed, 456 insertions(+), 321 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm index 984e08846bd1..8603082df2f3 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm @@ -5432,7 +5432,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150) + req_access = list(ACCESS_SYNDICATE) }, /obj/item/stamp/chameleon{ pixel_x = -6; diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index 8862fe8ef742..6292daab3ea7 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -162,7 +162,7 @@ "bx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(63) + req_access = list(ACCESS_SEC_BASIC) }, /turf/open/floor/plasteel, /area/mine/living_quarters) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index b8c959f26b79..d9383cbdec45 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -4216,7 +4216,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150) + req_access = list(ACCESS_SYNDICATE) }, /obj/item/paper{ info = "You have been entrusted with the Nuclear Authentication Disk of Space Station 12. Keep it secure until Nanotrasen finishes repairs."; diff --git a/_maps/RandomRuins/LavaRuins/miningbase.dmm b/_maps/RandomRuins/LavaRuins/miningbase.dmm index 598f0bef22d7..5671a4ac889e 100644 --- a/_maps/RandomRuins/LavaRuins/miningbase.dmm +++ b/_maps/RandomRuins/LavaRuins/miningbase.dmm @@ -141,7 +141,7 @@ "bx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(63) + req_access = list(ACCESS_SEC_BASIC) }, /turf/open/floor/plasteel, /area/mine/living_quarters) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 30f7c620d03c..eca003f2bf29 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -2445,7 +2445,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150) + req_access = list(ACCESS_SYNDICATE) }, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 7dbc8d496eb8..185cfa01e4ee 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -847,7 +847,7 @@ /area/awaymission/beach) "cr" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(25) + req_access = list(ACCESS_BAR) }, /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/food/condiment/milk, diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 44e269a85be3..65e6a62d83dd 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -78488,7 +78488,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/ministile/hop{ name = "Cargo line turnstile"; - req_one_access = list(50) + req_access = list(ACCESS_CARGO) }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -81621,7 +81621,7 @@ /obj/machinery/ministile/hop{ dir = 1; name = "Cargo line turnstile"; - req_one_access = list(50) + req_access = list(ACCESS_CARGO) }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/loading_area, diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 0db2c723c681..c34dc1f1226e 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -131,7 +131,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 23; - req_access_txt = "experimentation" + req_access = list(ACCESS_EXPERIMENTATION) }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -1273,7 +1273,7 @@ id = "detective_shutters"; name = "detective's office shutters control"; pixel_y = 26; - req_access_txt = "detective" + req_access = list(ACCESS_DETECTIVE) }, /obj/machinery/computer/security/wooden_tv{ pixel_x = 3; @@ -1796,7 +1796,7 @@ /obj/structure/closet/crate/secure/weapon{ desc = "A secure clothing crate."; name = "formal uniform crate"; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, @@ -2092,9 +2092,9 @@ /area/security/prison/hallway) "aFd" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "security" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "aFm" = ( @@ -2843,7 +2843,7 @@ id = "xenobio2"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/structure/window/reinforced{ dir = 1 @@ -3096,13 +3096,13 @@ }, /obj/machinery/door/window/westright{ dir = 2; - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics, /turf/open/floor/plating, /area/hydroponics) "aTa" = ( @@ -3475,8 +3475,7 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Infirmary"; - red_alert_access = 1; - req_access_txt = "brig_phys" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -3487,6 +3486,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "aYI" = ( @@ -5215,7 +5217,7 @@ id = "supplybridge"; name = "Shuttle Bay External Bridge Control"; pixel_y = 27; - req_access_txt = "external" + req_access = list(ACCESS_EXTERNAL) }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5679,8 +5681,10 @@ }, /obj/machinery/door/window/northright{ dir = 8; - name = "delivery door"; - req_access_txt = "maintenance" + name = "delivery door" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -5976,12 +5980,14 @@ "bLp" = ( /obj/machinery/door/window{ dir = 4; - name = "Mass Driver"; - req_access_txt = "chapel_office" + name = "Mass Driver" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/chapel/main) "bLt" = ( @@ -7271,7 +7277,7 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_y = -25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -7462,14 +7468,13 @@ "chC" = ( /obj/machinery/button/holosign{ id = "surgery_b"; - pixel_x = -38; - req_access_txt = "medical" + pixel_x = -38 }, /obj/machinery/button/door{ id = "cmoprivacy"; name = "Privacy Shutters Control"; pixel_x = -26; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/computer/operating{ dir = 4 @@ -7744,8 +7749,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/eastright{ dir = 1; - name = "Kitchen Delivery"; - req_access_txt = "kitchen" + name = "Kitchen Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 1 }, /turf/open/floor/plasteel{ dir = 1 @@ -7797,14 +7804,14 @@ /area/hallway/primary/fore) "cmw" = ( /obj/machinery/door/window{ - name = "MiniSat Walkway Access"; - req_access_txt = "ai_sat" + name = "MiniSat Walkway Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/aisat) "cmC" = ( @@ -9496,8 +9503,7 @@ "cPq" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #6"; - req_access_txt = "xenobiology" + name = "Containment Pen #6" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; @@ -9512,6 +9518,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "cPE" = ( @@ -10446,7 +10455,7 @@ name = "Toxins airlock control"; pixel_x = -24; pixel_y = 24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_exterior"; @@ -10454,7 +10463,7 @@ name = "Toxins airlock control"; pixel_x = 24; pixel_y = 24; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -10627,7 +10636,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access_txt = "engine_equip" + req_access = list(ACCESS_ENGINE_EQUIP) }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -10908,6 +10917,9 @@ icon_state = "1-8" }, /obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/fore) "dma" = ( @@ -12063,7 +12075,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -12127,12 +12139,12 @@ dir = 10 }, /obj/machinery/door/window/southleft{ - name = "Cargo Disposal"; - req_access_txt = "cargo" + name = "Cargo Disposal" }, /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/storage) "dBs" = ( @@ -13122,8 +13134,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/item/storage/firstaid/regular{ pixel_x = 6; @@ -13138,6 +13149,7 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "dRQ" = ( @@ -14034,9 +14046,9 @@ dir = 8 }, /obj/machinery/door/window/brigdoor/southleft{ - name = "Filing Room"; - req_access_txt = "psychology" + name = "Filing Room" }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology, /turf/open/floor/wood, /area/medical/psych) "egn" = ( @@ -14164,7 +14176,7 @@ normaldoorcontrol = 1; pixel_y = -25; specialfunctions = 4; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -14762,7 +14774,7 @@ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -28; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /turf/open/floor/plasteel/dark, /area/bridge) @@ -14772,7 +14784,7 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_y = 7; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "Secure Gate"; @@ -14780,14 +14792,14 @@ pixel_x = -5; pixel_y = -3; specialfunctions = 4; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; pixel_y = -3; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -15805,7 +15817,7 @@ name = "Access Console"; pixel_x = -25; pixel_y = -25; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -16039,7 +16051,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = -24; pixel_y = -24; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -17494,13 +17506,13 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Captain's Desk"; - req_access_txt = "captain" + name = "Captain's Desk" }, /obj/structure/disposalpipe/segment, /obj/item/stamp/captain, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "fju" = ( @@ -17771,7 +17783,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = -24; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -18185,8 +18197,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "ai_master" + name = "Core Modules" }, /obj/structure/window/reinforced, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -18195,6 +18206,9 @@ id = "AI"; pixel_y = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "fto" = ( @@ -18347,8 +18361,7 @@ /obj/machinery/door/window/northright{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "medical" + red_alert_access = 1 }, /obj/item/storage/firstaid/regular{ pixel_x = 6; @@ -18366,6 +18379,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "fvW" = ( @@ -18683,7 +18697,7 @@ id = "xenobio8"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -18831,8 +18845,7 @@ icon_state = "4-8" }, /obj/machinery/door/window/brigdoor{ - name = "Command Desk"; - req_access_txt = "command" + name = "Command Desk" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -18841,6 +18854,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/warning/lower, +/obj/effect/mapping_helpers/windoor/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fEr" = ( @@ -19242,9 +19256,9 @@ icon_state = "1-2" }, /obj/machinery/door/window{ - name = "HoP's Desk"; - req_access_txt = "hop" + name = "HoP's Desk" }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "fKY" = ( @@ -19835,7 +19849,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = 22; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -19844,7 +19858,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = -21; - req_access_txt = "atmospherics" + req_access = list(ACCESS_ATMOSPHERICS) }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -19901,6 +19915,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -20045,8 +20062,7 @@ pixel_y = 9 }, /obj/machinery/door/window/eastright{ - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -20058,6 +20074,9 @@ id = "chemistry_shutters"; name = "chemistry shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 4 + }, /turf/open/floor/plating, /area/medical/chemistry) "fVS" = ( @@ -20440,10 +20459,12 @@ /obj/machinery/door/window/eastleft{ base_state = "right"; icon_state = "right"; - name = "Deliveries"; - req_access_txt = "cargo" + name = "Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "gaz" = ( @@ -21699,14 +21720,14 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/light{ dir = 8 @@ -21864,9 +21885,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -21935,8 +21953,9 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "gwH" = ( -/obj/machinery/door/window/westright{ - req_access_txt = "captain" +/obj/machinery/door/window/westright, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) @@ -22029,7 +22048,7 @@ name = "Mech Bay Door Control"; pixel_x = 26; pixel_y = 6; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -22703,7 +22722,7 @@ name = "robotics shutters control"; pixel_x = -26; pixel_y = 26; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -23695,14 +23714,14 @@ pixel_x = 5; pixel_y = 27; specialfunctions = 4; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; pixel_y = 37; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/light/small{ dir = 1 @@ -23714,7 +23733,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 37; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -23723,7 +23742,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 27; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -24262,7 +24281,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -23; pixel_y = -24; - req_access_txt = "ai_sat" + req_access = list(ACCESS_AI_SAT) }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -24270,7 +24289,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = 23; - req_access_txt = "ai_sat" + req_access = list(ACCESS_AI_SAT) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -24642,7 +24661,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_access_txt = "toxins" + req_access = list(ACCESS_TOXINS) }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -25781,7 +25800,7 @@ name = "Privacy Shutters Control"; pixel_x = 26; pixel_y = 4; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/camera{ c_tag = "CMO's Office"; @@ -25956,18 +25975,20 @@ /turf/open/floor/plasteel/white/corner, /area/quartermaster/sorting) "hDE" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "mining_station" - }, -/obj/machinery/door/window/westleft{ - req_access_txt = "mining_station" - }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "hDS" = ( @@ -26288,13 +26309,11 @@ /area/escapepodbay) "hIK" = ( /obj/machinery/door/window/brigdoor{ - name = "Justice Chamber"; - req_access_txt = "brig" + name = "Justice Chamber" }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Justice Chamber"; - req_access_txt = "brig" + name = "Justice Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" @@ -26306,6 +26325,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/brig, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/execution/education) "hIL" = ( @@ -26726,8 +26749,7 @@ /area/security/range) "hOw" = ( /obj/machinery/door/window/southleft{ - name = "Maximum Security Test Chamber"; - req_access_txt = "xenobiology" + name = "Maximum Security Test Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "Xenolab"; @@ -26740,6 +26762,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "hOH" = ( @@ -28335,8 +28358,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #5"; - req_access_txt = "xenobiology" + name = "Containment Pen #5" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; @@ -28351,6 +28373,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "irC" = ( @@ -28415,20 +28440,19 @@ /area/mine/break_room) "ise" = ( /obj/machinery/door/window{ - name = "Captain's Desk"; - req_access_txt = "captain" + name = "Captain's Desk" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "isi" = ( /obj/structure/table/glass, /obj/machinery/door/window/westleft{ dir = 1; - name = "First-Aid Supplies"; - req_access_txt = "medical" + name = "First-Aid Supplies" }, /obj/structure/window/reinforced{ dir = 8 @@ -28449,6 +28473,9 @@ pixel_x = -1; pixel_y = -1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "isB" = ( @@ -28702,6 +28729,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "ivv" = ( @@ -28989,7 +29017,7 @@ id = "xenobio6"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -29992,7 +30020,7 @@ name = "Mech Bay Door Control"; pixel_x = -26; pixel_y = 6; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/light_switch{ pixel_x = -23; @@ -30252,10 +30280,12 @@ "iRQ" = ( /obj/machinery/door/window/southright{ dir = 4; - name = "Engineering Deliveries"; - req_access_txt = "engineering" + name = "Engineering Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "iSc" = ( @@ -30321,7 +30351,7 @@ id = "chapel_shutters_parlour"; name = "chapel shutters control"; pixel_y = -25; - req_access_txt = "chapel_office" + req_access = list(ACCESS_CHAPEL_OFFICE) }, /turf/open/floor/plasteel/dark, /area/chapel/main) @@ -30479,8 +30509,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #3"; - req_access_txt = "xenobiology" + name = "Containment Pen #3" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; @@ -30495,6 +30524,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "iWt" = ( @@ -31137,9 +31169,9 @@ /obj/machinery/door/window/westleft{ dir = 2; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "ai_master" + name = "Cyborg Upload Console Window" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "jeO" = ( @@ -31698,7 +31730,7 @@ name = "Secondary AI Core Access Console"; pixel_x = -24; pixel_y = -25; - req_access_txt = "ai_sat" + req_access = list(ACCESS_AI_SAT) }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -31706,7 +31738,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -33; pixel_y = -23; - req_access_txt = "ai_sat" + req_access = list(ACCESS_AI_SAT) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -33017,13 +33049,15 @@ pixel_y = 24 }, /obj/machinery/door/window/westleft{ - name = "Medical Delivery"; - req_access_txt = "medical" + name = "Medical Delivery" }, /obj/structure/window, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "jFI" = ( @@ -34106,7 +34140,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 30; - req_access_txt = "eva" + req_access = list(ACCESS_EVA) }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -34408,7 +34442,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Test Site Materials Crate"; - req_access_txt = "toxins" + req_access = list(ACCESS_SCIENCE) }, /obj/machinery/light/small{ dir = 1 @@ -34574,7 +34608,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = 24; pixel_y = -24; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 @@ -35075,7 +35109,7 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_x = -25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only, @@ -35309,7 +35343,7 @@ name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -35317,7 +35351,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = 5; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 @@ -35484,12 +35518,14 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #6"; - req_access_txt = "xenobiology" + name = "Containment Pen #6" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "kpZ" = ( @@ -35745,7 +35781,7 @@ name = "Virology Access Console"; pixel_x = 26; pixel_y = 26; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -36008,6 +36044,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/fore) "kyD" = ( @@ -36263,8 +36300,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 2; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" }, /obj/item/folder/white{ pixel_x = 4; @@ -36282,6 +36318,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry, /turf/open/floor/plating, /area/medical/chemistry) "kCt" = ( @@ -36530,7 +36567,7 @@ id = "xenobio3"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/structure/window/reinforced{ dir = 1 @@ -36771,8 +36808,10 @@ "kIc" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "chapel_office" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plating, /area/chapel/main) @@ -37921,7 +37960,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 9; pixel_y = 25; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) @@ -38426,8 +38465,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "RCD Storage"; - pixel_x = 1; - req_access_txt = "eva" + pixel_x = 1 }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -38437,6 +38475,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/eva{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ljH" = ( @@ -38561,7 +38602,7 @@ id = "armory"; name = "Armory Shutters"; pixel_x = 28; - req_access_txt = "armory" + req_access = list(ACCESS_ARMORY) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -39037,7 +39078,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = -24; - req_access_txt = "aux_base" + req_access = list(ACCESS_AUX_BASE) }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -39084,8 +39125,7 @@ name = "bridge blast door" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "command" + name = "Bridge Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39337,7 +39377,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "maintenance" + req_access = list(ACCESS_MAINT_TUNNELS) }, /obj/machinery/button/massdriver{ id = "trash"; @@ -40334,7 +40374,7 @@ name = "Privacy Shutters Control"; pixel_x = 26; pixel_y = -26; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 @@ -40996,8 +41036,7 @@ "lUr" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #2"; - req_access_txt = "xenobiology" + name = "Containment Pen #2" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; @@ -41012,6 +41051,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "lUs" = ( @@ -41482,7 +41524,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -41663,7 +41705,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; - req_access_txt = "sec_basic" + req_access = list(ACCESS_SEC_BASIC) }, /obj/machinery/power/apc{ areastring = "/area/security/range"; @@ -42058,7 +42100,7 @@ id = "emt_shutters"; name = "Paramedic Staging Area Shutters"; pixel_x = 28; - req_access_txt = "paramedic" + req_access = list(ACCESS_PARAMEDIC) }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -42196,14 +42238,14 @@ /turf/open/floor/plating, /area/security/checkpoint/medical) "mjN" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, -/obj/machinery/door/window/brigdoor/security/holding{ - id = "Holding Cell"; - name = "Holding Cell" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "mjX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -42268,14 +42310,14 @@ name = "Queue Shutters Control"; pixel_x = 25; pixel_y = -36; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/button/door{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = -26; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/button/flasher{ id = "hopflash"; @@ -42577,6 +42619,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "mpG" = ( @@ -43746,8 +43789,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Magboot Storage"; - pixel_x = -1; - req_access_txt = "eva" + pixel_x = -1 }, /obj/structure/window/reinforced{ dir = 1; @@ -43763,6 +43805,9 @@ pixel_x = 4; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/command/eva{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "mHk" = ( @@ -44130,14 +44175,14 @@ name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/button/door{ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; @@ -44497,7 +44542,7 @@ id = "Podbaydoor"; pixel_x = 24; pixel_y = -1; - req_access_txt = "external"; + req_access = list(ACCESS_EXTERNAL); name = "Shipbreaking External Control" }, /turf/open/floor/plasteel/dark, @@ -44598,7 +44643,7 @@ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -7; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44607,7 +44652,7 @@ normaldoorcontrol = 1; pixel_x = 7; pixel_y = 7; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44616,7 +44661,7 @@ normaldoorcontrol = 1; pixel_x = 7; pixel_y = -2; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/firealarm{ dir = 4; @@ -44703,8 +44748,10 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Chemistry Desk"; - req_access_txt = "chemistry" + name = "Chemistry Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 8 }, /turf/open/floor/plating, /area/medical/chemistry) @@ -44726,7 +44773,7 @@ id = "xenobio1"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -45083,11 +45130,13 @@ "mWH" = ( /obj/machinery/door/window{ dir = 1; - name = "Captain's Bedroom"; - req_access_txt = "captain" + name = "Captain's Bedroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "mWK" = ( @@ -45560,12 +45609,14 @@ "ndm" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #1"; - req_access_txt = "xenobiology" + name = "Containment Pen #1" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "ndu" = ( @@ -45882,8 +45933,7 @@ "nif" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = null; - req_access_txt = "sec_basic" + req_access = list(ACCESS_SEC_BASIC) }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -45981,8 +46031,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Jetpack Storage"; - pixel_x = -1; - req_access_txt = "eva" + pixel_x = -1 }, /obj/structure/window/reinforced, /obj/structure/rack, @@ -45995,6 +46044,9 @@ pixel_x = -4; pixel_y = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/eva{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "nkE" = ( @@ -46522,7 +46574,7 @@ name = "Teleporter Shutter Control"; pixel_x = 30; pixel_y = 5; - req_access_txt = "teleporter" + req_access = list(ACCESS_TELEPORTER) }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -46799,14 +46851,14 @@ /area/maintenance/fore) "nxg" = ( /obj/machinery/door/window{ - name = "SMES Chamber"; - req_access_txt = "engine_equip" + name = "SMES Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "nxi" = ( @@ -47197,7 +47249,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -47917,10 +47969,12 @@ dir = 1; icon_state = "right"; name = "Monkey Pen"; - pixel_y = 2; - req_access_txt = "genetics" + pixel_y = 2 }, /obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 1 + }, /turf/open/floor/grass, /area/medical/genetics) "nNq" = ( @@ -49404,8 +49458,7 @@ /obj/structure/table, /obj/machinery/door/window{ dir = 8; - name = "High-Risk Modules"; - req_access_txt = "ai_master" + name = "High-Risk Modules" }, /obj/structure/window/reinforced, /obj/machinery/flasher{ @@ -49417,6 +49470,9 @@ /obj/item/aiModule/supplied/protectStation, /obj/item/aiModule/zeroth/oneHuman, /obj/item/aiModule/reset/purge, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "oht" = ( @@ -49981,12 +50037,14 @@ "opO" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #5"; - req_access_txt = "xenobiology" + name = "Containment Pen #5" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "opQ" = ( @@ -50653,8 +50711,7 @@ "ozJ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "cargo" + name = "Cargo Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -50675,6 +50732,9 @@ pixel_x = -5; pixel_y = -9 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/office) "ozK" = ( @@ -51091,10 +51151,12 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "gas ports"; - req_access_txt = "brig" + name = "gas ports" }, /obj/effect/mapping_helpers/teleport_anchor, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/execution/education) "oFW" = ( @@ -51154,7 +51216,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = -12; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/item/radio/intercom{ freerange = 1; @@ -51353,7 +51415,7 @@ id = "lawyer_shutters"; name = "law office shutter control"; pixel_y = -26; - req_access_txt = "lawyer" + req_access = list(ACCESS_LAWYER) }, /turf/open/floor/wood, /area/lawoffice) @@ -51839,10 +51901,10 @@ "oSv" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Research Division Deliveries"; - req_access_txt = "science" + name = "Research Division Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "oSC" = ( @@ -53033,12 +53095,14 @@ "plz" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #3"; - req_access_txt = "xenobiology" + name = "Containment Pen #3" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "plH" = ( @@ -53801,10 +53865,12 @@ "pwl" = ( /obj/machinery/door/window/southleft{ dir = 1; - name = "Maximum Security Test Chamber"; - req_access_txt = "xenobiology" + name = "Maximum Security Test Chamber" }, /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "pwz" = ( @@ -54342,8 +54408,7 @@ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "hop" + name = "Head of Personnel's Desk" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54364,6 +54429,9 @@ pixel_x = -8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "pFu" = ( @@ -55467,8 +55535,10 @@ /area/quartermaster/storage) "pYo" = ( /obj/machinery/door/window{ - dir = 1; - req_access_txt = "detective" + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/detective{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) @@ -55977,13 +56047,12 @@ /turf/open/floor/plating, /area/maintenance/aft) "qgx" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, -/area/mine/eva_secondary) +/area/maintenance/fore) "qgy" = ( /obj/machinery/shower{ dir = 8 @@ -56386,7 +56455,7 @@ name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57323,7 +57392,7 @@ "qzU" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; - req_access_txt = "robotics" + req_access = list(ACCESS_ROBOTICS) }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57654,7 +57723,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 10; pixel_y = 22; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; @@ -57662,7 +57731,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 9; pixel_y = 32; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 @@ -57714,12 +57783,14 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #4"; - req_access_txt = "xenobiology" + name = "Containment Pen #4" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "qFD" = ( @@ -58028,8 +58099,7 @@ dir = 4; icon_state = "right"; name = "Infirmary"; - red_alert_access = 1; - req_access_txt = "brig_phys" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -58038,6 +58108,9 @@ dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "qIe" = ( @@ -58324,7 +58397,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = 24; - req_access_txt = "virology" + req_access = list(ACCESS_VIROLOGY) }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58431,9 +58504,9 @@ dir = 2; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "ai_master" + name = "Upload Console Window" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "qOL" = ( @@ -58560,7 +58633,7 @@ name = "Access Button"; pixel_x = 29; pixel_y = -8; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/machinery/light{ dir = 4 @@ -59243,7 +59316,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = -24; - req_access_txt = "ai_sat" + req_access = list(ACCESS_AI_SAT) }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -59299,7 +59372,7 @@ normaldoorcontrol = 1; pixel_x = 1; pixel_y = 22; - req_access_txt = "medical" + req_access = list(ACCESS_MEDICAL) }, /obj/machinery/modular_computer/telescreen/preset/medical{ pixel_y = 32 @@ -59463,8 +59536,10 @@ dir = 8 }, /obj/machinery/door/window/westright{ - name = "MULEbot Access"; - req_access_txt = "cargo_bay" + name = "MULEbot Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/cargo_bay{ + dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -59961,13 +60036,11 @@ base_state = "right"; dir = 2; icon_state = "right"; - name = "Reception Window"; - req_access_txt = "sec_basic" + name = "Reception Window" }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Brig Control Desk"; - req_access_txt = "armory" + name = "Brig Control Desk" }, /obj/item/paper, /obj/structure/cable/yellow{ @@ -59982,6 +60055,10 @@ pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "rnr" = ( @@ -60212,6 +60289,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "rtB" = ( @@ -61638,7 +61718,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 9; pixel_y = -22; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -62379,19 +62459,21 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Kitchen Window"; - req_access_txt = "kitchen" + name = "Kitchen Window" }, /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; - name = "Hydroponics Window"; - req_access_txt = "hydroponics" + name = "Hydroponics Window" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 1 + }, /turf/open/floor/plating, /area/crew_quarters/kitchen) "rXX" = ( @@ -62860,7 +62942,7 @@ id = "Podbaydoor"; pixel_x = -24; pixel_y = -1; - req_access_txt = "external"; + req_access = list(ACCESS_EXTERNAL); name = "Shipbreaking External Control" }, /obj/machinery/light, @@ -62907,10 +62989,12 @@ "see" = ( /obj/machinery/door/window/eastleft{ dir = 1; - name = "Robotics Deliveries"; - req_access_txt = "robotics" + name = "Robotics Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "seL" = ( @@ -63660,10 +63744,10 @@ /area/mine/maintenance) "ssB" = ( /obj/machinery/door/window/southleft{ - name = "Mass Driver Door"; - req_access_txt = "toxins" + name = "Mass Driver Door" }, /obj/effect/turf_decal/loading_area, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "ssC" = ( @@ -64014,8 +64098,7 @@ "swB" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #4"; - req_access_txt = "xenobiology" + name = "Containment Pen #4" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; @@ -64030,6 +64113,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "swC" = ( @@ -65847,8 +65933,7 @@ }, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Security Desk"; - req_access_txt = "security" + name = "Security Desk" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -65872,6 +65957,9 @@ pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/brig) "sWw" = ( @@ -65928,8 +66016,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ dir = 1; - name = "Delivery Desk"; - req_access_txt = "cargo" + name = "Delivery Desk" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor/border_only{ @@ -65941,6 +66028,9 @@ pixel_y = -4 }, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 1 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "sXC" = ( @@ -66227,7 +66317,7 @@ id = "xenobio7"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -66279,7 +66369,7 @@ name = "chemistry shutters control"; pixel_x = 24; pixel_y = -8; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -66348,6 +66438,9 @@ pixel_x = 2; pixel_y = -2 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "tbX" = ( @@ -67230,8 +67323,10 @@ /obj/machinery/meter, /obj/machinery/door/window/westleft{ dir = 1; - name = "gas ports"; - req_access_txt = "brig" + name = "gas ports" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/execution/education) @@ -68161,7 +68256,7 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -68725,7 +68820,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -70420,13 +70515,13 @@ }, /obj/machinery/door/window/northleft{ dir = 2; - name = "Hydroponics Desk"; - req_access_txt = "hydroponics" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics, /turf/open/floor/plating, /area/hydroponics) "ukA" = ( @@ -70601,7 +70696,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -71162,8 +71257,7 @@ "uvE" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Disposals Chute"; - req_access_txt = "teleporter" + name = "Disposals Chute" }, /obj/machinery/disposal/deliveryChute{ dir = 8; @@ -71173,6 +71267,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/teleporter{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/teleporter) "uvF" = ( @@ -71371,13 +71468,15 @@ "uyh" = ( /obj/machinery/door/window{ dir = 1; - name = "MiniSat Walkway Access"; - req_access_txt = "ai_sat" + name = "MiniSat Walkway Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/aisat) "uyn" = ( @@ -71484,7 +71583,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -72748,8 +72847,10 @@ }, /obj/machinery/door/window/northright{ dir = 4; - name = "delivery door"; - req_access_txt = "maintenance" + name = "delivery door" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -73921,12 +74022,14 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #2"; - req_access_txt = "xenobiology" + name = "Containment Pen #2" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "viO" = ( @@ -74243,7 +74346,7 @@ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_y = -26; - req_access_txt = "engineering" + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel/dark, @@ -74270,7 +74373,7 @@ name = "chemistry shutters control"; pixel_x = 26; pixel_y = -26; - req_access_txt = "chemistry" + req_access = list(ACCESS_CHEMISTRY) }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -74365,8 +74468,7 @@ /obj/structure/table/reinforced, /obj/item/pen, /obj/machinery/door/window/eastright{ - name = "Robotics Desk"; - req_access_txt = "robotics" + name = "Robotics Desk" }, /obj/item/folder/white{ pixel_x = 4; @@ -74394,6 +74496,9 @@ pixel_x = -5; pixel_y = -9 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 4 + }, /turf/open/floor/plating, /area/science/robotics/lab) "vpY" = ( @@ -74588,7 +74693,7 @@ name = "External Shutters Control"; pixel_x = -26; pixel_y = 34; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/photocopier/faxmachine{ department = "Head of Security"; @@ -74632,13 +74737,11 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Outer Window"; - req_access_txt = "security" + name = "Outer Window" }, /obj/machinery/door/window/brigdoor{ dir = 8; - name = "Brig Control Desk"; - req_access_txt = "armory" + name = "Brig Control Desk" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -74650,6 +74753,9 @@ /obj/item/folder/red, /obj/item/folder/red, /obj/item/poster/random_official, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "vtX" = ( @@ -74665,8 +74771,10 @@ dir = 8 }, /obj/machinery/door/window/westleft{ - name = "MULEbot Access"; - req_access_txt = "cargo_bay" + name = "MULEbot Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/cargo_bay{ + dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -75233,13 +75341,13 @@ }, /obj/machinery/door/window/northleft{ dir = 2; - name = "Paramedic Desk"; - req_access_txt = "paramedic" + name = "Paramedic Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "vAJ" = ( @@ -75410,9 +75518,10 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Library Desk Door"; - pixel_x = 3; - req_access_txt = "library" + name = "Library Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 8 }, /turf/open/floor/wood, /area/library) @@ -75546,7 +75655,7 @@ name = "Test Chamber Blast Doors"; pixel_x = 4; pixel_y = -3; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -76569,7 +76678,7 @@ name = "Justice Area Lockdown"; pixel_x = -25; pixel_y = 26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /obj/item/assembly/signaler{ pixel_x = -3; @@ -76587,7 +76696,7 @@ name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; - req_access_txt = "brig" + req_access = list(ACCESS_BRIG) }, /turf/open/floor/plasteel/dark, /area/security/execution/education) @@ -76756,8 +76865,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #1"; - req_access_txt = "xenobiology" + name = "Containment Pen #1" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; @@ -76772,6 +76880,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "vXV" = ( @@ -77390,7 +77501,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_y = -25; - req_access_txt = "experimentation" + req_access = list(ACCESS_EXPERIMENTATION) }, /turf/open/floor/engine, /area/science/explab) @@ -78574,7 +78685,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 10; pixel_y = -22; - req_access_txt = "ai_master" + req_access = list(ACCESS_AI_MASTER) }, /obj/machinery/light_switch{ pixel_x = -23 @@ -80018,8 +80129,10 @@ dir = 1 }, /obj/machinery/door/window/northright{ - name = "delivery door"; - req_access_txt = "maintenance" + name = "delivery door" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -80475,7 +80588,7 @@ id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; - req_access_txt = "command" + req_access = list(ACCESS_COMMAND) }, /obj/item/poster/random_official, /obj/item/poster/random_official, @@ -81775,7 +81888,7 @@ name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/machinery/light_switch{ pixel_x = -25; @@ -81829,7 +81942,7 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 24; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -81837,7 +81950,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 14; - req_access_txt = "security" + req_access = list(ACCESS_SECURITY) }, /obj/structure/table, /obj/item/paper_bin{ @@ -82151,7 +82264,7 @@ id = "hop"; name = "Privacy Shutters Control"; pixel_y = 25; - req_access_txt = "hop" + req_access = list(ACCESS_HOP) }, /obj/structure/table/wood, /turf/open/floor/wood, @@ -82370,7 +82483,7 @@ idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = -24; - req_access_txt = "xenobiology" + req_access = list(ACCESS_XENOBIOLOGY) }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82609,10 +82722,12 @@ }, /obj/machinery/door/window/eastright{ dir = 1; - name = "Hydroponics Delivery"; - req_access_txt = "hydroponics" + name = "Hydroponics Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics) "xAc" = ( @@ -82660,7 +82775,7 @@ name = "Bar Shutters Control"; pixel_x = 24; pixel_y = 9; - req_access_txt = "bar" + req_access = list(ACCESS_BAR) }, /obj/machinery/light_switch{ pixel_x = 22 @@ -82986,7 +83101,7 @@ name = "Kitchen Shutters Control"; pixel_x = -8; pixel_y = 23; - req_access_txt = "kitchen" + req_access = list(ACCESS_KITCHEN) }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -83182,7 +83297,7 @@ name = "Surgery shutters"; pixel_x = -24; pixel_y = 6; - req_access_txt = "surgery" + req_access = list(ACCESS_SURGERY) }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -83212,7 +83327,7 @@ name = "Secure Lab Shutter Control"; pixel_x = -5; pixel_y = -5; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -83220,21 +83335,21 @@ name = "Privacy Shutters Control"; pixel_x = 5; pixel_y = 5; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/machinery/button/door{ id = "Biohazard"; name = "Entrance Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /obj/machinery/button/door{ id = "toxins_blastdoor"; name = "Toxins Shutter Control"; pixel_x = 5; pixel_y = -5; - req_access_txt = "science" + req_access = list(ACCESS_SCIENCE) }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -83835,14 +83950,16 @@ "xPy" = ( /obj/machinery/door/window/westleft{ dir = 4; - name = "Bridge Deliveries"; - req_access_txt = "command" + name = "Bridge Deliveries" }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; name = "bridge blast door" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/bridge) "xPG" = ( @@ -83874,7 +83991,7 @@ /obj/item/clothing/under/rank/civilian/assistantformal, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -84090,7 +84207,7 @@ id = "supplybridge"; name = "Shuttle Bay External Bridge Control"; pixel_y = 27; - req_access_txt = "external" + req_access = list(ACCESS_EXTERNAL) }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -84550,7 +84667,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel{ dir = 1 }, @@ -166453,7 +166570,7 @@ uxg gOs aaU upf -qgx +rZh rZh bgq dEM @@ -245095,7 +245212,7 @@ loB lkw une rER -mjN +rmt nwn xvh iSo @@ -249472,7 +249589,7 @@ iWS ifc mxO hhy -wbr +qgx eRM miN eRM @@ -251004,7 +251121,7 @@ bja iNw sUe gep -wbr +mjN onR uJA uJA diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index a301fa029c17..c9140a9d02ae 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -19071,7 +19071,7 @@ "dXX" = ( /obj/machinery/computer/rdconsole/production{ dir = 8; - req_access = list(32) + req_access = list(ACCESS_ENGINEERING) }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 5 diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 4ff45c87bf2e..45a0413724f0 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5443,7 +5443,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/combat/durand, +/obj/mecha/combat/durand{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "arc" = ( @@ -7987,7 +7990,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/combat/phazon, +/obj/mecha/combat/phazon{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "awf" = ( @@ -9648,7 +9654,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/medical/odysseus, +/obj/mecha/medical/odysseus{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "azV" = ( @@ -14864,7 +14873,8 @@ dir = 8 }, /obj/mecha/combat/marauder/mauler{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/syndicate, /turf/open/floor/engine, @@ -16039,7 +16049,8 @@ dir = 8 }, /obj/mecha/combat/marauder/seraph{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/centcom, /turf/open/floor/engine, @@ -16628,7 +16639,8 @@ dir = 8 }, /obj/mecha/combat/gygax/dark{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/syndicate, /turf/open/floor/engine, @@ -16744,7 +16756,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/combat/gygax, +/obj/mecha/combat/gygax{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "aOJ" = ( @@ -17728,7 +17743,8 @@ dir = 8 }, /obj/mecha/combat/marauder{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/centcom, /turf/open/floor/engine, @@ -20409,7 +20425,8 @@ dir = 8 }, /obj/mecha/combat/reticence{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /turf/open/floor/engine, /area/centcom/testchamber) @@ -20868,7 +20885,8 @@ dir = 8 }, /obj/mecha/combat/honker{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /turf/open/floor/engine, /area/centcom/testchamber) @@ -21437,7 +21455,7 @@ /area/centcom) "bVV" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = list(ACCESS_SYNDICATE) }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -23390,7 +23408,7 @@ /area/centcom/tdome/tdomeobserve) "uRI" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = list(ACCESS_SYNDICATE) }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index e3885ef5d4fd..292bd69afebc 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -57,7 +57,7 @@ //--- ENGINEERING ---// -/// Engineering General Access, grants access to the standard parts of engineering (as well as the Supermatter and related equipment). +/// Engineering General Access, grants access to the standard parts of Engineering and the Engine Room. #define ACCESS_ENGINEERING "engineering" /// Access to Atmospherics Sections of the Engineering Department, as well as air alarms. #define ACCESS_ATMOSPHERICS "atmospherics" @@ -79,7 +79,7 @@ #define ACCESS_TCOMMS_ADMIN "tcomms_admin" /// Access to the Auxiliary Base Room, as well as the ability to launch it. #define ACCESS_AUX_BASE "aux_base" -/// Access for the Chief Engineer's office, Secure Tech Storage, as well as some other CE-related things. +/// Access for the Chief Engineer's office, as well as some other CE-related things. #define ACCESS_CE "ce" From f6bdb5a306b6d293cfc4effef5fc35c810cba77d Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 30 Jul 2024 20:14:56 +0200 Subject: [PATCH 36/48] ballin --- code/modules/jobs/access.dm | 46 ++++++++++--------- .../jobs/job_types/atmospheric_technician.dm | 2 +- .../mapping/access_helpers/airlock_helpers.dm | 10 ---- .../mapping/access_helpers/windoor_helpers.dm | 10 ---- .../telecomms/computers/traffic_control.dm | 2 +- yogstation/code/modules/power/apc.dm | 2 +- 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 9d8a6d1b0f84..d1a1f7f297ca 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -136,18 +136,21 @@ /// Gets all station access /proc/get_all_accesses() - return list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_SEC_BASIC, - ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, - ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, ACCESS_AI_SAT, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, - ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, - ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, - ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, - ACCESS_THEATRE, ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_MATERIALS, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) + return list( + // Service/Civilian + ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, + // Security + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, ACCESS_HOS, + // Medical + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, ACCESS_MECH_MEDICAL, ACCESS_CMO, + // Science + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_RD, + // Engineering + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, + // Supply + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MATERIALS, ACCESS_VAULT, ACCESS_MECH_MINING, ACCESS_QM, + // Command + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_SECURE_TECH, ACCESS_RND_SERVERS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS_ADMIN, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_HOP, ACCESS_CAPTAIN) /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -268,6 +271,7 @@ ACCESS_TCOMMS_ADMIN, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, + ACCESS_HOP, ACCESS_CAPTAIN) /// Gets the name from region ID @@ -295,9 +299,9 @@ switch(A) if(ACCESS_COMMAND) return "Command General" - if(ACCESS_AI_MASTER) + if(ACCESS_AI_MASTER) // Yog return "AI Master Access" - if(ACCESS_AI_SAT) + if(ACCESS_AI_SAT) // Yog return "AI Satellite" if(ACCESS_TELEPORTER) return "Teleporter" @@ -349,10 +353,10 @@ return "Secure Tech Storage" if(ACCESS_TCOMMS) return "Telecommunications" - if(ACCESS_TCOMMS_ADMIN) - return "Telecommunication Logs Auth." + if(ACCESS_TCOMMS_ADMIN) // Yog + return "Telecomms. Systems Admin" if(ACCESS_AUX_BASE) - return "Aux. Base Construction" + return "Auxiliary Base" if(ACCESS_CE) return "CE Office" if(ACCESS_MEDICAL) @@ -393,17 +397,17 @@ return "Toxins Lab" if(ACCESS_TOXINS_STORAGE) return "Toxins Storage" - if(ACCESS_EXPERIMENTATION) + if(ACCESS_EXPERIMENTATION) // Yog return "Experimentation Lab" if(ACCESS_GENETICS) return "Genetics Lab" if(ACCESS_ROBOTICS) return "Robotics Lab" if(ACCESS_ROBO_CONTROL) - return "Robotics and Bot Control" + return "Robotics Bot Control" if(ACCESS_XENOBIOLOGY) return "Xenobiology Lab" - if(ACCESS_RND_SERVERS) + if(ACCESS_RND_SERVERS) // Yog return "R&D Server Room" if(ACCESS_RD) return "RD Office" @@ -427,7 +431,7 @@ return "Janitor's Closet" if(ACCESS_LAWYER) return "Law Office" - if(ACCESS_CLERK) + if(ACCESS_CLERK) // Yog return "Gift Shop" if(ACCESS_HOP) return "HoP Office" diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index d200cb630096..181694a46b31 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/atmos added_access = list(ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE) - base_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_MATERIALS, ACCESS_ENGINEERING, ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MATERIALS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_ENGINE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN diff --git a/code/modules/mapping/access_helpers/airlock_helpers.dm b/code/modules/mapping/access_helpers/airlock_helpers.dm index 3aaa7873076f..1830fa2bc1c4 100644 --- a/code/modules/mapping/access_helpers/airlock_helpers.dm +++ b/code/modules/mapping/access_helpers/airlock_helpers.dm @@ -245,11 +245,6 @@ access_list += ACCESS_MINING_STATION return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/materials/get_access() - var/list/access_list = ..() - access_list += ACCESS_MATERIALS - return access_list - /obj/effect/mapping_helpers/airlock/access/any/supply/qm/get_access() var/list/access_list = ..() access_list += ACCESS_QM @@ -600,11 +595,6 @@ access_list += ACCESS_MINING_STATION return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/materials/get_access() - var/list/access_list = ..() - access_list += ACCESS_MATERIALS - return access_list - /obj/effect/mapping_helpers/airlock/access/all/supply/qm/get_access() var/list/access_list = ..() access_list += ACCESS_QM diff --git a/code/modules/mapping/access_helpers/windoor_helpers.dm b/code/modules/mapping/access_helpers/windoor_helpers.dm index 603e6e8140e0..e27e9210cec0 100644 --- a/code/modules/mapping/access_helpers/windoor_helpers.dm +++ b/code/modules/mapping/access_helpers/windoor_helpers.dm @@ -244,11 +244,6 @@ access_list += ACCESS_MINING_STATION return access_list -/obj/effect/mapping_helpers/windoor/access/any/supply/materials/get_access() - var/list/access_list = ..() - access_list += ACCESS_MATERIALS - return access_list - /obj/effect/mapping_helpers/windoor/access/any/supply/qm/get_access() var/list/access_list = ..() access_list += ACCESS_QM @@ -599,11 +594,6 @@ access_list += ACCESS_MINING_STATION return access_list -/obj/effect/mapping_helpers/windoor/access/all/supply/materials/get_access() - var/list/access_list = ..() - access_list += ACCESS_MATERIALS - return access_list - /obj/effect/mapping_helpers/windoor/access/all/supply/qm/get_access() var/list/access_list = ..() access_list += ACCESS_QM diff --git a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm index 5f4d743909c9..f810befec31d 100644 --- a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm @@ -20,7 +20,7 @@ var/process = 0 circuit = /obj/item/circuitboard/computer/telecomms/comm_traffic - req_access = list(ACCESS_TCOMMS) + req_access = list(ACCESS_TCOMMS_ADMIN) var/unlimited_range = FALSE /obj/machinery/computer/telecomms/traffic/Initialize(mapload) diff --git a/yogstation/code/modules/power/apc.dm b/yogstation/code/modules/power/apc.dm index 0ec31d4e2058..c8d001750e17 100644 --- a/yogstation/code/modules/power/apc.dm +++ b/yogstation/code/modules/power/apc.dm @@ -1,4 +1,4 @@ /obj/machinery/power/apc/tcomms req_access = null - req_one_access = list(ACCESS_TCOMMS_ADMIN, ACCESS_ENGINE_EQUIP) + req_one_access = list(ACCESS_TCOMMS, ACCESS_ENGINE_EQUIP) cell_type = /obj/item/stock_parts/cell/upgraded/plus // Apparently it's always been this? *shrug From c34f878d3ea8bccaf527d33599cfd1d6a91580f1 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 31 Jul 2024 01:51:04 +0200 Subject: [PATCH 37/48] ballin --- code/__DEFINES/access.dm | 8 +++----- code/game/objects/items/cards_ids.dm | 4 ++-- code/modules/jobs/access.dm | 16 +++++++--------- .../jobs/job_types/atmospheric_technician.dm | 2 +- code/modules/jobs/job_types/bartender.dm | 2 +- code/modules/jobs/job_types/botanist.dm | 2 +- .../jobs/job_types/cargo_technician.dm | 4 ++-- code/modules/jobs/job_types/chaplain.dm | 2 +- code/modules/jobs/job_types/chemist.dm | 2 +- code/modules/jobs/job_types/chief_engineer.dm | 10 ++++++---- .../jobs/job_types/chief_medical_officer.dm | 9 ++++++--- code/modules/jobs/job_types/clown.dm | 5 +++-- code/modules/jobs/job_types/cook.dm | 3 ++- code/modules/jobs/job_types/curator.dm | 5 +++-- code/modules/jobs/job_types/detective.dm | 4 ++-- code/modules/jobs/job_types/geneticist.dm | 5 +++-- .../jobs/job_types/head_of_personnel.dm | 17 +++++++++++++++-- .../jobs/job_types/head_of_security.dm | 2 +- code/modules/jobs/job_types/janitor.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/quartermaster.dm | 2 +- .../jobs/job_types/research_director.dm | 2 +- code/modules/jobs/job_types/roboticist.dm | 2 +- code/modules/jobs/job_types/scientist.dm | 2 +- .../jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/shaft_miner.dm | 2 +- .../jobs/job_types/station_engineer.dm | 2 +- code/modules/jobs/job_types/synthetic.dm | 19 +++++++------------ code/modules/jobs/job_types/virologist.dm | 2 +- code/modules/jobs/job_types/warden.dm | 2 +- code/modules/mining/machine_redemption.dm | 1 - code/modules/mining/machine_vending.dm | 1 - .../programs/command/synth_requester.dm | 2 +- .../modules/jobs/job_types/mining_medic.dm | 2 +- 34 files changed, 80 insertions(+), 69 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 292bd69afebc..35d83e3fe700 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -31,7 +31,7 @@ #define ACCESS_PERSONAL_LOCKERS "personal_lockers" /// Access used for Access-Changing Programs, this one will unlock all options that can be ever given via that program. #define ACCESS_CHANGE_IDS "change_ids" -/// Access used for the Captain's personal quarters in mapping, as well as what allows one to order emergency shuttles. +/// Access used for the Captain's personal quarters in mapping, the spare ID cabinet, and the antique gun (but only on gamma alert or above). #define ACCESS_CAPTAIN "captain" @@ -39,13 +39,13 @@ /// Security's General Access, armaments vendor, security lockers, and other secure gear. Applied to things to Officers and Wardens should access, but never Lawyers or Detectives. #define ACCESS_SECURITY "security" -/// Access to the front doors of the Brig, the "secure" portion of the Courtroom, and department outposts. Notably given to Lawyers, Heads of Staff, and Detectives. +/// Access to the front doors of the Brig, the "secure" portion of the Courtroom, and department outposts. Given to Lawyers, Heads of Staff, and Detectives. #define ACCESS_SEC_BASIC "sec_basic" /// Access to brig cells, brig timers, permabrig, gulag, gulag teleporter, gulag shuttle, prisoner management console, and some security cargo crates. #define ACCESS_BRIG "brig" /// Access to the armory, security incinerator (when present), and the execution/re-education chamber. #define ACCESS_ARMORY "armory" -/// Access for the Detective to get into their office, the medical data console, and some other detective-related stuff. +/// Access for the Detective, their office, and medical data console. Always mixed with ACCESS_SECURITY in the security office/delivery windoor, and the arrivals and departure sec checkpoints. #define ACCESS_DETECTIVE "detective" /// Access for the Brig Physician and their locker, also used for the Brig Infirmary doors. #define ACCESS_BRIG_PHYS "brig_phys" @@ -115,8 +115,6 @@ #define ACCESS_MINING "mining" /// Access to the "off-station" Mining Station, which contains gear dedicated for miners to do their job best, as well as seek shelter from the inhospitable elements. #define ACCESS_MINING_STATION "mining_station" -/// Access to release materials from the ORM. -#define ACCESS_MATERIALS "materials" /// Access for the Quartermaster's personal quarters in mapping, as well as some other QM-related things. #define ACCESS_QM "qm" diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index cb2a4da9a64f..7e91ff0ec0bb 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -608,7 +608,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/syndicate name = "agent card" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_MATERIALS) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE) var/anyone = FALSE //Can anyone forge the ID or just syndicate? var/forged = FALSE //have we set a custom name and job assignment, or will we use what we're given when we chameleon change? @@ -1029,7 +1029,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/mining name = "mining ID" - access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_CARGO, ACCESS_MATERIALS) + access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_CARGO) /obj/item/card/id/away name = "a perfectly generic identification card" diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index d1a1f7f297ca..414ce6a43e61 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -140,17 +140,17 @@ // Service/Civilian ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, // Security - ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, ACCESS_HOS, + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_HOS, // Medical - ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, // Science - ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_RD, + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_MECH_SCIENCE, ACCESS_RD, // Engineering ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, // Supply - ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MATERIALS, ACCESS_VAULT, ACCESS_MECH_MINING, ACCESS_QM, + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_QM, // Command - ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_SECURE_TECH, ACCESS_RND_SERVERS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS_ADMIN, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_HOP, ACCESS_CAPTAIN) + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_CAPTAIN) /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -178,7 +178,7 @@ /proc/get_all_syndicate_access() return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) -/// Gets access from region ID +/// Gets access from region ID - Overlap between departments for the sake of ID Console and door remote grouping /proc/get_region_accesses(code) switch(code) if(0) @@ -213,6 +213,7 @@ ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, + ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, @@ -253,7 +254,6 @@ ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, - ACCESS_MATERIALS, ACCESS_VAULT, ACCESS_MECH_MINING, ACCESS_QM) @@ -385,8 +385,6 @@ return "Mining" if(ACCESS_MINING_STATION) return "Mining Station" - if(ACCESS_MATERIALS) - return "Materials Auth." if(ACCESS_QM) return "QM Office" if(ACCESS_SCIENCE) diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 181694a46b31..01444973c938 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/atmos added_access = list(ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE) - base_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MATERIALS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_ENGINE) + base_access = list(ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_ENGINE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 334408626d54..3b1b842dd426 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/bartender added_access = list(ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_MORGUE) - base_access = list(ACCESS_BAR, ACCESS_MATERIALS, ACCESS_WEAPONS_PERMIT, ACCESS_SERVICE) + base_access = list(ACCESS_SERVICE, ACCESS_BAR, ACCESS_WEAPONS_PERMIT) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BARTENDER diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index d0a88c027fe3..e413975af63f 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -13,7 +13,7 @@ alt_titles = list("Ecologist", "Agriculturist", "Botany Greenhorn", "Hydroponicist", "Gardener") added_access = list(ACCESS_BAR, ACCESS_KITCHEN) - base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MATERIALS, ACCESS_SERVICE) + base_access = list(ACCESS_SERVICE, ACCESS_HYDROPONICS, ACCESS_MORGUE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BOTANIST diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index ec32ae7b6f7a..d8f6f027bec7 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -14,8 +14,8 @@ alt_titles = list("Deliveryperson", "Mail Service", "Exports Handler", "Cargo Trainee", "Crate Pusher", "Courier") - added_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION) - base_access = list(ACCESS_CARGO, ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_MATERIALS) + added_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION) + base_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index b4b3d364cfde..9cbe7fb3a0fa 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -14,7 +14,7 @@ alt_titles = list("Priest", "Preacher", "Cleric", "Exorcist", "Vicar") added_access = list() - base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE, ACCESS_SERVICE) + base_access = list(ACCESS_SERVICE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MORGUE, ACCESS_THEATRE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 7378c2759679..79137924c466 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -17,7 +17,7 @@ outfit = /datum/outfit/job/chemist added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL, ACCESS_MATERIALS) + base_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index e5fc171f905b..8ec1e05487cb 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -20,10 +20,12 @@ outfit = /datum/outfit/job/ce added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, - ACCESS_COMMAND, ACCESS_CONSTRUCTION, ACCESS_SEC_BASIC, ACCESS_AI_SAT, ACCESS_MECH_ENGINE, - ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS) + base_access = list(ACCESS_COMMAND, ACCESS_ENGINEERING, ACCESS_CE, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, + ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, + ACCESS_MECH_ENGINE, ACCESS_SEC_BASIC, ACCESS_EVA, ACCESS_AI_SAT, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_ENG diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 49f7d99294ba..92f9d5c9e9e0 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -20,9 +20,12 @@ outfit = /datum/outfit/job/cmo added_access = list(ACCESS_CAPTAIN) //Yogs: Gives CMO access to the brig physicians locker - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_COMMAND, ACCESS_MATERIALS, - ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL, - ACCESS_KEYCARD_AUTH, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS, ACCESS_PARAMEDIC, ACCESS_PSYCHOLOGY) //Yogs: Gives CMO access to the brig physicians locker + base_access = list(ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_CMO, ACCESS_SURGERY, + ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, + ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, + ACCESS_MECH_MEDICAL, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_EVA, + ACCESS_BRIG_PHYS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index c9d9e7f0a6f3..ba6ef66ff7aa 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -12,8 +12,9 @@ alt_titles = list("Entertainer", "Comedian", "Jester", "Improv Artist") - added_access = list() - base_access = list(ACCESS_THEATRE, ACCESS_SERVICE) + added_access = list(ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SERVICE, ACCESS_THEATRE) + paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index bce9ee2c44e7..30fae7c1729a 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -14,7 +14,8 @@ alt_titles = list("Chef", "Hash Slinger", "Sous-chef", "Culinary Artist", "Culinarian") added_access = list(ACCESS_HYDROPONICS, ACCESS_BAR) - base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MATERIALS, ACCESS_SERVICE) + base_access = list(ACCESS_SERVICE, ACCESS_KITCHEN, ACCESS_MORGUE) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 06efecc8b9bd..3a048de75033 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -13,8 +13,9 @@ alt_titles = list("Librarian", "Journalist", "Archivist", "Cartographer", "Space Archaeologist") - added_access = list() - base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION, ACCESS_SERVICE) + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_SERVICE, ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_BLOODSUCKER_HUNTER) diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 4563bc4e0021..6524f497c56c 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -17,8 +17,8 @@ alt_titles = list("Forensic Analyst", "Private Eye") - added_access = list() - base_access = list(ACCESS_SEC_BASIC, ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MATERIALS) + added_access = list(ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_SEC_BASIC, ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 5f7e0b9826cb..879535c8d2b4 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -13,8 +13,9 @@ outfit = /datum/outfit/job/geneticist - added_access = list(ACCESS_CHEMISTRY, ACCESS_XENOBIOLOGY, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_RESEARCH) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_SCIENCE, ACCESS_MATERIALS) + added_access = list(ACCESS_CHEMISTRY, ACCESS_RESEARCH) + base_access = list(ACCESS_MEDICAL, ACCESS_SCIENCE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 159096d87b47..684c45190a68 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -20,13 +20,26 @@ outfit = /datum/outfit/job/hop added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_WEAPONS_PERMIT, + base_access = list( + + ACCESS_COMMAND, ACCESS_SERVICE, ACCESS_HOP, ACCESS_CHANGE_IDS, + ACCESS_PERSONAL_LOCKERS, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, + ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, + ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_SEC_BASIC, + ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_WEAPONS_PERMIT, ACCESS_AI_SAT, + + + + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_WEAPONS_PERMIT, ACCESS_MEDICAL, ACCESS_ENGINEERING, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS, ACCESS_CLERK, ACCESS_SERVICE) //yogs - added ACCESS_CLERK as it's the clerk's + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CLERK, ACCESS_SERVICE) //yogs - added ACCESS_CLERK as it's the clerk's + + + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index b0243567be6e..9cc279d700ff 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -24,7 +24,7 @@ base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_ENGINEERING, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_CARGO, - ACCESS_COMMAND, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_MATERIALS, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker + ACCESS_COMMAND, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 80d92046d9b2..c6dc12a971b2 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -13,7 +13,7 @@ alt_titles = list("Custodian", "Sanitation Worker", "Cleaner", "Caretaker", "Maid") added_access = list() - base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MATERIALS, ACCESS_CARGO, ACCESS_SCIENCE, ACCESS_MEDICAL, ACCESS_SERVICE) + base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_SCIENCE, ACCESS_MEDICAL, ACCESS_SERVICE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 68ab4270ed98..29dc7ff877f4 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -15,7 +15,7 @@ outfit = /datum/outfit/job/doctor added_access = list(ACCESS_CHEMISTRY, ACCESS_GENETICS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MATERIALS) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 01696e3e1315..8cb212cb4817 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -11,7 +11,7 @@ outfit = /datum/outfit/job/quartermaster alt_titles = list("Stock Controller", "Cargo Coordinator", "Shipping Overseer", "Postmaster General") added_access = list() - base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MATERIALS, ACCESS_VAULT, ACCESS_RC_ANNOUNCE) + base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_VAULT, ACCESS_RC_ANNOUNCE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_QUARTERMASTER diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index c0ca67e4b05f..07c5f40b4d80 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -25,7 +25,7 @@ base_access = list(ACCESS_RD, ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_TOXINS_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_BASIC, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_MASTER, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MATERIALS, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TECH_STORAGE, ACCESS_AI_SAT, ACCESS_MAINT_TUNNELS) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index a0599ccdc136..dc4000093bbb 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/roboticist added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RESEARCH) - base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MATERIALS) + base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 42898daee6a8..50e1481913e2 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -13,7 +13,7 @@ outfit = /datum/outfit/job/scientist added_access = list(ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_GENETICS) - base_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MATERIALS) + base_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index e173bfb4598d..61d73dd852b3 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -18,7 +18,7 @@ alt_titles = list("Threat Response Officer", "Civilian Protection Officer", "Corporate Officer", "Peacekeeper") added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_MATERIALS) // See /datum/job/officer/get_access() + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY) // See /datum/job/officer/get_access() paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index a9121a343938..4c444da2e9ef 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -13,7 +13,7 @@ outfit = /datum/outfit/job/miner added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_QM, ACCESS_SCIENCE, ACCESS_RESEARCH) - base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_CARGO, ACCESS_MATERIALS) + base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_CARGO) paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 683d571d4281..31bb786b8b86 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -16,7 +16,7 @@ added_access = list(ACCESS_ATMOSPHERICS, ACCESS_SCIENCE, ACCESS_RESEARCH) base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MATERIALS) + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG diff --git a/code/modules/jobs/job_types/synthetic.dm b/code/modules/jobs/job_types/synthetic.dm index f1a2e8911ad4..5e648fdf9b10 100644 --- a/code/modules/jobs/job_types/synthetic.dm +++ b/code/modules/jobs/job_types/synthetic.dm @@ -1,16 +1,11 @@ GLOBAL_LIST_INIT(synthetic_base_access, list( - ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, - ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_SCIENCE, - ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_COMMAND, ACCESS_CAPTAIN, ACCESS_PERSONAL_LOCKERS, - ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, - ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, - ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, - ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_CARGO, ACCESS_WEAPONS_PERMIT, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS, ACCESS_MATERIALS, ACCESS_AI_SAT, ACCESS_TCOMMS_ADMIN, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_CLERK, ACCESS_BRIG_PHYS, ACCESS_PSYCHOLOGY, ACCESS_SERVICE)) + ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, ACCESS_HOS, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_RD, + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_VAULT, ACCESS_MECH_MINING, ACCESS_QM, + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_SECURE_TECH, ACCESS_RND_SERVERS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS_ADMIN, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_HOP, ACCESS_CAPTAIN)) GLOBAL_LIST_EMPTY(synthetic_added_access) diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 57bbe3b5772e..8f81b7ba8b7e 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -18,7 +18,7 @@ alt_titles = list("Microbiologist", "Pathologist", "Junior Disease Researcher", "Epidemiologist", "Disease Control Expert") added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MATERIALS) + base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index f9b85ae1e5d5..66400278f669 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -20,7 +20,7 @@ alt_titles = list("Brig Watchman", "Brig Superintendent", "Security Dispatcher", "Prison Supervisor") added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_MEDICAL) //they get medical access because apparently the windoors AREN'T BRIG PHYS ACCESS - base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_WEAPONS_PERMIT, ACCESS_MATERIALS) // See /datum/job/warden/get_access() + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_WEAPONS_PERMIT) // See /datum/job/warden/get_access() paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index a5bc866483f3..69cffe338349 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -9,7 +9,6 @@ density = TRUE input_dir = NORTH output_dir = SOUTH - req_access = list(ACCESS_MATERIALS) speed_process = TRUE circuit = /obj/item/circuitboard/machine/ore_redemption layer = BELOW_OBJ_LAYER diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 618e7070fccb..50f0c7be380a 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -455,7 +455,6 @@ I.access |= ACCESS_MINING I.access |= ACCESS_MINING_STATION I.access |= ACCESS_MECH_MINING - I.access |= ACCESS_MATERIALS I.access |= ACCESS_CARGO I.access |= ACCESS_CARGO to_chat(user, "You upgrade [I] with mining access.") diff --git a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm index e5d6d38d4a08..fc1ed304120e 100644 --- a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm +++ b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_supply") if(ACCESS_HOP in user_id.access) - var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_CARGO, ACCESS_MINING_STATION, ACCESS_MATERIALS) + var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_CARGO, ACCESS_MINING_STATION) if(GLOB.granted_synthetic_access[SUPPLY]) GLOB.granted_synthetic_access[SUPPLY] = FALSE binary_talk("Synthetic assistance no longer required in the Supply department", "Synthetic Access Requester") diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm index 34cf6017ded7..ea0a89a2e295 100644 --- a/yogstation/code/modules/jobs/job_types/mining_medic.dm +++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm @@ -29,7 +29,7 @@ //if it's skeleton there's probably no paramedic to save spaced miners that jaunted away from danger added_access = list(ACCESS_SURGERY, ACCESS_CARGO_BAY, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO, ACCESS_MATERIALS, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_MINING_MEDIC From 429d847d202118bf77726d8b6e4cd6f7575fd8be Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 31 Jul 2024 20:07:34 +0200 Subject: [PATCH 38/48] ballin --- code/modules/jobs/access.dm | 1 + code/modules/jobs/job_types/curator.dm | 2 +- code/modules/jobs/job_types/geneticist.dm | 2 +- .../jobs/job_types/head_of_personnel.dm | 27 +++++++------------ .../jobs/job_types/head_of_security.dm | 14 +++++++--- code/modules/jobs/job_types/janitor.dm | 4 ++- code/modules/jobs/job_types/lawyer.dm | 3 ++- code/modules/jobs/job_types/medical_doctor.dm | 6 +++-- code/modules/jobs/job_types/mime.dm | 4 +-- code/modules/jobs/job_types/quartermaster.dm | 8 +++++- .../jobs/job_types/research_director.dm | 12 +++++---- code/modules/jobs/job_types/roboticist.dm | 6 +++-- code/modules/jobs/job_types/scientist.dm | 5 ++-- .../jobs/job_types/security_officer.dm | 6 +++-- code/modules/jobs/job_types/shaft_miner.dm | 6 +++-- .../jobs/job_types/station_engineer.dm | 3 ++- code/modules/jobs/job_types/virologist.dm | 1 + code/modules/jobs/job_types/warden.dm | 6 +++-- .../modules/jobs/job_types/brig_physician.dm | 6 +++-- .../code/modules/jobs/job_types/clerk.dm | 8 ++++-- .../modules/jobs/job_types/mining_medic.dm | 4 ++- .../modules/jobs/job_types/network_admin.dm | 4 ++- .../code/modules/jobs/job_types/paramedic.dm | 4 ++- .../modules/jobs/job_types/psychiatrist.dm | 1 + 24 files changed, 90 insertions(+), 53 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 414ce6a43e61..e0c16a7fac93 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -247,6 +247,7 @@ ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, + ACCESS_AI_SAT, ACCESS_MECH_ENGINE, ACCESS_CE) if(6) // Supply diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 3a048de75033..7052f0f3acbc 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -13,7 +13,7 @@ alt_titles = list("Librarian", "Journalist", "Archivist", "Cartographer", "Space Archaeologist") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_AUX_BASE) base_access = list(ACCESS_SERVICE, ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) paycheck = PAYCHECK_EASY diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 879535c8d2b4..9140376187a4 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/geneticist added_access = list(ACCESS_CHEMISTRY, ACCESS_RESEARCH) - base_access = list(ACCESS_MEDICAL, ACCESS_SCIENCE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE ACCESS_MECH_MEDICAL) + base_access = list(ACCESS_MEDICAL, ACCESS_SCIENCE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 684c45190a68..1b9cb3eda21f 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -20,23 +20,16 @@ outfit = /datum/outfit/job/hop added_access = list(ACCESS_CAPTAIN) - base_access = list( - - ACCESS_COMMAND, ACCESS_SERVICE, ACCESS_HOP, ACCESS_CHANGE_IDS, - ACCESS_PERSONAL_LOCKERS, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, - ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, - ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_SEC_BASIC, - ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_WEAPONS_PERMIT, ACCESS_AI_SAT, - - - - ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_WEAPONS_PERMIT, - ACCESS_MEDICAL, ACCESS_ENGINEERING, ACCESS_CHANGE_IDS, ACCESS_AI_MASTER, ACCESS_EVA, ACCESS_COMMAND, - ACCESS_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CLERK, ACCESS_SERVICE) //yogs - added ACCESS_CLERK as it's the clerk's + base_access = list(ACCESS_COMMAND, ACCESS_SERVICE, ACCESS_CARGO, ACCESS_HOP, + ACCESS_CHANGE_IDS, ACCESS_PERSONAL_LOCKERS, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, + ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, + ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, + ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_QM, + ACCESS_MECH_MINING, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_EVA, + ACCESS_WEAPONS_PERMIT, ACCESS_AI_SAT, ACCESS_MEDICAL, ACCESS_ENGINEERING, + ACCESS_AUX_BASE, ACCESS_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, + ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH) diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 9cc279d700ff..a77d968eae0b 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -21,10 +21,16 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, - ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband - ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_ENGINEERING, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_CARGO, - ACCESS_COMMAND, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker + base_access = list(ACCESS_COMMAND, ACCESS_SECURITY, ACCESS_HOS, ACCESS_SEC_BASIC, + ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, + ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, + ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_EXPERIMENTATION, + ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CARGO_BAY, + ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, ACCESS_EVA, + ACCESS_PERSONAL_LOCKERS, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index c6dc12a971b2..e74ac4e6e67b 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -13,7 +13,9 @@ alt_titles = list("Custodian", "Sanitation Worker", "Cleaner", "Caretaker", "Maid") added_access = list() - base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_SCIENCE, ACCESS_MEDICAL, ACCESS_SERVICE) + base_access = list(ACCESS_SERVICE, ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_CARGO, + ACCESS_SCIENCE, ACCESS_MEDICAL, ACCESS_CONSTRUCTION) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index a890bedbdbab..e900a962bb6c 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -14,7 +14,8 @@ outfit = /datum/outfit/job/lawyer added_access = list() - base_access = list(ACCESS_LAWYER, ACCESS_SEC_BASIC, ACCESS_SERVICE) + base_access = list(ACCESS_SERVICE, ACCESS_SEC_BASIC, ACCESS_LAWYER) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 29dc7ff877f4..284c7c33629b 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -14,8 +14,10 @@ outfit = /datum/outfit/job/doctor - added_access = list(ACCESS_CHEMISTRY, ACCESS_GENETICS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL) + added_access = list(ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_VIROLOGY) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, + ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 144a3a734eef..a972ffa52594 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -12,8 +12,8 @@ alt_titles = list("Mute Entertainer", "Silent Jokester", "Pantomimist") - added_access = list() - base_access = list(ACCESS_THEATRE, ACCESS_SERVICE) + added_access = list(ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SERVICE, ACCESS_THEATRE) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 8cb212cb4817..86432c33764b 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -8,10 +8,16 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + outfit = /datum/outfit/job/quartermaster + alt_titles = list("Stock Controller", "Cargo Coordinator", "Shipping Overseer", "Postmaster General") + added_access = list() - base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_VAULT, ACCESS_RC_ANNOUNCE) + base_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_CARGO_BAY, ACCESS_MINING, + ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING, + ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_RC_ANNOUNCE) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_QUARTERMASTER diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 07c5f40b4d80..21537077bb69 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -22,11 +22,13 @@ outfit = /datum/outfit/job/rd added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_RD, ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_GENETICS, ACCESS_MORGUE, - ACCESS_TOXINS_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_BASIC, ACCESS_MECH_SCIENCE, - ACCESS_RESEARCH, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_MASTER, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, - ACCESS_TECH_STORAGE, ACCESS_AI_SAT, ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_RD, ACCESS_RESEARCH, + ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, + ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, + ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_TELEPORTER, + ACCESS_AUX_BASE, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index dc4000093bbb..ffd5560039da 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -13,8 +13,10 @@ outfit = /datum/outfit/job/roboticist - added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RESEARCH) - base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING) + added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_EXPERIMENTATION) + base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_MORGUE, + ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 50e1481913e2..f0f851633a56 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -12,8 +12,9 @@ alt_titles = list("Researcher", "Toxins Specialist", "Physicist", "Test Associate", "Anomalist", "Quantum Physicist", "Theoretical Physicist", "Xenobiologist", "Explosives Technician", "Hypothetical Physicist") outfit = /datum/outfit/job/scientist - added_access = list(ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_GENETICS) - base_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE) + added_access = list(ACCESS_ROBO_CONTROL, ACCESS_GENETICS) + base_access = list(ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, + ACCESS_EXPERIMENTATION, ACCESS_XENOBIOLOGY, ACCESS_AUX_BASE, ACCESS_MECH_SCIENCE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 61d73dd852b3..fed23668d65b 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -17,8 +17,10 @@ alt_titles = list("Threat Response Officer", "Civilian Protection Officer", "Corporate Officer", "Peacekeeper") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY) // See /datum/job/officer/get_access() + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS) + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_SECURITY) // See /datum/job/officer/get_access() + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 4c444da2e9ef..af917644e4e2 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -12,8 +12,10 @@ outfit = /datum/outfit/job/miner - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_QM, ACCESS_SCIENCE, ACCESS_RESEARCH) - base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_CARGO) + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_QM, ACCESS_SCIENCE, + ACCESS_RESEARCH, ACCESS_AUX_BASE) + base_access = list(ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING) + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 31bb786b8b86..aab47082a52a 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -16,7 +16,8 @@ added_access = list(ACCESS_ATMOSPHERICS, ACCESS_SCIENCE, ACCESS_RESEARCH) base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION) + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 8f81b7ba8b7e..918a071ff94d 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -19,6 +19,7 @@ added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING) base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 66400278f669..7e0791411c37 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -19,8 +19,10 @@ alt_titles = list("Brig Watchman", "Brig Superintendent", "Security Dispatcher", "Prison Supervisor") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_MEDICAL) //they get medical access because apparently the windoors AREN'T BRIG PHYS ACCESS - base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_WEAPONS_PERMIT) // See /datum/job/warden/get_access() + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE) + base_access = list(ACCESS_SECURITY, ACCESS_ARMORY, ACCESS_SEC_BASIC, ACCESS_BRIG, + ACCESS_MECH_SECURITY, ACCESS_WEAPONS_PERMIT, ACCESS_BRIG_PHYS, ACCESS_EXTERNAL_AIRLOCKS) // See /datum/job/warden/get_access() + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/yogstation/code/modules/jobs/job_types/brig_physician.dm b/yogstation/code/modules/jobs/job_types/brig_physician.dm index 82f98c037b7e..34183852ca10 100644 --- a/yogstation/code/modules/jobs/job_types/brig_physician.dm +++ b/yogstation/code/modules/jobs/job_types/brig_physician.dm @@ -22,8 +22,10 @@ /datum/job_department/security, ) - added_access = list(ACCESS_SURGERY, ACCESS_CLONING, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_BRIG, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, ACCESS_BRIG_PHYS) + added_access = list(ACCESS_SURGERY, ACCESS_CLONING) + base_access = list(ACCESS_MEDICAL, ACCESS_SEC_BASIC, ACCESS_BRIG_PHYS, ACCESS_MORGUE, + ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN diff --git a/yogstation/code/modules/jobs/job_types/clerk.dm b/yogstation/code/modules/jobs/job_types/clerk.dm index cd9932722f94..0f1288ea8ea6 100644 --- a/yogstation/code/modules/jobs/job_types/clerk.dm +++ b/yogstation/code/modules/jobs/job_types/clerk.dm @@ -7,12 +7,16 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - added_access = list() - base_access = list(ACCESS_SERVICE, ACCESS_CLERK) alt_titles = list("Salesman", "Gift Shop Attendent", "Retail Worker") + outfit = /datum/outfit/job/clerk + + added_access = list(ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SERVICE, ACCESS_CLERK) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV + display_order = JOB_DISPLAY_ORDER_CLERK minimal_character_age = 18 //Capitalism doesn't care about age diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm index ea0a89a2e295..a23c87a62988 100644 --- a/yogstation/code/modules/jobs/job_types/mining_medic.dm +++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm @@ -29,7 +29,9 @@ //if it's skeleton there's probably no paramedic to save spaced miners that jaunted away from danger added_access = list(ACCESS_SURGERY, ACCESS_CARGO_BAY, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) + base_access = list(ACCESS_CARGO, ACCESS_MEDICAL, ACCESS_MINING, ACCESS_MINING_STATION, + ACCESS_MORGUE, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_MINING_MEDIC diff --git a/yogstation/code/modules/jobs/job_types/network_admin.dm b/yogstation/code/modules/jobs/job_types/network_admin.dm index f83e6829d863..d9bc3412367d 100644 --- a/yogstation/code/modules/jobs/job_types/network_admin.dm +++ b/yogstation/code/modules/jobs/job_types/network_admin.dm @@ -14,7 +14,9 @@ outfit = /datum/outfit/job/network_admin added_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS) - base_access = list(ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_RESEARCH, ACCESS_AI_SAT, ACCESS_RESEARCH, ACCESS_SCIENCE) + base_access = list(ACCESS_SCIENCE, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, + ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_RESEARCH, ACCESS_AI_SAT) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_NETWORK_ADMIN diff --git a/yogstation/code/modules/jobs/job_types/paramedic.dm b/yogstation/code/modules/jobs/job_types/paramedic.dm index 5ce2ea6200a8..d23b0ea90827 100644 --- a/yogstation/code/modules/jobs/job_types/paramedic.dm +++ b/yogstation/code/modules/jobs/job_types/paramedic.dm @@ -12,7 +12,9 @@ outfit = /datum/outfit/job/paramedic added_access = list(ACCESS_SURGERY, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC, ACCESS_MECH_MEDICAL) + base_access = list(ACCESS_MEDICAL, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_PARAMEDIC diff --git a/yogstation/code/modules/jobs/job_types/psychiatrist.dm b/yogstation/code/modules/jobs/job_types/psychiatrist.dm index 3b61c2a5aa5d..666a799495d1 100644 --- a/yogstation/code/modules/jobs/job_types/psychiatrist.dm +++ b/yogstation/code/modules/jobs/job_types/psychiatrist.dm @@ -14,6 +14,7 @@ added_access = list(ACCESS_CHEMISTRY) base_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED mind_traits = list(TRAIT_PSYCH) From 9b89371f94834bddceeb7fbb6abc85a8732ccd6e Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 31 Jul 2024 23:31:13 +0200 Subject: [PATCH 39/48] ballin --- code/modules/jobs/access.dm | 17 +++++++++++++---- code/modules/jobs/job_types/chief_engineer.dm | 2 +- .../jobs/job_types/chief_medical_officer.dm | 2 +- code/modules/jobs/job_types/head_of_security.dm | 8 ++++---- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index e0c16a7fac93..583820f42c9b 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -156,11 +156,20 @@ /proc/get_all_centcom_access() return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN) -/// Gets all accesses between 1 and 500 +/// Every access in the game, temp solution /proc/get_debug_access() - . = list() - for(var/i = 1; i <= 500; i++) - . += i + return list( + ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_HOS, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_MECH_SCIENCE, ACCESS_RD, + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_QM, + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_CAPTAIN, + ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN, + ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_BLOODCULT, ACCESS_CLOCKCULT, + ACCESS_RUINS_GENERAL, ACCESS_RUINS_COMMAND, ACCESS_RUINS_SECURITY, ACCESS_RUINS_ENGINEERING, ACCESS_RUINS_MEDICAL, ACCESS_RUINS_SUPPLY, ACCESS_RUINS_SCIENCE, ACCESS_RUINS_MAINTENANCE, ACCESS_RUINS_MATERIALS, ACCESS_RUINS_GENERIC1, ACCESS_RUINS_GENERIC2, ACCESS_RUINS_GENERIC3, ACCESS_RUINS_GENERIC4, ACCESS_RUINS_MECH, + ACCESS_INACCESSIBLE) // Killing myself /// Gets access for ERT /proc/get_ert_access(class) diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 8ec1e05487cb..de80adfed05c 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -19,7 +19,7 @@ outfit = /datum/outfit/job/ce - added_access = list(ACCESS_CAPTAIN) + added_access = list(ACCESS_CAPTAIN, ACCESS_AI_MASTER) base_access = list(ACCESS_COMMAND, ACCESS_ENGINEERING, ACCESS_CE, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 92f9d5c9e9e0..c24f83422b19 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -19,7 +19,7 @@ outfit = /datum/outfit/job/cmo - added_access = list(ACCESS_CAPTAIN) //Yogs: Gives CMO access to the brig physicians locker + added_access = list(ACCESS_CAPTAIN, ACCESS_AI_SAT, ACCESS_AI_MASTER) //Yogs: Gives CMO access to the brig physicians locker base_access = list(ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_CMO, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index a77d968eae0b..173c9f052cef 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -20,16 +20,16 @@ outfit = /datum/outfit/job/hos mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) - added_access = list(ACCESS_CAPTAIN) + added_access = list(ACCESS_CAPTAIN, ACCESS_AI_MASTER) base_access = list(ACCESS_COMMAND, ACCESS_SECURITY, ACCESS_HOS, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_EXPERIMENTATION, - ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CARGO_BAY, - ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, ACCESS_EVA, - ACCESS_PERSONAL_LOCKERS, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_AI_SAT, ACCESS_CARGO, + ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, + ACCESS_EVA, ACCESS_PERSONAL_LOCKERS, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC From a470a6e051670b58132ccf21d1fc465d198e30e1 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 31 Jul 2024 23:43:15 +0200 Subject: [PATCH 40/48] ballin --- .../RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm | 3 ++- code/modules/jobs/access.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index d9383cbdec45..639f131e68e0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -3861,7 +3861,8 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access = list(ACCESS_SYNDICATE)specialfunctions=4 + req_access = list(ACCESS_SYNDICATE); + specialfunctions=4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 583820f42c9b..31e9e94564f8 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -168,7 +168,7 @@ ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_BLOODCULT, ACCESS_CLOCKCULT, - ACCESS_RUINS_GENERAL, ACCESS_RUINS_COMMAND, ACCESS_RUINS_SECURITY, ACCESS_RUINS_ENGINEERING, ACCESS_RUINS_MEDICAL, ACCESS_RUINS_SUPPLY, ACCESS_RUINS_SCIENCE, ACCESS_RUINS_MAINTENANCE, ACCESS_RUINS_MATERIALS, ACCESS_RUINS_GENERIC1, ACCESS_RUINS_GENERIC2, ACCESS_RUINS_GENERIC3, ACCESS_RUINS_GENERIC4, ACCESS_RUINS_MECH, + ACCESS_RUINS_GENERAL, ACCESS_RUINS_COMMAND, ACCESS_RUINS_SECURITY, ACCESS_RUINS_ENGINEERING, ACCESS_RUINS_MEDICAL, ACCESS_RUINS_SUPPLY, ACCESS_RUINS_SCIENCE, ACCESS_RUINS_MAINTENANCE, ACCESS_RUINS_MATERIALS, ACCESS_RUINS_GENERIC1, ACCESS_RUINS_GENERIC2, ACCESS_RUINS_GENERIC3, ACCESS_RUINS_GENERIC4, ACCESS_MECH_RUINS, ACCESS_INACCESSIBLE) // Killing myself /// Gets access for ERT From 5abcd5e750fdd7481ed7325a8014502b4ae212c5 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Thu, 1 Aug 2024 00:15:59 +0200 Subject: [PATCH 41/48] ballin --- .../AsteroidStation/AsteroidStation.dmm | 12 +++--------- _maps/map_files/DonutStation/DonutStation.dmm | 7 ++----- _maps/map_files/GaxStation/GaxStation.dmm | 2 +- _maps/map_files/IceMeta/IceMeta.dmm | 17 +++++------------ _maps/map_files/YogStation/YogStation.dmm | 10 +++------- 5 files changed, 14 insertions(+), 34 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 65e6a62d83dd..4e276930be3e 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -18715,7 +18715,7 @@ name = "Shutters Control Button"; pixel_x = -25; pixel_y = -26; - req_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + req_access = list(ACCESS_SCIENCE) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -37544,10 +37544,7 @@ pixel_x = -10; pixel_y = -1 }, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ - dir = 1 - }, -/obj/effect/mapping_helpers/windoor/access/any/science/general{ +/obj/effect/mapping_helpers/windoor/access/all/science/general{ dir = 1 }, /turf/open/floor/plating, @@ -52994,10 +52991,7 @@ name = "Research Division Delivery" }, /obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ - dir = 8 - }, -/obj/effect/mapping_helpers/windoor/access/any/science/general{ +/obj/effect/mapping_helpers/windoor/access/all/science/general{ dir = 8 }, /turf/open/floor/plasteel, diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index fc55ae7d5449..525386c1a783 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -30397,10 +30397,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ - dir = 8 - }, -/obj/effect/mapping_helpers/windoor/access/any/science/general{ +/obj/effect/mapping_helpers/windoor/access/all/science/general{ dir = 8 }, /turf/open/floor/plating, @@ -49846,7 +49843,7 @@ name = "Desk Privacy Shutters Control"; pixel_x = 24; pixel_y = -4; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + req_access = list(ACCESS_SCIENCE) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 67c676406228..02801d536b02 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -43723,7 +43723,7 @@ name = "Shutters Control Button"; pixel_x = -7; pixel_y = -24; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + req_access = list(ACCESS_SCIENCE) }, /turf/open/floor/plasteel/white, /area/science/lab) diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index c34dc1f1226e..d221b85938b2 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -59,8 +59,7 @@ pixel_y = 7 }, /obj/item/storage/pencil_holder/crew, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics, -/obj/effect/mapping_helpers/windoor/access/any/science/general, +/obj/effect/mapping_helpers/windoor/access/all/science/general, /turf/open/floor/plating, /area/science/lab) "aaU" = ( @@ -18769,7 +18768,7 @@ id = "research_shutters"; name = "research shutters control"; pixel_x = 28; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + req_access = list(ACCESS_SCIENCE) }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -32765,10 +32764,7 @@ pixel_x = -7; pixel_y = -3 }, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ - dir = 4 - }, -/obj/effect/mapping_helpers/windoor/access/any/science/general{ +/obj/effect/mapping_helpers/windoor/access/all/science/general{ dir = 4 }, /turf/open/floor/plating, @@ -46210,10 +46206,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ - dir = 1 - }, -/obj/effect/mapping_helpers/windoor/access/any/science/general{ +/obj/effect/mapping_helpers/windoor/access/all/science/general{ dir = 1 }, /turf/open/floor/plasteel, @@ -68398,7 +68391,7 @@ name = "research shutters control"; pixel_x = -26; pixel_y = -26; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + req_access = list(ACCESS_SCIENCE) }, /obj/effect/turf_decal/stripes/line{ dir = 1 diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index c9140a9d02ae..bd06e1d016df 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -20373,8 +20373,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics, -/obj/effect/mapping_helpers/windoor/access/any/science/general, +/obj/effect/mapping_helpers/windoor/access/all/science/general, /turf/open/floor/plating, /area/science/lab) "evD" = ( @@ -25528,10 +25527,7 @@ name = "Research Division Delivery" }, /obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ - dir = 8 - }, -/obj/effect/mapping_helpers/windoor/access/any/science/general{ +/obj/effect/mapping_helpers/windoor/access/all/science/general{ dir = 8 }, /turf/open/floor/plasteel, @@ -44319,7 +44315,7 @@ name = "Research Lab Shutters Control"; pixel_x = -6; pixel_y = 24; - req_one_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS) + req_access = list(ACCESS_SCIENCE) }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 From 64d86a62472dd3c396f53b3957ba27a1a9a71c6f Mon Sep 17 00:00:00 2001 From: AMyriad Date: Thu, 1 Aug 2024 02:57:30 +0200 Subject: [PATCH 42/48] ballin --- _maps/map_files/IceMeta/IceMeta.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index d221b85938b2..3ef332cf5b76 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -5216,7 +5216,7 @@ id = "supplybridge"; name = "Shuttle Bay External Bridge Control"; pixel_y = 27; - req_access = list(ACCESS_EXTERNAL) + req_access = list(ACCESS_EXTERNAL_AIRLOCKS) }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44538,7 +44538,7 @@ id = "Podbaydoor"; pixel_x = 24; pixel_y = -1; - req_access = list(ACCESS_EXTERNAL); + req_access = list(ACCESS_EXTERNAL_AIRLOCKS); name = "Shipbreaking External Control" }, /turf/open/floor/plasteel/dark, @@ -62935,7 +62935,7 @@ id = "Podbaydoor"; pixel_x = -24; pixel_y = -1; - req_access = list(ACCESS_EXTERNAL); + req_access = list(ACCESS_EXTERNAL_AIRLOCKS); name = "Shipbreaking External Control" }, /obj/machinery/light, @@ -84200,7 +84200,7 @@ id = "supplybridge"; name = "Shuttle Bay External Bridge Control"; pixel_y = 27; - req_access = list(ACCESS_EXTERNAL) + req_access = list(ACCESS_EXTERNAL_AIRLOCKS) }, /obj/structure/cable/yellow{ icon_state = "4-8" From 3344cf31ec06456c5de0650c18a2cca86b8d946c Mon Sep 17 00:00:00 2001 From: AMyriad Date: Thu, 1 Aug 2024 04:28:27 +0200 Subject: [PATCH 43/48] ballin --- _maps/map_files/AsteroidStation/AsteroidStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 4e276930be3e..7ae3bbb5e4fe 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -15401,7 +15401,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY)) + req_access = list(ACCESS_CARGO_BAY) }, /obj/machinery/button/door{ id = "QMLoaddoor2"; From fd788d71e04713fe5bafd2045deeb8114d59eb97 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Tue, 6 Aug 2024 23:50:59 +0200 Subject: [PATCH 44/48] ballin --- code/modules/jobs/access.dm | 4 ++-- .../file_system/programs/command/card.dm | 8 ++++---- .../file_system/programs/engineering/ntmonitor.dm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 31e9e94564f8..040acec84f26 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -142,7 +142,7 @@ // Security ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_HOS, // Medical - ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, // Science ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_MECH_SCIENCE, ACCESS_RD, // Engineering @@ -161,7 +161,7 @@ return list( ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_HOS, - ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_MECH_SCIENCE, ACCESS_RD, ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_QM, diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 2ece8de0ae6f..cda18d6e817f 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -77,7 +77,7 @@ var/list/head_types = list() for(var/access_text in sub_managers) var/list/info = sub_managers[access_text] - var/access = text2num(access_text) + var/access = access_text if((access in id_card.access) && ((info["region"] in target_dept) || !length(target_dept))) region_access += info["region"] //I don't even know what I'm doing anymore @@ -227,7 +227,7 @@ if("PRG_access") if(!computer || !authenticated) return - var/access_type = text2num(params["access_target"]) + var/access_type = (params["access_target"]) if(access_type in (is_centcom ? get_all_centcom_access() : get_all_accesses())) if(access_type in target_id_card.access) target_id_card.access -= access_type @@ -250,7 +250,7 @@ if("PRG_grantregion") if(!computer || !authenticated) return - var/region = text2num(params["region"]) + var/region = (params["region"]) if(isnull(region) || (!(region in region_access) && minor)) return target_id_card.access |= get_region_accesses(region) @@ -259,7 +259,7 @@ if("PRG_denyregion") if(!computer || !authenticated) return - var/region = text2num(params["region"]) + var/region = (params["region"]) if(isnull(region) || (!(region in region_access) && minor)) return target_id_card.access -= get_region_accesses(region) diff --git a/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm index 5a310a1f7282..8afaa8ac2f55 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm @@ -7,7 +7,7 @@ size = 12 requires_ntnet = TRUE usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_TELESCREEN | PROGRAM_PDA - required_access = ACCESS_ENGINE_EQUIP //NETWORK CONTROL IS A MORE SECURE PROGRAM. + required_access = ACCESS_TCOMMS_ADMIN //NETWORK CONTROL IS A MORE SECURE PROGRAM. available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" program_icon = "network-wired" From 11621ffb14b4ffd8a0a9833e679f60cb214dbf1a Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 7 Aug 2024 02:39:49 +0200 Subject: [PATCH 45/48] ballin --- .../IceRuins/icemoon_surface_inn.dmm | 2 +- .../IceRuins/icemoon_surface_syndicate.dmm | 56 ++--- .../JungleRuins/jungleland_jungle_sinden.dmm | 2 +- .../jungleland_swamp_syndicatestation.dmm | 26 +- _maps/RandomRuins/JungleRuins/miningbase.dmm | 2 +- .../LavaRuins/lavaland_biodome_fishing.dmm | 4 +- .../lavaland_surface_gas_station.dmm | 6 +- .../lavaland_surface_syndicate_base1.dmm | 48 ++-- _maps/RandomRuins/LavaRuins/miningbase.dmm | 2 +- .../SpaceRuins/crashedclownship.dmm | 2 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 6 +- _maps/RandomRuins/SpaceRuins/gameroom.dmm | 4 +- .../SpaceRuins/listeningstation.dmm | 22 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +- _maps/RandomRuins/SpaceRuins/spacebar.dmm | 8 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 12 +- .../StationRuins/BoxStation/chapel1.dmm | 4 +- .../StationRuins/BoxStation/chapel2.dmm | 4 +- .../StationRuins/BoxStation/clerk_box.dmm | 4 +- .../BoxStation/engine_reactor.dmm | 4 +- .../BoxStation/engine_singulo_tesla.dmm | 8 +- .../StationRuins/BoxStation/engine_sm.dmm | 2 +- .../StationRuins/BoxStation/engine_teg.dmm | 4 +- .../StationRuins/BoxStation/transfer1.dmm | 2 +- .../StationRuins/BoxStation/transfer10.dmm | 2 +- .../StationRuins/BoxStation/transfer2.dmm | 2 +- .../StationRuins/BoxStation/transfer3.dmm | 4 +- .../StationRuins/BoxStation/transfer4.dmm | 2 +- .../StationRuins/BoxStation/transfer5.dmm | 2 +- .../StationRuins/BoxStation/transfer6.dmm | 4 +- .../StationRuins/BoxStation/transfer7.dmm | 4 +- .../StationRuins/BoxStation/transfer8.dmm | 2 +- .../StationRuins/BoxStation/transfer9.dmm | 2 +- .../StationRuins/GaxStation/ai_whale.dmm | 10 +- .../StationRuins/MetaStation/meta_reactor.dmm | 4 +- .../MetaStation/meta_singulo_tesla.dmm | 8 +- .../StationRuins/MetaStation/meta_sm.dmm | 2 +- .../StationRuins/MetaStation/meta_teg.dmm | 4 +- _maps/RandomZLevels/TheBeach.dmm | 2 +- _maps/RandomZLevels/VR/snowdin_VR.dmm | 4 +- _maps/RandomZLevels/VR/syndicate_trainer.dmm | 6 +- _maps/RandomZLevels/VR/vrhub.dmm | 6 +- _maps/RandomZLevels/moonoutpost19.dmm | 34 +-- _maps/RandomZLevels/snowdin.dmm | 4 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 56 ++--- .../AsteroidStation/AsteroidStation.dmm | 178 +++++++------- _maps/map_files/DonutStation/DonutStation.dmm | 110 ++++----- _maps/map_files/GaxStation/GaxStation.dmm | 132 +++++----- _maps/map_files/IceMeta/IceMeta.dmm | 230 +++++++++--------- _maps/map_files/YogStation/YogStation.dmm | 202 +++++++-------- _maps/map_files/generic/CentCom.dmm | 22 +- _maps/map_files/mining/Jungleland.dmm | 2 +- _maps/map_files/mining/Lavaland.dmm | 2 +- _maps/shuttles/cargo_birdboat.dmm | 4 +- _maps/shuttles/cargo_box.dmm | 4 +- _maps/shuttles/cargo_delta.dmm | 4 +- _maps/shuttles/cargo_gax.dmm | 4 +- _maps/shuttles/cargo_kilo.dmm | 4 +- _maps/shuttles/emergency_48641.dmm | 4 +- _maps/shuttles/emergency_cargo.dmm | 4 +- _maps/shuttles/emergency_octa.dmm | 2 +- _maps/shuttles/emergency_raven.dmm | 6 +- _maps/shuttles/emergency_russiafightpit.dmm | 4 +- _maps/shuttles/emergency_triage.dmm | 2 +- _maps/shuttles/infiltrator_basic.dmm | 6 +- _maps/shuttles/infiltrator_cutter.dmm | 6 +- _maps/shuttles/labour_box.dmm | 2 +- _maps/shuttles/labour_delta.dmm | 2 +- _maps/shuttles/labour_kilo.dmm | 2 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 10 +- .../shuttles/ruin_syndicate_fighter_shiv.dmm | 4 +- _maps/templates/lazy_templates/chapel1.dmm | 4 +- _maps/templates/lazy_templates/chapel2.dmm | 2 +- _maps/templates/lazy_templates/clerk_box.dmm | 4 +- _maps/templates/shelter_2.dmm | 2 +- 75 files changed, 683 insertions(+), 683 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm index c873eec18191..aa151f479613 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm @@ -224,7 +224,7 @@ name = "Inn Front door Shutter"; pixel_x = 6; pixel_y = -24; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /turf/open/floor/wood/broken/two, /area/ruin/powered/inn) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm index 8603082df2f3..df208041c55c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm @@ -214,7 +214,7 @@ id = "icemoon_syndicate_canteen_windows"; name = "Canteen Shutters"; pixel_y = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/oven, /turf/open/floor/plasteel/cafeteria, @@ -2241,7 +2241,7 @@ /area/ruin/syndicate_icemoon/command) "mc" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/spawner/lootdrop/donkpockets, /obj/effect/spawner/lootdrop/donkpockets, @@ -2286,7 +2286,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -2524,7 +2524,7 @@ /area/ruin/syndicate_icemoon/research) "np" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/storage/box/ingredients/american, /obj/item/storage/box/ingredients/delights, @@ -2886,7 +2886,7 @@ /obj/structure/closet/crate/secure/gear{ desc = "A secure gear crate. A faded note on it reads 'CHAIR NOT INCLUDED'."; name = "electric chair kit crate"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/screwdriver/nuke, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3721,7 +3721,7 @@ /area/ruin/syndicate_icemoon/hallway) "ub" = ( /obj/structure/closet/crate/secure/weapon{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -3991,7 +3991,7 @@ /area/ruin/syndicate_icemoon/medical) "vR" = ( /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); desc = "An old, dusty crate." }, /obj/item/clothing/gloves/color/captain/centcom/admiral{ @@ -4206,7 +4206,7 @@ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -4405,7 +4405,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, @@ -4574,7 +4574,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE_LEADER); + req_access = list("syndicate_leader"); specialfunctions = 4; pixel_x = 6 }, @@ -4592,7 +4592,7 @@ id = "syndicate_icemoon_bridge_windows"; name = "Window Shutters"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE_LEADER); + req_access = list("syndicate_leader"); specialfunctions = 4; pixel_x = -6 }, @@ -5032,7 +5032,7 @@ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; pixel_y = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -5056,7 +5056,7 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_access"; name = "Reactor Access"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) @@ -5131,7 +5131,7 @@ "Bt" = ( /obj/machinery/button/door{ id = "syndieicemoon_observatory_shutters"; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); name = "Observatory Shutters"; pixel_x = -24 }, @@ -5432,7 +5432,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/stamp/chameleon{ pixel_x = -6; @@ -5680,7 +5680,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -5888,7 +5888,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -6844,7 +6844,7 @@ /area/ruin/syndicate_icemoon/hallway) "JZ" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/light/small, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -6923,7 +6923,7 @@ name = "Window Shutters"; pixel_x = 24; pixel_y = 6; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) @@ -7318,7 +7318,7 @@ id = "syndicate_icemoon_dorms_window"; name = "Window Shutters"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); pixel_x = -6 }, /obj/effect/turf_decal/siding/wood, @@ -7552,13 +7552,13 @@ /area/icemoon/surface/outdoors) "OA" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/gun/syringe/rapidsyringe, /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/blue{ dir = 10 @@ -7731,7 +7731,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access = list(ACCESS_SYNDICATE_LEADER); + req_access = list("syndicate_leader"); specialfunctions = 4 }, /turf/open/floor/circuit/red/anim, @@ -7950,7 +7950,7 @@ info = "Please be advised that the firing pins in your standard-issue SMG and the research team's rifles are designed to explode if removed. DO NOT TRY TO REMOVE THEM." }, /obj/structure/closet/crate/secure/weapon{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/box/white, /obj/item/gun/ballistic/shotgun/doublebarrel, @@ -8757,7 +8757,7 @@ id = "syndicate_icemoon_hop_shutters"; name = "Window Shutters"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4; pixel_x = -6 }, @@ -9020,7 +9020,7 @@ id = "syndicate_icemoon_powerstation_windows"; name = "Window Shutters"; pixel_x = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -9042,7 +9042,7 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_vent"; name = "Reactor Vent"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/sealant{ pixel_x = 12 @@ -9356,7 +9356,7 @@ id = "syndieicemoon_brig_cell"; name = "Cell Lockdown"; pixel_x = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 6 diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm index 4fe31492aff7..0c50926ed1a6 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm @@ -542,7 +542,7 @@ /area/ruin/powered/sinden) "HD" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/item/storage/firstaid/regular, /obj/item/stack/spacecash/c200, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm index 33ce0b196b6b..6fb04d361293 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm @@ -724,14 +724,14 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 36; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); pixel_x = -6 }, /obj/machinery/button/door{ id = "lavalandsyndi_centralwindows"; name = "Exterior Windows Blast Door Control"; pixel_y = 36; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); pixel_x = 6 }, /obj/item/radio/intercom{ @@ -901,7 +901,7 @@ "ja" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/weapon{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -1642,7 +1642,7 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/door/window/northleft{ dir = 8; @@ -2591,7 +2591,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/structure/chair/office/dark{ dir = 1 @@ -3182,7 +3182,7 @@ id = "syndie_lavaland_exitdoors"; name = "Central External Airlock Blast Door Control"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/structure/safe/floor, /obj/item/reagent_containers/food/drinks/bottle/vodka, @@ -3399,7 +3399,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Ft" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, @@ -3495,7 +3495,7 @@ "Gs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -3546,7 +3546,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/engine, /area/ruin/powered/syndicate_lava_base/chemistry) @@ -4509,7 +4509,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Pk" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/spawner/lootdrop/donkpockets, /obj/item/storage/box/ingredients/vegetarian, @@ -4836,7 +4836,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -4876,7 +4876,7 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -5329,7 +5329,7 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index 6292daab3ea7..ab4711856f09 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -162,7 +162,7 @@ "bx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(ACCESS_SEC_BASIC) + req_access = list("sec_basic") }, /turf/open/floor/plasteel, /area/mine/living_quarters) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm index adcf67a296b0..dc4c4b71e2ae 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm @@ -375,7 +375,7 @@ /area/ruin/powered/fishing/shop) "kB" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = "Fisherman" + req_access = null }, /obj/item/reagent_containers/glass/mixbowl{ pixel_x = 1; @@ -1701,7 +1701,7 @@ /area/ruin/powered/fishing/hall) "QL" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = "Fisherman" + req_access = null }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm index a0042c62d93e..1d804c765449 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm @@ -14,7 +14,7 @@ }, /obj/structure/closet/crate/secure{ name = "Emergency Supplies Crate"; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, @@ -632,7 +632,7 @@ /obj/machinery/button/door{ id = "cashiershutters"; name = "Cashier Lockdown"; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) @@ -781,7 +781,7 @@ /obj/machinery/button/door{ id = "gasstation"; name = "Gas Station Lockdown"; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 639f131e68e0..e8d9dc5de2bf 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -572,7 +572,7 @@ /area/ruin/powered/syndicate_lava_base/arrivals) "ej" = ( /obj/structure/closet/crate/secure/weapon{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -769,7 +769,7 @@ /obj/machinery/button/door{ id = "lavalandsyndi_virology"; name = "Virology Blast Door Control"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/storage/box/monkeycubes, /obj/effect/turf_decal/siding/green{ @@ -781,7 +781,7 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -1230,7 +1230,7 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/airalarm/syndicate{ dir = 4; @@ -1560,7 +1560,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "hr" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/airalarm/syndicate{ dir = 1; @@ -1850,7 +1850,7 @@ id = "syndicate_lavaland_vault_windows"; name = "Vault Window Shutters"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) @@ -1875,7 +1875,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /turf/open/floor/mineral/plastitanium, @@ -2014,7 +2014,7 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -2058,7 +2058,7 @@ id = "lavalandsyndi_chemistry"; name = "Chemistry Blast Door Control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/chem_master, /obj/effect/turf_decal/siding/purple{ @@ -2080,7 +2080,7 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/red{ dir = 1 @@ -2841,7 +2841,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -2997,7 +2997,7 @@ }, /obj/effect/turf_decal/tile/bar, /obj/structure/closet/syndicate{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/ammo_casing/shotgun/beanbag, @@ -3299,7 +3299,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "lT" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -3438,7 +3438,7 @@ name = "syndicate commander's gloves" }, /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plating/lavaland_baseturf, /area/ruin/powered/syndicate_lava_base/engineering) @@ -3644,7 +3644,7 @@ /obj/item/circuitboard/machine/clonescanner, /obj/structure/closet/crate/secure/medical{ desc = "A crate with a lock on it, painted in the scheme of the station's doctors. This one is marked to contain prototype circuitry and clearly hasn't been touched in years."; - req_access = list(ACCESS_SYNDICATE_LEADER) + req_access = list("syndicate_leader") }, /obj/item/paper{ info = "You have been assigned to test an old cloner system provided to us by one of our research stations. Your monkeys should make excellent DNA sources. Do not clone too many crew, and be prepared to treat genetic defects and cellular damage." @@ -3861,7 +3861,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions=4 }, /obj/effect/decal/cleanable/dirt, @@ -3923,7 +3923,7 @@ id = "lavalandsyndi_arrivals"; name = "Arrivals Blast Door Control"; pixel_y = -26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -3954,7 +3954,7 @@ id = "lavalandsyndi_medsci"; name = "Medical Bay Shutters"; pixel_y = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -4217,7 +4217,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/paper{ info = "You have been entrusted with the Nuclear Authentication Disk of Space Station 12. Keep it secure until Nanotrasen finishes repairs."; @@ -4359,7 +4359,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/mineral/plastitanium, @@ -4370,7 +4370,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -5017,7 +5017,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -5473,7 +5473,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -5951,7 +5951,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, diff --git a/_maps/RandomRuins/LavaRuins/miningbase.dmm b/_maps/RandomRuins/LavaRuins/miningbase.dmm index 5671a4ac889e..4ced6517874b 100644 --- a/_maps/RandomRuins/LavaRuins/miningbase.dmm +++ b/_maps/RandomRuins/LavaRuins/miningbase.dmm @@ -141,7 +141,7 @@ "bx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(ACCESS_SEC_BASIC) + req_access = list("sec_basic") }, /turf/open/floor/plasteel, /area/mine/living_quarters) diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 6a1da4a31747..1cca56bea561 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -44,7 +44,7 @@ "k" = ( /obj/structure/closet/secure_closet{ name = "clown locker"; - req_access = list(ACCESS_THEATRE) + req_access = list("theatre") }, /obj/item/clothing/shoes/clown_shoes/banana_shoes, /obj/effect/spawner/lootdrop/maintenance/two, diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index d6466f769168..4551aae96d27 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -2152,20 +2152,20 @@ name = "exterior blast door access"; pixel_x = -24; pixel_y = -8; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/machinery/button/door{ id = "bunkerinterior"; name = "interior blast door access"; pixel_x = -24; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/machinery/button/door{ id = "bunkershutter"; name = "hallway shutter toggle"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/machinery/computer/security/telescreen{ dir = 1; diff --git a/_maps/RandomRuins/SpaceRuins/gameroom.dmm b/_maps/RandomRuins/SpaceRuins/gameroom.dmm index 5aae569feb45..7eafae0e9cc8 100644 --- a/_maps/RandomRuins/SpaceRuins/gameroom.dmm +++ b/_maps/RandomRuins/SpaceRuins/gameroom.dmm @@ -251,7 +251,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = 23; pixel_y = -21; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/gaming) @@ -917,7 +917,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = -22; pixel_y = -21; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powered/gaming) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index eca003f2bf29..c1a7bc2efc3f 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -337,7 +337,7 @@ id = "lpost_privacy_left"; name = "Privacy Shutters"; pixel_y = 23; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -482,7 +482,7 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4; pixel_x = -3 }, @@ -960,7 +960,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_y = -24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/critter, @@ -1083,7 +1083,7 @@ /area/ruin/space/has_grav/listeningstation/hallway) "iO" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -1097,7 +1097,7 @@ id = "lpost_privacy_right"; name = "Privacy Shutters"; pixel_y = 23; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -1692,7 +1692,7 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) @@ -2073,7 +2073,7 @@ pixel_y = 23 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/snacks/meat/slab, @@ -2364,7 +2364,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_x = -24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); pixel_y = 6 }, /turf/open/floor/plasteel/dark, @@ -2445,7 +2445,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -2991,7 +2991,7 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/light/small{ brightness = 3; @@ -3150,7 +3150,7 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_x = 24; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index c6bb60851216..414bb6cb0c74 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2362,7 +2362,7 @@ /obj/item/assembly/flash/handheld, /obj/item/storage/box/firingpins, /obj/structure/closet/crate/secure/weapon{ - req_access = list(ACCESS_RUINS_SECURITY) + req_access = list("ruins_security") }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -8835,7 +8835,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/engineering{ name = "plasma tank crate"; - req_access = list(ACCESS_RUINS_ENGINEERING) + req_access = list("ruins_engineering") }, /obj/item/tank/internals/plasma/full, /obj/item/tank/internals/plasma/full, diff --git a/_maps/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/RandomRuins/SpaceRuins/spacebar.dmm index b65c125b7ca4..94150c29e15c 100644 --- a/_maps/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacebar.dmm @@ -85,7 +85,7 @@ "aU" = ( /obj/structure/disposalpipe/segment, /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -384,7 +384,7 @@ pixel_y = 32 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -826,7 +826,7 @@ /area/ruin/space/has_grav/powered/spacebar) "Gk" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/structure/window{ dir = 4 @@ -1115,7 +1115,7 @@ name = "Bar Shutters Control"; pixel_x = 25; pixel_y = 24; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/spacebar) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 077bb8ce4674..c92b1235a4a5 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -2159,7 +2159,7 @@ /area/ruin/space/has_grav/hotel/bar) "fE" = ( /obj/machinery/vending/boozeomat{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -2572,7 +2572,7 @@ /area/ruin/space/has_grav/hotel/bar) "gC" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2659,7 +2659,7 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2834,7 +2834,7 @@ /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3105,7 +3105,7 @@ /area/ruin/space/has_grav/hotel/custodial) "hT" = ( /obj/machinery/vending/dinnerware{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -4477,7 +4477,7 @@ /area/ruin/space/has_grav/hotel/security) "lT" = ( /obj/structure/closet/secure_closet/security{ - req_access = list(ACCESS_RUINS_SECURITY) + req_access = list("ruins_security") }, /obj/item/gun/energy/laser/scatter/shotty, /obj/item/clothing/head/helmet/justice, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm index f041d6f4066e..eaeb7a4c2ecf 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm @@ -584,7 +584,7 @@ "Ny" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -862,7 +862,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = 24; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm index 44506af81f1e..c53d5b8e1275 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm @@ -511,7 +511,7 @@ "Dj" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -593,7 +593,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_y = 30; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/office) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm index 20317e91a184..2fe3f6b3788d 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm @@ -76,14 +76,14 @@ name = "Gift Shop Internal Shutters"; pixel_x = 26; pixel_y = 24; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; pixel_y = 24; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm index 76e5841e6a8b..f482b6c81a5f 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm @@ -822,7 +822,7 @@ /obj/machinery/button/door{ id = "reactorcore"; name = "Core Access"; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -1196,7 +1196,7 @@ /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel/dark, /area/engine/engineering) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm index 8f28221dc879..c032af42fe80 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm @@ -247,7 +247,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -337,7 +337,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -352,7 +352,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -601,7 +601,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /mob/living/simple_animal/opossum/poppy, /turf/open/floor/engine, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm index c90986915c0b..9afd6153b126 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm @@ -196,7 +196,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index d5d3c40dc4d4..1cef0cf201db 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -179,7 +179,7 @@ name = "Hot Chamber Vent"; pixel_x = -26; pixel_y = 8; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /mob/living/simple_animal/opossum/poppy, /obj/structure/chair/office/dark{ @@ -807,7 +807,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_x = 26; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/structure/lattice/catwalk, /turf/template_noop, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm index 4880c8ee848d..12650283d4c9 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm @@ -69,7 +69,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm index ec17dddf2bf5..ec3aa48b0e11 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm @@ -243,7 +243,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm index fdace3ab1150..db31622f556d 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm @@ -115,7 +115,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm index 253e076344e1..190116f5e32a 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm @@ -74,7 +74,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -95,7 +95,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm index c163fd14348f..03b9b60cc9d0 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm @@ -128,7 +128,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm index e617fcfaf9ee..e891100f18fa 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm @@ -108,7 +108,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm index 3cb88ff59684..9a3be45751f6 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm @@ -362,7 +362,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -383,7 +383,7 @@ name = "Crush"; pixel_x = 25; pixel_y = -15; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel/dark, /area/template_noop) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm index c57a6b90dedd..a4baa2b1d045 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm @@ -173,7 +173,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -199,7 +199,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm index b10137da0bb5..3a063c2891ca 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm @@ -91,7 +91,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm index eff958a2b1ea..9ad3d682ab5f 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm @@ -95,7 +95,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm index 5aef6935f95e..7d66016f2935 100644 --- a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm +++ b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm @@ -1678,14 +1678,14 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/camera{ c_tag = "MiniSat Antechamber"; @@ -2591,7 +2591,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2736,7 +2736,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/turret_protected/ai) @@ -2834,7 +2834,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/light{ dir = 1 diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm index f06205aa856f..f0a362e44d99 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm @@ -1066,13 +1066,13 @@ id = "reactorcore"; name = "Core Access"; pixel_y = -2; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; pixel_y = 8; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm index be332cf22b07..2e56c58c2b4e 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm @@ -278,7 +278,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = -24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -440,7 +440,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -571,7 +571,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -735,7 +735,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm index 8fdcb48996eb..996291c07dd2 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm @@ -1507,7 +1507,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/stripes/line{ dir = 4 diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm index 00ff6d05c8eb..bb9a7bb6b2db 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm @@ -200,7 +200,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_y = 22; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/structure/lattice/catwalk, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -891,7 +891,7 @@ name = "Hot Chamber Vent"; pixel_x = -7; pixel_y = -24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/ignition{ id = "teghotburn"; diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 185cfa01e4ee..a6d9a20629ba 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -847,7 +847,7 @@ /area/awaymission/beach) "cr" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/food/condiment/milk, diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index 019d5947d2ee..1c08baef6e92 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -6507,7 +6507,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7740,7 +7740,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access = list(ACCESS_CONSTRUCTION) + req_access = list("construction") }, /obj/machinery/button/ignition/indestructible{ id = "snowdin_turbine_ignitor"; diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm index 7aa03f5a61c6..c05dddb97fd0 100644 --- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm +++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm @@ -542,7 +542,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access = list(ACCESS_CENT_SPECOPS) + req_access = list("cent_specops") }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) @@ -1307,7 +1307,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1715,7 +1715,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/RandomZLevels/VR/vrhub.dmm b/_maps/RandomZLevels/VR/vrhub.dmm index c6e892272b24..d0c023da1053 100644 --- a/_maps/RandomZLevels/VR/vrhub.dmm +++ b/_maps/RandomZLevels/VR/vrhub.dmm @@ -2187,7 +2187,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2899,7 +2899,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3136,7 +3136,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access = list(ACCESS_CENT_SPECOPS) + req_access = list("cent_specops") }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/vr/syndicate) diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index b6612cac70f9..5151a735e793 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1786,7 +1786,7 @@ /area/awaymission/moonoutpost19/syndicate) "dr" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/ammo_box/magazine/m10mm{ icon_state = "9x19p-8" @@ -1811,7 +1811,7 @@ "dt" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/stack/spacecash/c50, /turf/open/floor/wood{ @@ -2383,7 +2383,7 @@ name = "Containment Chamber Blast Doors"; pixel_x = 4; pixel_y = -2; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/machinery/button/ignition{ id = "awayxenobio"; @@ -2974,7 +2974,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/clothing/suit/armor/vest, /obj/item/reagent_containers/spray/pepper, @@ -3492,7 +3492,7 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_x = -25; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/machinery/light/small{ dir = 8 @@ -3742,7 +3742,7 @@ /area/awaymission/moonoutpost19/hive) "hm" = ( /obj/machinery/vending/medical{ - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /turf/open/floor/plasteel/white/side{ dir = 2; @@ -3785,7 +3785,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/storage/backpack/satchel/tox, /obj/item/clothing/gloves/color/latex, @@ -4301,13 +4301,13 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_y = 8; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/machinery/button/door{ id = "AwayRD"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5614,7 +5614,7 @@ "kU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/clothing/under/suit/navy, /turf/open/floor/carpet{ @@ -6167,7 +6167,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -6182,7 +6182,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, @@ -6197,7 +6197,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, @@ -6545,7 +6545,7 @@ "nb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/clothing/under/rank/civilian/assistantformal, /turf/open/floor/carpet{ @@ -6954,7 +6954,7 @@ "nT" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/clothing/under/suit/burgundy, /turf/open/floor/carpet{ @@ -7080,7 +7080,7 @@ icon_state = "science"; locked = 0; name = "scientist's locker"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/clothing/suit/toggle/labcoat, /turf/open/floor/plasteel{ @@ -7093,7 +7093,7 @@ icon_state = "science"; locked = 1; name = "scientist's locker"; - req_access = list(ACCESS_RUINS_MAINTENANCE) + req_access = list("ruins_maintenance") }, /obj/item/clothing/suit/toggle/labcoat, /obj/item/tank/internals/air, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 3764de0e6322..a927029d8d06 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -6578,7 +6578,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7815,7 +7815,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/machinery/button/ignition{ id = "snowdin_turbine_ignitor"; diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 8dbd47148a45..e88279800a70 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -298,7 +298,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -344,7 +344,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/clothing/under/suit/female, /turf/open/floor/carpet{ @@ -381,7 +381,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -409,7 +409,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -1021,7 +1021,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/clothing/suit/apron, /obj/item/storage/bag/plants/portaseeder, @@ -1757,7 +1757,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 @@ -1780,7 +1780,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -2112,7 +2112,7 @@ "ev" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -4583,7 +4583,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -5125,7 +5125,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -5220,7 +5220,7 @@ /obj/item/clothing/under/suit/navy, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -5924,7 +5924,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -6608,7 +6608,7 @@ /obj/item/clothing/glasses/meson, /obj/structure/closet/secure_closet/engineering_personal{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -7948,14 +7948,14 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = 8; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/machinery/button/door{ desc = "A remote control-switch that controls the privacy shutters."; id = "UO45_rdprivacy"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -8385,7 +8385,7 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = -24; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -8978,7 +8978,7 @@ /area/awaymission/undergroundoutpost45/research) "qq" = ( /obj/machinery/vending/medical{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/plasteel/white/side{ dir = 6; @@ -9172,7 +9172,7 @@ layer = 2.9 }, /obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ @@ -9592,7 +9592,7 @@ locked = 1; name = "UO45 Engineering APC"; pixel_x = -25; - req_access = list(ACCESS_RUINS_GENERAL); + req_access = list("ruins_general"); start_charge = 100 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -9622,7 +9622,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 6; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, @@ -9630,7 +9630,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -9646,7 +9646,7 @@ "rs" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -10190,7 +10190,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -10214,7 +10214,7 @@ icon_state = "mining"; locked = 0; name = "miner's equipment"; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/gloves/fingerless, @@ -10968,7 +10968,7 @@ name = "Privacy Shutters"; pixel_x = -24; pixel_y = 6; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -12971,7 +12971,7 @@ pixel_y = -24 }, /obj/structure/closet/secure_closet/miner{ - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ @@ -13162,7 +13162,7 @@ name = "Engineering Lockdown"; pixel_x = -6; pixel_y = -24; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -13170,7 +13170,7 @@ name = "Engineering Secure Storage"; pixel_x = 6; pixel_y = -24; - req_access = list(ACCESS_RUINS_GENERAL) + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/neutral{ dir = 1 diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 7ae3bbb5e4fe..257e6902ce5a 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -1269,7 +1269,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = 25; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -3496,7 +3496,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/light_switch{ pixel_y = -23 @@ -7651,14 +7651,14 @@ name = "Prison Wing Lockdown"; pixel_x = 8; pixel_y = -25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = 8; pixel_y = -35; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/light_switch{ pixel_x = -5; @@ -9051,7 +9051,7 @@ name = "Toxins airlock control"; pixel_x = 8; pixel_y = 25; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -9060,7 +9060,7 @@ name = "Toxins airlock control"; pixel_x = 8; pixel_y = -25; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Mix to Space" @@ -9397,7 +9397,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 26; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/structure/closet/crate/freezer, /obj/machinery/light_switch{ @@ -9616,7 +9616,7 @@ name = "Psych Office Shutters Control"; pixel_x = -6; pixel_y = -25; - req_access = list(ACCESS_PSYCHOLOGY) + req_access = list("psychology") }, /obj/machinery/light_switch{ pixel_x = 9; @@ -10209,7 +10209,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -10218,7 +10218,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/closed/wall, /area/medical/medbay/central) @@ -11336,7 +11336,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -11447,7 +11447,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = -6; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/execution/transfer) @@ -11999,14 +11999,14 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = -26; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio"; name = "Xenobiology Desk Shutters"; pixel_x = 7; pixel_y = -26; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes{ dir = 8 @@ -12840,7 +12840,7 @@ id = "barshutters"; name = "Bar Shutters Control"; pixel_y = 24; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/machinery/firealarm{ dir = 8; @@ -14424,7 +14424,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -15401,7 +15401,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -15409,7 +15409,7 @@ name = "Loading Doors"; pixel_x = -7; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/computer/cargo{ dir = 1 @@ -18715,7 +18715,7 @@ name = "Shutters Control Button"; pixel_x = -25; pixel_y = -26; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -19097,7 +19097,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_x = -26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -21598,14 +21598,14 @@ name = "Toxins Mixing Room Access Console"; pixel_x = 6; pixel_y = -25; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/button/door{ id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -7; pixel_y = -24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -24199,7 +24199,7 @@ name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/structure/cable{ icon_state = "2-8" @@ -24209,7 +24209,7 @@ name = "Mech Bay Door Control"; pixel_x = -7; pixel_y = 24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /turf/open/floor/plasteel/dark, /area/science/robotics/mechbay) @@ -26209,7 +26209,7 @@ name = "Incinerator airlock control"; pixel_x = 22; pixel_y = 8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -27259,7 +27259,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -5; pixel_y = 3; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/machinery/button/ignition{ id = "testigniter"; @@ -27347,7 +27347,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; @@ -27355,7 +27355,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -28321,7 +28321,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -24; pixel_y = -7; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -30373,7 +30373,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = -25; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /turf/open/floor/plasteel{ icon_state = "cafeteria" @@ -31517,7 +31517,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = 24; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /obj/machinery/light{ dir = 1 @@ -31680,7 +31680,7 @@ name = "CMO Shutter Control"; pixel_x = 25; pixel_y = -9; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/light_switch{ pixel_x = 35; @@ -31958,7 +31958,7 @@ name = "Privacy Shutters"; pixel_x = 6; pixel_y = -26; - req_access = list(ACCESS_DETECTIVE) + req_access = list("detective") }, /obj/machinery/light_switch{ pixel_x = -6; @@ -32786,7 +32786,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = -6; pixel_y = 25; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -33484,7 +33484,7 @@ id = "heads_meeting"; name = "Security Shutters"; pixel_y = 24; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/wood, /area/bridge/meeting_room) @@ -33618,7 +33618,7 @@ name = "Delivery Office Door"; pixel_x = -6; pixel_y = 7; - req_access = list(ACCESS_CARGO) + req_access = list("cargo") }, /obj/item/folder/yellow{ pixel_x = 6; @@ -35351,7 +35351,7 @@ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_y = 25; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/machinery/firealarm{ dir = 1; @@ -36058,7 +36058,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_x = -26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -37207,7 +37207,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -8; pixel_y = -24; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacoreserver) @@ -38400,7 +38400,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 7; pixel_y = -23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/machinery/light_switch{ pixel_x = -23 @@ -39345,7 +39345,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_SURGERY) + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery"; @@ -42186,14 +42186,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -42707,7 +42707,7 @@ id = "Secure Storage"; pixel_x = -24; pixel_y = -26; - req_access = list(ACCESS_ENGINE_EQUIP) + req_access = list("engine_equip") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -42877,7 +42877,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -43712,7 +43712,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -43987,7 +43987,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 26; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -44108,7 +44108,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -23; pixel_y = -23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -44687,7 +44687,7 @@ name = "Telecommunications server shutters control"; pixel_x = 8; pixel_y = 23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -47082,7 +47082,7 @@ name = "Engineering Lockdown"; pixel_x = -8; pixel_y = 39; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -47090,21 +47090,21 @@ name = "Engineering Secure Storage"; pixel_x = -8; pixel_y = 26; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 7; pixel_y = 26; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_x = 7; pixel_y = 39; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -47474,7 +47474,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Bridge Delivery"; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/plasteel, /area/maintenance/central) @@ -47500,14 +47500,14 @@ name = "Telecommunications server shutters control"; pixel_x = 28; pixel_y = -2; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/button/door{ id = "bridge blast"; name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/structure/cable{ icon_state = "1-2" @@ -51440,14 +51440,14 @@ name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 6 @@ -51817,7 +51817,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -52358,7 +52358,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -55204,7 +55204,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -55514,7 +55514,7 @@ name = "Shutters Control Button"; pixel_x = -6; pixel_y = 24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) @@ -56486,7 +56486,7 @@ name = "Incinerator airlock control"; pixel_x = -24; pixel_y = -8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -59960,7 +59960,7 @@ name = "Warehouse Door Control"; pixel_x = 1; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -60269,7 +60269,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = -7; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -62976,7 +62976,7 @@ id = "atmos"; name = "Atmospherics Lockdown"; pixel_y = 24; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -63100,7 +63100,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -25; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -63980,20 +63980,20 @@ name = "Left side containment blast doors"; pixel_x = -6; pixel_y = 30; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 6; pixel_y = 30; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = 39; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/plortrefinery, /turf/open/floor/plasteel/white, @@ -64847,7 +64847,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -69009,7 +69009,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -69818,14 +69818,14 @@ idSelf = "telecomms_airlock_control"; pixel_x = 5; pixel_y = 25; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = -7; pixel_y = 23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -72124,7 +72124,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = 24; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/science/server) @@ -74140,14 +74140,14 @@ name = "Public Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/button/door{ id = "robotics2"; name = "Science Shutters Control Button"; pixel_x = 26; pixel_y = 27; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/button/door{ desc = "A remote control switch for the robotics foyer."; @@ -74156,7 +74156,7 @@ normaldoorcontrol = 1; pixel_x = 38; pixel_y = 27; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -75920,7 +75920,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -7; pixel_y = -24; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -75929,7 +75929,7 @@ name = "Secondary AI Core Access Console"; pixel_x = 6; pixel_y = -26; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacoreserver) @@ -75976,7 +75976,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -77436,7 +77436,7 @@ id = "hosspace"; name = "Space Shutters Control"; pixel_y = 36; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/item/paper_bin{ pixel_y = 5 @@ -78482,7 +78482,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/ministile/hop{ name = "Cargo line turnstile"; - req_access = list(ACCESS_CARGO) + req_access = list("cargo") }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -78880,7 +78880,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 21; pixel_y = -4; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/item/radio/intercom{ freerange = 1; @@ -78974,7 +78974,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access = list(ACCESS_MAINT_TUNNELS) + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -79038,7 +79038,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_x = -26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -80906,7 +80906,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = 6; pixel_y = 25; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/effect/turf_decal/tile/darkgreen{ dir = 1 @@ -80933,7 +80933,7 @@ name = "Gift Shop External Shutters"; pixel_x = -5; pixel_y = 25; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /turf/open/floor/plasteel, /area/clerk) @@ -81615,7 +81615,7 @@ /obj/machinery/ministile/hop{ dir = 1; name = "Cargo line turnstile"; - req_access = list(ACCESS_CARGO) + req_access = list("cargo") }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/loading_area, diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 525386c1a783..997a1eadee75 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -1869,7 +1869,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = 22; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -1878,7 +1878,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = -21; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -2808,7 +2808,7 @@ name = "Mech Bay Door Control"; pixel_x = 24; pixel_y = -6; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = 24; @@ -4959,7 +4959,7 @@ name = "Privacy Shutter Controls"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5439,7 +5439,7 @@ }, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ pixel_y = 28; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5949,21 +5949,21 @@ id = "xenobio_main"; name = "Main containment blast doors"; pixel_x = -32; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = -32; pixel_y = 10; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_l"; name = "Left side containment blast doors"; pixel_x = -32; pixel_y = -10; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/disposal/bin{ name = "sample disposal unit" @@ -6922,14 +6922,14 @@ name = "Secure Storage Control"; pixel_x = -8; pixel_y = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ id = "enginepashutter"; name = "Particle Accelerator Shutter Control"; pixel_x = 2; pixel_y = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer"; @@ -7429,14 +7429,14 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -7467,7 +7467,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -7861,7 +7861,7 @@ name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = 10; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) @@ -8129,7 +8129,7 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/carpet, /area/bridge) @@ -8998,14 +8998,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = -25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = -25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -12694,14 +12694,14 @@ name = "Cell Shutters"; pixel_x = -7; pixel_y = 30; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 7; pixel_y = 30; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -13424,7 +13424,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_x = 24; - req_access = list(ACCESS_AUX_BASE) + req_access = list("aux_base") }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) @@ -14529,7 +14529,7 @@ name = "Secure Storage Control"; pixel_x = 7; pixel_y = 25; - req_access = list(ACCESS_ENGINE_EQUIP) + req_access = list("engine_equip") }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 @@ -14867,7 +14867,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -17036,7 +17036,7 @@ id = "robotics2"; name = "Shutters Control Button"; pixel_y = 24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = -8; @@ -19155,7 +19155,7 @@ name = "Disposal Vent Control"; pixel_x = -8; pixel_y = -23; - req_access = list(ACCESS_MAINT_TUNNELS) + req_access = list("maint_tunnels") }, /obj/structure/window/reinforced/spawner/east, /obj/structure/railing/corner{ @@ -22639,7 +22639,7 @@ name = "Privacy Shutters"; pixel_x = -28; pixel_y = 5; - req_access = list(ACCESS_DETECTIVE) + req_access = list("detective") }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) @@ -23750,7 +23750,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -27404,7 +27404,7 @@ name = "Desk Shutters"; pixel_x = -7; pixel_y = -25; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -27428,7 +27428,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -29360,14 +29360,14 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/machinery/button/door{ id = "rnd2"; name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 5; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/item/toy/figure/rd, /turf/open/floor/carpet/purple, @@ -31326,7 +31326,7 @@ name = "Virology Access Button"; pixel_x = -28; pixel_y = 8; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31987,7 +31987,7 @@ name = "Cell 2 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -32496,7 +32496,7 @@ name = "Virology Access Console"; pixel_x = 22; pixel_y = 8; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 6 @@ -34459,7 +34459,7 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -4; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/item/deskbell/preset/med{ pixel_x = 7; @@ -35775,7 +35775,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = 24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/light{ dir = 1 @@ -35786,7 +35786,7 @@ name = "Loading Doors"; pixel_x = -7; pixel_y = 24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/camera{ c_tag = "Cargo - Docking Bay North" @@ -35801,7 +35801,7 @@ /obj/machinery/button/door{ id = "xenocontainment"; name = "Xenobiology Containment Control"; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -37679,7 +37679,7 @@ name = "disposals shutter control"; pixel_x = -5; pixel_y = -25; - req_access = list(ACCESS_CARGO) + req_access = list("cargo") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -38503,7 +38503,7 @@ }, /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_x = 28; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -39988,7 +39988,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -40265,7 +40265,7 @@ name = "Cell 1 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -43051,7 +43051,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; - req_access = list(ACCESS_EXPERIMENTATION) + req_access = list("experimentation") }, /turf/open/floor/plasteel/white, /area/science/explab) @@ -43773,7 +43773,7 @@ name = "Chemistry Privacy Toggle"; pixel_x = -26; pixel_y = 24; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/effect/landmark/start/chemist, /turf/open/floor/plasteel/white, @@ -45065,7 +45065,7 @@ name = "Bar Shutters Control"; pixel_x = -4; pixel_y = 33; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -46813,7 +46813,7 @@ name = "Desk Privacy Shutters Control"; pixel_x = 4; pixel_y = 24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 5 @@ -47168,7 +47168,7 @@ name = "Surgery shutters"; pixel_x = -24; pixel_y = 6; - req_access = list(ACCESS_SURGERY) + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery_b"; @@ -47603,7 +47603,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -47831,7 +47831,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access = list(ACCESS_PSYCHOLOGY) + req_access = list("psychology") }, /obj/effect/landmark/start/yogs/psychiatrist, /turf/open/floor/carpet, @@ -48263,7 +48263,7 @@ name = "Armory Shutters"; pixel_x = -5; pixel_y = -25; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /obj/machinery/light_switch{ pixel_x = 8; @@ -48854,7 +48854,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_PARAMEDIC) + req_access = list("paramedic") }, /obj/machinery/computer/med_data{ dir = 8 @@ -49843,7 +49843,7 @@ name = "Desk Privacy Shutters Control"; pixel_x = 24; pixel_y = -4; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -50842,14 +50842,14 @@ name = "Gift Shop Internal Shutters"; pixel_x = 26; pixel_y = 24; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; pixel_y = 24; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/structure/table/wood, /obj/machinery/power/apc{ @@ -54575,7 +54575,7 @@ id = "lawyerprivate"; pixel_x = 24; pixel_y = -8; - req_access = list(ACCESS_LAWYER) + req_access = list("lawyer") }, /turf/open/floor/wood, /area/lawoffice) @@ -55314,7 +55314,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = -24; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/machinery/door/firedoor/border_only{ dir = 4 diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 02801d536b02..b641c27b91b4 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -545,34 +545,34 @@ name = "CMO Privacy Shutters Control"; pixel_x = 23; pixel_y = -10; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/button/door{ id = "cloning_shutters"; name = "cloning shutters"; pixel_x = 33; pixel_y = 10; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/button/door{ id = "genetics_shutters"; name = "genetics shutters"; pixel_x = 33; pixel_y = -10; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/button/door{ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_x = 36; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; pixel_x = 23; pixel_y = 10; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) @@ -4076,7 +4076,7 @@ name = "Virology Access Console"; pixel_x = -23; pixel_y = 24; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/structure/disposalpipe/segment{ dir = 10 @@ -4721,14 +4721,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -4768,7 +4768,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = 1; pixel_y = 23; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/five, @@ -5092,7 +5092,7 @@ name = "Disposal Vent Control"; pixel_x = 4; pixel_y = -25; - req_access = list(ACCESS_MAINT_TUNNELS) + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -6526,7 +6526,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/machinery/chem_master, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ @@ -6868,7 +6868,7 @@ name = "Armory Shutters"; pixel_x = -24; pixel_y = 7; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -7362,7 +7362,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 24; - req_access = list(ACCESS_EVA) + req_access = list("eva") }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -7999,7 +7999,7 @@ name = "Privacy Shutters"; pixel_x = 25; pixel_y = 8; - req_access = list(ACCESS_SEC_BASIC) + req_access = list("sec_basic") }, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine{ @@ -9775,7 +9775,7 @@ name = "Secure Storage Toggle"; pixel_x = -8; pixel_y = -23; - req_access = list(ACCESS_ENGINE_EQUIP) + req_access = list("engine_equip") }, /obj/structure/closet/radiation{ anchored = 1 @@ -10120,7 +10120,7 @@ name = "Warehouse Door Control"; pixel_x = -25; pixel_y = 7; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/machinery/camera{ c_tag = "Cargo Bay East"; @@ -10190,7 +10190,7 @@ normaldoorcontrol = 1; pixel_x = -6; pixel_y = -2; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/item/storage/pencil_holder/crew, /turf/open/floor/plasteel/white, @@ -10826,7 +10826,7 @@ name = "Incinerator Access Console"; pixel_x = -24; pixel_y = -6; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -11579,7 +11579,7 @@ name = "Kitchen Shutters Control"; pixel_x = -1; pixel_y = -24; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -11874,7 +11874,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 1; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, @@ -14178,7 +14178,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 11; pixel_y = -22; - req_access = list(ACCESS_RND_SERVERS) + req_access = list("rnd_servers") }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_exterior"; @@ -14186,7 +14186,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access = list(ACCESS_RND_SERVERS) + req_access = list("rnd_servers") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -14194,7 +14194,7 @@ idSelf = "secondary_aicore_controller"; name = "Secondary AI Core Access Console"; pixel_y = -24; - req_access = list(ACCESS_RND_SERVERS) + req_access = list("rnd_servers") }, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) @@ -14712,7 +14712,7 @@ name = "Loading Doors"; pixel_x = -8; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; @@ -14720,7 +14720,7 @@ name = "Loading Doors"; pixel_x = 8; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -14850,7 +14850,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 7; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -15249,7 +15249,7 @@ /obj/machinery/button/door{ id = "teleshutter"; name = "Teleporter Shutter Control"; - req_access = list(ACCESS_TELEPORTER) + req_access = list("teleporter")" }, /turf/closed/wall/r_wall, /area/teleporter) @@ -16778,7 +16778,7 @@ name = "Toxins airlock control"; pixel_x = 24; pixel_y = 24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -16787,7 +16787,7 @@ name = "Toxins airlock control"; pixel_x = -24; pixel_y = 24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -17542,7 +17542,7 @@ name = "privacy shutters"; pixel_x = -22; pixel_y = 23; - req_access = list(ACCESS_PARAMEDIC) + req_access = list("paramedic") }, /turf/open/floor/plasteel/white, /area/medical/paramedic) @@ -18107,7 +18107,7 @@ name = "Desk Shutters"; pixel_x = -26; pixel_y = 6; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/structure/cable{ icon_state = "1-2" @@ -18387,7 +18387,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 10; pixel_y = -22; - req_access = list(ACCESS_RND_SERVERS) + req_access = list("rnd_servers") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -18576,7 +18576,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -18676,7 +18676,7 @@ name = "Shutters Control Button"; pixel_x = -26; pixel_y = 4; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/camera{ c_tag = "Robotics Lab - South"; @@ -18852,7 +18852,7 @@ name = "Virology Access Button"; pixel_x = -10; pixel_y = -22; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/machinery/doorButtons/access_button{ idDoor = "virology_airlock_interior"; @@ -18860,7 +18860,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 10; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -19439,7 +19439,7 @@ id = "medpriv_shutters"; name = "medbay storage shutters"; pixel_x = -24; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -21434,7 +21434,7 @@ name = "Bridge Blast Door Control"; pixel_x = -7; pixel_y = -34; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/structure/chair/comfy/black{ dir = 4; @@ -21952,7 +21952,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_SURGERY) + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery"; @@ -26433,7 +26433,7 @@ name = "Space Shutters Control"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -28240,7 +28240,7 @@ name = "cloning shutters"; pixel_x = -25; pixel_y = 9; - req_access = list(ACCESS_CLONING) + req_access = list("cloning") }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) @@ -29230,7 +29230,7 @@ name = "Bar Shutters Control"; pixel_x = -8; pixel_y = 22; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) @@ -31552,7 +31552,7 @@ name = "privacy shutters"; pixel_x = -55; pixel_y = 6; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/open/floor/plasteel/white, /area/medical/storage) @@ -32009,7 +32009,7 @@ name = "E.V.A. Storage Shutter Control"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_EVA) + req_access = list("eva") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -34333,7 +34333,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -34487,7 +34487,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = -24; - req_access = list(ACCESS_CHAPEL_OFFICE); + req_access = list("chapel_office"); pixel_y = -4 }, /turf/open/floor/plating, @@ -34732,7 +34732,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = -8; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34779,7 +34779,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ id = "outerbrig"; @@ -34787,7 +34787,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/structure/cable{ icon_state = "1-2" @@ -34950,7 +34950,7 @@ name = "Incinerator airlock control"; pixel_x = 22; pixel_y = -10; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -36073,7 +36073,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = 10; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -37445,7 +37445,7 @@ name = "Warehouse Door Control"; pixel_x = 25; pixel_y = 7; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -37611,7 +37611,7 @@ name = "genetics shutters"; pixel_x = -25; pixel_y = 9; - req_access = list(ACCESS_GENETICS) + req_access = list("genetics") }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -39346,14 +39346,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; pixel_y = -2; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/structure/chair/office/dark, /turf/open/floor/plasteel/showroomfloor, @@ -39378,7 +39378,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -39558,7 +39558,7 @@ name = "disposals shutter control"; pixel_x = -24; pixel_y = 9; - req_access = list(ACCESS_CARGO) + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -40270,7 +40270,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -41516,14 +41516,14 @@ name = "Turbine Vent Control"; pixel_x = -25; pixel_y = 8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = -25; pixel_y = -9; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -43608,7 +43608,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = 5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/structure/table/optable, /obj/item/storage/backpack/duffelbag/sec/surgery{ @@ -43723,7 +43723,7 @@ name = "Shutters Control Button"; pixel_x = -7; pixel_y = -24; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -44224,7 +44224,7 @@ id = "armory_eva"; name = "Armory Shutters"; pixel_x = 24; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -44874,7 +44874,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = 8; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/item/paper_bin{ pixel_x = 4; @@ -46150,7 +46150,7 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_y = -24; - req_access = list(ACCESS_DETECTIVE) + req_access = list("detective") }, /turf/open/floor/wood, /area/security/detectives_office) @@ -48837,7 +48837,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access = list(ACCESS_RND_SERVERS) + req_access = list("rnd_servers") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 3ef332cf5b76..8d0f62312763 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -130,7 +130,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 23; - req_access = list(ACCESS_EXPERIMENTATION) + req_access = list("experimentation") }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -1272,7 +1272,7 @@ id = "detective_shutters"; name = "detective's office shutters control"; pixel_y = 26; - req_access = list(ACCESS_DETECTIVE) + req_access = list("detective") }, /obj/machinery/computer/security/wooden_tv{ pixel_x = 3; @@ -1795,7 +1795,7 @@ /obj/structure/closet/crate/secure/weapon{ desc = "A secure clothing crate."; name = "formal uniform crate"; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, @@ -2842,7 +2842,7 @@ id = "xenobio2"; name = "Containment Blast Doors"; pixel_y = 4; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/structure/window/reinforced{ dir = 1 @@ -3683,7 +3683,7 @@ name = "Warehouse Door Control"; pixel_x = 24; pixel_y = 28; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -4009,7 +4009,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = -5; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -4017,7 +4017,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = 5; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/computer/cargo{ dir = 4 @@ -5216,7 +5216,7 @@ id = "supplybridge"; name = "Shuttle Bay External Bridge Control"; pixel_y = 27; - req_access = list(ACCESS_EXTERNAL_AIRLOCKS) + req_access = list("external_airlocks") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7276,7 +7276,7 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_y = -25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -7473,7 +7473,7 @@ id = "cmoprivacy"; name = "Privacy Shutters Control"; pixel_x = -26; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/computer/operating{ dir = 4 @@ -10454,7 +10454,7 @@ name = "Toxins airlock control"; pixel_x = -24; pixel_y = 24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_exterior"; @@ -10462,7 +10462,7 @@ name = "Toxins airlock control"; pixel_x = 24; pixel_y = 24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -10635,7 +10635,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access = list(ACCESS_ENGINE_EQUIP) + req_access = list("engine_equip") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -12074,7 +12074,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -13376,7 +13376,7 @@ name = "Warehouse Door Control"; pixel_x = -24; pixel_y = 28; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -14175,7 +14175,7 @@ normaldoorcontrol = 1; pixel_y = -25; specialfunctions = 4; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -14773,7 +14773,7 @@ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -28; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/plasteel/dark, /area/bridge) @@ -14783,7 +14783,7 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_y = 7; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; @@ -14791,14 +14791,14 @@ pixel_x = -5; pixel_y = -3; specialfunctions = 4; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; pixel_y = -3; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -15816,7 +15816,7 @@ name = "Access Console"; pixel_x = -25; pixel_y = -25; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -16050,7 +16050,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = -24; pixel_y = -24; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -17782,7 +17782,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = -24; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -18696,7 +18696,7 @@ id = "xenobio8"; name = "Containment Blast Doors"; pixel_y = 4; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -18768,7 +18768,7 @@ id = "research_shutters"; name = "research shutters control"; pixel_x = 28; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -19848,7 +19848,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = 22; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -19857,7 +19857,7 @@ name = "Incinerator airlock control"; pixel_x = -22; pixel_y = -21; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -21719,14 +21719,14 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -5; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/light{ dir = 8 @@ -22047,7 +22047,7 @@ name = "Mech Bay Door Control"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -22721,7 +22721,7 @@ name = "robotics shutters control"; pixel_x = -26; pixel_y = 26; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -23713,14 +23713,14 @@ pixel_x = 5; pixel_y = 27; specialfunctions = 4; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; pixel_y = 37; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/light/small{ dir = 1 @@ -23732,7 +23732,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 37; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -23741,7 +23741,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 27; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -24280,7 +24280,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -23; pixel_y = -24; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -24288,7 +24288,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = 23; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -24660,7 +24660,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -25799,7 +25799,7 @@ name = "Privacy Shutters Control"; pixel_x = 26; pixel_y = 4; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/camera{ c_tag = "CMO's Office"; @@ -29016,7 +29016,7 @@ id = "xenobio6"; name = "Containment Blast Doors"; pixel_y = 4; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -30019,7 +30019,7 @@ name = "Mech Bay Door Control"; pixel_x = -26; pixel_y = 6; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = -23; @@ -30350,7 +30350,7 @@ id = "chapel_shutters_parlour"; name = "chapel shutters control"; pixel_y = -25; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/main) @@ -31729,7 +31729,7 @@ name = "Secondary AI Core Access Console"; pixel_x = -24; pixel_y = -25; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -31737,7 +31737,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -33; pixel_y = -23; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -34136,7 +34136,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 30; - req_access = list(ACCESS_EVA) + req_access = list("eva") }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -34438,7 +34438,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Test Site Materials Crate"; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/machinery/light/small{ dir = 1 @@ -34604,7 +34604,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = 24; pixel_y = -24; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 @@ -35105,7 +35105,7 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_x = -25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only, @@ -35339,7 +35339,7 @@ name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -35347,7 +35347,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = 5; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 @@ -35777,7 +35777,7 @@ name = "Virology Access Console"; pixel_x = 26; pixel_y = 26; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -36563,7 +36563,7 @@ id = "xenobio3"; name = "Containment Blast Doors"; pixel_y = 4; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/structure/window/reinforced{ dir = 1 @@ -37956,7 +37956,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 9; pixel_y = 25; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) @@ -38598,7 +38598,7 @@ id = "armory"; name = "Armory Shutters"; pixel_x = 28; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -39074,7 +39074,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = -24; - req_access = list(ACCESS_AUX_BASE) + req_access = list("aux_base") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -39373,7 +39373,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access = list(ACCESS_MAINT_TUNNELS) + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -40370,7 +40370,7 @@ name = "Privacy Shutters Control"; pixel_x = 26; pixel_y = -26; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 @@ -41701,7 +41701,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; - req_access = list(ACCESS_SEC_BASIC) + req_access = list("sec_basic") }, /obj/machinery/power/apc{ areastring = "/area/security/range"; @@ -42096,7 +42096,7 @@ id = "emt_shutters"; name = "Paramedic Staging Area Shutters"; pixel_x = 28; - req_access = list(ACCESS_PARAMEDIC) + req_access = list("paramedic") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -42306,14 +42306,14 @@ name = "Queue Shutters Control"; pixel_x = 25; pixel_y = -36; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/button/door{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = -26; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/button/flasher{ id = "hopflash"; @@ -44171,14 +44171,14 @@ name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/button/door{ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; @@ -44538,7 +44538,7 @@ id = "Podbaydoor"; pixel_x = 24; pixel_y = -1; - req_access = list(ACCESS_EXTERNAL_AIRLOCKS); + req_access = list("external_airlocks"); name = "Shipbreaking External Control" }, /turf/open/floor/plasteel/dark, @@ -44639,7 +44639,7 @@ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -7; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44648,7 +44648,7 @@ normaldoorcontrol = 1; pixel_x = 7; pixel_y = 7; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44657,7 +44657,7 @@ normaldoorcontrol = 1; pixel_x = 7; pixel_y = -2; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/firealarm{ dir = 4; @@ -44769,7 +44769,7 @@ id = "xenobio1"; name = "Containment Blast Doors"; pixel_y = 4; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -45929,7 +45929,7 @@ "nif" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(ACCESS_SEC_BASIC) + req_access = list("sec_basic") }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -46567,7 +46567,7 @@ name = "Teleporter Shutter Control"; pixel_x = 30; pixel_y = 5; - req_access = list(ACCESS_TELEPORTER) + req_access = list("teleporter")" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -47242,7 +47242,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -51209,7 +51209,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = -12; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/item/radio/intercom{ freerange = 1; @@ -51408,7 +51408,7 @@ id = "lawyer_shutters"; name = "law office shutter control"; pixel_y = -26; - req_access = list(ACCESS_LAWYER) + req_access = list("lawyer") }, /turf/open/floor/wood, /area/lawoffice) @@ -53361,7 +53361,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -56448,7 +56448,7 @@ name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57385,7 +57385,7 @@ "qzU" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57716,7 +57716,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 10; pixel_y = 22; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; @@ -57724,7 +57724,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 9; pixel_y = 32; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 @@ -58390,7 +58390,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = 24; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58626,7 +58626,7 @@ name = "Access Button"; pixel_x = 29; pixel_y = -8; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/light{ dir = 4 @@ -59309,7 +59309,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = -24; - req_access = list(ACCESS_AI_SAT) + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -59365,7 +59365,7 @@ normaldoorcontrol = 1; pixel_x = 1; pixel_y = 22; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/modular_computer/telescreen/preset/medical{ pixel_y = 32 @@ -61711,7 +61711,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 9; pixel_y = -22; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -62935,7 +62935,7 @@ id = "Podbaydoor"; pixel_x = -24; pixel_y = -1; - req_access = list(ACCESS_EXTERNAL_AIRLOCKS); + req_access = list("external_airlocks"); name = "Shipbreaking External Control" }, /obj/machinery/light, @@ -66310,7 +66310,7 @@ id = "xenobio7"; name = "Containment Blast Doors"; pixel_y = 4; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -66362,7 +66362,7 @@ name = "chemistry shutters control"; pixel_x = 24; pixel_y = -8; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -68249,7 +68249,7 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -68391,7 +68391,7 @@ name = "research shutters control"; pixel_x = -26; pixel_y = -26; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68813,7 +68813,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -70689,7 +70689,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -71576,7 +71576,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -74339,7 +74339,7 @@ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_y = -26; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel/dark, @@ -74366,7 +74366,7 @@ name = "chemistry shutters control"; pixel_x = 26; pixel_y = -26; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -74686,7 +74686,7 @@ name = "External Shutters Control"; pixel_x = -26; pixel_y = 34; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/photocopier/faxmachine{ department = "Head of Security"; @@ -75648,7 +75648,7 @@ name = "Test Chamber Blast Doors"; pixel_x = 4; pixel_y = -3; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -76671,7 +76671,7 @@ name = "Justice Area Lockdown"; pixel_x = -25; pixel_y = 26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/item/assembly/signaler{ pixel_x = -3; @@ -76689,7 +76689,7 @@ name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel/dark, /area/security/execution/education) @@ -77494,7 +77494,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_y = -25; - req_access = list(ACCESS_EXPERIMENTATION) + req_access = list("experimentation") }, /turf/open/floor/engine, /area/science/explab) @@ -77687,7 +77687,7 @@ name = "Psych Office Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access = list(ACCESS_PSYCHOLOGY) + req_access = list("psychology") }, /obj/machinery/light_switch{ pixel_x = 8; @@ -78678,7 +78678,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 10; pixel_y = -22; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/light_switch{ pixel_x = -23 @@ -80581,7 +80581,7 @@ id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/item/poster/random_official, /obj/item/poster/random_official, @@ -81881,7 +81881,7 @@ name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -25; @@ -81935,7 +81935,7 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 24; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -81943,7 +81943,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 14; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/structure/table, /obj/item/paper_bin{ @@ -82257,7 +82257,7 @@ id = "hop"; name = "Privacy Shutters Control"; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/structure/table/wood, /turf/open/floor/wood, @@ -82476,7 +82476,7 @@ idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = -24; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82768,7 +82768,7 @@ name = "Bar Shutters Control"; pixel_x = 24; pixel_y = 9; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/machinery/light_switch{ pixel_x = 22 @@ -83094,7 +83094,7 @@ name = "Kitchen Shutters Control"; pixel_x = -8; pixel_y = 23; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -83290,7 +83290,7 @@ name = "Surgery shutters"; pixel_x = -24; pixel_y = 6; - req_access = list(ACCESS_SURGERY) + req_access = list("surgery") }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -83320,7 +83320,7 @@ name = "Secure Lab Shutter Control"; pixel_x = -5; pixel_y = -5; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -83328,21 +83328,21 @@ name = "Privacy Shutters Control"; pixel_x = 5; pixel_y = 5; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/machinery/button/door{ id = "Biohazard"; name = "Entrance Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/machinery/button/door{ id = "toxins_blastdoor"; name = "Toxins Shutter Control"; pixel_x = 5; pixel_y = -5; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -83669,7 +83669,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = 24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -84200,7 +84200,7 @@ id = "supplybridge"; name = "Shuttle Bay External Bridge Control"; pixel_y = 27; - req_access = list(ACCESS_EXTERNAL_AIRLOCKS) + req_access = list("external_airlocks") }, /obj/structure/cable/yellow{ icon_state = "4-8" diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index bd06e1d016df..958e81ce5c0e 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -354,14 +354,14 @@ name = "Cell 5 Blast Door Control"; pixel_x = -28; pixel_y = 8; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "cell4 blast"; name = "Cell 4 Blast Door Control"; pixel_x = -28; pixel_y = -8; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -2793,14 +2793,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; pixel_y = -2; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -4133,7 +4133,7 @@ name = "Desk Shutters"; pixel_x = -26; pixel_y = 6; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/flasher{ id = "brigentry"; @@ -5480,7 +5480,7 @@ name = "Privacy Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /obj/machinery/camera{ c_tag = "Kitchen South"; @@ -7891,7 +7891,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -9053,7 +9053,7 @@ name = "Shutters Control Button"; pixel_x = 24; pixel_y = -24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -10855,7 +10855,7 @@ name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = 10; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -12838,7 +12838,7 @@ normaldoorcontrol = 1; pixel_x = 26; pixel_y = 26; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; @@ -12849,7 +12849,7 @@ name = "Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -13324,7 +13324,7 @@ name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = -7; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -14078,7 +14078,7 @@ name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = -6; @@ -15027,7 +15027,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/warning/lower, /obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ @@ -16205,7 +16205,7 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 28; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -17170,7 +17170,7 @@ name = "Space Shutters Control"; pixel_x = -26; pixel_y = 34; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) @@ -17497,7 +17497,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_SURGERY) + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery"; @@ -18501,7 +18501,7 @@ id = "captain blast"; name = "Privacy Shutters Control"; pixel_x = 5; - req_access = list(ACCESS_CAPTAIN) + req_access = list("captain") }, /turf/open/floor/stone, /area/crew_quarters/heads/captain) @@ -18627,14 +18627,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_HOP) + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -19071,7 +19071,7 @@ "dXX" = ( /obj/machinery/computer/rdconsole/production{ dir = 8; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 5 @@ -19331,7 +19331,7 @@ name = "Counter Shutters Control"; pixel_x = -25; pixel_y = 24; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /obj/machinery/light_switch{ pixel_x = -25; @@ -19342,7 +19342,7 @@ name = "Window Shutters Control"; pixel_x = -25; pixel_y = 32; - req_access = list(ACCESS_BAR) + req_access = list("bar") }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -19458,7 +19458,7 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/recharger/wallrecharger{ pixel_x = -22; @@ -19632,7 +19632,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_PARAMEDIC) + req_access = list("paramedic") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -19981,7 +19981,7 @@ name = "Shutters Control Button"; pixel_x = -6; pixel_y = 25; - req_access = list(ACCESS_ROBOTICS) + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 9 @@ -22524,7 +22524,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -22541,7 +22541,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/item/folder/white{ pixel_x = 4; @@ -24217,14 +24217,14 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/button/door{ id = "tcomms_bridge"; name = "Telecommunications Shutter Control"; pixel_x = 28; pixel_y = -2; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/structure/chair/comfy/black{ dir = 1; @@ -26173,7 +26173,7 @@ id = "Shuttle Construction Storage"; name = "Shuttle Construction Storage"; pixel_x = 24; - req_access = list(ACCESS_AUX_BASE) + req_access = list("aux_base") }, /obj/effect/turf_decal/delivery, /obj/structure/closet/emcloset, @@ -26240,7 +26240,7 @@ name = "Biohazard Shutter Control"; pixel_x = 29; pixel_y = -4; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -26343,7 +26343,7 @@ name = "Counter Shutters Control"; pixel_x = -27; pixel_y = -5; - req_access = list(ACCESS_KITCHEN) + req_access = list("kitchen") }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -27430,7 +27430,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -28613,7 +28613,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/structure/cable{ icon_state = "1-2" @@ -29957,7 +29957,7 @@ name = "Armory Shutters"; pixel_x = 23; pixel_y = -22; - req_access = list(ACCESS_ARMORY) + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -30105,7 +30105,7 @@ name = "Privacy Shutters"; pixel_x = -9; pixel_y = -20; - req_access = list(ACCESS_LAWYER) + req_access = list("lawyer") }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -31735,7 +31735,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -32665,14 +32665,14 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 10; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 24; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -32680,7 +32680,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = -10; - req_access = list(ACCESS_ENGINEERING) + req_access = list("engineering") }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) @@ -32930,7 +32930,7 @@ id = "cmo"; name = "CMO Privacy Shutters Control"; pixel_y = 28; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) @@ -33876,7 +33876,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access = list(ACCESS_ENGINE_EQUIP) + req_access = list("engine_equip") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -34838,7 +34838,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison/hallway) @@ -37629,14 +37629,14 @@ idSelf = "ai_core_airlock_control"; pixel_x = 25; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -38440,7 +38440,7 @@ name = "Visitation Shutters"; pixel_x = -6; pixel_y = 36; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "visitorflash"; @@ -39033,7 +39033,7 @@ name = "disposals shutter control"; pixel_x = -24; pixel_y = 9; - req_access = list(ACCESS_CARGO) + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -39543,7 +39543,7 @@ id = "testlab"; name = "Test Chamber Blast Doors"; pixel_y = -4; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -42066,7 +42066,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/button/door{ id = "outerbrig"; @@ -42074,7 +42074,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/structure/cable{ icon_state = "1-2" @@ -42233,7 +42233,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -43006,7 +43006,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = 23; pixel_y = -7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -43696,7 +43696,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = 25; - req_access = list(ACCESS_CHEMISTRY) + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/warning/lower{ dir = 4 @@ -44315,7 +44315,7 @@ name = "Research Lab Shutters Control"; pixel_x = -6; pixel_y = 24; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -44530,7 +44530,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -7; pixel_y = 23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "telecomms_airlock_exterior"; @@ -44538,7 +44538,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = 5; pixel_y = 25; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44779,7 +44779,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access = list(ACCESS_MAINT_TUNNELS) + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -44813,7 +44813,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -46680,7 +46680,7 @@ id = "tcomms"; name = "Telecommunications Shutter Control"; pixel_y = -27; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/structure/cable{ @@ -46966,7 +46966,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -48431,7 +48431,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/virology{ @@ -48936,7 +48936,7 @@ id = "genedesk"; name = "Genetics Desk Shutters Control"; pixel_x = 28; - req_access = list(ACCESS_GENETICS) + req_access = list("genetics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -49153,14 +49153,14 @@ name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/button/door{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/effect/turf_decal/stripes/corner{ @@ -49403,7 +49403,7 @@ id = "heads_meeting"; name = "Security Shutters"; pixel_y = 24; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/wood, /area/bridge/meeting_room) @@ -50626,7 +50626,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = 24; - req_access = list(ACCESS_TELEPORTER) + req_access = list("teleporter")" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -50983,7 +50983,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_y = -26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -51106,20 +51106,20 @@ name = "Left side containment blast doors"; pixel_x = -7; pixel_y = -24; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 7; pixel_y = -24; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = -34; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -51956,7 +51956,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -53053,7 +53053,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = -8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -53061,7 +53061,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53439,7 +53439,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access = list(ACCESS_PSYCHOLOGY) + req_access = list("psychology") }, /turf/open/floor/carpet, /area/medical/psych) @@ -55517,7 +55517,7 @@ idSelf = "telecomms_airlock_control"; pixel_x = -23; pixel_y = -23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -57274,7 +57274,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = -24; - req_access = list(ACCESS_TELEPORTER) + req_access = list("teleporter")" }, /turf/open/floor/plating, /area/teleporter) @@ -58096,7 +58096,7 @@ name = "Toxins airlock control"; pixel_x = 24; pixel_y = 24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -58105,7 +58105,7 @@ name = "Toxins airlock control"; pixel_x = -24; pixel_y = 24; - req_access = list(ACCESS_TOXINS) + req_access = list("toxins") }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -58380,7 +58380,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -61370,7 +61370,7 @@ id = "xenodesk"; name = "Xenobiology Desk Shutters Control"; pixel_x = -28; - req_access = list(ACCESS_XENOBIOLOGY) + req_access = list("xenobiology") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 9 @@ -61642,7 +61642,7 @@ name = "South Research Lab Shutter Control"; pixel_x = -23; pixel_y = 1; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 10 @@ -62484,7 +62484,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; - req_access = list(ACCESS_EXPERIMENTATION) + req_access = list("experimentation") }, /turf/open/floor/plasteel/white, /area/science/explab) @@ -64580,7 +64580,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_y = -26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -64964,14 +64964,14 @@ idSelf = "telecomms_airlock_control"; pixel_x = 7; pixel_y = -23; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; pixel_y = 6; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/machinery/camera{ c_tag = "Telecomms Server Room Access"; @@ -65453,7 +65453,7 @@ name = "Privacy Shutters"; pixel_x = -6; pixel_y = 8; - req_access = list(ACCESS_DETECTIVE) + req_access = list("detective") }, /turf/open/floor/carpet, /area/security/detectives_office) @@ -65594,7 +65594,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_y = -26; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -65764,7 +65764,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_access = list(ACCESS_TCOMMS) + req_access = list("tcomms") }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/effect/turf_decal/trimline/neutral/filled/line/lower{ @@ -65801,7 +65801,7 @@ id = "viropen"; name = "Monkey Pen Shutters"; pixel_x = -24; - req_access = list(ACCESS_VIROLOGY) + req_access = list("virology") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -67762,7 +67762,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = 24; - req_access = list(ACCESS_AUX_BASE) + req_access = list("aux_base") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -68256,7 +68256,7 @@ name = "Biohazard Shutter Control"; pixel_x = 6; pixel_y = 8; - req_access = list(ACCESS_SCIENCE) + req_access = list("science") }, /obj/item/storage/pencil_holder/crew/fancy{ pixel_x = -8; @@ -68345,7 +68345,7 @@ name = "Incinerator airlock control"; pixel_x = -24; pixel_y = -8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -68688,7 +68688,7 @@ idSelf = "ai_core_airlock_control"; pixel_x = -23; pixel_y = 7; - req_access = list(ACCESS_AI_MASTER) + req_access = list("ai_master") }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -69311,7 +69311,7 @@ name = "Space Shutters Control"; pixel_x = -1; pixel_y = 23; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -69699,7 +69699,7 @@ name = "CMO Privacy Shutters Control"; pixel_x = 7; pixel_y = 24; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -71124,7 +71124,7 @@ name = "Incinerator airlock control"; pixel_x = 22; pixel_y = 8; - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -71228,7 +71228,7 @@ name = "Cell 6 Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -74158,7 +74158,7 @@ id = "phoenixwright"; name = "Lawyer Shutters"; pixel_x = -23; - req_access = list(ACCESS_LAWYER) + req_access = list("lawyer") }, /turf/open/floor/wood, /area/lawoffice) @@ -74872,7 +74872,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -74881,7 +74881,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 45a0413724f0..40d784f5321b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1613,7 +1613,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = -5; - req_access = list(ACCESS_CENT_STORAGE) + req_access = list("cent_storage") }, /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor2"; @@ -1621,7 +1621,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = 5; - req_access = list(ACCESS_CENT_STORAGE) + req_access = list("cent_storage") }, /obj/machinery/computer/cargo{ dir = 4 @@ -7763,7 +7763,7 @@ name = "Hanger Bay Shutters"; pixel_x = -8; pixel_y = 24; - req_access = list(ACCESS_CENT_GENERAL) + req_access = list("cent_general") }, /obj/machinery/button/door/indestructible{ id = "XCCsec3"; @@ -8139,7 +8139,7 @@ id = "XCCFerry"; name = "Hanger Bay Shutters"; pixel_y = 24; - req_access = list(ACCESS_CENT_GENERAL) + req_access = list("cent_general") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8674,7 +8674,7 @@ id = "XCCsec1"; name = "CC Shutter 1 Control"; pixel_y = -24; - req_access = list(ACCESS_CENT_GENERAL) + req_access = list("cent_general") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -15084,7 +15084,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomehea"; name = "Heavy Supply Control"; - req_access = list(ACCESS_CENT_THUNDER) + req_access = list("cent_thunder") }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15103,7 +15103,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdome"; name = "Main Blast Doors Control"; - req_access = list(ACCESS_CENT_THUNDER) + req_access = list("cent_thunder") }, /obj/structure/table/reinforced, /obj/machinery/light, @@ -15123,7 +15123,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomegen"; name = "General Supply Control"; - req_access = list(ACCESS_CENT_THUNDER) + req_access = list("cent_thunder") }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -21455,7 +21455,7 @@ /area/centcom) "bVV" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -23408,7 +23408,7 @@ /area/centcom/tdome/tdomeobserve) "uRI" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, @@ -23440,7 +23440,7 @@ /obj/machinery/button/door{ id = "nukie_leader_dorm_windows"; name = "Window Shutters"; - req_access = list(ACCESS_SYNDICATE_LEADER) + req_access = list("syndicate_leader") }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) diff --git a/_maps/map_files/mining/Jungleland.dmm b/_maps/map_files/mining/Jungleland.dmm index bd6c8c15514f..736ee9ac5cd1 100644 --- a/_maps/map_files/mining/Jungleland.dmm +++ b/_maps/map_files/mining/Jungleland.dmm @@ -490,7 +490,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 diff --git a/_maps/map_files/mining/Lavaland.dmm b/_maps/map_files/mining/Lavaland.dmm index b5b792741bfd..faefe499409d 100644 --- a/_maps/map_files/mining/Lavaland.dmm +++ b/_maps/map_files/mining/Lavaland.dmm @@ -2968,7 +2968,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access = list(ACCESS_BRIG) + req_access = list("brig") }, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny, diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo_birdboat.dmm index 04442dd30516..5bd86e044b68 100644 --- a/_maps/shuttles/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo_birdboat.dmm @@ -99,14 +99,14 @@ name = "Loading Doors"; pixel_x = 24; pixel_y = 8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/conveyor_switch/oneway{ id = "cargoshuttle" diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo_box.dmm index 88762a33abf4..77370830b14c 100644 --- a/_maps/shuttles/cargo_box.dmm +++ b/_maps/shuttles/cargo_box.dmm @@ -42,14 +42,14 @@ name = "Loading Doors"; pixel_x = 24; pixel_y = 8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/light{ dir = 4 diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm index 23a1fb6adbab..59d333cfb48d 100644 --- a/_maps/shuttles/cargo_delta.dmm +++ b/_maps/shuttles/cargo_delta.dmm @@ -121,14 +121,14 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = 8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "cargoload"; name = "Loading Doors"; pixel_x = -24; pixel_y = -8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/shuttles/cargo_gax.dmm b/_maps/shuttles/cargo_gax.dmm index 63bd4e9b5d9e..56498c747a8e 100644 --- a/_maps/shuttles/cargo_gax.dmm +++ b/_maps/shuttles/cargo_gax.dmm @@ -111,14 +111,14 @@ name = "Loading Doors"; pixel_x = 24; pixel_y = 8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo_bay") }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm index 40983c1167e3..f207bfa4b1b8 100644 --- a/_maps/shuttles/cargo_kilo.dmm +++ b/_maps/shuttles/cargo_kilo.dmm @@ -138,7 +138,7 @@ name = "Off Ramp Toggle"; pixel_x = -24; pixel_y = 6; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -146,7 +146,7 @@ name = "On Ramp Toggle"; pixel_x = -24; pixel_y = -6; - req_access = list(ACCESS_CARGO_BAY) + req_access = list("cargo") }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/supply) diff --git a/_maps/shuttles/emergency_48641.dmm b/_maps/shuttles/emergency_48641.dmm index 59d5e0122589..ee75b5944d94 100644 --- a/_maps/shuttles/emergency_48641.dmm +++ b/_maps/shuttles/emergency_48641.dmm @@ -27,7 +27,7 @@ id = "48641ragecageexit"; name = "Rage Cage Exit Doors"; pixel_x = 24; - req_access = req_access = list(ACCESS_CMO) + req_access = list("cmo") }, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -517,7 +517,7 @@ name = "Table Privacy Shutters"; pixel_x = -28; pixel_y = -5; - req_access = req_access = list(ACCESS_CMO) + req_access = list("cmo") }, /turf/open/floor/wood, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_cargo.dmm b/_maps/shuttles/emergency_cargo.dmm index afdb5e4fc774..e3c297024c6c 100644 --- a/_maps/shuttles/emergency_cargo.dmm +++ b/_maps/shuttles/emergency_cargo.dmm @@ -825,14 +825,14 @@ name = "Cockpit Window Blast Doors"; pixel_x = 26; pixel_y = 32; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/machinery/button/door{ id = "ock_cargo_door"; name = "Cargo Airlock Blast Doors"; pixel_x = 39; pixel_y = 32; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_octa.dmm b/_maps/shuttles/emergency_octa.dmm index bb0660ca8055..e5e769b3b0ba 100644 --- a/_maps/shuttles/emergency_octa.dmm +++ b/_maps/shuttles/emergency_octa.dmm @@ -598,7 +598,7 @@ name = "Cockpit Window Blast Doors"; pixel_x = -7; pixel_y = 32; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 2552d88418c6..b686d860129e 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -39,7 +39,7 @@ id = "escape_cockpit_windows"; name = "Cockpit Window Blast Doors"; pixel_x = -7; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) @@ -267,7 +267,7 @@ id = "escape_cockpit_blast"; name = "Cockpit Airlock Blast Doors"; pixel_y = -26; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/effect/turf_decal/raven/two, /turf/open/floor/plasteel/dark, @@ -2290,7 +2290,7 @@ lethal = 1; pixel_x = 5; pixel_y = 32; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index b52821630967..93d2b4336994 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -100,7 +100,7 @@ name = "window shutters"; pixel_x = 26; pixel_y = -6; - req_access = list(ACCESS_COMMAND) + req_access = list("command") }, /obj/structure/chair/comfy/shuttle, /obj/machinery/button/door{ @@ -108,7 +108,7 @@ name = "release bears"; pixel_x = 26; pixel_y = 6; - req_access = list(ACCESS_CAPTAIN) + req_access = list("captain") }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_triage.dmm b/_maps/shuttles/emergency_triage.dmm index 4be42888f2aa..db03fcc812d7 100644 --- a/_maps/shuttles/emergency_triage.dmm +++ b/_maps/shuttles/emergency_triage.dmm @@ -790,7 +790,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/closet/secure_closet{ name = "Plasmaman Supplies Locker"; - req_access = list(ACCESS_MEDICAL) + req_access = list("medical") }, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/plasmaman, diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 3104e8876e69..6890fe623576 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -110,7 +110,7 @@ name = "Cockpit View Control"; pixel_x = 32; pixel_y = 32; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) @@ -462,7 +462,7 @@ id = "smindicate"; name = "external door control"; pixel_y = 26; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/docking_port/mobile{ dheight = 1; @@ -1356,7 +1356,7 @@ id = "syndiedriver"; name = "Mass Driver Controller"; pixel_x = -24; - req_access = req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 1 diff --git a/_maps/shuttles/infiltrator_cutter.dmm b/_maps/shuttles/infiltrator_cutter.dmm index dcd8fd9331d4..a37ff62f9cc3 100644 --- a/_maps/shuttles/infiltrator_cutter.dmm +++ b/_maps/shuttles/infiltrator_cutter.dmm @@ -143,7 +143,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = 25; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -694,7 +694,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -25; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -1014,7 +1014,7 @@ name = "Bridge Blast Door Control"; pixel_x = 25; pixel_y = 8; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index bb24ad37e89c..8fd488f72c5e 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -38,7 +38,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 856553cd24a1..63bc82229917 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -45,7 +45,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index 9bdc2d781b92..4205e6cd6a95 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -40,7 +40,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access = list(ACCESS_SECURITY) + req_access = list("security") }, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral, diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index c7af19b3f626..20785b2db47e 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -102,7 +102,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = -6; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -213,7 +213,7 @@ name = "Bridge Blast Door Control"; pixel_x = -16; pixel_y = 5; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/button/door{ id = "caravansyndicate3_bolt_bridge"; @@ -221,7 +221,7 @@ normaldoorcontrol = 1; pixel_x = -16; pixel_y = -5; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, @@ -347,7 +347,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -461,7 +461,7 @@ lethal = 1; name = "Shuttle turret control"; pixel_y = 34; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/structure/chair/comfy/shuttle{ dir = 4 diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index a56500974257..e37f895a800a 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -27,7 +27,7 @@ dir = 8; name = "Syndicate Fighter APC"; pixel_x = -25; - req_access = list(ACCESS_SYNDICATE) + req_access = list("syndicate") }, /obj/machinery/computer/security{ dir = 1; @@ -112,7 +112,7 @@ name = "External Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access = list(ACCESS_SYNDICATE); + req_access = list("syndicate"); specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/templates/lazy_templates/chapel1.dmm b/_maps/templates/lazy_templates/chapel1.dmm index 225a5371f424..d05ed777201d 100644 --- a/_maps/templates/lazy_templates/chapel1.dmm +++ b/_maps/templates/lazy_templates/chapel1.dmm @@ -588,7 +588,7 @@ "Ny" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -858,7 +858,7 @@ id = "chapelgun"; name = "Mass Driver Controller"; pixel_x = 24; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/templates/lazy_templates/chapel2.dmm b/_maps/templates/lazy_templates/chapel2.dmm index 38aa49c987ae..0f47d4878094 100644 --- a/_maps/templates/lazy_templates/chapel2.dmm +++ b/_maps/templates/lazy_templates/chapel2.dmm @@ -511,7 +511,7 @@ "Dj" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access = list(ACCESS_CHAPEL_OFFICE) + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ diff --git a/_maps/templates/lazy_templates/clerk_box.dmm b/_maps/templates/lazy_templates/clerk_box.dmm index 5f895f4c8ac3..3df3dd1d9cca 100644 --- a/_maps/templates/lazy_templates/clerk_box.dmm +++ b/_maps/templates/lazy_templates/clerk_box.dmm @@ -76,14 +76,14 @@ name = "Gift Shop Internal Shutters"; pixel_x = 26; pixel_y = 24; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; pixel_y = 24; - req_access = list(ACCESS_CLERK) + req_access = list("clerk") }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index b8cb751c2a8a..5bbccc491135 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -147,7 +147,7 @@ desc = "A display case containing an expensive forgery, probably."; pixel_y = -4; start_showpiece_type = /obj/item/fakeartefact; - req_access = list(ACCESS_MINING) + req_access = list("mining") }, /turf/open/floor/carpet/black, /area/survivalpod) From 9ab0d2fc1262daf1b5a6593c30b8a7056c97d82a Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 7 Aug 2024 02:55:36 +0200 Subject: [PATCH 46/48] ballin --- _maps/map_files/GaxStation/GaxStation.dmm | 73 +++++++++++++++-- _maps/map_files/IceMeta/IceMeta.dmm | 26 +++--- _maps/map_files/YogStation/YogStation.dmm | 6 +- code/game/objects/structures/stairs.dm | 92 ++++++++++++++-------- goon/icons/turfs/floors.dmi | Bin 4525 -> 3704 bytes icons/obj/stairs.dmi | Bin 7927 -> 0 bytes 6 files changed, 140 insertions(+), 57 deletions(-) delete mode 100644 icons/obj/stairs.dmi diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index b641c27b91b4..a70eb34e3fa3 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -5511,8 +5511,11 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "cES" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide{ - dir = 8 + dir = 4 }, /area/bridge) "cEZ" = ( @@ -6134,6 +6137,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "cVa" = ( @@ -7325,6 +7331,9 @@ /area/security/checkpoint/medical) "dxA" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "dxH" = ( @@ -13201,6 +13210,12 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 6 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "gfu" = ( @@ -14660,7 +14675,9 @@ /obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone, +/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{ + dir = 1 + }, /area/hallway/secondary/entry) "gRV" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -15249,7 +15266,7 @@ /obj/machinery/button/door{ id = "teleshutter"; name = "Teleporter Shutter Control"; - req_access = list("teleporter")" + req_access = list("teleporter") }, /turf/closed/wall/r_wall, /area/teleporter) @@ -20459,6 +20476,9 @@ /obj/effect/turf_decal/trimline/secred/warning/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "jHj" = ( @@ -21087,7 +21107,9 @@ /obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/turf/open/floor/plasteel/stairs/goon/stairs_middle, +/turf/open/floor/plasteel/stairs/goon/stairs_middle{ + dir = 1 + }, /area/hallway/secondary/entry) "jXr" = ( /obj/effect/spawner/structure/window/reinforced/shutter, @@ -24657,8 +24679,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "lMp" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{ - dir = 8 + dir = 4 }, /area/bridge) "lMu" = ( @@ -27519,6 +27544,11 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"njz" = ( +/obj/effect/spawner/structure/window/reinforced/shutter, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "njB" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 1 @@ -27588,8 +27618,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{ - dir = 8 + dir = 4 }, /area/bridge) "nlR" = ( @@ -28781,6 +28814,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "nMW" = ( @@ -31219,6 +31255,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "pgd" = ( @@ -34500,6 +34539,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "qJl" = ( @@ -34714,7 +34756,9 @@ /obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/turf/open/floor/plasteel/stairs/goon/stairs_middle, +/turf/open/floor/plasteel/stairs/goon/stairs_middle{ + dir = 1 + }, /area/hydroponics/garden) "qQC" = ( /obj/machinery/navbeacon{ @@ -35324,6 +35368,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/dark, /area/bridge) "rdP" = ( @@ -38123,6 +38171,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "sup" = ( @@ -43651,6 +43702,9 @@ /obj/structure/railing, /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "vgJ" = ( @@ -45717,6 +45771,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "wgK" = ( @@ -96163,7 +96220,7 @@ ajU dfE aLl aLl -xut +njz iNf xut aLl diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 8d0f62312763..3647c50c36c7 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -2231,10 +2231,10 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "aHc" = ( -/obj/structure/stairs/goon/wide/right{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_right{ dir = 1 }, /turf/open/floor/plating, @@ -13100,10 +13100,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "dRf" = ( -/obj/structure/stairs/goon/wide/left{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_left{ dir = 1 }, /turf/open/floor/plating, @@ -32370,10 +32370,10 @@ /turf/open/floor/plasteel/vaporwave, /area/storage/art) "jvC" = ( -/obj/structure/stairs/goon/wide/right{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_right{ dir = 1 }, /turf/open/floor/plating, @@ -45522,10 +45522,10 @@ /turf/open/floor/plasteel/cafeteria, /area/mine/break_room) "ncA" = ( -/obj/structure/stairs/goon/wide/left{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_left{ dir = 1 }, /turf/open/floor/plating, @@ -46567,7 +46567,7 @@ name = "Teleporter Shutter Control"; pixel_x = 30; pixel_y = 5; - req_access = list("teleporter")" + req_access = list("teleporter") }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -78130,10 +78130,12 @@ /turf/open/floor/plasteel/dark, /area/engine/foyer) "wop" = ( -/obj/structure/stairs/goon/wide, /obj/effect/turf_decal/ramp_middle{ dir = 1 }, +/obj/structure/stairs/wide_mid{ + dir = 1 + }, /turf/open/floor/plating, /area/mine/living_quarters) "wot" = ( @@ -79426,10 +79428,12 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "wHy" = ( -/obj/structure/stairs/goon/wide, /obj/effect/turf_decal/ramp_middle{ dir = 1 }, +/obj/structure/stairs/wide_mid{ + dir = 1 + }, /turf/open/floor/plating, /area/mine/abandoned) "wHH" = ( diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 958e81ce5c0e..e543ca33042c 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -50626,7 +50626,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = 24; - req_access = list("teleporter")" + req_access = list("teleporter") }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -57274,7 +57274,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = -24; - req_access = list("teleporter")" + req_access = list("teleporter") }, /turf/open/floor/plating, /area/teleporter) @@ -61935,7 +61935,7 @@ /obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/turf/open/floor/plasteel/stairs{ +/turf/open/floor/plasteel/stairs/goon/stairs_alone{ dir = 1 }, /area/escapepodbay) diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index 9c6225a364e5..bcf7e57fae4d 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -8,9 +8,9 @@ /obj/structure/stairs name = "stairs" - icon = 'icons/obj/stairs.dmi' - icon_state = "stairs" - layer = EMISSIVE_FLOOR_LAYER + icon = 'goon/icons/turfs/floors.dmi' + icon_state = "stairs_alone" + layer = BELOW_OPEN_DOOR_LAYER anchored = TRUE move_resist = INFINITY @@ -18,18 +18,6 @@ var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC var/turf/listeningTo -/obj/structure/stairs/north - dir = NORTH - -/obj/structure/stairs/south - dir = SOUTH - -/obj/structure/stairs/east - dir = EAST - -/obj/structure/stairs/west - dir = WEST - /obj/structure/stairs/Initialize(mapload) GLOB.stairs += src if(force_open_above) @@ -96,14 +84,6 @@ for(var/mob/living/buckled as anything in climber.buckled_mobs) buckled.pulling?.move_from_pull(buckled, loc, buckled.glide_size) - -/obj/structure/stairs/update_icon_state() - . = ..() - if(isTerminator()) - icon_state = "stairs_t" - else - icon_state = "stairs" - /obj/structure/stairs/vv_edit_var(var_name, var_value) . = ..() if(!.) @@ -157,24 +137,66 @@ return FALSE return TRUE -// For the sake of keeping the same sprite as /turf/open/floor/plasteel/stairs/goon/stairs -// One-tile stairs -/obj/structure/stairs/goon - icon = 'goon/icons/turfs/floors.dmi' - icon_state = "stairs_alone" - base_icon_state = "stairs_alone" -// Middle -/obj/structure/stairs/goon/wide +/obj/structure/stairs/wide_mid icon_state = "stairs_middle" base_icon_state = "stairs_middle" -// Left side -/obj/structure/stairs/goon/wide/left +/obj/structure/stairs/wide_left icon_state = "stairs_wide" base_icon_state = "stairs_wide" -// Right side -/obj/structure/stairs/goon/wide/right +/obj/structure/stairs/wide_right icon_state = "stairs2_wide" base_icon_state = "stairs2_wide" + + +/obj/structure/stairs/white + icon_state = "medstairs_alone" + base_icon_state = "medstairs_alone" + +/obj/structure/stairs/white/wide_mid + icon_state = "medstairs_middle" + base_icon_state = "medstairs_middle" + +/obj/structure/stairs/white/wide_left + icon_state = "medstairs_wide" + base_icon_state = "medstairs_wide" + +/obj/structure/stairs/white/wide_right + icon_state = "medstairs2_wide" + base_icon_state = "medstairs2_wide" + + +/obj/structure/stairs/wood + icon_state = "woodstairs_alone" + base_icon_state = "woodstairs_alone" + +/obj/structure/stairs/wood/wide_mid + icon_state = "woodstairs_middle" + base_icon_state = "woodstairs_middle" + +/obj/structure/stairs/wood/wide_left + icon_state = "woodstairs_wide" + base_icon_state = "woodstairs_wide" + +/obj/structure/stairs/wood/wide_right + icon_state = "woodstairs2_wide" + base_icon_state = "woodstairs2_wide" + + +/obj/structure/stairs/dark + icon_state = "darkstairs_alone" + base_icon_state = "darkstairs_alone" + +/obj/structure/stairs/dark/wide_mid + icon_state = "darkstairs_middle" + base_icon_state = "darkstairs_middle" + +/obj/structure/stairs/dark/wide_left + icon_state = "darkstairs_wide" + base_icon_state = "darkstairs_wide" + +/obj/structure/stairs/dark/wide_right + icon_state = "darkstairs2_wide" + base_icon_state = "darkstairs2_wide" diff --git a/goon/icons/turfs/floors.dmi b/goon/icons/turfs/floors.dmi index b5b3a57b9852fffc561b4bc987092fac12964a25..1cb6f302fc01022508bcd0e3de7016e990f68715 100644 GIT binary patch literal 3704 zcmY+H3p7++8^_N%#$^bD+#&`eng}ILQ8P4=Tw{>jE0>f(DVM|#2fb5TaykRJV-o#{CGq}#N9h|CX>lvFnW4=rl+Up=jV+S zHkqO2Jq%TY4`?{(Y*tfK)6vy6G1*5X5=kVIc49&f?;}-Fq@!U(-*YFG`;=-=_A_}H&E+3m4hkj9`n45QN&zW-Dp=YY3 zi&I}@4phfDSe)-Wb3a!Xlhwk^XrRB$UsN-gN>FrG>_ai47G<0r2wPHJQrtQvk^{OVC{8aX^Vm(_y#yYu&+H3kwX*gR3hb4e#OaOkPkekwRM2GYv~{Jx zUh!|gTs^m`|5EhV?ML!@V{Az@B}Ei`b4$ITv~7d?i_okHn}YFm{POp|J(lk%I+%`) zA1+S9ZCR$81^_`xl>Sq=cP@AStJ$-xLo@HegJ%L=hXxom|t%Qbp##3lSNPw6a`rehEUJR+IyyC zqSnc>^bg}JA~2%!^nx4$E$f|_#VJl{KsbWOa9z@@!(Me^MZ1*8%EF4az;bv?Hp#7^ z@O8&WEManvEV52I!aY-osElojGKTBz#546DecTCGMy8#jo9Qlhp`{PyUSjax@TK*eIgPl>hbF@NYRG3yZPV9biB`85f=H2T=h(Ka@wU}^DfurQ}yQ0kQvq7Dt2 ztadQh&-P3WFWzGRCI3jgT??BiH@2RJf?{S}#kTkFwcf5PXU) z%s0ie6gYM8jgyKn_KAAT^4&Njx zS9An5fu+}N)Kps=!V(zomZShA&l|cT1T0Hbi)|;HC{+YihuqbKvzZZ7)~9hzu2a@F zfNo6Y*n_9I!>P2FPH^Y&5NhrIT~5C@(tAC(3zM{&G)mKpg6tz+qdv)$r~^I=%J*FE zfPT62n{R0Vaal`|ryd~`!0Yr11X{e#a8Igi9K%>M9;m-X0GhsBl ze`yJOb8dz#g0H1l*9%MDC_{G!)_9(hS??dpIo zM{+*ihx-AEkNu$#WUkF_``ELYtpT23Kl_q1FZclwibFD@RzB4Ta7W^(!&pfDfXt-@ z>-#jyTGtP+D#!c&Yc>Q-MXXAgv8t{eE+a%P`@ z52&ZrY0o!K*9*WXRY!ylH(fD&c{`A3E!A0M^iqbK()M{13|$Bi5O-7>mSR`Q^R!Mg;R~8@UiTkf^Vt_Ow-Z$|Be2DbabS{S?7K0ENG=SVv3~@s_DnLo-UQ z`@gv!)U6bWY{EQg4v2}gSYOO#eg`iyT&{&i0cL}m!flf}zO@){ zRpDt&ZT_!3-f9xTw|eJslymCi;Q75Mz%k_LJ$=g?;47^Yw8T{R8ELQ&h;g8JjO!Jv z1vfqIVIWyMESw0iZB>SH$XlsvNc&RQHu16Ob+=CSh7!?2-dry;Z&CJ%laEkNaI1UE zNfdR7Ap?-S`QrTz<4s=&H_Q}mR9+c6UyzP%Q}vv{MC8VXE8Y3zzJcv=-4w)YwLIDI zVS9bAvw|dV(TBkjyj%dBl?%})?gUFwWyWH#=3V!=eI3wwH=k8kLUw{M_MG*W>>Whk zw3b4L%fipQe3Uf5m?x0K`phk#NhwV_=LBVEyB&Gn>+9zG#W{Mfm`+~!#Xg@T%`ZL) zDi`{EEF%?uHC?q=yeW*G&w1OmqI5@qYtTX;$5oIh9*F1_GcyMCcX{QS4*hxN*9f_i z=b78c34`CO>K4mtrMle@cUyI|RYolHEYfDcq zPigHXWo4B&PZ>$EOzx#hDFMWc(ecHfz@$e;VupY*h<$n&%l+{1Hn7ptpb6^_B+v(1 z>@%*Rj5-WzHbvJVmdD1NBWw3VO_*xDP$YF~SCiKC!t-NLY#w4LjFY>px_x46&GRH^ z$3fqcp3xy6Vw0-BxDL=(H4?q4w`HXEaj#LMZg9g&^pN?*W+&TCw$@xZSh~$h zw(a?_r>m2@<(+K?QnAVl8pj3QM-Lpy>-Iw5JXI@`m|`FbvaGXdG7!KM=LN5HTn^6>bf z%pN?gb4I6<2G)E;roDAN%78Yi=Daz(;%f1;An##2REFDn#`Fe8d(5R2F2(IFzTTg) zb@bhIkaWD$+~?UNEB&)gX@c5MP>diE-orLpx;kL3kTZp4D-Ti)E*WO zYf9@aWLQq#&c)~V-{!h9_J=P<0~<``c!wHkq*1ePL8lT0t7NKMrfsqO=FFQ0nbBxv zc6UdDaPzd^*SDWL%{3N7WwkfsV)g?;#6ELjJtWiBLc(wX&poMatQ)7H^ICRyT3tQs{ma{DVlGK*JNm7t0?DX=ej( zn$Yyi-qc`CtY1w$WTB3Pt34|o)G&kojTf(yn?rNkkuXJWYDnCQjY_tbO3qSBLM~NV)irK}7wC z^$D5FyZwIDya-@cy-?$wINd^$^J^BBKlE9Wi=o4juVSMQdCf16UK}p`n4Ug@XW4nx zi*%1#Kt!vZ(fHd5yZ5cK2f#n*tI9`T)!|tDAM}0kFZvE^B*3&^*_>n`6wU)ih6ZTA zF$aHq+b4Mh@Yk563Xs5|VWHWxN-mMgB|Rye{!~%OkV65ylYyz3$cq6 z9KH|Kt~*XWe;Z7AckYU3qEN0+LwHykAY%J|;^k{;Z-oA|70}JPm{rv*AQQsqM@%BU z)jsC)&YWo4pod^U=1eK1V`+pQdE^AkEH*m9dKsz(h~bt?ed}g|Of>Q)Pf4yQVW%wm zw~%vu(Eo$_0ep=6C%*Dn7l&lJl(6JUm-!GpNwbRxk&U=_e`oo=|6`l`m2QZ^S3I^^ a2f{gqTi=(7OY&}kfaO73VuhJ^+T@Szg*Rg=#c}`s{Z@23y{@hR6#f+7b!Bsa1KG<`noqJ!IF^%hJuS_$l(|EY*lKI5`lerE zNgaLU_Q+>+d|*^qBvD3|hUg~U6tk+)+{x9pJ?P5SBH(Pc+_f|nK5dIw*CC#Q^k%8xv7L>t*(FAw!|LFF|N6FweGpo za?A4iu3`D+QKM)Y-|x%D;7QOQ&QJ`A+#NIZ>AB&=P@u2t239=SHG-PP>CVlA(7GmN|is{21@GDR;MX_~)pr7~BPL5E%SooX`86mXDL?)sro$90lF zx7PbmJA0hGMr39urug%+uU@8ljjI^y7t?o_=;;)sDjeKStbS`Go*ZXhV6}Q$hOY7W zE>iSI?Mz{VdqC;#)S)O}kb3?C3okQ+l*SO@;MG7+PTqLoQ8id$vNmMkiM0O;u!16h z8pIHA?fmPH&aT90J zkQUf#W71-S3Ab+qTIqA$w=OQ-9kTtuMTr-4`?oCnVE?O-*7<*fFwXh!w@=V0i|yaf zJ)&i`Xyx>Vxv`vSlsaFCjWiL@nRa734^WxQz`l#tSb{sCARDHk<7z4q7Z8$+x1ADO~&L&achlG44iJ_u__MnPdwl~%@2z@;^l-6QYvH^ZdYhN2nsJl zpysnmYwAxHNnYQC`oV5^R8+nV0ZOu?y3h&q8$8RngxmjlH^;)TaO^i@f8)Cpwa z|I6rKZT(MIW)ISp|5MmLH+?ydq{ei#Bpfwj0=g^=mL)*99w};2fyqI}#q-_hsWZbr zz?*G87Mgq4XK`3C1PXQ=l$#^IYbI^G;9!6uX)P>lLLx z=ap>kU)K<)GQKxwZqUFe8Y>z`&jkH*i*0MAy*b5e+|43V=Pd9>ugUeA>GH)tV^%0mDl3P2y39SUf` ziDi#m-9>sGn<5zu;*E;>MHP$;qiAr>($1xWTS+yd#e5z@D1AHJT{bd*?P@^3FzYmA z)4^w$;~#TYl^VqPHG673%AG#)7SHR2oS7fC^||W z`^-lD9Awbj-q8s^$*HifXVuFl(dvujDB)TMx^eNm_!j-_?0?7s36@ER;n?-?8!WB@r0`s1v%VNhH&&l^);Jp{LTDmG%~;aY_oGuZFS|AsePpKqoi-pJf%L z9GU`af_>_=J|TltbZDIIR_ymc)&i)2)fP>I2F*?Gk7m_&tcD)o#`E*N4(M0iI)>T} zm;s$nz+xZnE}B*fMck0B5i5M>L{aAKH+0o=Hl`-t{azc3*2ZD)n==cJs$-YdN7pKQ z7@b7QP}_%VPNj$4uN|3uQAs6O#TrIUMj&K?9nNMl*_Vz`M-9C<^~29d0_|OvLFWW1 zMnxhN+ruX;nb(ilO68>RCj_c9ykr6Yu$vzg=k3dv3P08;=_&5(_zZzriu-UyfdMD1 z%x7NP_Kd$f>($i6Bk`@pXPwwM_ttyJE2$+Ctjyn%A7s{9_A~djyCex14@!r>LF4QC z0PJX+EJ4#y)vjvq-^FCVz>|3E_i+f=H~h}5mgN$Ef@-HqtK^4;bi3+g*cdzR_BK@E zuk6-H6R`wlNo})d@09w2*jxM#+orEuu$fJdIYyFbS(}>~@l8ux2JJ=;KVNK;*%2%S zy%ybTDs}Q>|JG5P-a-Om$2XseXg9pM5yJ61ECCjCzmm2R2Gi`wI#cW&bvYNWB;ETE z#&6M8vWZ;?D6*<1r%_{4r($Ock(XUe^HNI0*eBQFn8f@(w{8=^otq9s$9-#{mvu>s zk|cm=p)Y}*e%?bwk8{6e7Y})CpR!keN{L57pQJvG)gB z{ls2_8$Q`vl6SeD%3jI$jr6v6ISAH$?TMICN(ecwW$GrmD>IY@VM!sp96VW^yEp)SPDTh0E8 z6u6to<8(iN^XZ#MO*8T}eI)Hp(mopGQQJtin-?hyUgB~r^#;@ec}d0sAXtsi`}^%9 z8h(tFnvq@zx0BwOo`@Q@!(0_Daj)Oe1f?BeNwm@ltjyj~Zg%mZbRVVD+)Y`x?QYz3 zvKnD1s^AvJ&X^!Av9YkUYj*ON1_nuR8PN`sJx%i;snnw(xOcax&`WAkQHGf-Ux*Ty zHfwH?BQo`nL5p&swrxc)g~V~pnF<=Oo6u8eBd)>fbK4^J2tNPR&G_kyVp**#e8=9K z7w+WHN}20PUGV8WSC)Q1eyai7Rypc|JLZ?nAZm)m`=s!l$B?+@DjnQ`;0hwO^q0zy zHS=Wt!)Spsm-bJ8`fjPD#F%*N)hn>MFFuLFm%qI18JiF6ykz}L=l8~9?cg|hU}xKz zZcMFC-ffv87~cGl)Z=E2PCK~^`yIztZ++Qy9ILPR^N@#G?&Xy*!!l+OOh5lp0y%@m zn|ENgZO%%Fq%`E8^N{D$Kl=uT+?{zXy8EjB@i~9dGwS;-Fa9AY^jqCZZ2!wcRbkWK z+-#kh(|fz)mtJ!vaCQt1UvXJJoH_>==*T>x)xyr6?pujS(ZWs}FBuzM`$Ssimvv~P zM|-k7xLry&%3k5{3rQI?}n*4M;lqz6KBkHg8x-;6i4SC&{!YF-QDs0sMBP{?^azm z?k18@l_C?DoNyRTR3Z!$7V)1%U2ML3`VTtlaGu>sbH99-+QNri*&_?f5eUkpDV|d# zK6yv>`%9h*UH@m$OWxo2jlXtEclM?@k2`cVUIvJVeNN9pg>qr>;SU93qp@-?Du{-gpRs#`QE zZsfaG)vdWzz=MD$<_THR_u}!=JF)Uj;QUsbK@pW<(P-o+yyA0l5&(f>2FuB9^mgIK z&@A)`8$>AQZx##bs-V*SU8LQO8{|Y$ixLvE{`LPjk6tl}#|`vCIO+mm{cAv`?#+t} zy~qdU|Dxl02?Rx|ObWsLAaozN=Ftu5%;06SD+-}Vi~C=*JoIU~vmcxi9SY7_`ZYGA z)!p^KDhV!x$cwNxRZeIPJ*64xP<8S}Ul)99&HBg^l3_wtd8)2m<28u^7({e(ThY&3 zWLBu`tJ*K;#F2CkMc&0mzRbta{I2CQjI9LX)#vv*L9J)5&p$Jda@n($MHgmiB3k`A0!@;7Q$AHR_IRr&84L5xS)Yt!{I~2 zyfL7vk(i5j{#5*PT)<64^8*mU-SgdpCrsG*PyseX|>ZPxt{qa zgzX={cheGu58Ao2+h~bVL2z35$edH+iHJMeC{C7X{NJ5>F&Vla=YQdvv_Byi6y{d6 zg`+zE{t`wjr2(dUz@6-$$wf;^?NIx+Hu|2`dy~tyo8o$nO2i%**@irm;XLNi#VGZ$ z{OqNqhkB3i$*x>bK#iapyPpU_b@kl~iyJ~AXu*};GYi;>n#8xzwCnuppE=QYXqbGy zT2(V@B+1xTw}5bQLs3|d5|a*kop78U>y+#Ljy=}*0QW6A8EdU*Um-lQa(A@%K_@6^&vW;mYWIx(|BgPpWr2&gh4a$<6S_ zbalVIpeOWZ%orUG)Y#DJD14ynAWQILLipV=-0C=2r$~_8$KoADddgl}$+DrUtr;!!eLaz`OT(eVXU}uQePmwNQ`QX(U zr#Y+w z3`$e*rdK7jMJjX*n2M>UH?RH;g%^6Ge}Yg;0#PBIB8W*9uS763Dx{fA3o)%0FT@LH z=FCjm=A6COdN0;~*8Z($?~{+$b|wpk^R@Q+cs_s6v!1=j{P2H%7_Pp16{k*}0ypnH zthE3DV@&p22qArMj6qdZ@ZQ6FpZXL<0b>lTwb@wSdsJ103l}cn=+UD%eE2Z_{O3R8 zsi&UG#?;Mw59eI!Qoub1X?&cQi{qA1Yo^-z{20N}ajp2Nk97qfME?_qxQ zqaTH(r6rj9%iukH2yj)ECbZTj!Wd)H#)Qy909QFwu1ePwMbR3=dk5z{f)BX9wuZ+Z zdlUe0;>3xJ*_z3+Ir+>47UqNyYQi*g%Vv2G0C4f*ML6g1>tFvGr%#_w4BXn+BLlL$}8#j_4Rd(Mk5qOfm^q3;p)|^ zc-8|1OaK7C``z#G&O7g*6ylkh_{Lfw1QbP)Bszr9l1d?f5J4m!1}$PR zVU4jU3Ih~CQP_<5OnCk*-^o})bZH{>T}`eP?U8ok#0gxwbP1M4owZJz zNx4qwC)#!|tptFrt*x{umNv1mdUD=`Y(z^WGm>BB_pPn1+9Y}OdcFIj-e=rI^JUFI zO;oY~>ARZH(!|usZ%o5GHDO{|mIZcpc3K>ji5t_=cErpqO>AKbFE|8WFS<;2`}yae zPj+#)+ldn=@W(&?5k3Tf_QRSW>(tWEf+^oI@DO@w)5pyigJd{2H#d_+G6#jIya3H0 ztpSb0%_WGhk$Em%x`Y>Ac;UY$=KrT%x^yWboT|!*cc;cCl{H$f7kb@I6XdtDC`#|k|u6~@}6cK6e)v4BB~33qbhi;Iit{j0COisQ$Rr_U@kg0g@bwviv<&Bz~1BY*@= zLkO9pzH;RXjvqgs`8M`n+=RGdqBIx~A6b@VO9SrK%Cao*?z`{e%$YOUpxk8ROwghz z(!#{du!Ck4)uqDc&!5Lvzxq{FRfS{6j^R&#`cpP1OP3}Hn>x*eE>oEpP?Yc?+WX^A zKG|s=G+dSa^Imm-`P1f!1wl6%zwGz>3Fpd!Wnn@@Autar1B=wKl*qNxDvBv&fiJ)O zGFDetF_}y-H#di4$Bt$GMxzaOa@sHH_(YpNkyu_62X$;_bsWO`*A7^(Lql$+0^%QXsb&Uo0K_o@n+Yb6M2-gz97xyjs}Lpl03UqDfL07b%#&E8ODJSNo12>% z6L>zRf%F$a(x%Q@o9F@{uJtaaTeWO9}iHcK*@gx@T+yaCptnVFds zvd_-WwosG=S6T~X43;EqbF~v>lfXi-zP_Fb9y66Sz!(FBoKf7^FFEIupvd)IO$4t5 zV$`NpTrXB8VtX$eV=ZBoyOT{GjYi3rEG#VGKmYkpl3I~e_5)fVm{472fsq);E7E^v zW~LQXGIKSP5!%QnV>lYROzWqa1|X&)*4NiFY1O7kCXvq?RQoyW5TTu#$e5UTWAnibTUuH|S(cbgCV2hz z*YVx&ez!F~r?EAH;q)~3PnyfBoxUar*S>G$Bv&c@tnfzKx}&C7e5VE@Sv^2*7wePV3apmo-XEl{RCdkX;tw zUYfNQWv|!6E3dqQ$z+nNdpptev31FtNidm3MQ3 zV(WznMSY4Tw%Ztkxw*Mr2LS>;IE|bIT&9VF*_pGJX!FC)cbbC-8Y_~V@b>n08eBNY zxeXcoPEyD3H4K#R7zT=oT3A@f;tY)-Sjw0XIwvE7!_48e$+a@h=H_OU#L9Kw{^h_};bAu1Y6)vVLwND7{{<)9H4ZJ$aqRETMDhoWp1|N*myS_uh&bb_uN=zyAX-Cg_=41z4X`VU;r48$9Ut7H}JjheJ@?ZX>9o{%m9GNWRj)B z1(k77#HQ&^>2M(&uT!q&G1#m&w6PiSS%{|DeodRQEKB_5FMr8S?|1V+q^caAc;X5C z>}NmQ^#h^Xw{IuO)(N|=rhOwzKQoIpn^W=Gn(KK>0C?@S*Y11M|84u`H@}HXmoCA% z3bV7bSX^9eIZWX5I}#PA-W5c$qzhbTDB5N7d7W&=?u3|(F({vV?zufX6o2NKXYkXX z{uBT(H#e8Q?~>du)287qo5mKVN4qFsb8|BX8cI{T2rZ5M1FyNuGITYWx4d}qBEI#l zZ`~K+KCAYd-~0wu6%S*8Jo8u-MT%0{PU~bCqbdCzGev&mv80engAZYpTqCb67+O=9 zk;0g=D5n;T$vR4F?Vf3XwBc}=3d7hDiV4sJ26B50@cO{z3EuZ;;F>I0o>Qo%Wo3l}b=0FSl8 zdymD%MVvo>J`q$7jpQ(CX=w>(&z=QpO_kqeuH#QWi7QvGbQ1pJ#f!Ln`7+FpfBfUH z*X7}RSsowzmZ?zK5c7Mz9tMK}%Cb!6urXV4pZ$Ix{eC|or7mAk6a}7n=9wgP?66A! ziTJXK=bwKbmo8lbfF#*+fG!*R^wUpkiN6i+^OS?Ms0|LTE?KWCDfTt^(wDx3kN)uy z*4|sgKmYkpT)TEH+53LKpK9)PP$WJ}@>YYvAPK;DJWg|qfbhY-#3Dse;9vjx7Y2g? z9((LCoU3s4>S`vT2mvA1jOS>`dxU_P6*hp8ViDFh$;KK(oGdzIx^^GVT#?*c&rar8-FxJ2t&T$E+kPho3-EGn&S+}(&GOQy) zHZUl@|NZa(FW2Wwz#%snyz|aGn4h0Vzu(7TFu*6De3JSsE-vD?zx^$S!yyKP0s8$u zZr{F*{rmUB7=y*dMZEp?+nAl5#s2;K(eL*$nM|<%3txb>7DtaB#e46)hcAEm%dOM` zLpza5QG1=A;an5L%!IW`3s{@}{qKKcZf*{}ejoex?Zf{4`>}7|zGzkk{j}#ne}H}a z_G2*Ehkg6@r9Okf0E58*`}gn1U@%C($vFG=?ZaTOFVRN+lTRwP=VZgHQk=$F$4GCl`>^Yim9AHrj6L68irm_#l- z<27<)SS{mhZ*9ZgEnLDIDvBb5njwUA%MUY?&yY2S*C_$5HLM|= zDwk`3=57~b4d&z z(w0=3IIU^P2bvtWb}Vdqx>{B-T}zZmsNAK)DF-oiUBO~k)T-Yz@%1%K1lGEw$ssRL zkZW{+#!dSqJx>P9>kRIF`2fMg3=es7wwGcnd2-G`$~8q%;Ny=!#^3+`_iRqh*n4gF zdd;CjhXBO0g>&c5;iZ>ef^!wB%0=^NOhP-(yBbmkgwRg5iMCo35tCXGLO^B}LI_w{ zS;6CvKi*VFcS$az5?1XlPD^8H;qPP&ePUG<1#aHFiEp1giK;dM+NN?EL0YfZ%R+zg z8Dgt>z3kNEJ-`MlD=T>P(MK^JPjL9L$6`baw6wjYX*Kkm)~5MX?H3LoK8(p^a%Tpx ztz)Fa3)5;XXhYk5>C4QMjV>=Q108*)9RSJr+Q9<`<6?UORW`YEQ<(&dCw!ds@ z#C~zqDw7E@03=+kRhTuxnpmWjprEDNOhQ{MkyTZ}yS!=*CTEcJuUwT**5s5*6Q?LF zzWBv2!rGbv0DNsuWet+tE6OrKXzzV){z9}1jaD=d0AV^kro#{9cCyISEG4Hxp5@aFuqL(}AD z!*FJZN9xFUw@hH9L2ZKMpreZcEVUZh=x9@CDV=kWiZyo9VsD#Vj}WnjfQU|zBiiIQ zNUN;1nG-CmtxugijA{EdUW43xQB5jLswy2S?Is8qjYcTB?0Xsm?iQ#q*ExsJ`JxQ_ z*MU)!Blk57EL$*8_~+;=TKPnNCxr&Da}4L71GeI6v^#s`UVEs zq&VeBfOaI!&Q_0r^y zm6a7NfBW01A8Y)ybhwo5Gc5qzcRIWj?sPGN9W{P6BJ`v3)*w=L+;+(@Hk351mFIh(?EM>LbVWaZSU zQ&?SHg>w$W;SdK89!z_Y`5T!0*&m6f^8m5UUH4XLwbkCf>;9=}jN#w4#&tPoYb+e{ z`cOTOj$inMO!{`MO>8(qcby4QyR5&5lRcp%*;$icmUZ$xn&$VbLMdYr0ay> zf{?7W*@J1dmY0_=Uq)3`IC0`c%Sm3jawR=oP$rW{jRC;fvuCliv;^;)n)%t;*~GB( z=g(ttaWVZSwl;)#YQ7v(N5odHl-C3Lbv=VVI|%emaQ+O9|gxkepcU4`TRUqOb*u zGM;G31oAX0V+{JeKKlJ$QbCdYBnf4S@%T2Rxi8VR!{`8Yiu(q~_)2B~oXeU0H!(eCU7Jw+t z!{HD!Gc%Z-izdt(i(mZW7kK26M*zgzSm)>GqlpU<99+0?p|0l%n4O))+}s?7!(kGb zm6er*?`LLaFf%jLIKQ&QuYUEbJs~mtJ})sjr|N09aq&!0PHM-hcmn0FCx-ZfvIK zZZ0n`=<&dS}Bf& zAAZ3>hm;G##KQ{Tf#rc1trkTIAg?j1stJms%zR0Pyy~}IFmGBw(;ScpqCxsxk5-$Q zymplljfRJN)k;|uKlTO4BS`)(I2TWi2p$SX@48>0svIO?$ITKGHPqDUWt~Q*g#n0X z3YCj@JsM-+e9TVDJ!vwJj3ZUh)1Kq7o2}%3P}3DK$inq;BO@MtlEh;K$^r4Kobk$a znh_k40(pd*G$iCOvT{{?B8$uK*VWfayITyj8_f#b0-A+#xU8Ad5I=njAfDmsV8}$< z5D5{QF%lXIc_9-c9e~1qON?f-q#{y4&{bnjQ(qO8>-T%rvWNDG)CjKSsM8iTf$G}r)pJbb-A?oKOQ=brGkQHEH>e7xb0wq|FcDWybWCjJ*^vYgZpYx45<*}V}>7VXA z2pUjw%2nq)0D9!FZzPvf%Q3jgGoSH&_XD;0giP}LT)roL#q`9M=XR`Z(#o>dvd9A- z-I#fz;SWM9IXKaFR_Am8LLv2ggP2(3klTBYAcuG+KuQ3!WLbS)8ql4%c8sgQ5JN0|#^T;(K zr>Zp`Xq>2(HdfA&Y2w5fkC&~xcJdNo?{!OsSzULV0PPbVEvZZtt=6$mbFQipQvC)1 zGT+m6nkHVnNsu`NpZ8&3#xPdq(`$YZoUj!KCJ}Jg@f!d@LB+;HN)c0jeE@0`ZdxWJ zWi^w;=Kn-3IqT$i)U8fv+wm@^s_&2&rs&G;y=u`pVVMH&M^ zPa%{%Q6x$u>c3c~!30b`sg7j%ZX02~ATnlZ9y{cXBVl2L{wJM#(MmQwoZpu3dc9cH zCAE~!x#Z}?T(D`9adeYw0g`ZpmUeJN-I%E+R>+Y|^E(1k@spepu!b-L9u(;Z&^$X@ z{xmUTwL+1kS!z0+cM0R`{EZHPjL9DXAAdl~=d)RoIrFA`jN)(R2W$flcn#cFzME=p zcd^;QV366!R)-9?$Cl8K$v?|`K}pP6+vD8AoeC zw)R>RZr{Fr{}lU-Tgjy$U6LZ3kUIEjRROv@o5fU!F6XHU$pFcGNIyL3nThE!1weay%X<2nuw=J84?_LWm{YzVP*(A5@T4b3h2p zCN4^!Xi}345V>$?}N>fT=O8r0VU8p+?oR>A#hbyS@oHQ zd8vQ>IiVU#IY>YGJxaSx{rIMgJbe%k&}Ft1>B@giqF^pd)=eQS!(o2j&tA6lxEgIE zrF9idu^%wDsB=Ae{$BbB*5(Rf?@_c~&Z-6$lUji7%9y2y&B!!krCDs-+(Jy1m*5ke3eXwe4lg z($PRWbJ&=a=;*xj>9a6E2-!9vdDD_AH#JDgK{EhB5_2B#L!fPfq_K^zT!Yi~9UlNPEr`E$Jzc8F^)vIjqUsRZxgt3Rm9+^PGQp%*EmZPe z3*BC}QtY9%`2+5>Bzy1SoyVk_WTl3DUlp4s`8EX3+wlV}P)EX{m9p-Yz4SjLWerS3 z@g;Q58R2K;5;7AY!Rd|YSK^77E+W{gW_8*C=sq`<%>nu87vHZX(iJnE?IK#S!^tGX zNs~ECYccXbi)M_>jF?7y;=J89o&!T>h^%F=pBfL;xgcH?kVDPnfa}a-N%!&sd73~F zl0?FpLsfy1M8eSrwEvB4L|D1gZk%&-exMn|eW&>|f!7ZV3gSZ$c4V!DY z^ia~Ml{eqSp+kpo;J|@&hrZm1VXej6Z@<0U^lmlt^wUoVHana}?79iB!Q%1zUcc8= zNRauF$XEVh17|!@_lE)c{Q(@`4r?0*#mD1MFrJLl?_vr=2$)nATvfsO_zxMld|u2R ho2#xY=w6qn{~sIUfuJS7F6ICL002ovPDHLkV1h}!Ri^*| From 7baf52b0044551a6e739090e6b1bf834be3b405b Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 7 Aug 2024 03:56:43 +0200 Subject: [PATCH 47/48] ballin linter please I beg you --- code/__DEFINES/access.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 35d83e3fe700..818e53f74241 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -126,7 +126,7 @@ /// Access needed to research tech nodes at R&D consoles. May also be needed to access some scientific equipment. #define ACCESS_RESEARCH "research" /// Access to the Toxins Mixing Lab and Toxins Test Area equipment. -#define ACCESS_TOXINS "toxins" +#define ACCESS_TOXINS "toxins"r /// Access to the Toxins Storage Room, where all of the bomb-making gases are stored. #define ACCESS_TOXINS_STORAGE "toxins_storage" /// Access to the Experimentation Lab, containing the E.X.P.E.R.I-MENTOR. Uses of this access is set to change in the future. From 514ea5d7a63a58c993ff7876b43204f652c776b2 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 7 Aug 2024 03:56:53 +0200 Subject: [PATCH 48/48] ballin --- code/__DEFINES/access.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 818e53f74241..35d83e3fe700 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -126,7 +126,7 @@ /// Access needed to research tech nodes at R&D consoles. May also be needed to access some scientific equipment. #define ACCESS_RESEARCH "research" /// Access to the Toxins Mixing Lab and Toxins Test Area equipment. -#define ACCESS_TOXINS "toxins"r +#define ACCESS_TOXINS "toxins" /// Access to the Toxins Storage Room, where all of the bomb-making gases are stored. #define ACCESS_TOXINS_STORAGE "toxins_storage" /// Access to the Experimentation Lab, containing the E.X.P.E.R.I-MENTOR. Uses of this access is set to change in the future.