From b5057b2fde0f8ae72b5e9f192a57f97db40d61ec Mon Sep 17 00:00:00 2001 From: "ericgfwong@hotmail.com" Date: Tue, 25 Dec 2012 19:33:30 +0000 Subject: [PATCH] Cargo ordering forms will now list access requirements Removed redundant Mulebot access Removed unused accesses from get_all_accesses() so it'd stop appearing on airlock electronics git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5396 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/access.dm | 24 ++++++++++++------------ code/game/machinery/bots/mulebot.dm | 2 +- code/game/supplyshuttle.dm | 3 +++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index f8215d3cf65..5b58acc4147 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -284,12 +284,12 @@ return 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_external_airlocks, access_emergency_storage, access_change_ids, access_ai_upload, + 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_chapel_office, access_atmospherics, access_kitchen, - access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction, - access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, - access_theatre, access_research, access_mining, access_mailsorting, access_mint_vault, access_mint, + access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_construction, + access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, + access_theatre, access_research, access_mining, access_mailsorting, access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) @@ -312,11 +312,11 @@ if(4) //engineering and maintenance return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_ce) if(5) //command - return list(access_heads, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_all_personal_lockers, access_heads_vault, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_hop, access_captain) + return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain) if(6) //station general return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime) if(7) //supply - return list(access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station, access_qm) + return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm) /proc/get_region_accesses_name(var/code) switch(code) @@ -365,7 +365,7 @@ if(access_chemistry) return "Chemistry Lab" if(access_rd) - return "RD Private" + return "Research Director" if(access_bar) return "Bar" if(access_janitor) @@ -391,7 +391,7 @@ if(access_heads) return "Bridge" if(access_captain) - return "Captain Private" + return "Captain" if(access_all_personal_lockers) return "Personal Lockers" if(access_chapel_office) @@ -419,7 +419,7 @@ if(access_virology) return "Virology" if(access_cmo) - return "CMO Private" + return "Chief Medical Officer" if(access_qm) return "Quartermaster's Office" if(access_clown) @@ -451,11 +451,11 @@ if(access_xenobiology) return "Xenobiology Lab" if(access_hop) - return "HoP Private" + return "Head of Personnel" if(access_hos) - return "HoS Private" + return "Head of Security" if(access_ce) - return "CE Private" + return "Chief Engineer" if(access_RC_announce) return "RC Announcements" if(access_keycard_auth) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 802daf8e750..68f9ea26801 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -28,7 +28,7 @@ var/new_destination = "" // pending new destination (waiting for beacon response) var/destination = "" // destination description var/home_destination = "" // tag of home beacon - req_access = list(access_cargo, access_cargo_bot) // added robotics access so assembly line drop-off works properly -veyveyr //I don't think so, Tim. You need to add it to the MULE's hidden robot ID card. -NEO + req_access = list(access_cargo) // added robotics access so assembly line drop-off works properly -veyveyr //I don't think so, Tim. You need to add it to the MULE's hidden robot ID card. -NEO var/path[] = new() var/mode = 0 //0 = idle/ready diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 5472421557f..5fe4a2b1a5d 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -303,6 +303,7 @@ var/list/mechtoys = list( if(SP.access) A:req_access = list() A:req_access += text2num(SP.access) + slip.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(SP.access))]" var/list/contains if(istype(SP,/datum/supply_packs/randomised)) @@ -411,6 +412,7 @@ var/list/mechtoys = list( reqform.info += "RANK: [idrank]
" reqform.info += "REASON: [reason]
" reqform.info += "SUPPLY CRATE TYPE: [P.name]
" + reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
" reqform.info += "CONTENTS:
" reqform.info += P.manifest reqform.info += "
" @@ -584,6 +586,7 @@ var/list/mechtoys = list( reqform.info += "RANK: [idrank]
" reqform.info += "REASON: [reason]
" reqform.info += "SUPPLY CRATE TYPE: [P.name]
" + reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
" reqform.info += "CONTENTS:
" reqform.info += P.manifest reqform.info += "
"