diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 044271be9b5a..97e4b0dbd1e8 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -43,6 +43,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_SYNTH 36 #define ACCESS_MARINE_ASO 37 +#define ACCESS_MARINE_CHAPLAIN 38 // AI Core Accesses /// Used in temporary passes @@ -52,7 +53,9 @@ most of them are tied into map-placed objects. This should be reworked in the fu /// Used to access Maintenance Protocols on ARES Interface. #define ACCESS_ARES_DEBUG 92 -//Surface access levels +//================================================= + +//Civilian access levels #define ACCESS_CIVILIAN_PUBLIC 100 #define ACCESS_CIVILIAN_LOGISTICS 101 #define ACCESS_CIVILIAN_ENGINEERING 102 @@ -60,23 +63,138 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_CIVILIAN_BRIG 104 #define ACCESS_CIVILIAN_MEDBAY 105 #define ACCESS_CIVILIAN_COMMAND 106 +#define ACCESS_PRESS 110 + +///The generic "I'm a bad guy" access +#define ACCESS_ILLEGAL_PIRATE 120 + +//================================================= + +//Weyland Yutani access levels (200-229) +///Found on just about all corporate ID cards +#define ACCESS_WY_GENERAL 200 +///WY employee override for most colonial areas +#define ACCESS_WY_COLONIAL 201 +#define ACCESS_WY_MEDICAL 202 +#define ACCESS_WY_SECURITY 203 +#define ACCESS_WY_ENGINEERING 204 +#define ACCESS_WY_FLIGHT 205 +#define ACCESS_WY_RESEARCH 206 +///WY access given to field executives, like a marine liaison. +#define ACCESS_WY_EXEC 207 + +#define ACCESS_WY_PMC 210 +#define ACCESS_WY_PMC_TL 211 +#define ACCESS_WY_ARMORY 212 +///Secret research or other projects with highly restricted access +#define ACCESS_WY_SECRETS 213 + +#define ACCESS_WY_LEADERSHIP 215 +///Senior leadership, the highest ranks +#define ACCESS_WY_SENIOR_LEAD 216 + +//================================================= + +//Union of Progressive Peoples access levels (230-259) +///Found on just about all Union ID cards +#define ACCESS_UPP_GENERAL 230 +#define ACCESS_UPP_MEDICAL 231 +#define ACCESS_UPP_ENGINEERING 232 +#define ACCESS_UPP_SECURITY 233 +#define ACCESS_UPP_ARMORY 234 +#define ACCESS_UPP_FLIGHT 235 +#define ACCESS_UPP_RESEARCH 236 + +#define ACCESS_UPP_COMMANDO 239 +#define ACCESS_UPP_LEADERSHIP 240 +///Senior leadership, the highest ranks +#define ACCESS_UPP_SENIOR_LEAD 241 + +//================================================= + +//Colonial Liberation Front access levels (260-289) +///Found on just about all CLF ID cards +#define ACCESS_CLF_GENERAL 260 +#define ACCESS_CLF_MEDICAL 261 +#define ACCESS_CLF_ENGINEERING 262 +#define ACCESS_CLF_SECURITY 263 +#define ACCESS_CLF_ARMORY 264 +#define ACCESS_CLF_FLIGHT 265 + +#define ACCESS_CLF_LEADERSHIP 270 +///Senior leadership, the highest ranks +#define ACCESS_CLF_SENIOR_LEAD 271 + +//================================================= + +//Three World Empire access levels (290-319) +///Found on just about all Imperial ID cards +#define ACCESS_TWE_GENERAL 290 +#define ACCESS_TWE_MEDICAL 291 +#define ACCESS_TWE_ENGINEERING 292 +#define ACCESS_TWE_SECURITY 293 +#define ACCESS_TWE_ARMORY 294 +#define ACCESS_TWE_FLIGHT 295 +#define ACCESS_TWE_RESEARCH 296 + +#define ACCESS_TWE_COMMANDO 299 +#define ACCESS_TWE_LEADERSHIP 300 +///Senior leadership, the highest ranks +#define ACCESS_TWE_SENIOR_LEAD 301 -//Special access levels. Should be alright to modify these. -#define ACCESS_WY_PMC_GREEN 180 -#define ACCESS_WY_PMC_ORANGE 181 -#define ACCESS_WY_PMC_RED 182 -#define ACCESS_WY_PMC_BLACK 183 -#define ACCESS_WY_PMC_WHITE 184 -#define ACCESS_WY_CORPORATE 200 -#define ACCESS_ILLEGAL_PIRATE 201 -#define ACCESS_WY_CORPORATE_DS 202 -#define ACCESS_PRESS 203 //================================================= // Yautja Access Levels /// Requires a visible ID chip to open -#define ACCESS_YAUTJA_SECURE 250 +#define ACCESS_YAUTJA_SECURE 390 /// Elders+ only -#define ACCESS_YAUTJA_ELDER 251 +#define ACCESS_YAUTJA_ELDER 391 /// Ancients only -#define ACCESS_YAUTJA_ANCIENT 252 +#define ACCESS_YAUTJA_ANCIENT 392 + +///Temporary, just so I can flag places I need to change +#define ACCESS_COME_BACK_TO_ME 999 + + +//Big lists of access codes, so I can get rid of the half a million different "get_bla_bla_bla_access" procs. +//See /proc/get_access(access_list = ACCESS_LIST_GLOBAL) +///Well... everything (non Yautja). +#define ACCESS_LIST_GLOBAL "EVERYTHING" + +///Most of the USCM Access Levels used on the USS Almayer, excluding highly restricted ones. +#define ACCESS_LIST_MARINE_MAIN "Almayer (Main)" +///All USCM Access levels used on the USS Almayer +#define ACCESS_LIST_MARINE_ALL "Almayer (ALL)" +///Used by the Wey-Yu - USCM Liaison +#define ACCESS_LIST_MARINE_LIAISON "Wey-Yu (Liaison)" + +///The accesses granted to emergency responders. +#define ACCESS_LIST_EMERGENCY_RESPONSE "Almayer (ERT)" +///Access used by United Americas responders. +#define ACCESS_LIST_UA "United Americas" + +///Generic/basic access to Wey-Yu stuff +#define ACCESS_LIST_WY_BASE "Wey-Yu (Basic)" +///Wey-Yu Corp Security access. +#define ACCESS_LIST_WY_GOON "Wey-Yu (Goons)" +///Wey-Yu PMCs access. +#define ACCESS_LIST_WY_PMC "Wey-Yu (PMC)" +///Access levels for WY senior leadership +#define ACCESS_LIST_WY_SENIOR "Wey-Yu (Senior Lead)" +///All access levels associated with Weyland Yutani +#define ACCESS_LIST_WY_ALL "Wey-Yu (ALL)" + +///All the access levels in the civillian category, excluding Press. +#define ACCESS_LIST_COLONIAL_ALL "Colonial (ALL)" +///Used by the Wey-Yu - Civil Authority Liaison +#define ACCESS_LIST_CIVIL_LIAISON "Colonial (Liaison)" +///The access used by delivery ERT (Pizza/Souto) +#define ACCESS_LIST_DELIVERY "Delivery" + +///All access levels associated with UPP +#define ACCESS_LIST_UPP_ALL "UPP (ALL)" + +///Generic/basic access to CLF stuff +#define ACCESS_LIST_CLF_BASE "CLF (Basic)" +///All access levels associated with CLF +#define ACCESS_LIST_CLF_ALL "CLF (ALL)" diff --git a/code/datums/agents/tools/stimulants.dm b/code/datums/agents/tools/stimulants.dm index f4cd9c40f9ba..ff177a1310d2 100644 --- a/code/datums/agents/tools/stimulants.dm +++ b/code/datums/agents/tools/stimulants.dm @@ -6,7 +6,6 @@ pill_type_to_fill = /obj/item/reagent_container/pill/stimulant req_access = null - req_role = null /obj/item/storage/pill_bottle/ultrazine/antag/id_check(mob/user) if(!skillcheckexplicit(user, SKILL_ANTAG, SKILL_ANTAG_AGENT)) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 425a09afb591..0d10b06d5fef 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -93,119 +93,244 @@ return return 1 -///Grants access to EVERYWHERE -/proc/get_global_access() - return get_all_marine_access() + get_all_main_access() -///Grants standard access for all factions, does not include high restrictions like COs office. -/proc/get_all_main_access() - return get_antagonist_access() + get_all_civilian_access() + get_all_weyland_access() - -/proc/get_all_civilian_access() - return list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -///Includes restricted accesses -/proc/get_all_marine_access() - return list( - ACCESS_MARINE_CO, - ACCESS_MARINE_AI, - ACCESS_MARINE_AI_TEMP, - ) + get_main_marine_access() - -///All Almayer accesses other than the highly restricted ones, such as CO's office. -/proc/get_main_marine_access() - return list( - ACCESS_MARINE_SENIOR, - ACCESS_MARINE_DATABASE, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_CMP, - ACCESS_MARINE_BRIG, - ACCESS_MARINE_ARMORY, - ACCESS_MARINE_CMO, - ACCESS_MARINE_MEDBAY, - ACCESS_MARINE_CHEMISTRY, - ACCESS_MARINE_MORGUE, - ACCESS_MARINE_RESEARCH, - ACCESS_MARINE_CE, - ACCESS_MARINE_ENGINEERING, - ACCESS_MARINE_MAINT, - ACCESS_MARINE_OT, - ACCESS_MARINE_RO, - ACCESS_MARINE_CARGO, - ACCESS_MARINE_PREP, - ACCESS_MARINE_MEDPREP, - ACCESS_MARINE_ENGPREP, - ACCESS_MARINE_SMARTPREP, - ACCESS_MARINE_LEADER, - ACCESS_MARINE_SPECPREP, - ACCESS_MARINE_TL_PREP, - ACCESS_MARINE_ALPHA, - ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, - ACCESS_MARINE_DELTA, - ACCESS_MARINE_PILOT, - ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_SEA, - ACCESS_MARINE_KITCHEN, - ACCESS_MARINE_SYNTH, - ACCESS_PRESS, - ACCESS_MARINE_ASO, - ) - -/proc/get_all_weyland_access() - return list(ACCESS_WY_PMC_GREEN, ACCESS_WY_PMC_ORANGE, ACCESS_WY_PMC_RED, ACCESS_WY_PMC_BLACK, ACCESS_WY_PMC_WHITE, ACCESS_WY_CORPORATE) - -///CLF & UPP, UPP Commandos have global. -/proc/get_antagonist_access() - return get_main_marine_access() + list(ACCESS_ILLEGAL_PIRATE) - -///Used by PMCs and elite mercs. -/proc/get_weyland_pmc_access() - return get_all_main_access() - -///This is only used by USCM ERTs at present -/proc/get_friendly_ert_access() - return get_main_marine_access() + get_all_civilian_access() - -///Pizza and Souto -/proc/get_civil_ert_access() - return list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) + +/proc/get_access(access_list = ACCESS_LIST_GLOBAL) + switch(access_list) + if(ACCESS_LIST_GLOBAL) + return list(ACCESS_ILLEGAL_PIRATE) + get_access(ACCESS_LIST_MARINE_ALL) + get_access(ACCESS_LIST_WY_ALL) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_CLF_ALL) + get_access(ACCESS_LIST_UPP_ALL) + if(ACCESS_LIST_MARINE_MAIN) + return list( + ACCESS_MARINE_SENIOR, + ACCESS_MARINE_DATABASE, + ACCESS_MARINE_COMMAND, + ACCESS_MARINE_CMP, + ACCESS_MARINE_BRIG, + ACCESS_MARINE_ARMORY, + ACCESS_MARINE_CMO, + ACCESS_MARINE_MEDBAY, + ACCESS_MARINE_CHEMISTRY, + ACCESS_MARINE_MORGUE, + ACCESS_MARINE_RESEARCH, + ACCESS_MARINE_CE, + ACCESS_MARINE_ENGINEERING, + ACCESS_MARINE_MAINT, + ACCESS_MARINE_OT, + ACCESS_MARINE_RO, + ACCESS_MARINE_CARGO, + ACCESS_MARINE_PREP, + ACCESS_MARINE_MEDPREP, + ACCESS_MARINE_ENGPREP, + ACCESS_MARINE_SMARTPREP, + ACCESS_MARINE_LEADER, + ACCESS_MARINE_SPECPREP, + ACCESS_MARINE_TL_PREP, + ACCESS_MARINE_ALPHA, + ACCESS_MARINE_BRAVO, + ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_DELTA, + ACCESS_MARINE_PILOT, + ACCESS_MARINE_DROPSHIP, + ACCESS_MARINE_SEA, + ACCESS_MARINE_KITCHEN, + ACCESS_MARINE_SYNTH, + ACCESS_MARINE_ASO, + ACCESS_MARINE_CHAPLAIN, + ACCESS_PRESS, + ) + + if(ACCESS_LIST_MARINE_ALL) + return list( + ACCESS_MARINE_CO, + ACCESS_MARINE_AI, + ACCESS_MARINE_AI_TEMP, + ) + get_access(ACCESS_LIST_MARINE_MAIN) + + if(ACCESS_LIST_EMERGENCY_RESPONSE) + return list( + ACCESS_MARINE_MAINT, + ACCESS_MARINE_MEDBAY, + ACCESS_MARINE_KITCHEN, + ACCESS_PRESS, + ) + + if(ACCESS_LIST_UA) + return get_access(ACCESS_LIST_MARINE_MAIN) + get_access(ACCESS_LIST_COLONIAL_ALL) + + if(ACCESS_LIST_MARINE_LIAISON) + return list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_FLIGHT, + ACCESS_WY_RESEARCH, + ACCESS_WY_EXEC, + ACCESS_MARINE_COMMAND, + ACCESS_MARINE_RESEARCH, + ACCESS_MARINE_MEDBAY, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + + if(ACCESS_LIST_COLONIAL_ALL) + return list( + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) + + if(ACCESS_LIST_CIVIL_LIAISON) + return list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_RESEARCH, + ACCESS_WY_EXEC, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + + if(ACCESS_LIST_DELIVERY) + return list( + ACCESS_MARINE_COMMAND, + ACCESS_MARINE_CARGO, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ) + + + if(ACCESS_LIST_WY_ALL) + return list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_ENGINEERING, + ACCESS_WY_FLIGHT, + ACCESS_WY_RESEARCH, + ACCESS_WY_EXEC, + ACCESS_WY_PMC, + ACCESS_WY_PMC_TL, + ACCESS_WY_ARMORY, + ACCESS_WY_SECRETS, + ACCESS_WY_LEADERSHIP, + ACCESS_WY_SENIOR_LEAD, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + + if(ACCESS_LIST_WY_BASE) + return list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ) + + if(ACCESS_LIST_WY_SENIOR) + return list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_ENGINEERING, + ACCESS_WY_FLIGHT, + ACCESS_WY_RESEARCH, + ACCESS_WY_EXEC, + ACCESS_WY_PMC, + ACCESS_WY_PMC_TL, + ACCESS_WY_ARMORY, + ACCESS_WY_LEADERSHIP, + ACCESS_WY_SENIOR_LEAD, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + + if(ACCESS_LIST_WY_GOON) + return list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_RESEARCH, + ACCESS_WY_ARMORY, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + + if(ACCESS_LIST_WY_PMC) + return list( + ACCESS_WY_PMC, + ACCESS_WY_ENGINEERING, + ACCESS_WY_FLIGHT, + ) + get_access(ACCESS_LIST_WY_GOON) + + if(ACCESS_LIST_CLF_ALL) + return list( + ACCESS_CLF_SECURITY, + ACCESS_CLF_ARMORY, + ACCESS_CLF_LEADERSHIP, + ACCESS_CLF_SENIOR_LEAD, + ) + get_access(ACCESS_LIST_CLF_BASE) + + if(ACCESS_LIST_CLF_BASE) + return list( + ACCESS_CLF_GENERAL, + ACCESS_CLF_MEDICAL, + ACCESS_CLF_ENGINEERING, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + + if(ACCESS_LIST_UPP_ALL) + return list( + ACCESS_UPP_GENERAL, + ACCESS_UPP_MEDICAL, + ACCESS_UPP_ENGINEERING, + ACCESS_UPP_SECURITY, + ACCESS_UPP_ARMORY, + ACCESS_UPP_FLIGHT, + ACCESS_UPP_RESEARCH, + ACCESS_UPP_COMMANDO, + ACCESS_UPP_LEADERSHIP, + ACCESS_UPP_SENIOR_LEAD, + ) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE) /proc/get_region_accesses(code) switch(code) - if(0) - return get_all_main_access() - if(1) - return list(ACCESS_MARINE_CMP, ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY) // Security - if(2) - return list(ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_CHEMISTRY) // Medbay - if(3) - return list(ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) // Research - if(4) - return list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_OT, ACCESS_MARINE_MAINT) // Engineering - if(5) - return list(ACCESS_MARINE_CO, ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RO, ACCESS_MARINE_CARGO, ACCESS_MARINE_SEA, ACCESS_MARINE_SYNTH) // Command - if(6) - return list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_ENGPREP, ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_SPECPREP, ACCESS_MARINE_TL_PREP, ACCESS_MARINE_KITCHEN)//spess mahreens - if(7) - return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) // Squads - if(8) + if(0)//Everything + return get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_MARINE_MAIN) + if(1)//Security + return list(ACCESS_MARINE_CMP, ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY) + if(2)//Medbay + return list(ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_CHEMISTRY) + if(3)//Research + return list(ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) + if(4)//Engineering + return list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_OT, ACCESS_MARINE_MAINT) + if(5)//Command + return list( + ACCESS_MARINE_SENIOR, + ACCESS_MARINE_DATABASE, + ACCESS_MARINE_COMMAND, + ACCESS_MARINE_RO, + ACCESS_MARINE_CARGO, + ACCESS_MARINE_SEA, + ACCESS_MARINE_SYNTH, + ) + if(6)//Marines + return list( + ACCESS_MARINE_PREP, + ACCESS_MARINE_MEDPREP, + ACCESS_MARINE_ENGPREP, + ACCESS_MARINE_SMARTPREP, + ACCESS_MARINE_LEADER, + ACCESS_MARINE_SPECPREP, + ACCESS_MARINE_TL_PREP, + ACCESS_MARINE_KITCHEN, + ) + if(7)//Squads + return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) + if(8)//Civilian return list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) //Civilian + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) /proc/get_region_accesses_name(code) switch(code) @@ -230,55 +355,124 @@ /proc/get_access_desc(A) switch(A) - if(ACCESS_MARINE_CMP) return "CMP's Office" - if(ACCESS_MARINE_BRIG) return "Brig" - if(ACCESS_MARINE_ARMORY) return "Armory" - if(ACCESS_MARINE_CMO) return "CMO's Office" - if(ACCESS_MARINE_MEDBAY) return "[MAIN_SHIP_NAME] Medbay" - if(ACCESS_MARINE_RESEARCH) return "[MAIN_SHIP_NAME] Research" - if(ACCESS_MARINE_CHEMISTRY) return "[MAIN_SHIP_NAME] Chemistry" - if(ACCESS_MARINE_MORGUE) return "[MAIN_SHIP_NAME] Morgue" - if(ACCESS_MARINE_CE) return "CE's Office" - if(ACCESS_MARINE_RO) return "RO's Office" - if(ACCESS_MARINE_ENGINEERING) return "[MAIN_SHIP_NAME] Engineering" - if(ACCESS_MARINE_OT) return "[MAIN_SHIP_NAME] Ordnance Workshop" - if(ACCESS_MARINE_SENIOR) return "[MAIN_SHIP_NAME] Senior Command" - if(ACCESS_MARINE_CO) return "Commander's Quarters" - if(ACCESS_MARINE_DATABASE) return "[MAIN_SHIP_NAME]'s Database" - if(ACCESS_MARINE_COMMAND) return "[MAIN_SHIP_NAME] Command" - if(ACCESS_MARINE_CREWMAN) return "Vehicle Crewman" - if(ACCESS_MARINE_PREP) return "Marine Prep" - if(ACCESS_MARINE_ENGPREP) return "Marine Squad Engineering" - if(ACCESS_MARINE_MEDPREP) return "Marine Squad Medical" - if(ACCESS_MARINE_SPECPREP) return "Marine Weapons Specialist" - if(ACCESS_MARINE_SMARTPREP) return "Marine Smartgunner" - if(ACCESS_MARINE_TL_PREP) return "Marine Team Leader" - if(ACCESS_MARINE_LEADER) return "Marine Leader" - if(ACCESS_MARINE_ALPHA) return "Alpha Squad" - if(ACCESS_MARINE_BRAVO) return "Bravo Squad" - if(ACCESS_MARINE_CHARLIE) return "Charlie Squad" - if(ACCESS_MARINE_DELTA) return "Delta Squad" - if(ACCESS_MARINE_CARGO) return "Requisitions" - if(ACCESS_MARINE_DROPSHIP) return "Dropship Piloting" - if(ACCESS_MARINE_PILOT) return "Pilot Gear" - if(ACCESS_MARINE_MAINT) return "[MAIN_SHIP_NAME] Maintenance" - if(ACCESS_CIVILIAN_RESEARCH) return "Civilian Research" - if(ACCESS_CIVILIAN_COMMAND) return "Civilian Command" - if(ACCESS_CIVILIAN_MEDBAY) return "Civilian Medbay" - if(ACCESS_CIVILIAN_LOGISTICS) return "Civilian Logistics" - if(ACCESS_CIVILIAN_ENGINEERING) return "Civilian Engineering" - if(ACCESS_CIVILIAN_BRIG) return "Civilian Brig" - if(ACCESS_CIVILIAN_PUBLIC) return "Civilian" - if(ACCESS_MARINE_SEA) return "SEA's Office" - if(ACCESS_MARINE_KITCHEN) return "Kitchen" - if(ACCESS_MARINE_SYNTH) return "Synthetic Storage" - if(ACCESS_MARINE_AI) return "AI Core" + if(ACCESS_MARINE_CMP) + return "CMP's Office" + if(ACCESS_MARINE_BRIG) + return "Brig" + if(ACCESS_MARINE_ARMORY) + return "Armory" + if(ACCESS_MARINE_CMO) + return "CMO's Office" + if(ACCESS_MARINE_MEDBAY) + return "[MAIN_SHIP_NAME] Medbay" + if(ACCESS_MARINE_RESEARCH) + return "[MAIN_SHIP_NAME] Research" + if(ACCESS_MARINE_CHEMISTRY) + return "[MAIN_SHIP_NAME] Chemistry" + if(ACCESS_MARINE_MORGUE) + return "[MAIN_SHIP_NAME] Morgue" + if(ACCESS_MARINE_CE) + return "CE's Office" + if(ACCESS_MARINE_RO) + return "RO's Office" + if(ACCESS_MARINE_ENGINEERING) + return "[MAIN_SHIP_NAME] Engineering" + if(ACCESS_MARINE_OT) + return "[MAIN_SHIP_NAME] Ordnance Workshop" + if(ACCESS_MARINE_SENIOR) + return "[MAIN_SHIP_NAME] Senior Command" + if(ACCESS_MARINE_CO) + return "Commander's Quarters" + if(ACCESS_MARINE_DATABASE) + return "[MAIN_SHIP_NAME]'s Database" + if(ACCESS_MARINE_COMMAND) + return "[MAIN_SHIP_NAME] Command" + if(ACCESS_MARINE_CREWMAN) + return "Vehicle Crewman" + if(ACCESS_MARINE_PREP) + return "Marine Prep" + if(ACCESS_MARINE_ENGPREP) + return "Marine Squad Engineering" + if(ACCESS_MARINE_MEDPREP) + return "Marine Squad Medical" + if(ACCESS_MARINE_SPECPREP) + return "Marine Weapons Specialist" + if(ACCESS_MARINE_SMARTPREP) + return "Marine Smartgunner" + if(ACCESS_MARINE_TL_PREP) + return "Marine Team Leader" + if(ACCESS_MARINE_LEADER) + return "Marine Leader" + if(ACCESS_MARINE_ALPHA) + return "Alpha Squad" + if(ACCESS_MARINE_BRAVO) + return "Bravo Squad" + if(ACCESS_MARINE_CHARLIE) + return "Charlie Squad" + if(ACCESS_MARINE_DELTA) + return "Delta Squad" + if(ACCESS_MARINE_CARGO) + return "Requisitions" + if(ACCESS_MARINE_DROPSHIP) + return "Dropship Piloting" + if(ACCESS_MARINE_PILOT) + return "Pilot Gear" + if(ACCESS_MARINE_MAINT) + return "[MAIN_SHIP_NAME] Maintenance" + if(ACCESS_CIVILIAN_RESEARCH) + return "Civilian Research" + if(ACCESS_CIVILIAN_COMMAND) + return "Civilian Command" + if(ACCESS_CIVILIAN_MEDBAY) + return "Civilian Medbay" + if(ACCESS_CIVILIAN_LOGISTICS) + return "Civilian Logistics" + if(ACCESS_CIVILIAN_ENGINEERING) + return "Civilian Engineering" + if(ACCESS_CIVILIAN_BRIG) + return "Civilian Brig" + if(ACCESS_CIVILIAN_PUBLIC) + return "Civilian" + if(ACCESS_MARINE_SEA) + return "SEA's Office" + if(ACCESS_MARINE_KITCHEN) + return "Kitchen" + if(ACCESS_MARINE_SYNTH) + return "Synthetic Storage" + if(ACCESS_MARINE_AI) + return "AI Core" + if(ACCESS_MARINE_AI_TEMP) + return "AI Access" + if(ACCESS_ARES_DEBUG) + return "AI Debug" /proc/get_weyland_access_desc(A) switch(A) - if(ACCESS_WY_PMC_GREEN) return "Wey-Yu PMC Green" - if(ACCESS_WY_PMC_ORANGE) return "Wey-Yu PMC Orange" - if(ACCESS_WY_PMC_RED) return "Wey-Yu PMC Red" - if(ACCESS_WY_PMC_BLACK) return "Wey-Yu PMC Black" - if(ACCESS_WY_PMC_WHITE) return "Wey-Yu PMC White" - if(ACCESS_WY_CORPORATE) return "Wey-Yu Executive" + if(ACCESS_WY_GENERAL) + return "Wey-Yu General" + if(ACCESS_WY_COLONIAL) + return "Wey-Yu Colony" + if(ACCESS_WY_MEDICAL) + return "Wey-Yu Medical" + if(ACCESS_WY_SECURITY) + return "Wey-Yu Security" + if(ACCESS_WY_ENGINEERING) + return "Wey-Yu Engineering" + if(ACCESS_WY_FLIGHT) + return "Wey-Yu Flight Control" + if(ACCESS_WY_RESEARCH) + return "Wey-Yu Research" + if(ACCESS_WY_EXEC) + return "Wey-Yu Corporate" + if(ACCESS_WY_PMC) + return "Wey-Yu PMC" + if(ACCESS_WY_PMC_TL) + return "Wey-Yu PMC Lead" + if(ACCESS_WY_ARMORY) + return "Wey-Yu Armory" + if(ACCESS_WY_SECRETS) + return "Wey-Yu HighSec" + if(ACCESS_WY_LEADERSHIP) + return "Wey-Yu Leadership" + if(ACCESS_WY_SENIOR_LEAD) + return "Wey-Yu Senior Leadership" diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index c78a0131b7f1..a335a36994e5 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list( return ARES_ACCESS_CO if(ACCESS_MARINE_SENIOR in card.access) return ARES_ACCESS_SENIOR - if(ACCESS_WY_CORPORATE in card.access) + if(ACCESS_WY_GENERAL in card.access) return ARES_ACCESS_CORPORATE if(ACCESS_MARINE_COMMAND in card.access) return ARES_ACCESS_COMMAND @@ -613,7 +613,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list( return APOLLO_ACCESS_AUTHED if(ACCESS_MARINE_AI_TEMP in card.access) return APOLLO_ACCESS_TEMP - if((ACCESS_MARINE_SENIOR in card.access ) || (ACCESS_MARINE_ENGINEERING in card.access) || (ACCESS_WY_CORPORATE in card.access)) + if((ACCESS_MARINE_SENIOR in card.access ) || (ACCESS_MARINE_ENGINEERING in card.access) || (ACCESS_WY_GENERAL in card.access)) return APOLLO_ACCESS_REPORTER else return APOLLO_ACCESS_REQUEST diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm index 2d943d643cb3..60bf17388db8 100644 --- a/code/game/machinery/computer/dropship_weapons.dm +++ b/code/game/machinery/computer/dropship_weapons.dm @@ -712,7 +712,7 @@ /obj/structure/machinery/computer/dropship_weapons/dropship1 name = "\improper 'Alamo' weapons controls" - req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT) firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship() /obj/structure/machinery/computer/dropship_weapons/dropship1/New() @@ -721,7 +721,7 @@ /obj/structure/machinery/computer/dropship_weapons/dropship2 name = "\improper 'Normandy' weapons controls" - req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT) firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship() /obj/structure/machinery/computer/dropship_weapons/dropship2/New() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 3c92bd33a681..b68ca41d6f09 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_state = "medcomp" density = TRUE - req_one_access = list(ACCESS_MARINE_MEDBAY, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_MARINE_MEDBAY, ACCESS_WY_MEDICAL) circuit = /obj/item/circuitboard/computer/med_data var/obj/item/card/id/scan = null var/last_user_name = "" diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 373c74767bb4..f4d09796194c 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -10,32 +10,32 @@ name = "\improper Command Airlock" icon = 'icons/obj/structures/doors/comdoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_com - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/security/colony name = "\improper Security Airlock" icon = 'icons/obj/structures/doors/secdoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_sec - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_SECURITY) /obj/structure/machinery/door/airlock/engineering/colony name = "\improper Engineering Airlock" icon = 'icons/obj/structures/doors/engidoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_eng - req_one_access = list(ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) + req_one_access = list(ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/medical/colony name = "\improper Medical Airlock" icon = 'icons/obj/structures/doors/medidoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_med - req_one_access = list(ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND) + req_one_access = list(ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/maintenance/colony name = "\improper Maintenance Hatch" icon = 'icons/obj/structures/doors/maintdoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_mai - req_one_access = list(ACCESS_CIVILIAN_PUBLIC) + req_one_access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/external/colony name = "\improper External Airlock" @@ -61,7 +61,7 @@ icon = 'icons/obj/structures/doors/vault.dmi' opacity = TRUE assembly_type = /obj/structure/airlock_assembly/airlock_assembly_highsecurity //Until somebody makes better sprites. - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_LEADERSHIP) /obj/structure/machinery/door/airlock/freezer/colony name = "\improper Freezer Airlock" @@ -83,7 +83,7 @@ opacity = FALSE assembly_type = /obj/structure/airlock_assembly/airlock_assembly_com glass = 1 - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/glass_engineering/colony name = "\improper Engineering Airlock" @@ -130,7 +130,7 @@ name = "\improper Research Airlock" icon = 'icons/obj/structures/doors/medidoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_research - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/glass_research/colony name = "\improper Research Airlock" @@ -139,7 +139,7 @@ assembly_type = /obj/structure/airlock_assembly/airlock_assembly_research glass = 1 heat_proof = 1 - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/glass_mining/colony name = "\improper Mining Airlock" @@ -214,7 +214,7 @@ name = "\improper Research Airlock" icon = 'icons/obj/structures/doors/medidoor.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_science - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_RESEARCH) /obj/structure/machinery/door/airlock/glass_science/colony name = "\improper Research Airlock" @@ -222,13 +222,13 @@ opacity = 0 assembly_type = /obj/structure/airlock_assembly/airlock_assembly_science glass = 1 - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_RESEARCH) /obj/structure/machinery/door/airlock/highsecurity/colony name = "\improper High Tech Security Airlock" icon = 'icons/obj/structures/doors/hightechsecurity.dmi' assembly_type = /obj/structure/airlock_assembly/airlock_assembly_highsecurity - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_SECURITY, ACCESS_WY_LEADERSHIP) //STRATA AIRLOCKS // Add me later y'know? @@ -392,7 +392,7 @@ /obj/structure/machinery/door/airlock/almayer/command/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/almayer/command/autoname autoname = TRUE @@ -403,7 +403,7 @@ /obj/structure/machinery/door/airlock/almayer/command/reinforced/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/almayer/secure name = "\improper Secure Airlock" @@ -521,11 +521,11 @@ /obj/structure/machinery/door/airlock/almayer/research name = "\improper Research Airlock" icon = 'icons/obj/structures/doors/medidoor.dmi' - req_access = list(ACCESS_MARINE_RESEARCH) + req_one_access = list(ACCESS_MARINE_RESEARCH, ACCESS_WY_RESEARCH, ACCESS_WY_EXEC) /obj/structure/machinery/door/airlock/almayer/research/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL, ACCESS_WY_RESEARCH) /obj/structure/machinery/door/airlock/almayer/research/autoname autoname = TRUE @@ -536,7 +536,7 @@ /obj/structure/machinery/door/airlock/almayer/research/reinforced/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL, ACCESS_WY_RESEARCH) /obj/structure/machinery/door/airlock/almayer/research/glass name = "\improper Research Airlock" @@ -547,7 +547,7 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/almayer/research/glass/autoname autoname = TRUE @@ -558,7 +558,7 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/almayer/generic name = "\improper Airlock" @@ -576,7 +576,11 @@ /obj/structure/machinery/door/airlock/almayer/generic/corporate name = "Corporate Liaison's Quarters" icon = 'icons/obj/structures/doors/personaldoor.dmi' - req_access = list(ACCESS_WY_CORPORATE) + req_access = list(ACCESS_WY_GENERAL) + +/obj/structure/machinery/door/airlock/almayer/generic/press + name = "Press Office" + req_access = list(ACCESS_PRESS) /obj/structure/machinery/door/airlock/almayer/marine name = "\improper Airlock" diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index ee30af72558e..2a49b8696a9f 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -39,7 +39,7 @@ /obj/structure/machinery/door/airlock/multi_tile/command/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/medical name = "Medical Airlock" @@ -69,7 +69,7 @@ /obj/structure/machinery/door/airlock/multi_tile/research/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/research/reinforced name = "Reinforced Research Airlock" @@ -77,7 +77,7 @@ /obj/structure/machinery/door/airlock/multi_tile/research/reinforced/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/secure name = "Secure Airlock" @@ -183,7 +183,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor name = "\improper Command Airlock" @@ -194,7 +194,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced name = "\improper Reinforced Command Airlock" @@ -202,7 +202,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/solid icon = 'icons/obj/structures/doors/2x1comdoor_solid.dmi' @@ -211,7 +211,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/solid/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/solid/reinforced name = "\improper Reinforced Command Airlock" @@ -219,7 +219,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/solid/reinforced/colony req_access = null - req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/almayer/handle_multidoor() if(!(width > 1)) return //Bubblewrap diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 976ec285c8f4..a5e0eafe2f91 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -210,7 +210,7 @@ assignment = "Corporate Mercenary" /obj/item/card/id/pmc/New() - access = get_all_weyland_access() + access = get_access(ACCESS_LIST_WY_ALL) ..() /obj/item/card/id/pmc/ds @@ -236,7 +236,7 @@ assignment = "General" /obj/item/card/id/general/New() - access = get_all_weyland_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /obj/item/card/id/provost name = "provost holo-badge" @@ -246,7 +246,7 @@ assignment = "Provost" /obj/item/card/id/provost/New() - access = get_all_weyland_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /obj/item/card/id/syndicate name = "agent card" @@ -331,7 +331,7 @@ assignment = "Captain" /obj/item/card/id/captains_spare/New() - access = get_all_marine_access() + access = get_access(ACCESS_LIST_MARINE_ALL) ..() /obj/item/card/id/centcom @@ -342,7 +342,7 @@ assignment = "General" /obj/item/card/id/centcom/New() - access = get_all_weyland_access() + access = get_access(ACCESS_LIST_WY_ALL) ..() diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index 873d326847ec..4de97a8e20f3 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -44,7 +44,7 @@ t1 += "
" - var/list/accesses = get_all_main_access() + var/list/accesses = get_access(ACCESS_LIST_MARINE_ALL) for (var/acc in accesses) var/aname = get_access_desc(acc) diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm index 875087efbff0..65e2128a02c0 100644 --- a/code/game/objects/items/devices/portable_vendor.dm +++ b/code/game/objects/items/devices/portable_vendor.dm @@ -238,7 +238,7 @@ special_prod_time_lock = CL_BRIEFCASE_TIME_LOCK special_prods = list(/obj/item/implanter/neurostim, /obj/item/reagent_container/hypospray/autoinjector/ultrazine/liaison) - req_access = list(ACCESS_WY_CORPORATE) + req_access = list(ACCESS_WY_EXEC) req_role = JOB_CORPORATE_LIAISON listed_products = list( list("INCENTIVES", 0, null, null, null), diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 0d976b4cdf57..5816da7740c3 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -616,40 +616,35 @@ icon_state = "pill_canister11" max_storage_space = 5 skilllock = SKILL_MEDICAL_DEFAULT //CL can open it - var/idlock = 1 + var/idlock = TRUE pill_type_to_fill = /obj/item/reagent_container/pill/ultrazine/unmarked display_maptext = FALSE //for muh corporate secrets - Stan_Albatross - req_access = list(ACCESS_WY_CORPORATE) - var/req_role = JOB_CORPORATE_LIAISON + req_one_access = list(ACCESS_WY_EXEC, ACCESS_WY_RESEARCH) black_market_value = 35 /obj/item/storage/pill_bottle/ultrazine/proc/id_check(mob/user) if(!idlock) - return 1 + return TRUE var/mob/living/carbon/human/H = user if(!allowed(user)) to_chat(user, SPAN_NOTICE("It must have some kind of ID lock...")) - return 0 + return FALSE var/obj/item/card/id/I = H.wear_id if(!istype(I)) //not wearing an ID to_chat(H, SPAN_NOTICE("It must have some kind of ID lock...")) - return 0 + return FALSE if(I.registered_name != H.real_name) to_chat(H, SPAN_WARNING("Wrong ID card owner detected.")) - return 0 - - if(req_role && I.rank != req_role) - to_chat(H, SPAN_NOTICE("It must have some kind of ID lock...")) - return 0 + return FALSE - return 1 + return TRUE /obj/item/storage/pill_bottle/ultrazine/attack_self(mob/living/user) if(!id_check(user)) @@ -663,7 +658,7 @@ /obj/item/storage/pill_bottle/ultrazine/skillless name = "\improper Ultrazine pill bottle" - idlock = 0 + idlock = FALSE display_maptext = TRUE maptext_label = "Uz" diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 30be2f6bc2e2..50a6cc92cb5f 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -51,7 +51,7 @@ /obj/item/storage/lockbox/loyalty name = "\improper Wey-Yu equipment lockbox" - req_access = list(ACCESS_WY_CORPORATE) + req_one_access = list(ACCESS_WY_EXEC, ACCESS_WY_SECURITY) /obj/item/storage/lockbox/loyalty/fill_preset_inventory() new /obj/item/ammo_magazine/pistol/es4(src) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 20e5ac4f9bdc..6cb9f58aae37 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -11,7 +11,7 @@ w_class = SIZE_MEDIUM attack_verb = list("beaten") - req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY, ACCESS_MARINE_SENIOR, ACCESS_WY_CORPORATE, ACCESS_WY_PMC_GREEN, ACCESS_CIVILIAN_BRIG) + req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY, ACCESS_MARINE_SENIOR, ACCESS_WY_GENERAL, ACCESS_WY_SECURITY, ACCESS_CIVILIAN_BRIG) var/stunforce = 50 var/status = 0 //whether the thing is on or not var/obj/item/cell/bcell = null diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index b92624cf4201..24f019b9f89f 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -29,6 +29,8 @@ var/list/req_one_access = null var/req_access_txt = null var/req_one_access_txt = null + ///Whether or not this instance is using accesses different from initial code. Used for easy locating in map files. + var/access_modified = FALSE var/flags_obj = NO_FLAGS /// set when a player uses a pen on a renamable object diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 357606e01ee6..8bb00a349fce 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -130,4 +130,4 @@ /obj/structure/closet/secure_closet/guncabinet/wy name = "weyland yutani gun cabinet" - req_access = ACCESS_WY_CORPORATE + req_access = ACCESS_WY_SECURITY diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 435dfce3f122..e290a23a61e9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -41,7 +41,7 @@ open() else src.req_access = list() - src.req_access += pick(get_all_main_access()) + src.req_access += pick(get_access(ACCESS_LIST_MARINE_MAIN)) ..() /obj/structure/closet/secure_closet/proc/togglelock(mob/living/user) diff --git a/code/game/objects/structures/crates_lockers/secure_crates.dm b/code/game/objects/structures/crates_lockers/secure_crates.dm index b4ebb6d5e827..0bd77d877ee6 100644 --- a/code/game/objects/structures/crates_lockers/secure_crates.dm +++ b/code/game/objects/structures/crates_lockers/secure_crates.dm @@ -104,7 +104,7 @@ open() else src.req_access = list() - src.req_access += pick(get_all_main_access()) + src.req_access += pick(get_access(ACCESS_LIST_MARINE_MAIN)) ..() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 6be6b14e0247..0297145c7e8d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -203,7 +203,7 @@ /client/proc/cmd_admin_grantfullaccess(mob/M in GLOB.mob_list) set category = null - set name = "Grant Full Access" + set name = "Grant Global Access" if(!check_rights(R_DEBUG|R_ADMIN)) return @@ -216,11 +216,11 @@ if (H.wear_id) var/obj/item/card/id/id = H.wear_id id.icon_state = "gold" - id:access = get_global_access() + id:access = get_access(ACCESS_LIST_GLOBAL) else var/obj/item/card/id/id = new/obj/item/card/id(M); id.icon_state = "gold" - id:access = get_all_main_access() + id:access = get_access(ACCESS_LIST_GLOBAL) id.registered_name = H.real_name id.registered_ref = WEAKREF(H) id.assignment = "Captain" @@ -230,7 +230,7 @@ else alert("Invalid mob") - message_admins("[key_name_admin(usr)] has granted [M.key] full access.") + message_admins("[key_name_admin(usr)] has granted [M.key] global access.") /client/proc/cmd_admin_grantallskills(mob/M in GLOB.mob_list) set category = null diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index ad0ebac8307b..a3bea392c201 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -109,7 +109,7 @@ Access:
"} - var/known_access_rights = get_all_main_access() + var/known_access_rights = get_access(ACCESS_LIST_MARINE_ALL) for(var/A in target_id_card.access) if(A in known_access_rights) contents += " [get_access_desc(A)]" @@ -197,7 +197,7 @@ else var/list/new_access = list() if(is_centcom) - new_access = get_all_weyland_access() + new_access = get_access(ACCESS_LIST_WY_ALL) else var/datum/job/job = RoleAuthority.roles_for_mode[target] @@ -205,7 +205,7 @@ visible_message("[SPAN_BOLD("[src]")] states, \"DATA ERROR: Can not find next entry in database: [target]\"") return new_access = job.get_access() - target_id_card.access -= get_all_weyland_access() + get_all_main_access() + target_id_card.access -= get_access(ACCESS_LIST_WY_ALL) + get_access(ACCESS_LIST_MARINE_MAIN) target_id_card.access |= new_access target_id_card.assignment = target target_id_card.rank = target @@ -227,7 +227,7 @@ log_idmod(target_id_card, " [key_name_admin(usr)] granted [access_type] IFF. ") return TRUE access_type = text2num(params["access_target"]) - if(access_type in (is_centcom ? get_all_weyland_access() : get_main_marine_access())) + if(access_type in (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN))) if(access_type in target_id_card.access) target_id_card.access -= access_type log_idmod(target_id_card, " [key_name_admin(usr)] revoked access '[access_type]'. ") @@ -239,7 +239,7 @@ if(!authenticated || !target_id_card) return - target_id_card.access |= (is_centcom ? get_all_weyland_access() : get_main_marine_access()) + target_id_card.access |= (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN)) target_id_card.faction_group |= factions log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and USCM IFF. ") return TRUE diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 311605a407c7..901de2c21ca3 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -9,7 +9,7 @@ /datum/equipment_preset/clf/New() . = ..() - access = get_antagonist_access() + access = get_access(ACCESS_LIST_CLF_BASE) /datum/equipment_preset/clf/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(60;MALE, 40;FEMALE) @@ -439,6 +439,10 @@ role_comm_title = "SPC" skills = /datum/skills/clf/specialist +/datum/equipment_preset/clf/specialist/New() + . = ..() + access = get_access(ACCESS_LIST_CLF_BASE) + list(ACCESS_CLF_ARMORY) + /datum/equipment_preset/clf/specialist/load_gear(mob/living/carbon/human/new_human) //jumpsuit and their webbing @@ -550,131 +554,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/clf/commander - name = "CLF Cell Commander" - flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_CLF_COMMANDER - rank = JOB_CLF_COMMANDER - role_comm_title = "CMDR" - skills = /datum/skills/clf/commander - -/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/smartgun(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) - -/datum/equipment_preset/clf/commander/get_antag_clothing_equipment() - return list( - list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Combat Boots", 0, /obj/item/clothing/shoes/combat, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("CLF Uniform", 0, /obj/item/clothing/under/colonist/clf, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("CLF Smartgun Armor", 0, /obj/item/clothing/suit/storage/militia/smartgun, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("Black Gloves", 0, /obj/item/clothing/gloves/black, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("CLF Smartgunner Belt", 0, /obj/item/storage/belt/gun/smartgunner/clf, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/CLF/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Flashlight", 0, /obj/item/device/flashlight, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), - - list("HELMET (CHOOSE 1)", 0, null, null, null), - list("Y8 Miner Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - - list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - - list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Gyroscopic Stabilizer", 0, /obj/item/attachable/gyro, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Masterkey Shotgun", 0, /obj/item/attachable/attached_gun/shotgun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Recoil Compensator", 0, /obj/item/attachable/compensator, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) - ) - -/datum/equipment_preset/clf/commander/get_antag_gear_equipment() - return list( - list("CELL LEADER SET (MANDATORY)", 0, null, null, null), - list("Essential Leader Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), - - list("GENERAL SUPPLIES", 0, null, null, null), - list("Megaphone", 5, /obj/item/device/megaphone, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), - - list("ENGINEERING SUPPLIES", 0, null, null, null), - list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), - list("Insulated Gloves", 3, /obj/item/clothing/gloves/yellow, null, VENDOR_ITEM_REGULAR), - list("Metal x10", 5, /obj/item/stack/sheet/metal/small_stack, null, VENDOR_ITEM_RECOMMENDED), - list("Plasteel x10", 7, /obj/item/stack/sheet/plasteel/small_stack, null, VENDOR_ITEM_RECOMMENDED), - list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED), - list("Tools Pouch (Full)", 5, /obj/item/storage/pouch/tools/full, null, VENDOR_ITEM_REGULAR), - list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), - - list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), - list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), - list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), - - list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), - list("Sensor Medical HUD", 4, /obj/item/clothing/glasses/hud/sensor, null, VENDOR_ITEM_MANDATORY), - - list("SPECIAL AMMUNITION", 0, null, null, null), - list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR), - list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR), - list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR), - - list("EXPLOSIVES", 0, null, null, null), - list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR), - list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR), - list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR), - list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR), - list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR), - list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), - - list("UTILITIES", 0, null, null, null), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Random Useful (Or Not) Item", 5, /obj/effect/essentials_set/random/clf_bonus_item, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR) - ) - -//*****************************************************************************************************/ - /datum/equipment_preset/clf/leader name = "CLF Leader" flags = EQUIPMENT_PRESET_EXTRA @@ -683,6 +562,10 @@ role_comm_title = "LDR" skills = /datum/skills/clf/leader +/datum/equipment_preset/clf/leader/New() + . = ..() + access = get_access(ACCESS_LIST_CLF_BASE) + list(ACCESS_CLF_ARMORY, ACCESS_CLF_LEADERSHIP, ACCESS_CLF_FLIGHT) + /datum/equipment_preset/clf/leader/load_gear(mob/living/carbon/human/new_human) //No random armor, so that it's more clear that he's the leader @@ -828,6 +711,9 @@ rank = JOB_CLF_SYNTH role_comm_title = "Syn" +/datum/equipment_preset/clf/synth/New() + . = ..() + access = get_access(ACCESS_LIST_CLF_ALL) /datum/equipment_preset/clf/synth/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(50;MALE,50;FEMALE) @@ -1014,20 +900,24 @@ role_comm_title = "CMDR" skills = /datum/skills/clf/commander -/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/smartgun(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) - - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_R_STORE) +/datum/equipment_preset/clf/commander/New() + . = ..() + access = get_access(ACCESS_LIST_CLF_ALL) + +/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/smartgun(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) /datum/equipment_preset/clf/commander/get_antag_clothing_equipment() return list( @@ -1092,8 +982,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), + list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 55602ec956f3..c42b1bf868f0 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -10,7 +10,7 @@ /datum/equipment_preset/cmb/New() . = ..() - access = get_friendly_ert_access() + access = get_access(ACCESS_LIST_UA) /datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human) new_human.gender = pick(80;MALE,20;FEMALE) @@ -404,7 +404,7 @@ /datum/equipment_preset/uscm/cmb/New() . = ..() - access = get_friendly_ert_access() + access = get_access(ACCESS_LIST_UA) assignment = "Anchorpoint Station Marine Rifleman" rank = JOB_SQUAD_MARINE diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 62495ac59213..9a4497e071ed 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -1,49 +1,3 @@ -/datum/equipment_preset/contractor - name = "Military Contractor" - - assignment = "VAI Mercenary" - rank = JOB_CONTRACTOR - idtype = /obj/item/card/id/data - faction = FACTION_CONTRACTOR - -/datum/equipment_preset/contractor/New() - . = ..() - access = get_all_main_access() - -/datum/equipment_preset/contractor/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(80;MALE,20;FEMALE) - var/datum/preferences/A = new() - A.randomize_appearance(new_human) - var/random_name - var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) - var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) - var/hair_color = pick(hair_colors) - new_human.r_hair = hair_colors[hair_color][1] - new_human.g_hair = hair_colors[hair_color][2] - new_human.b_hair = hair_colors[hair_color][3] - new_human.r_facial = hair_colors[hair_color][1] - new_human.g_facial = hair_colors[hair_color][2] - new_human.b_facial = hair_colors[hair_color][3] - var/eye_color = pick(colors) - new_human.r_eyes = colors[eye_color][1] - new_human.g_eyes = colors[eye_color][2] - new_human.b_eyes = colors[eye_color][3] - idtype = /obj/item/card/id/data - if(new_human.gender == MALE) - random_name = "[pick(first_names_male)] [pick(last_names)]" - new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) - else - random_name = "[pick(first_names_female)] [pick(last_names)]" - new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) - -//*****************************************************************************************************/ - /datum/equipment_preset/contractor name = "Military Contractor" faction = FACTION_CONTRACTOR @@ -57,10 +11,10 @@ /datum/equipment_preset/contractor/New() . = ..() - access = get_all_main_access() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) -/datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/new_human) +/datum/equipment_preset/contractor/load_name(mob/living/carbon/human/new_human) new_human.gender = pick(60;MALE,40;FEMALE) var/datum/preferences/A = new() A.randomize_appearance(new_human) @@ -595,11 +549,6 @@ skills = /datum/skills/contractor/heavy faction = FACTION_CONTRACTOR - -/datum/equipment_preset/contractor/covert/heavy/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/contractor/covert/heavy/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY) @@ -648,11 +597,6 @@ skills = /datum/skills/contractor/engi faction = FACTION_CONTRACTOR - -/datum/equipment_preset/contractor/covert/engi/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/contractor/covert/engi/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/tool_webbing, WEAR_ACCESSORY) @@ -700,11 +644,6 @@ skills = /datum/skills/contractor/medic faction = FACTION_CONTRACTOR - -/datum/equipment_preset/contractor/covert/medic/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/contractor/covert/medic/load_gear(mob/living/carbon/human/new_human) //clothing new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 18903ef491ee..62782b77eae5 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -221,7 +221,7 @@ /datum/equipment_preset/corpse/clown/New() . = ..() //As a joke, clown has all access so they can clown everywhere... - access = get_all_main_access() + access = get_access(ACCESS_LIST_DELIVERY) /datum/equipment_preset/corpse/clown/load_name(mob/living/carbon/human/new_human, randomise) . = ..() //To load gender, randomise appearance, etc. @@ -467,12 +467,12 @@ ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_PMC_GREEN, - ACCESS_WY_PMC_ORANGE, - ACCESS_WY_PMC_RED, - ACCESS_WY_PMC_BLACK, - ACCESS_WY_PMC_WHITE, - ACCESS_WY_CORPORATE, + ACCESS_WY_MEDICAL, + ACCESS_WY_ENGINEERING, + ACCESS_WY_SECURITY, + ACCESS_WY_LEADERSHIP, + ACCESS_WY_COLONIAL, + ACCESS_WY_GENERAL, ) /datum/equipment_preset/corpse/bridgeofficer/johnson/load_gear(mob/living/carbon/human/new_human) @@ -527,12 +527,9 @@ ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_PMC_GREEN, - ACCESS_WY_PMC_ORANGE, - ACCESS_WY_PMC_RED, - ACCESS_WY_PMC_BLACK, - ACCESS_WY_PMC_WHITE, - ACCESS_WY_CORPORATE, + ACCESS_WY_SECURITY, + ACCESS_WY_COLONIAL, + ACCESS_WY_GENERAL, ) /datum/equipment_preset/corpse/wysec/load_gear(mob/living/carbon/human/new_human) @@ -629,8 +626,6 @@ ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, ) /datum/equipment_preset/corpse/ua_riot/load_gear(mob/living/carbon/human/new_human) @@ -678,11 +673,15 @@ faction_group = FACTION_LIST_WY languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) access = list( - ACCESS_WY_CORPORATE, + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_LEADERSHIP, + ACCESS_WY_SECURITY, + ACCESS_WY_EXEC, + ACCESS_WY_RESEARCH, + ACCESS_WY_ENGINEERING, + ACCESS_WY_MEDICAL, ACCESS_ILLEGAL_PIRATE, - ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_RESEARCH, - ACCESS_MARINE_MEDBAY, ) /datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/new_human) @@ -716,17 +715,10 @@ idtype = /obj/item/card/id/silver xenovictim = FALSE faction = FACTION_CLF - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, - ) + +/datum/equipment_preset/corpse/clf/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) /datum/equipment_preset/corpse/clf/load_gear(mob/living/carbon/human/new_human) @@ -758,17 +750,10 @@ idtype = /obj/item/card/id/silver xenovictim = FALSE faction = FACTION_UPP - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, - ) + +/datum/equipment_preset/corpse/upp/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) /datum/equipment_preset/corpse/upp/load_gear(mob/living/carbon/human/new_human) @@ -807,9 +792,16 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) access = list( ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_WY_CORPORATE, ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_SECURITY, + ACCESS_WY_PMC, ) /datum/equipment_preset/corpse/pmc/load_gear(mob/living/carbon/human/new_human) @@ -881,17 +873,10 @@ assignment = "Freelancer Mercenary" idtype = /obj/item/card/id/silver xenovictim = FALSE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, - ) + +/datum/equipment_preset/corpse/freelancer/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) /datum/equipment_preset/corpse/freelancer/load_gear(mob/living/carbon/human/new_human) @@ -921,17 +906,10 @@ idtype = /obj/item/card/id/silver faction = FACTION_DUTCH xenovictim = FALSE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, - ) + +/datum/equipment_preset/corpse/dutchrifle/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) /datum/equipment_preset/corpse/dutchrifle/load_gear(mob/living/carbon/human/new_human) @@ -959,17 +937,10 @@ idtype = /obj/item/card/id/silver faction = FACTION_PIZZA xenovictim = FALSE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, - ) + +/datum/equipment_preset/corpse/pizza/New() + . = ..() + access = get_access(ACCESS_LIST_DELIVERY) /datum/equipment_preset/corpse/pizza/load_gear(mob/living/carbon/human/new_human) @@ -1014,7 +985,6 @@ ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, ACCESS_MARINE_MAINT, - ACCESS_WY_CORPORATE, ) /datum/equipment_preset/corpse/gladiator/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index 20a7f18077dd..8eacbb8161d2 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -246,7 +246,7 @@ /datum/equipment_preset/fun/santa/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/fun/santa/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE @@ -342,7 +342,7 @@ /datum/equipment_preset/fun/van_bandolier/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/fun/van_bandolier/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index c2beca202e84..9780b739cf67 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -38,7 +38,7 @@ /datum/equipment_preset/other/freelancer/New() . = ..() - access = get_all_main_access() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) //ACCESS_COME_BACK_TO_ME /datum/equipment_preset/other/freelancer/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(60;MALE,40;FEMALE) @@ -247,7 +247,7 @@ /datum/equipment_preset/other/elite_merc/New() . = ..() - access = get_all_main_access() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) /datum/equipment_preset/other/elite_merc/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(70;MALE,30;FEMALE) @@ -278,10 +278,6 @@ skills = /datum/skills/mercenary/elite faction = FACTION_MERCENARY -/datum/equipment_preset/other/elite_merc/standard/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/other/elite_merc/standard/load_gear(mob/living/carbon/human/new_human) //TODO: add unique backpacks and satchels //clothes @@ -319,10 +315,6 @@ skills = /datum/skills/mercenary/elite/heavy faction = FACTION_MERCENARY -/datum/equipment_preset/other/elite_merc/heavy/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/other/elite_merc/heavy/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels //clothes @@ -363,9 +355,6 @@ skills = /datum/skills/mercenary/elite/engineer faction = FACTION_MERCENARY -/datum/equipment_preset/other/elite_merc/engineer/New() - . = ..() - access = get_weyland_pmc_access() /datum/equipment_preset/other/elite_merc/engineer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -420,10 +409,6 @@ skills = /datum/skills/mercenary/elite/medic faction = FACTION_MERCENARY -/datum/equipment_preset/other/elite_merc/medic/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/other/elite_merc/medic/load_gear(mob/living/carbon/human/new_human) //webbing var/obj/item/clothing/under/marine/veteran/mercenary/support/SUPPORT = new() @@ -470,10 +455,6 @@ skills = /datum/skills/mercenary/elite/leader faction = FACTION_MERCENARY -/datum/equipment_preset/other/elite_merc/leader/New() - . = ..() - access = get_weyland_pmc_access() - /datum/equipment_preset/other/elite_merc/leader/load_gear(mob/living/carbon/human/new_human) //clothes new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) @@ -512,7 +493,7 @@ /datum/equipment_preset/other/business_person/New() . = ..() - access = get_all_main_access() + access = get_access(ACCESS_LIST_CIVIL_LIAISON) /datum/equipment_preset/other/business_person/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -562,7 +543,7 @@ /datum/equipment_preset/other/pizza/New() . = ..() - access = get_civil_ert_access() + access = get_access(ACCESS_LIST_DELIVERY) /datum/equipment_preset/other/pizza/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE,FEMALE) @@ -607,7 +588,7 @@ /datum/equipment_preset/other/souto/New() . = ..() - access = get_civil_ert_access() + access = get_access(ACCESS_LIST_DELIVERY) /datum/equipment_preset/other/souto/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE @@ -789,7 +770,7 @@ /datum/equipment_preset/other/xeno_cultist/New() . = ..() - access = get_all_civilian_access() + access = get_access(ACCESS_LIST_COLONIAL_ALL) /datum/equipment_preset/other/xeno_cultist/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(new_human), WEAR_BODY) @@ -912,7 +893,7 @@ /datum/equipment_preset/other/tank/New() . = ..() - access = get_antagonist_access() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) /datum/equipment_preset/other/tank/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 5fa5dd1374e8..fcfb61a7d810 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -12,7 +12,7 @@ /datum/equipment_preset/pmc/New() . = ..() - access = get_weyland_pmc_access() + access = get_access(ACCESS_LIST_WY_PMC) /datum/equipment_preset/pmc/load_name(mob/living/carbon/human/new_human, randomise) @@ -691,6 +691,10 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/SL headset_type = /obj/item/device/radio/headset/distress/pmc/command +/datum/equipment_preset/pmc/pmc_leader/New() + . = ..() + access = get_access(ACCESS_LIST_WY_PMC) + list(ACCESS_WY_LEADERSHIP, ACCESS_WY_PMC_TL) + /datum/equipment_preset/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) @@ -843,6 +847,10 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/SL/chem headset_type = /obj/item/device/radio/headset/distress/pmc/command +/datum/equipment_preset/pmc/pmc_lead_investigator/New() + . = ..() + access = get_access(ACCESS_LIST_WY_PMC) + list(ACCESS_WY_LEADERSHIP, ACCESS_WY_PMC_TL) + /datum/equipment_preset/pmc/pmc_lead_investigator/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm index 9ab5e7c8d22c..243cb9440824 100644 --- a/code/modules/gear_presets/survivors.dm +++ b/code/modules/gear_presets/survivors.dm @@ -326,7 +326,13 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND paygrade = "WYC2" idtype = /obj/item/card/id/silver/clearance_badge/cl - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_WY_CORPORATE,ACCESS_CIVILIAN_COMMAND) + access = list( + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_COMMAND, + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_EXEC, + ) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) survivor_variant = CORPORATE_SURVIVOR @@ -1151,10 +1157,13 @@ paygrade = "WYC2" role_comm_title = "ICC Rep." flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_WY_CORPORATE,ACCESS_CIVILIAN_COMMAND) survivor_variant = CORPORATE_SURVIVOR +/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/New() + . = ..() + access = get_access(ACCESS_LIST_CIVIL_LIAISON) + /datum/equipment_preset/survivor/interstellar_commerce_commission_liason/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) @@ -1390,13 +1399,15 @@ idtype = /obj/item/card/id/silver/clearance_badge/manager faction_group = list(FACTION_WY, FACTION_SURVIVOR) access = list( - ACCESS_WY_CORPORATE, + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_LEADERSHIP, + ACCESS_WY_SECURITY, + ACCESS_WY_EXEC, + ACCESS_WY_RESEARCH, + ACCESS_WY_ENGINEERING, + ACCESS_WY_MEDICAL, ACCESS_ILLEGAL_PIRATE, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_RESEARCH, - ACCESS_CIVILIAN_COMMAND, - ACCESS_CIVILIAN_PUBLIC, ) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index eaab23630ed2..32bcd61d6708 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -9,7 +9,7 @@ /datum/equipment_preset/synth/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/synth/load_race(mob/living/carbon/human/new_human) if(new_human.client?.prefs?.synthetic_type) @@ -141,7 +141,7 @@ /datum/equipment_preset/synth/survivor/New() . = ..() - access = get_all_civilian_access() + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_CORPORATE //Access to civillians stuff + medbay stuff + engineering stuff + research + access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) @@ -560,7 +560,7 @@ /datum/equipment_preset/synth/working_joe/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_WORKING_JOE) @@ -721,7 +721,7 @@ /datum/equipment_preset/synth/infiltrator/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/synth/infiltrator/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE,FEMALE) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index a43404c59450..63d1fd48e665 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -7,7 +7,7 @@ /datum/equipment_preset/upp/New() . = ..() - access = get_antagonist_access() + access = get_access(ACCESS_LIST_UPP_ALL) //ACCESS_COME_BACK_TO_ME /datum/equipment_preset/upp/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(60;MALE,40;FEMALE) @@ -2105,7 +2105,7 @@ /datum/equipment_preset/upp/commando/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/upp/commando/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 6165a7eaaa56..1c84e7cad4ba 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -785,7 +785,7 @@ /datum/equipment_preset/uscm/marsoc/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/uscm/marsoc/load_gear(mob/living/carbon/human/new_human) //back diff --git a/code/modules/gear_presets/uscm_dress.dm b/code/modules/gear_presets/uscm_dress.dm index 600b8dcce1b2..393cc5b41a66 100644 --- a/code/modules/gear_presets/uscm_dress.dm +++ b/code/modules/gear_presets/uscm_dress.dm @@ -111,7 +111,7 @@ /datum/equipment_preset/uscm_event/dress/officer/capt/New() . = ..() - access = get_main_marine_access() + access = get_access(ACCESS_LIST_MARINE_MAIN) /datum/equipment_preset/uscm_event/dress/officer/co name = "Dress Blues - (O-4) Major" @@ -121,7 +121,7 @@ /datum/equipment_preset/uscm_event/dress/officer/co/New() . = ..() - access = get_all_marine_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/uscm_event/dress/officer/co/ltcol name = "Dress Blues - (O-5) Lieutenant Colonel" @@ -145,7 +145,7 @@ /datum/equipment_preset/uscm_event/dress/officer/general/New() . = ..() - access = get_all_marine_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/uscm_event/dress/officer/general/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/general(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 1af69f567077..77f7665ce5b7 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -39,7 +39,7 @@ /datum/equipment_preset/uscm_event/colonel/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/uscm_event/colonel/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) @@ -74,7 +74,7 @@ /datum/equipment_preset/uscm_event/general/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/uscm_event/general/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -185,28 +185,11 @@ name = "USCM Provost" idtype = /obj/item/card/id/provost - access = list( - ACCESS_MARINE_BRIG, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_DATABASE, - ACCESS_MARINE_PREP, - ACCESS_MARINE_MEDBAY, - ACCESS_MARINE_MORGUE, - ACCESS_MARINE_ALPHA, - ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, - ACCESS_MARINE_DELTA, - ACCESS_MARINE_ENGINEERING, - ACCESS_MARINE_MAINT, - ACCESS_MARINE_OT, - ACCESS_WY_CORPORATE, - ) skills = /datum/skills/provost /datum/equipment_preset/uscm_event/provost/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/uscm_event/provost/enforcer name = "Provost Enforcer (ME5)" @@ -464,28 +447,11 @@ name = "UAAC-TIS" idtype = /obj/item/card/id/provost - access = list( - ACCESS_MARINE_BRIG, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_DATABASE, - ACCESS_MARINE_PREP, - ACCESS_MARINE_MEDBAY, - ACCESS_MARINE_MORGUE, - ACCESS_MARINE_ALPHA, - ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, - ACCESS_MARINE_DELTA, - ACCESS_MARINE_ENGINEERING, - ACCESS_MARINE_MAINT, - ACCESS_MARINE_OT, - ACCESS_WY_CORPORATE, - ) skills = /datum/skills/provost /datum/equipment_preset/uscm_event/uaac/tis/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/uscm_event/uaac/tis/io name = "UAAC-TIS Intelligence Officer (NO2)" diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 29bc32cffa7a..0ead4f713c23 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -205,7 +205,7 @@ /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/New() . = ..() - access = get_main_marine_access() + access = get_access(ACCESS_LIST_MARINE_MAIN) /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 457ef71e9a46..578114222c01 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -30,7 +30,7 @@ idtype = /obj/item/card/id/silver/cl access = list( - ACCESS_WY_CORPORATE, + ACCESS_WY_GENERAL, ACCESS_ILLEGAL_PIRATE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RESEARCH, @@ -41,7 +41,7 @@ ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, - ACCESS_WY_CORPORATE_DS, + ACCESS_WY_FLIGHT, ACCESS_CIVILIAN_COMMAND, ) assignment = JOB_CORPORATE_LIAISON @@ -70,6 +70,10 @@ dress_gloves = list(/obj/item/clothing/gloves/marine/dress) dress_shoes = list(/obj/item/clothing/shoes/laceup) +/datum/equipment_preset/uscm_ship/liaison/New() + . = ..() + access = get_access(ACCESS_LIST_MARINE_LIAISON) + /datum/equipment_preset/uscm_ship/liaison/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/lockable/liaison //There is no suitable backpack for a CL really... @@ -420,7 +424,7 @@ /datum/equipment_preset/uscm_ship/commander/New() . = ..() - access = get_all_marine_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/uscm_ship/commander/load_race(mob/living/carbon/human/new_human, client/mob_client) ..() @@ -517,7 +521,7 @@ /datum/equipment_preset/uscm_ship/xo/New() . = ..() - access = get_main_marine_access() + access = get_access(ACCESS_LIST_MARINE_MAIN) /datum/equipment_preset/uscm_ship/xo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -588,7 +592,7 @@ /datum/equipment_preset/uscm_ship/sea/New() . = ..() - access = get_main_marine_access() + access = get_access(ACCESS_LIST_MARINE_MAIN) /datum/equipment_preset/uscm_ship/sea/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -797,7 +801,7 @@ /datum/equipment_preset/uscm_ship/officer/New() . = ..() - access = get_all_marine_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/uscm_ship/officer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 78128c32a44a..dde564f93375 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -13,7 +13,7 @@ /datum/equipment_preset/pmc/w_y_whiteout/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/pmc/w_y_whiteout/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COMBAT) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 1033a5f14db3..521d2690d367 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -41,7 +41,7 @@ /datum/equipment_preset/wo/commander/New() . = ..() - access = get_all_marine_access() + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/wo/commander/load_gear(mob/living/carbon/human/new_human) var/sidearm = "Mateba" @@ -109,7 +109,7 @@ /datum/equipment_preset/wo/xo/New() . = ..() - access = get_main_marine_access() + access = get_access(ACCESS_LIST_MARINE_MAIN) /datum/equipment_preset/wo/xo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -579,10 +579,6 @@ name = "WO Combat Reporter" //CL flags = EQUIPMENT_PRESET_START_OF_ROUND_WO - access = list( - ACCESS_WY_CORPORATE, ACCESS_ILLEGAL_PIRATE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_RESEARCH, ACCESS_MARINE_MEDBAY, ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) assignment = JOB_WO_CORPORATE_LIAISON rank = JOB_WO_CORPORATE_LIAISON paygrade = "WYC2" @@ -593,6 +589,10 @@ minimap_icon = "surv" minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN +/datum/equipment_preset/wo/reporter/New() + . = ..() + access = get_access(ACCESS_LIST_MARINE_LIAISON) + list(ACCESS_PRESS) + /datum/equipment_preset/wo/reporter/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel //There is no suitable backpack for a CL really... diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index c773ea9b9b4e..d5b5194401bd 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -6,22 +6,13 @@ rank = FACTION_WY idtype = /obj/item/card/id/silver faction_group = FACTION_LIST_WY - access = list( - ACCESS_WY_CORPORATE, - ACCESS_ILLEGAL_PIRATE, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_RESEARCH, - ACCESS_WY_CORPORATE_DS, - ACCESS_MARINE_MEDBAY, - ) skills = /datum/skills/civilian languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/headset_type = /obj/item/device/radio/headset/distress/WY /datum/equipment_preset/wy/New() . = ..() - access += get_all_civilian_access() + get_all_weyland_access() + access += get_access(ACCESS_LIST_WY_BASE) /datum/equipment_preset/wy/load_id(mob/living/carbon/human/new_human) . = ..() @@ -86,7 +77,7 @@ /datum/equipment_preset/wy/manager/New() . = ..() - access = get_global_access() + access = get_access(ACCESS_LIST_WY_SENIOR) /datum/equipment_preset/wy/manager/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) @@ -116,6 +107,10 @@ rank = JOB_CHIEF_EXECUTIVE paygrade = "WYC9" +/datum/equipment_preset/wy/manager/chief_executive/New() + . = ..() + access = get_access(ACCESS_LIST_WY_ALL) + /datum/equipment_preset/wy/manager/director name = "Corporate - J - Director" flags = EQUIPMENT_PRESET_EXTRA @@ -125,6 +120,10 @@ skills = /datum/skills/civilian/manager/director headset_type = /obj/item/device/radio/headset/distress/pmc/command/director +/datum/equipment_preset/wy/manager/director/New() + . = ..() + access = get_access(ACCESS_LIST_WY_ALL) + /datum/equipment_preset/wy/manager/director/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/director(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/director(new_human), WEAR_JACKET) diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index 753693ef31f9..5160f0bf319a 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -9,7 +9,7 @@ /datum/equipment_preset/goon/New() . = ..() - access = get_all_main_access() + access = get_access(ACCESS_LIST_WY_GOON) /datum/equipment_preset/goon/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) @@ -97,6 +97,10 @@ paygrade = "WEY-GOON-L" skills = /datum/skills/MP +/datum/equipment_preset/goon/lead/New() + . = ..() + access = get_access(ACCESS_LIST_WY_GOON) + list(ACCESS_WY_LEADERSHIP) + /datum/equipment_preset/goon/lead/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index ea33700eb433..92b4422aeebe 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1178,7 +1178,8 @@ "adR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Pilot's Office"; - req_one_access_txt = "3;22;19" + req_one_access_txt = "3;22;19"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -1365,7 +1366,8 @@ "aeD" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ req_one_access = null; - req_one_access_txt = "2;7" + req_one_access_txt = "2;7"; + access_modified = 1 }, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -1842,7 +1844,8 @@ dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -1912,7 +1915,8 @@ /obj/structure/machinery/door/airlock/almayer/maint{ req_access = null; req_one_access = null; - req_one_access_txt = "3;22;19" + req_one_access_txt = "3;22;19"; + access_modified = 1 }, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -2137,7 +2141,8 @@ /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Commanding Officer's Quarters"; req_access = null; - req_access_txt = "31" + req_access_txt = "31"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -2162,7 +2167,8 @@ dir = 1; req_access = null; req_one_access = null; - req_one_access_txt = "3;22;19" + req_one_access_txt = "3;22;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -2493,7 +2499,8 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ req_one_access = null; - req_one_access_txt = "7;19" + req_one_access_txt = "7;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -3740,7 +3747,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) "amq" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, /turf/open/floor/almayer{ @@ -3748,7 +3755,7 @@ }, /area/almayer/command/lifeboat) "ams" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -4886,10 +4893,6 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "apR" = ( -/obj/structure/pipes/vents/pump{ - name = "Secure Air Vent"; - welded = 1 - }, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 @@ -4897,6 +4900,10 @@ /obj/structure/machinery/alarm/almayer{ dir = 1 }, +/obj/structure/pipes/vents/pump/no_boom{ + welded = 1; + name = "Secure Reinforced Air Vent" + }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -5173,7 +5180,7 @@ }, /area/almayer/living/pilotbunks) "aqC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, @@ -5251,7 +5258,6 @@ name = "\improper Containment Cell 1"; unacidable = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 @@ -5264,12 +5270,13 @@ id = "Containment Breach"; name = "\improper Secure Airlock" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell) "aqS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -5853,7 +5860,8 @@ /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper AI Reception"; req_access = null; - req_one_access_txt = "91;92" + req_one_access_txt = "91;92"; + access_modified = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -6230,9 +6238,9 @@ /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1; name = "\improper Spare Bomb Suit"; - req_access = null; req_one_access = null; - req_one_access_txt = "35" + req_one_access_txt = "35"; + access_modified = 1 }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) @@ -6735,7 +6743,8 @@ /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; name = "Telecommunications"; - req_access_txt = "6" + req_access_txt = "6"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -6954,9 +6963,9 @@ "avk" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1; - req_access = null; req_one_access = null; - req_one_access_txt = "35" + req_one_access_txt = "35"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -7413,7 +7422,8 @@ dir = 1; name = "\improper Engineering Storage"; req_one_access = null; - req_one_access_txt = "2;7" + req_one_access_txt = "2;7"; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -7499,7 +7509,7 @@ }, /area/almayer/medical/hydroponics) "awR" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -7828,7 +7838,7 @@ }, /area/almayer/engineering/upper_engineering) "ayg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 5 }, /turf/open/floor/almayer{ @@ -8685,7 +8695,8 @@ dir = 2; name = "Morgue"; req_access_txt = "25"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -8762,7 +8773,7 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, -/obj/structure/pipes/vents/pump{ +/obj/structure/pipes/vents/pump/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -8786,7 +8797,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -8797,7 +8808,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -8829,7 +8840,8 @@ "aBf" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "Telecommunications"; - req_access_txt = "6" + req_access_txt = "6"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -8837,7 +8849,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -9067,7 +9079,8 @@ "aBP" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1; - req_one_access = list(36) + req_one_access = list(36); + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -9291,7 +9304,7 @@ id = "containmentlockdown_S"; name = "Containment Lockdown"; pixel_y = 28; - req_one_access_txt = "19;28" + req_one_access_txt = "28" }, /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -10083,7 +10096,8 @@ }, /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; - req_one_access = list(2,34,30) + req_one_access = list(2,34,30); + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10395,7 +10409,8 @@ name = "\improper Engineering Storage"; no_panel = 1; req_one_access = null; - req_one_access_txt = "2;7" + req_one_access_txt = "2;7"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10414,7 +10429,8 @@ name = "\improper Engineering Storage"; no_panel = 1; req_one_access = null; - req_one_access_txt = "2;7" + req_one_access_txt = "2;7"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10672,7 +10688,8 @@ /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper XO's Quarters"; req_access = null; - req_access_txt = "1" + req_access_txt = "1"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10699,7 +10716,8 @@ /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; name = "Telecommunications"; - req_access_txt = "6" + req_access_txt = "6"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -11607,7 +11625,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "aMR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -11615,7 +11633,7 @@ }, /area/almayer/command/lifeboat) "aMS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, @@ -12055,10 +12073,10 @@ }, /area/almayer/squads/alpha) "aPk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -12535,7 +12553,8 @@ dir = 2; name = "Morgue Processing"; req_access_txt = "25"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -15889,9 +15908,9 @@ /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 2; name = "\improper Chemistry Laboratory"; - req_access = null; req_access_txt = "20"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -16174,9 +16193,9 @@ /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 2; name = "\improper Nurse Office"; - req_access = null; req_access_txt = "20"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -16380,7 +16399,8 @@ dir = 2; name = "Firing Range"; req_access = null; - req_one_access_txt = "2;4;7;9;21" + req_one_access_txt = "2;4;7;9;21"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -17107,7 +17127,8 @@ dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -19597,7 +19618,8 @@ dir = 2; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -19905,7 +19927,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ dir = 1; name = "\improper Auxiliary Combat Support Secondary Preparations"; - req_one_access = "19;27;22" + req_one_access = "19;27;22"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -20489,7 +20512,7 @@ }, /area/almayer/living/bridgebunks) "bFD" = ( -/obj/structure/pipes/vents/pump{ +/obj/structure/pipes/vents/pump/no_boom{ dir = 1 }, /turf/open/floor/almayer{ @@ -20819,7 +20842,8 @@ dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -21090,7 +21114,8 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/generic{ name = "Storage"; - req_one_access = "2;21" + req_one_access = "2;21"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -21288,7 +21313,8 @@ /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; name = "\improper Auxiliary Support Officers Quarters"; - req_one_access_txt = "37" + req_one_access_txt = "37"; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -21476,7 +21502,8 @@ dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "7;19" + req_one_access_txt = "7;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -24967,7 +24994,8 @@ /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" + req_one_access_txt = "19;22"; + access_modified = 1 }, /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -25243,7 +25271,8 @@ dir = 2; name = "Firing Range"; req_access = null; - req_one_access_txt = "2;4;7;9;21" + req_one_access_txt = "2;4;7;9;21"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -27075,7 +27104,7 @@ }, /area/almayer/hallways/port_hallway) "ckn" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer, /area/almayer/command/lifeboat) "ckr" = ( @@ -27668,7 +27697,8 @@ /obj/structure/machinery/door/airlock/almayer/security/reinforced{ name = "\improper Astronavigational Deck"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -27679,7 +27709,8 @@ /obj/structure/machinery/door/airlock/almayer/security/reinforced{ name = "\improper Astronavigational Deck"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -27964,7 +27995,7 @@ }, /area/almayer/hull/upper_hull/u_a_s) "coJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 10 }, /turf/open/floor/almayer{ @@ -28832,7 +28863,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "cFZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -28999,7 +29030,6 @@ pixel_x = 16; pixel_y = 16 }, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 @@ -29018,6 +29048,7 @@ pixel_y = -6; req_one_access_txt = "19;28" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -29230,12 +29261,12 @@ }, /area/almayer/engineering/upper_engineering/starboard) "cQo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "sterile_green_side" @@ -31280,7 +31311,8 @@ dir = 2; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -32873,7 +32905,7 @@ }, /area/almayer/engineering/port_atmos) "eqD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 9 }, /turf/open/floor/almayer/research/containment/floor2{ @@ -34033,8 +34065,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ dir = 2; id_tag = "tc04"; - name = "\improper Treatment Center"; - req_access = null + name = "\improper Treatment Center" }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -34897,7 +34928,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ dir = 2; name = "\improper Requisitions Break Room"; - req_one_access = "2;21" + req_one_access = "19;21"; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35000,7 +35032,7 @@ }, /area/almayer/hull/upper_hull/u_a_s) "foI" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, /turf/open/floor/almayer, @@ -35030,7 +35062,7 @@ name = "Containment Lockdown"; pixel_x = 29; pixel_y = 3; - req_one_access_txt = "19;28" + req_one_access_txt = "28" }, /obj/structure/window/reinforced{ dir = 8; @@ -35207,7 +35239,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ name = "\improper Cryogenics Bay"; req_access = null; - req_one_access_txt = "1;3" + req_one_access_txt = "1;3"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -35713,7 +35746,8 @@ "fEo" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Kitchen"; - req_one_access_txt = "30;19" + req_one_access_txt = "30;19"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -35949,7 +35983,8 @@ "fIX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ name = "\improper Requisitions Auxiliary Storage Room"; - req_one_access = "19;21" + req_one_access = "19;21"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -36769,7 +36804,8 @@ /obj/structure/machinery/door/airlock/almayer/command{ name = "\improper Senior Enlisted Advisor's Office"; req_access = null; - req_access_txt = "19;29" + req_access_txt = "19;29"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -37310,7 +37346,8 @@ /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1; req_one_access = null; - req_one_access_txt = "7;19" + req_one_access_txt = "7;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -38053,7 +38090,7 @@ }, /area/almayer/squads/delta) "gEz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 6 }, /turf/open/floor/plating/plating_catwalk, @@ -38413,7 +38450,8 @@ "gMA" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 8; - req_one_access = list(2,34,30) + req_one_access = list(2,34,30); + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -39679,7 +39717,6 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "hqh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_x = 1; @@ -39689,6 +39726,7 @@ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/research/containment/entrance, /area/almayer/medical/containment/cell) "hqs" = ( @@ -40309,7 +40347,8 @@ /obj/structure/machinery/door/airlock/almayer/medical{ name = "Autopsy"; req_access_txt = "25"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -40432,7 +40471,8 @@ }, /obj/structure/machinery/door/airlock/almayer/maint{ req_access_txt = "200"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -40845,7 +40885,8 @@ dir = 2; name = "Morgue"; req_access_txt = "25"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -41487,7 +41528,8 @@ /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; req_one_access = null; - req_one_access_txt = "19;34;30" + req_one_access_txt = "19;34;30"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -41837,7 +41879,8 @@ "iqp" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_one_access = null; - req_one_access_txt = "37" + req_one_access_txt = "37"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -42160,9 +42203,6 @@ }, /area/almayer/engineering/laundry) "iwJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; pixel_y = -1 @@ -42171,6 +42211,9 @@ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, /turf/open/floor/almayer/research/containment/entrance{ dir = 8 }, @@ -42338,10 +42381,10 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "iAz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ dir = 10; icon_state = "sterile_green_side" @@ -42872,10 +42915,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) "iOp" = ( -/obj/structure/pipes/vents/pump, /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" }, +/obj/structure/pipes/vents/pump/no_boom, /turf/open/floor/almayer, /area/almayer/command/lifeboat) "iOD" = ( @@ -42974,7 +43017,8 @@ "iQL" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; - req_one_access = list(2,34,30) + req_one_access = list(2,34,30); + access_modified = 1 }, /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -43334,7 +43378,7 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "iZr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -43374,7 +43418,7 @@ }, /area/almayer/hallways/port_hallway) "iZL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 9 }, /turf/open/floor/plating/plating_catwalk, @@ -43878,7 +43922,8 @@ "jip" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Main Kitchen"; - req_one_access_txt = "30;19" + req_one_access_txt = "30;19"; + access_modified = 1 }, /turf/open/floor/prison{ icon_state = "kitchen" @@ -44041,18 +44086,17 @@ }, /area/almayer/shipboard/brig/perma) "jlA" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ dir = 5; icon_state = "sterile_green_side" }, /area/almayer/medical/containment) "jlG" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1; @@ -44062,6 +44106,7 @@ icon_state = "SW-out"; pixel_y = -1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/research/containment/entrance, /area/almayer/medical/containment/cell) "jlN" = ( @@ -45018,9 +45063,6 @@ id = "Containment Cell 3"; name = "\improper Containment Cell 3" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -45033,6 +45075,9 @@ id = "Containment Breach"; name = "\improper Secure Airlock" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -45445,8 +45490,7 @@ "jXf" = ( /obj/structure/machinery/door/airlock/almayer/medical{ id_tag = "or03"; - name = "Lobby"; - req_access = null + name = "Lobby" }, /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -45709,11 +45753,11 @@ }, /area/almayer/command/airoom) "kbJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ dir = 6; icon_state = "sterile_green_side" @@ -46826,7 +46870,6 @@ }, /area/almayer/hallways/hangar) "kCE" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_x = 1; @@ -46836,6 +46879,7 @@ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -46874,9 +46918,6 @@ }, /area/almayer/medical/lower_medical_medbay) "kDk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1; @@ -46887,6 +46928,9 @@ pixel_x = 1; pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -47023,7 +47067,7 @@ }, /area/almayer/hallways/aft_hallway) "kGQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer/research/containment/corner_var1{ @@ -47617,7 +47661,8 @@ "kUh" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" + req_one_access_txt = "19;22"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -47955,7 +48000,7 @@ }, /area/almayer/squads/charlie) "lbE" = ( -/obj/structure/pipes/vents/pump, +/obj/structure/pipes/vents/pump/no_boom, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -48417,6 +48462,9 @@ "lmz" = ( /turf/closed/wall/almayer/white/hull, /area/space) +"lmK" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/command/securestorage) "lmW" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ @@ -48932,7 +48980,8 @@ /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; req_one_access = null; - req_one_access_txt = "2;7" + req_one_access_txt = "2;7"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -49313,7 +49362,7 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "lDO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 10 }, /turf/open/floor/almayer{ @@ -50754,7 +50803,6 @@ }, /area/almayer/living/briefing) "mnW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/surface/table/almayer, /obj/item/device/reagent_scanner{ pixel_x = -8; @@ -50774,6 +50822,7 @@ pixel_x = 7; pixel_y = 7 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -51323,7 +51372,8 @@ /obj/structure/machinery/door/airlock/almayer/security/reinforced{ name = "\improper Astronavigational Deck"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -52111,7 +52161,8 @@ }, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ req_one_access = null; - req_one_access_txt = "19;30" + req_one_access_txt = "19;30"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -52341,7 +52392,7 @@ /turf/open/floor/carpet, /area/almayer/command/cichallway) "mWW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 10 }, /turf/open/floor/almayer/research/containment/floor2{ @@ -52598,7 +52649,8 @@ "nec" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_access_txt = "200"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -52793,7 +52845,8 @@ dir = 2; name = "\improper Chief Engineer's Office"; req_one_access = null; - req_one_access_txt = "1;6" + req_one_access_txt = "1;6"; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -52933,7 +52986,7 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -53118,7 +53171,6 @@ /turf/open/floor/plating, /area/almayer/engineering/starboard_atmos) "npt" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1; @@ -53128,6 +53180,7 @@ icon_state = "SW-out"; pixel_y = -1 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -53251,6 +53304,9 @@ icon_state = "green" }, /area/almayer/squads/req) +"ntj" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/command/computerlab) "ntm" = ( /obj/structure/sign/safety/maint{ pixel_x = -17; @@ -53399,7 +53455,7 @@ /turf/open/floor/almayer, /area/almayer/squads/req) "nwi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer/research/containment/corner{ @@ -54298,7 +54354,6 @@ }, /area/almayer/lifeboat_pumps/south1) "nPf" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/computer/cameras/almayer/containment{ dir = 8; pixel_x = -4; @@ -54316,6 +54371,7 @@ pixel_y = -4; req_one_access_txt = "19;28" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -54362,7 +54418,7 @@ name = "\improper Lifeboat Control Bubble"; req_access = null }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -54977,7 +55033,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) "ohR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 9 }, /turf/open/floor/almayer{ @@ -55347,7 +55403,7 @@ }, /area/almayer/squads/req) "opy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 6 }, /turf/open/floor/almayer{ @@ -55765,7 +55821,8 @@ /obj/structure/machinery/door/airlock/almayer/maint{ req_access = null; req_one_access = null; - req_one_access_txt = "19;29" + req_one_access_txt = "19;29"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -55963,7 +56020,7 @@ }, /area/almayer/hull/upper_hull/u_f_s) "oCO" = ( -/obj/structure/pipes/vents/pump{ +/obj/structure/pipes/vents/pump/no_boom{ dir = 8 }, /turf/open/floor/almayer, @@ -56774,7 +56831,7 @@ }, /area/almayer/squads/alpha) "oTP" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer, /area/almayer/command/lifeboat) "oUG" = ( @@ -56839,7 +56896,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; name = "\improper Kitchen Hydroponics"; - req_one_access_txt = "30;19" + req_one_access_txt = "30;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -57266,7 +57324,7 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "pjh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -57360,7 +57418,8 @@ dir = 2; name = "Brig"; req_access = null; - req_one_access_txt = "1;3" + req_one_access_txt = "1;3"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -57987,7 +58046,7 @@ }, /area/almayer/hull/upper_hull/u_a_s) "pCb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer, @@ -58088,7 +58147,7 @@ }, /area/almayer/squads/charlie) "pDL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 10 }, /turf/open/floor/plating/plating_catwalk, @@ -58405,7 +58464,8 @@ dir = 1; req_access = null; req_one_access = null; - req_one_access_txt = "3;22;19" + req_one_access_txt = "3;22;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -59445,10 +59505,9 @@ /area/almayer/hull/lower_hull/l_m_p) "qgK" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; +/obj/structure/machinery/door/airlock/almayer/generic/press{ name = "\improper Combat Correspondent Room"; - req_access = list(203) + dir = 1 }, /turf/open/floor/almayer, /area/almayer/command/combat_correspondent) @@ -60051,18 +60110,14 @@ }, /area/almayer/hallways/port_hallway) "quT" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 2; - id = "tc02"; - id_tag = "tc02"; - name = "\improper Treatment Center"; - req_access = null; - req_one_access = null; - req_one_access_txt = "2;8;19" - }, /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 2; + id_tag = "tc04"; + name = "\improper Treatment Center" + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -60417,7 +60472,7 @@ }, /area/almayer/hull/lower_hull/l_f_s) "qDz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "red" }, @@ -60789,7 +60844,6 @@ }, /area/almayer/hallways/port_hallway) "qLi" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1; @@ -60800,6 +60854,7 @@ pixel_x = 1; pixel_y = 1 }, +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -62506,7 +62561,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ name = "\improper Brig"; req_access = null; - req_one_access_txt = "1;3" + req_one_access_txt = "1;3"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -62927,15 +62983,6 @@ }, /area/almayer/squads/alpha_bravo_shared) "rHo" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 2; - id = "tc01"; - id_tag = "tc01"; - name = "\improper Treatment Center"; - req_access = null; - req_one_access = null; - req_one_access_txt = "2;8;19" - }, /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 }, @@ -62945,6 +62992,11 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 2; + id_tag = "tc04"; + name = "\improper Treatment Center" + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -63439,7 +63491,7 @@ }, /area/almayer/shipboard/brig/chief_mp_office) "rTB" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, @@ -64760,7 +64812,8 @@ id_tag = "CO-Office"; name = "\improper Commanding Officer's Office"; req_access = null; - req_access_txt = "31" + req_access_txt = "31"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -65221,7 +65274,7 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "sLt" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 }, /turf/open/floor/almayer, @@ -65637,7 +65690,7 @@ }, /area/almayer/medical/containment/cell) "sXd" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -65907,9 +65960,6 @@ id = "Containment Cell 2"; name = "\improper Containment Cell 2" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -65922,6 +65972,9 @@ id = "Containment Breach"; name = "\improper Secure Airlock" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -66264,7 +66317,8 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ req_one_access = null; - req_one_access_txt = "7;19" + req_one_access_txt = "7;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -67173,7 +67227,7 @@ }, /area/almayer/hull/upper_hull/u_f_s) "tCk" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -67505,7 +67559,8 @@ /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; name = "Storage"; - req_one_access = "2;21" + req_one_access = "2;21"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -67737,7 +67792,9 @@ "tPj" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ name = "\improper Requisition's Office"; - req_one_access_txt = "1;26" + req_one_access_txt = "1;26"; + req_one_access = null; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -67992,7 +68049,8 @@ /obj/structure/machinery/door/airlock/almayer/medical/glass{ name = "\improper CMO's Office"; req_one_access = null; - req_one_access_txt = "1;5" + req_one_access_txt = "1;5"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -68038,7 +68096,8 @@ /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/eastright{ dir = 8; - req_access_txt = "19" + req_access_txt = "19"; + access_modified = 1 }, /obj/effect/landmark/map_item, /obj/structure/machinery/door/window/eastleft{ @@ -68616,7 +68675,8 @@ /obj/structure/machinery/door/airlock/almayer/security{ name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -68961,7 +69021,7 @@ }, /area/almayer/medical/medical_science) "usB" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, @@ -70206,7 +70266,7 @@ }, /area/almayer/hull/upper_hull/u_a_s) "uSk" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 }, /turf/open/floor/almayer{ @@ -70493,7 +70553,6 @@ id = "medcryobeds"; id_tag = "medcryobeds"; name = "Medical Hypersleep Access"; - req_access = null; req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -71516,7 +71575,8 @@ name = "\improper Power Control Room"; req_access = null; req_one_access = null; - req_one_access_txt = "3;6" + req_one_access_txt = "3;6"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "orangefull" @@ -72051,7 +72111,8 @@ dir = 2; name = "\improper Field Surgery Equipment"; req_access_txt = "20"; - req_one_access = null + req_one_access = null; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -72555,7 +72616,7 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "vQu" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, /turf/open/floor/almayer{ @@ -73017,7 +73078,6 @@ }, /area/almayer/medical/lower_medical_medbay) "vYz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker{ pixel_x = 8 @@ -73039,6 +73099,7 @@ pixel_x = -1; pixel_y = 9 }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -73195,7 +73256,7 @@ }, /area/almayer/medical/operating_room_four) "wbR" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) "wbX" = ( @@ -73609,14 +73670,19 @@ }, /area/almayer/living/briefing) "wkc" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ - name = "\improper Engineering Storage"; - req_one_access_txt = "2;7;11" +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/eastright{ + dir = 8; + req_access_txt = "8"; + access_modified = 1 + }, +/obj/structure/machinery/door/window/eastleft{ + req_access_txt = "8" }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "sterile_green" }, -/area/almayer/hallways/hangar) +/area/almayer/medical/lockerroom) "wky" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73791,8 +73857,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ dir = 2; id_tag = "tc03"; - name = "\improper Treatment Center"; - req_access = null + name = "\improper Treatment Center" }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -74007,7 +74072,7 @@ }, /area/almayer/hallways/hangar) "wse" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer{ @@ -74133,7 +74198,8 @@ dir = 2; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19" + req_one_access_txt = "3;19"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -74685,7 +74751,8 @@ dir = 1; name = "\improper CMO's Bedroom"; req_access = null; - req_one_access_txt = "1;5" + req_one_access_txt = "1;5"; + access_modified = 1 }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -74795,9 +74862,9 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "wLy" = ( -/obj/structure/pipes/vents/pump{ - name = "Secure Air Vent"; - welded = 1 +/obj/structure/pipes/vents/pump/no_boom{ + welded = 1; + name = "Secure Reinforced Air Vent" }, /turf/open/floor/almayer/research/containment/floor2{ dir = 1 @@ -74847,7 +74914,7 @@ }, /area/almayer/living/grunt_rnr) "wLN" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, /turf/open/floor/almayer{ @@ -74921,7 +74988,8 @@ "wNU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; - req_one_access = list(2,34,30) + req_one_access = list(2,34,30); + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -75780,12 +75848,12 @@ }, /area/almayer/medical/operating_room_one) "xgg" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, /obj/structure/machinery/power/apc/almayer/hardened{ dir = 4 }, +/obj/structure/pipes/vents/pump/no_boom{ + dir = 8 + }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) "xgh" = ( @@ -76238,7 +76306,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ name = "\improper Brig"; req_access = null; - req_one_access_txt = "1;3" + req_one_access_txt = "1;3"; + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -76389,7 +76458,8 @@ /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; req_one_access = null; - req_one_access_txt = "30;19" + req_one_access_txt = "30;19"; + access_modified = 1 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -76448,7 +76518,6 @@ name = "\improper Containment Cell 5"; unacidable = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "W" }, @@ -76460,6 +76529,7 @@ id = "Containment Breach"; name = "\improper Secure Airlock" }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -77093,7 +77163,7 @@ }, /area/almayer/living/briefing) "xGU" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -77865,7 +77935,9 @@ /area/almayer/squads/alpha_bravo_shared) "xWo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access_txt = "19;21" + req_one_access_txt = "19;21"; + access_modified = 1; + req_one_access = null }, /turf/open/floor/almayer{ icon_state = "plate" @@ -77883,7 +77955,8 @@ "xWF" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; - req_one_access = list(2,34,30) + req_one_access = list(2,34,30); + access_modified = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -77927,13 +78000,13 @@ }, /area/almayer/medical/medical_science) "xXu" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, /obj/structure/machinery/camera/autoname/almayer{ dir = 1; name = "ship-grade camera" }, +/obj/structure/pipes/vents/pump/no_boom{ + dir = 1 + }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) "xYf" = ( @@ -77983,6 +78056,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"xYZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering) "xZz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/command/capt, @@ -101276,7 +101358,7 @@ bHB tIS bcm bcm -wkc +wXT cdA bcm bcm @@ -104717,7 +104799,7 @@ qjN hpN gfW omo -uFo +wkc gfW uFo omo @@ -108476,7 +108558,7 @@ vOy vOy wMO wky -ajl +sqf hon ajt mce @@ -108679,7 +108761,7 @@ vOy ayX kXw pxo -ajl +sqf kHT pjM aim @@ -108882,7 +108964,7 @@ vOy niL kXw pxo -ajl +sqf atL bkQ atL @@ -109694,7 +109776,7 @@ vOy vOy mFq vqW -ajl +sqf ybf aii avj @@ -117798,16 +117880,16 @@ adO aEp xTt aEp -ioU -ioU -ioU -ioU -ioU -aHq -aHq -aHq -aHq -aHq +lmK +lmK +lmK +lmK +lmK +ntj +ntj +ntj +ntj +ntj aHq cnH kzk @@ -121865,7 +121947,7 @@ arq arq arq aze -aBo +xYZ aDe arq arq diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index d7dcb49427a0..f8b3028a68ff 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -793,7 +793,7 @@ name = "Cell Lockdown 1"; pixel_x = -25; pixel_y = 9; - req_one_access_txt = "250;251;252" + req_one_access_txt = "390;391;392" }, /turf/open/shuttle/predship, /area/yautja) @@ -803,7 +803,7 @@ name = "Cell Lockdown 4"; pixel_x = -7; pixel_y = 9; - req_one_access_txt = "250;251;252" + req_one_access_txt = "390;391;392" }, /turf/closed/wall/huntership, /area/yautja) @@ -858,7 +858,7 @@ name = "Cell Lockdown 2"; pixel_x = -25; pixel_y = 9; - req_one_access_txt = "250;251;252" + req_one_access_txt = "390;391;392" }, /turf/open/shuttle/predship, /area/yautja) @@ -911,7 +911,7 @@ name = "Cell Lockdown 3"; pixel_x = -25; pixel_y = 9; - req_one_access_txt = "250;251;252" + req_one_access_txt = "390;391;392" }, /turf/open/shuttle/predship, /area/yautja) @@ -921,7 +921,7 @@ name = "Cell Lockdown 6"; pixel_x = -7; pixel_y = 9; - req_one_access_txt = "250;251;252" + req_one_access_txt = "390;391;392" }, /turf/closed/wall/huntership, /area/yautja) @@ -1587,7 +1587,7 @@ name = "Cell Lockdown 5"; pixel_x = -7; pixel_y = 9; - req_one_access_txt = "250;251;252" + req_one_access_txt = "390;391;392" }, /turf/closed/wall/huntership, /area/yautja) @@ -1788,9 +1788,9 @@ /area/yautja) "gr" = ( /obj/structure/closet/crate/secure{ + req_one_access_txt = "392"; color = "#6b675e"; - name = "Secure Yautja crate"; - req_one_access_txt = "252" + name = "Secure Yautja crate" }, /obj/item/explosive/grenade/spawnergrenade/hellhound, /obj/item/explosive/grenade/spawnergrenade/hellhound, @@ -1807,7 +1807,8 @@ name = "Armory Shutters"; needs_power = 0; pixel_x = 24; - req_one_access_txt = "252" + req_one_access_txt = "392"; + needs_power = 0 }, /turf/open/floor/corsat{ dir = 1; @@ -2423,9 +2424,9 @@ /area/yautja) "Bg" = ( /obj/structure/closet/crate/secure{ + req_one_access_txt = "392"; color = "#6b675e"; - name = "Secure Yautja crate"; - req_one_access_txt = "252" + name = "Secure Yautja crate" }, /obj/item/weapon/yautja/combistick, /obj/item/weapon/yautja/combistick{ diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index 9e7c1b047805..8ccfac333080 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -469,11 +469,7 @@ }, /area/shuttle/drop1/sulaco) "KC" = ( -/obj/structure/machinery/door/airlock/hatch/cockpit{ - req_access = null; - req_access_txt = "22"; - req_one_access = null - }, +/obj/structure/machinery/door/airlock/hatch/cockpit, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/shuttle/dropship{ icon_state = "rasputin15" diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index 6a4191679104..e5aaaa568590 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -693,11 +693,7 @@ }, /area/shuttle/drop2/sulaco) "VW" = ( -/obj/structure/machinery/door/airlock/hatch/cockpit/two{ - req_access = null; - req_access_txt = "22"; - req_one_access = null - }, +/obj/structure/machinery/door/airlock/hatch/cockpit/two, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/shuttle/dropship{ icon_state = "rasputin15"