From ae4a5482f0eac62a459c23003b5d73576159df2d Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 6 Apr 2014 15:40:46 -0600 Subject: [PATCH 1/3] Mineral Storage Access Mineral Storage gives you access to the ore redemption machine, instead of keeping a list of req_one_access for various jobs. The intention is to make it easier to manage accesses and make it more clear who could use the machine. Miners and their superiors now have access to the machine. If this becomes an issue I can adjust it. Relabeled Mineral Storeroom access to Mineral Storage since the storeroom doesn't exist any more. --- code/game/jobs/access.dm | 6 +++--- code/game/jobs/job/captain.dm | 4 ++-- code/game/jobs/job/civilian.dm | 8 ++++---- code/modules/mining/equipment_locker.dm | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 03b32f2cc60..467051927f3 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -215,7 +215,7 @@ if(2) //medbay return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) if(3) //research - return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd, access_mineral_storeroom) + return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd) 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_tcomsat, access_ce) if(5) //command @@ -223,7 +223,7 @@ 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) if(7) //supply - return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm) + return list(access_mailsorting, access_mining, access_mining_station, access_mineral_storeroom, access_cargo, access_qm) /proc/get_region_accesses_name(var/code) switch(code) @@ -370,7 +370,7 @@ if(access_sec_doors) return "Brig" if(access_mineral_storeroom) - return "Mineral Storeroom" + return "Mineral Storage" /proc/get_centcom_access_desc(A) switch(A) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 95666d483b3..69d1b734dc5 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -60,13 +60,13 @@ access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_hop, access_RC_announce, access_keycard_auth, access_gateway) + access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom) minimal_access = list(access_security, access_sec_doors, access_court, 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_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_hop, access_RC_announce, access_keycard_auth, access_gateway) + access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 4127d1f49b9..89e3fb140e2 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -101,8 +101,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) - minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) + minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) @@ -151,8 +151,8 @@ spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) - minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting) + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) + minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 7a234b3a894..6e18fa19247 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -10,7 +10,7 @@ anchored = 1.0 input_dir = WEST output_dir = SOUTH - req_one_access = list(access_mining_station, access_chemistry, access_bar, access_research, access_ce, access_virology) + req_access = list(access_mineral_storeroom) var/stk_types = list() var/stk_amt = list() var/stack_list[0] //Key: Type. Value: Instance of type. From 6dff6fa813cc1693628e7b2751fee9dc5ccf9d8c Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 6 Apr 2014 16:30:19 -0600 Subject: [PATCH 2/3] Added Mineral Storage access to CMO. --- code/game/jobs/job/civilian.dm | 4 ++-- code/game/jobs/job/medical.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 89e3fb140e2..2fa99c1d5e8 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -8,8 +8,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_mineral_storeroom) - minimal_access = list(access_bar, access_mineral_storeroom) + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) + minimal_access = list(access_bar) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 88077adfd72..451a122b328 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -9,10 +9,10 @@ selection_color = "#ffddf0" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 - access = list(access_medical, access_morgue, access_genetics, access_heads, + access = list(access_medical, access_morgue, access_genetics, access_heads, access_mineral_storeroom, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors) - minimal_access = list(access_medical, access_morgue, access_genetics, access_heads, + minimal_access = list(access_medical, access_morgue, access_genetics, access_heads, access_mineral_storeroom, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors) minimal_player_age = 7 From 81187c4243d63b02301ebb1715911c73de27657d Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Tue, 8 Apr 2014 08:40:23 -0600 Subject: [PATCH 3/3] Reverted Bartender Changes --- code/game/jobs/job/civilian.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 2fa99c1d5e8..89e3fb140e2 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -8,8 +8,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) - minimal_access = list(access_bar) + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_mineral_storeroom) + minimal_access = list(access_bar, access_mineral_storeroom) equip(var/mob/living/carbon/human/H)