diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index ecf63a2a7902..f52350aa8db3 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -520,7 +520,7 @@ return 0 /obj/structure/machinery/smartfridge/chemistry/antag - req_one_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) /obj/structure/machinery/smartfridge/chemistry/virology name = "\improper Smart Virus Storage" diff --git a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm index df047d6cf5fb..85210e1aaa3f 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm @@ -5,7 +5,8 @@ name = "\improper Suspicious Automated Equipment Rack" desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various equipment." icon_state = "antag_clothing" - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null listed_products = list() diff --git a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm index 84cd4a8bcec0..3e847b4919de 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm @@ -5,7 +5,8 @@ desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various gear." icon_state = "gear" - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null listed_products = list() /obj/structure/machinery/cm_vending/gear/antag/Initialize() diff --git a/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm b/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm index a2cd462cd6a2..73a2c7346a4c 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm @@ -4,7 +4,8 @@ name = "\improper Suspicious Automated Guns Rack" desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various weapons, ammunition and explosives." icon_state = "antag_guns" - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null use_snowflake_points = TRUE diff --git a/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm b/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm index 6267db911b09..ab319f1eca1d 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm @@ -4,7 +4,8 @@ name = "\improper Suspicious Automated Guns Rack" desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various weapons." icon_state = "antag_guns" - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null listed_products = list() /obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns/Initialize() diff --git a/code/game/machinery/vending/vendor_types/engineering.dm b/code/game/machinery/vending/vendor_types/engineering.dm index 2fe6962e93bb..1983365bd661 100644 --- a/code/game/machinery/vending/vendor_types/engineering.dm +++ b/code/game/machinery/vending/vendor_types/engineering.dm @@ -94,7 +94,8 @@ ) /obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage name = "\improper Electronics Vendor" @@ -117,7 +118,8 @@ ) /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage/antag - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null /obj/structure/machinery/cm_vending/sorted/tech/comp_storage name = "\improper Component Storage Machine" @@ -146,7 +148,8 @@ ) /obj/structure/machinery/cm_vending/sorted/tech/comp_storage/antag - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null //------COLONY-SPECIFIC VENDORS------- diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 70ac7701973b..7f43f93cf8a4 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -227,7 +227,8 @@ /obj/structure/machinery/cm_vending/sorted/medical/antag name = "\improper Medical Equipment Vendor" desc = "A vending machine dispensing various pieces of medical equipment." - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null vendor_theme = VENDOR_THEME_CLF /obj/structure/machinery/cm_vending/sorted/medical/marinemed @@ -267,7 +268,8 @@ /obj/structure/machinery/cm_vending/sorted/medical/marinemed/antag name = "\improper Basic Medical Supplies Vendor" desc = "A vending machine dispensing basic medical supplies." - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null vendor_theme = VENDOR_THEME_CLF /obj/structure/machinery/cm_vending/sorted/medical/blood @@ -298,7 +300,8 @@ return /obj/structure/machinery/cm_vending/sorted/medical/blood/antag - req_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) + req_access = null vendor_theme = VENDOR_THEME_CLF /obj/structure/machinery/cm_vending/sorted/medical/wall_med diff --git a/code/modules/gear_presets/agents.dm b/code/modules/gear_presets/agents.dm index e346cba373bf..dcf2a367b677 100644 --- a/code/modules/gear_presets/agents.dm +++ b/code/modules/gear_presets/agents.dm @@ -63,6 +63,9 @@ ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, ACCESS_MARINE_MAINT, + ACCESS_UPP_GENERAL, + ACCESS_UPP_FLIGHT, + ACCESS_UPP_LEADERSHIP, ) assignment = JOB_UPP_REPRESENTATIVE rank = JOB_UPP_REPRESENTATIVE @@ -96,6 +99,9 @@ ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, ACCESS_MARINE_MAINT, + ACCESS_TWE_GENERAL, + ACCESS_TWE_FLIGHT, + ACCESS_TWE_LEADERSHIP, ) assignment = JOB_TWE_REPRESENTATIVE rank = JOB_TWE_REPRESENTATIVE diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index f3129acb23d2..5b546b0c941c 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -31,7 +31,6 @@ idtype = /obj/item/card/id/silver/cl access = list( ACCESS_WY_GENERAL, - ACCESS_ILLEGAL_PIRATE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_MEDBAY, @@ -106,7 +105,6 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list( - ACCESS_ILLEGAL_PIRATE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_MEDBAY, diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e7a160095705..80e376e630f2 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1359,7 +1359,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( /obj/structure/machinery/power/apc/antag cell_type = /obj/item/cell/apc - req_one_access = list(ACCESS_ILLEGAL_PIRATE) + req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) //------Almayer APCs ------//