diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 22c1279793f..28fa4444d60 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -43,9 +43,9 @@ /proc/get_centcom_access(job) switch(job) if("SCC Agent", "SCC Executive", "SCC Bodyguard") - return list(access_cent_general, access_cent_captain, access_cent_living) + return list(access_cent_general, access_cent_ccia, access_cent_specops) if("CCIA Agent") - return list(access_cent_general, access_cent_captain, access_cent_living) + return list(access_cent_general, access_cent_ccia, access_cent_specops) if("Emergency Response Team") return list(access_cent_general, access_cent_specops, access_cent_living) if("Odin Security") @@ -55,11 +55,11 @@ if("Service") return list(access_cent_general, access_cent_living) if("Death Commando") - return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) - if("NanoTrasen Representative") - return list(access_cent_general, access_cent_living, access_cent_storage, access_cent_thunder, access_cent_medical, access_cent_specops, access_cent_teleporter) + return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_cent_medical) if("BlackOps Commander") return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) + if("NanoTrasen Representative") //Adminspawn roles + return get_all_centcom_access() if("Supreme Commander") return get_all_centcom_access() diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 02e11cd44e3..8b13d328b40 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -426,57 +426,62 @@ var/const/access_consular = 72 /****************** * Central Command * ******************/ -/var/const/access_cent_general = 101//General facilities. +//General facilities. - Everyone on central has that --> Use this for doors that every central role should have access to, but not the aurora people +/var/const/access_cent_general = 101 /datum/access/cent_general id = access_cent_general desc = "Code Grey" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_thunder = 102//Thunderdome. +//Thunderdome. +/var/const/access_cent_thunder = 102 /datum/access/cent_thunder id = access_cent_thunder desc = "Code Yellow" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_specops = 103//Special Ops. +//Centcom Security - This access is used by the ERT / Odin Security and CCIA +// Separation between Odin Sec/CCIA and ERT is achieved via the ERT Commander Access (access_cent_creed) +/var/const/access_cent_specops = 103 /datum/access/cent_specops id = access_cent_specops desc = "Code Black" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_medical = 104//Medical/Research +//Medical/Research - Thats the access for the medical section. Used for the odin doctors/chemists +/var/const/access_cent_medical = 104 /datum/access/cent_medical id = access_cent_medical desc = "Code White" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_living = 105//Living quarters. +//Living quarters. - Thats the accesse used by the odin bartenders/chefs +/var/const/access_cent_living = 105 /datum/access/cent_living id = access_cent_living desc = "Code Green" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_storage = 106//Generic storage areas. +//Generic storage areas. - Thats used for the Maint Tunnels on Centcom +/var/const/access_cent_storage = 106 /datum/access/cent_storage id = access_cent_storage desc = "Code Orange" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_teleporter = 107//Teleporter. -/datum/access/cent_teleporter - id = access_cent_teleporter - desc = "Code Blue" - access_type = ACCESS_TYPE_CENTCOM +//107 is unused -/var/const/access_cent_creed = 108//Creed's office. +//Creed's office. - ERT/TCFL Commander +/var/const/access_cent_creed = 108 /datum/access/cent_creed id = access_cent_creed desc = "Code Silver" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_captain = 109//Captain's office/ID comp/AI. -/datum/access/cent_captain - id = access_cent_captain +//CCIA Access on Centcom +/var/const/access_cent_ccia = 109 +/datum/access/cent_ccia + id = access_cent_ccia desc = "Code Gold" access_type = ACCESS_TYPE_CENTCOM diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index bc9356fbf75..74980902fc3 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -336,7 +336,7 @@ name = "central command internal affairs jacket" /obj/item/storage/lockbox/cciaa - req_access = list(access_cent_captain) + req_access = list(access_cent_ccia) name = "CCIA agent briefcase" desc = "A smart looking briefcase with a NT logo on the side" storage_slots = 8 diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 5ab16c09d9d..8188ee49852 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -220,7 +220,7 @@ var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/card)) var/obj/item/card/id/C = I - if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access)) + if((access_cent_ccia in C.access) || (access_hop in C.access) || (access_captain in C.access)) access_code = 0 to_chat(usr, "[icon2html(src, usr)]Access code reset to 0.") else if (istype(I, /obj/item/card/emag)) diff --git a/code/modules/modular_computers/file_system/programs/command/account_database.dm b/code/modules/modular_computers/file_system/programs/command/account_database.dm index f8ed6f6a675..35c067ef93c 100644 --- a/code/modules/modular_computers/file_system/programs/command/account_database.dm +++ b/code/modules/modular_computers/file_system/programs/command/account_database.dm @@ -33,7 +33,7 @@ var/obj/item/card/id/held_card = get_held_card() if (!held_card) return 0 - if(access_cent_captain in held_card.access) + if(access_cent_ccia in held_card.access) return 2 else if((access_hop in held_card.access) || (access_captain in held_card.access)) return 1 @@ -135,7 +135,7 @@ //create a transaction log entry var/datum/transaction/trx = create_transation(account_name, "New account activation", "([starting_funds])") SSeconomy.add_transaction_log(SSeconomy.station_account,trx) - + if(href_list["suspend"]) var/account = href_list["suspend"]["account"] @@ -143,14 +143,15 @@ if(Acc) Acc.suspended = !Acc.suspended callHook("change_account_status", list(Acc)) - - + + if(href_list["add_funds"] && access_level == 2) var/account = href_list["add_funds"]["account"] var/amount = href_list["add_funds"]["amount"] var/datum/money_account/Acc = SSeconomy.get_account(account) if(Acc) + log_and_message_admins("Added [amount] credits to the [Acc.owner_name] account.") Acc.money = min(Acc.money + amount, FUND_CAP) if(href_list["remove_funds"] && access_level == 2) @@ -159,6 +160,7 @@ var/datum/money_account/Acc = SSeconomy.get_account(account) if(Acc) + log_and_message_admins("Removed [amount] credits to the [Acc.owner_name] account.") Acc.money = max(Acc.money - amount, -FUND_CAP) if(href_list["revoke_payroll"]) @@ -260,4 +262,4 @@ SSvueui.check_uis_for_change(src) -#undef FUND_CAP \ No newline at end of file +#undef FUND_CAP diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index f9006e2ab2f..c28bebc740a 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -9939,8 +9939,7 @@ id = "CentComArrivalsForeChkpt"; name = "Fore Checkpoint Blast Doors"; pixel_x = -23; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -13007,7 +13006,8 @@ "ezv" = ( /obj/machinery/door/airlock/centcom{ name = "Telecommunications Monitoring"; - req_access = list(101) + req_access = null; + req_one_access = list(106,108,109) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -16394,8 +16394,7 @@ opacity = 0 }, /obj/machinery/door/window/brigdoor/northright{ - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /obj/structure/table/reinforced, /obj/machinery/button/remote/blast_door{ @@ -16404,8 +16403,7 @@ name = "inner blast door"; pixel_x = -24; pixel_y = -3; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /obj/machinery/button/remote/blast_door{ dir = 8; @@ -16413,8 +16411,7 @@ name = "outer blast door"; pixel_x = 27; pixel_y = -3; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/simulated/floor/tiled/dark, /area/centcom/spawning) @@ -18199,8 +18196,7 @@ "hDo" = ( /obj/machinery/door/airlock/centcom{ name = "Security Checkpoint"; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -22539,8 +22535,7 @@ name = "Exterior Checkpoint"; pixel_x = 6; pixel_y = -1; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /obj/machinery/turretid{ ailock = 1; @@ -22579,7 +22574,7 @@ "kzj" = ( /obj/machinery/door/airlock/centcom{ name = "Custodial Closet"; - req_access = list(101) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -22670,8 +22665,7 @@ name = "checkpoint shutters"; pixel_x = 25; pixel_y = 8; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -23621,8 +23615,7 @@ "liD" = ( /obj/machinery/door/airlock/centcom{ name = "Port Checkpoint Door"; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -27495,8 +27488,7 @@ "nDp" = ( /obj/machinery/door/airlock/centcom{ name = "Civil Protection Station"; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -35384,8 +35376,7 @@ id = "CentComArrivalsAftChkpt"; name = "Aft Checkpoint Blast Doors"; pixel_x = -23; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /turf/unsimulated/floor{ icon_state = "dark2" @@ -36046,8 +36037,7 @@ "tyu" = ( /obj/machinery/door/airlock/centcom{ name = "Starboard Checkpoint Door"; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /obj/machinery/door/blast/odin{ _wifi_id = "odin_arrivals_lockdown"; @@ -39022,8 +39012,7 @@ name = "Interior Checkpoint"; pixel_x = -6; pixel_y = 5; - req_access = null; - req_one_access = list(101,103) + req_access = list(103) }, /obj/machinery/turretid{ ailock = 1; @@ -39048,7 +39037,8 @@ name = "VIP Shuttle Access"; pixel_x = -7; pixel_y = -23; - req_access = list(101) + req_access = null; + req_one_access = list(108,109) }, /turf/unsimulated/floor, /area/centcom/holding) diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 65a6d81f1db..cd98f80d174 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -14881,7 +14881,7 @@ "aWM" = ( /obj/machinery/door/airlock/centcom{ name = "Teleporter Bay"; - req_access = list(107) + req_access = list(106) }, /turf/unsimulated/floor{ icon_state = "delivery"