diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index dcc8e4bf6c4b..044271be9b5a 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -42,6 +42,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_OT 35 #define ACCESS_MARINE_SYNTH 36 +#define ACCESS_MARINE_ASO 37 // AI Core Accesses /// Used in temporary passes diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index d598a8ff6f67..f110d3baaaac 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -72,10 +72,13 @@ var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST #define JOB_COMMAND_ROLES_LIST list(JOB_CO, JOB_XO, JOB_SO) var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST +#define JOB_AUXILIARY_OFFICER "Auxiliary Support Officer" #define JOB_PILOT "Pilot Officer" #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief" #define JOB_CREWMAN "Vehicle Crewman" #define JOB_INTEL "Intelligence Officer" +#define JOB_AUXILIARY_ROLES /datum/timelock/auxiliary +#define JOB_AUXILIARY_ROLES_LIST list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL) #define JOB_POLICE "Military Police" #define JOB_WARDEN "Military Warden" @@ -91,7 +94,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST #define JOB_ENGINEER_ROLES /datum/timelock/engineer #define JOB_ENGINEER_ROLES_LIST list(JOB_SQUAD_ENGI, JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER) -#define JOB_CHIEF_REQUISITION "Requisitions Officer" +#define JOB_CHIEF_REQUISITION "Quartermaster" #define JOB_CARGO_TECH "Cargo Technician" #define JOB_REQUISITION_ROLES /datum/timelock/requisition #define JOB_REQUISITION_ROLES_LIST list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 2895b3211fd3..5892709141c8 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -107,12 +107,12 @@ //================================================= //Role defines, specifically lists of roles for job bans, crew manifests and the like. -var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN) +var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN) //Marine roles -#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) +#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO) -var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT) +var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT) var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH) var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH) diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index e12ec1079589..4d9268220f2b 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -34,7 +34,8 @@ #define URL_WIKI_CMP_GUIDE "https://cm-ss13.com/wiki/Chief_MP" // MP Roles // #define URL_WIKI_MW_GUIDE "https://cm-ss13.com/wiki/Warden" #define URL_WIKI_MP_GUIDE "https://cm-ss13.com/wiki/Military_Police" -#define URL_WIKI_PO_GUIDE "https://cm-ss13.com/wiki/Pilot_Officer" // Auxiliary Support +#define URL_WIKI_ASO_GUIDE "https://cm-ss13.com/wiki/Auxiliary_Support_Officer" // Auxiliary Support +#define URL_WIKI_PO_GUIDE "https://cm-ss13.com/wiki/Pilot_Officer" #define URL_WIKI_DCC_GUIDE "https://cm-ss13.com/wiki/Dropship_Crew_Chief" #define URL_WIKI_IO_GUIDE "https://cm-ss13.com/wiki/Intelligence_Officer" #define URL_WIKI_SYN_GUIDE "https://cm-ss13.com/wiki/Synthetic" diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm index 4d13e7d285ca..cf77142ce5d6 100644 --- a/code/datums/factions/uscm.dm +++ b/code/datums/factions/uscm.dm @@ -77,6 +77,9 @@ if(JOB_SO) marine_rk = "so" border_rk = "command" + if(JOB_AUXILIARY_OFFICER) + marine_rk = "aso" + border_rk = "command" if(JOB_GENERAL, JOB_COLONEL, JOB_ACMC, JOB_CMC) marine_rk = "general" border_rk = "command" diff --git a/code/datums/skills.dm b/code/datums/skills.dm index b70b2bb9b7b0..f55b49b0f0f0 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -757,6 +757,20 @@ MILITARY NONCOMBATANT SKILL_INTEL = SKILL_INTEL_TRAINED, ) +/datum/skills/auxiliary_officer + name = "Auxiliary Support Officer" + skills = list( + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + ) + /datum/skills/pilot name = "Pilot Officer" skills = list( diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index d19cbd3a6dec..6ced81a22b15 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -317,6 +317,11 @@ icon_state = "livingspace" fake_zlevel = 2 +/area/almayer/living/auxiliary_officer_office + name = "\improper Auxiliary Support Officer office" + icon_state = "livingspace" + fake_zlevel = 2 + /area/almayer/squads/tankdeliveries name = "\improper Vehicle ASRS" icon_state = "req" diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 54f79ce32881..425a09afb591 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -156,6 +156,7 @@ ACCESS_MARINE_KITCHEN, ACCESS_MARINE_SYNTH, ACCESS_PRESS, + ACCESS_MARINE_ASO, ) /proc/get_all_weyland_access() diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index 37e0b01ad711..615df24ecb47 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -4,7 +4,7 @@ spawn_positions = 1 selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT - supervisors = "the acting commanding officer" + supervisors = "the auxiliary support officer" gear_preset = /datum/equipment_preset/uscm_ship/chef entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!" diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm new file mode 100644 index 000000000000..9196e1ffbd41 --- /dev/null +++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm @@ -0,0 +1,27 @@ +/datum/job/command/auxiliary_officer + title = JOB_AUXILIARY_OFFICER + total_positions = 1 + spawn_positions = 1 + allow_additional = TRUE + flags_startup_parameters = ROLE_ADD_TO_DEFAULT + gear_preset = /datum/equipment_preset/uscm_ship/auxiliary_officer + entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency." + +AddTimelock(/datum/job/command/auxiliary_officer, list( + JOB_SQUAD_ROLES = 5 HOURS, + JOB_REQUISITION_ROLES = 5 HOURS, + JOB_ENGINEERING_ROLES = 5 HOURS, + JOB_AUXILIARY_ROLES = 5 HOURS, +)) + +/obj/effect/landmark/start/auxiliary_officer + name = JOB_AUXILIARY_OFFICER + icon_state = "dcc_spawn" //add unique sprite here - Morrow + job = /datum/job/command/auxiliary_officer + +/datum/timelock/auxiliary + name = "Auxiliary Roles" + +/datum/timelock/requisition/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_AUXILIARY_ROLES_LIST diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index 3bf7f0bcd33e..5f846bf6581e 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -4,6 +4,7 @@ spawn_positions = 2 allow_additional = TRUE scaled = TRUE + supervisors = "the pilot officers" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/dcc entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot." diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index f30bb62e8d72..10b8381c417e 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -5,6 +5,7 @@ spawn_positions = 3 allow_additional = 1 scaled = 1 + supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = "USCM Intelligence Officer (IO) (Cryo)" entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index b7c9d15fa366..57495fe8be28 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -4,6 +4,7 @@ spawn_positions = 2 allow_additional = TRUE scaled = TRUE + supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/po entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason." diff --git a/code/game/jobs/job/logistics/logistics.dm b/code/game/jobs/job/logistics/logistics.dm index 6c0a2d0447e1..ef4364354067 100644 --- a/code/game/jobs/job/logistics/logistics.dm +++ b/code/game/jobs/job/logistics/logistics.dm @@ -1,5 +1,5 @@ /datum/job/logistics - supervisors = "the acting commanding officer" + supervisors = "the auxiliary support officer" total_positions = 1 spawn_positions = 1 diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 24b60079692b..7436e2079af6 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -2,7 +2,7 @@ name = "\improper ColMarTech Senior Officer Equipment Rack" desc = "An automated equipment vendor for Senior Officers." req_access = list(ACCESS_MARINE_SENIOR) - vendor_role = list(JOB_CHIEF_POLICE,JOB_CMO,JOB_XO,JOB_CHIEF_ENGINEER,JOB_CHIEF_REQUISITION) + vendor_role = list(JOB_CHIEF_POLICE, JOB_CMO, JOB_XO, JOB_CHIEF_ENGINEER, JOB_CHIEF_REQUISITION, JOB_AUXILIARY_OFFICER) /obj/structure/machinery/cm_vending/clothing/senior_officer/get_listed_products(mob/user) if(!user) @@ -23,6 +23,8 @@ return GLOB.cm_vending_clothing_cmo else if(user.job == JOB_CHIEF_POLICE) return GLOB.cm_vending_clothing_military_police_chief + else if(user.job == JOB_AUXILIARY_OFFICER) + return GLOB.cm_vending_clothing_auxiliary_officer return ..() @@ -308,3 +310,38 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Officer Cap", 0, /obj/item/clothing/head/cmcap/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), )) + +//------------ AUXILIARY SUPPORT OFFICER --------------- +GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list( + + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("Officer Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/ro, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY), + list("Auxiliary Support Officer Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service/aso, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), + list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("M44 Custom Revolver", 0, /obj/item/storage/belt/gun/m44/custom, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + + list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), + + list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + 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("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Empty)", 0, /obj/item/storage/pouch/tools, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + )) diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 3113b38e6e41..4ca2a54af4bf 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -217,6 +217,13 @@ icon_state = "bridge_coat_grey" valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_MEDAL) +/obj/item/clothing/suit/storage/jacket/marine/service/aso + name = "auxiliary support officer jacket" + desc = "A comfortable vest for officers who are expected to work long hours staring at rows of numbers and inspecting equipment from knives to torpedos to entire dropships." + icon_state = "aso_jacket" + blood_overlay_type = "coat" + flags_armor_protection = BODY_FLAG_CHEST + has_buttons = FALSE //=========================//PROVOST\\================================\\ diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 36535a0b5141..a639abc0ef82 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -902,10 +902,11 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) RAIDER_OFFICER_SQUAD = 11, JOB_SO = 12, JOB_SEA = 13, - // 20-29: Aux Command (Synth isn't Aux head, but important - make him bold) - JOB_SYNTH = 20, - JOB_PILOT = 21, - JOB_DROPSHIP_CREW_CHIEF = 22, + // 20-29: Aux Command + JOB_AUXILIARY_OFFICER = 20, + JOB_SYNTH = 21, + JOB_PILOT = 22, + JOB_DROPSHIP_CREW_CHIEF = 23, JOB_INTEL = 24, // 30-39: Security JOB_CHIEF_POLICE = 30, @@ -929,11 +930,11 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) // 60-69: Cargo JOB_CHIEF_REQUISITION = 60, JOB_CARGO_TECH = 61, + JOB_MESS_SERGEANT = 62, // 70-139: SQUADS (look below) // 140+: Civilian/other JOB_CORPORATE_LIAISON = 140, - JOB_MESS_SERGEANT = 141, - JOB_PASSENGER = 142, + JOB_PASSENGER = 141, // Non Almayer jobs lower then registered JOB_SYNTH_SURVIVOR = 150, JOB_SURVIVOR = 151, diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 75d661da503f..0f8506ce9d5f 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -202,7 +202,7 @@ ) assignment = JOB_CHIEF_ENGINEER rank = JOB_CHIEF_ENGINEER - paygrade = "MO2" + paygrade = "MO1" role_comm_title = "CE" minimum_age = 27 skills = /datum/skills/CE @@ -308,7 +308,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/ro - name = "USCM Requisitions Officer (RO)" + name = "USCM Quartermaster (QM)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -326,8 +326,8 @@ ) assignment = JOB_CHIEF_REQUISITION rank = JOB_CHIEF_REQUISITION - paygrade = "MO2" - role_comm_title = "RO" + paygrade = "ME7" + role_comm_title = "QM" minimum_age = 27 skills = /datum/skills/RO @@ -615,6 +615,62 @@ //*****************************************************************************************************/ +/datum/equipment_preset/uscm_ship/auxiliary_officer + name = "USCM Auxiliary Support Officer (ASO)" + flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE + + idtype = /obj/item/card/id/silver + assignment = JOB_AUXILIARY_OFFICER + rank = JOB_AUXILIARY_OFFICER + paygrade = "MO2" + role_comm_title = "ASO" + minimum_age = 27 + skills = /datum/skills/auxiliary_officer + + minimap_icon = list("cic" = MINIMAP_ICON_COLOR_HEAD) + minimap_background = MINIMAP_ICON_BACKGROUND_CIC //Add unique sprite here and above - Morrow + +/datum/equipment_preset/uscm_ship/auxiliary_officer/New() + . = ..() + access = list( + ACCESS_MARINE_ASO, + ACCESS_MARINE_COMMAND, + ACCESS_MARINE_BRIG, + ACCESS_MARINE_ARMORY, + ACCESS_MARINE_MEDBAY, + ACCESS_MARINE_CE, + ACCESS_MARINE_ENGINEERING, + ACCESS_MARINE_MAINT, + ACCESS_MARINE_OT, + ACCESS_MARINE_RO, + ACCESS_MARINE_CARGO, + ACCESS_MARINE_PREP, + ACCESS_MARINE_ALPHA, + ACCESS_MARINE_BRAVO, + ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_DELTA, + ACCESS_MARINE_PILOT, + ACCESS_MARINE_DROPSHIP, + ACCESS_MARINE_KITCHEN, + ACCESS_PRESS, + ) + +/datum/equipment_preset/uscm_ship/auxiliary_officer/load_gear(mob/living/carbon/human/new_human) + var/back_item = /obj/item/storage/backpack/satchel + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) + back_item = /obj/item/storage/backpack/marine + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) //Preset gear - Morrow + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service/aso(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_STORE) + +//*****************************************************************************************************/ + /datum/equipment_preset/uscm_ship/po name = "USCM Pilot (DP) (Cryo)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index f8c86f9c5171..0cf0c7bf9a8a 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -245,6 +245,8 @@ return /datum/equipment_preset/uscm_ship/so if(JOB_XO) return /datum/equipment_preset/uscm_ship/xo + if(JOB_AUXILIARY_OFFICER) + return /datum/equipment_preset/uscm_ship/auxiliary_officer if(JOB_INTEL) return /datum/equipment_preset/uscm/intel/full if(JOB_PILOT) diff --git a/colonialmarines.dme b/colonialmarines.dme index 2b3b08984dfa..11c35963edf9 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -704,6 +704,7 @@ #include "code\game\jobs\job\civilians\support\synthetic.dm" #include "code\game\jobs\job\civilians\support\working_joe.dm" #include "code\game\jobs\job\command\command.dm" +#include "code\game\jobs\job\command\auxiliary\auxiliary_support_officer.dm" #include "code\game\jobs\job\command\auxiliary\crew_chief.dm" #include "code\game\jobs\job\command\auxiliary\intel.dm" #include "code\game\jobs\job\command\auxiliary\pilot.dm" diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi index 32c1d71e68cb..05390b270254 100644 Binary files a/icons/mob/hud/marine_hud.dmi and b/icons/mob/hud/marine_hud.dmi differ diff --git a/icons/mob/hud/sec_hud.dmi b/icons/mob/hud/sec_hud.dmi index 9c1c4052caaf..9cc3e66c3e0b 100644 Binary files a/icons/mob/hud/sec_hud.dmi and b/icons/mob/hud/sec_hud.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index f0daf54e7ac9..19f2a2f6f68b 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index 3a2ba038bef4..232e74695a1b 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index f8c9cc99d534..65844dbd6c58 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -5211,6 +5211,12 @@ icon_state = "plate" }, /area/almayer/medical/medical_science) +"aqI" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "aqJ" = ( /turf/open/floor/almayer{ dir = 5; @@ -19333,7 +19339,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bBa" = ( /turf/open/floor/almayer{ dir = 4; @@ -19514,19 +19520,31 @@ }, /area/almayer/hallways/aft_hallway) "bBD" = ( -/obj/structure/bed/chair{ - dir = 4 - }, /obj/structure/machinery/firealarm{ pixel_y = 28 }, /obj/structure/sign/safety/maint{ pixel_x = -17 }, +/obj/structure/surface/table/almayer, +/obj/structure/transmitter/rotary{ + name = "Telephone"; + phone_category = "Almayer"; + phone_id = "Auxiliary Support Office Second Line"; + pixel_x = -5; + pixel_y = 3 + }, +/obj/structure/transmitter/rotary{ + name = "Telephone"; + phone_category = "Almayer"; + phone_id = "Auxiliary Support Office"; + pixel_x = 8; + pixel_y = 8 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bBN" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -20425,7 +20443,7 @@ "bFr" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bFs" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -21122,7 +21140,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bII" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -21262,8 +21280,8 @@ "bJl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; - name = "\improper Tanker Quarters"; - req_one_access_txt = "19;27" + name = "\improper Auxiliary Support Officers Quarters"; + req_one_access_txt = "37" }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -21276,7 +21294,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bJo" = ( /turf/closed/wall/almayer, /area/almayer/hallways/repair_bay) @@ -23773,20 +23791,15 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/surface/table/almayer, -/obj/item/paper_bin, -/obj/item/tool/pen, -/obj/item/clothing/mask/rebreather/scarf, -/obj/item/clothing/mask/rebreather/scarf, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bTS" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bTT" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -23794,11 +23807,14 @@ "bTU" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, +/obj/item/dogtag{ + desc = "A blank marine's information dog tag. \"Ranger\" and a pawprint is scratched into it." + }, /obj/item/device/megaphone, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bTV" = ( /obj/item/bedsheet/brown{ pixel_y = 13 @@ -24430,7 +24446,7 @@ /obj/structure/machinery/door/window/eastright, /obj/structure/window/reinforced/tinted/frosted, /turf/open/floor/plating/plating_catwalk, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "bWK" = ( /obj/structure/bed/chair{ dir = 1 @@ -26236,10 +26252,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_umbilical) -"cey" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_f_p) "ceC" = ( /obj/structure/machinery/light, /obj/structure/bed/chair{ @@ -27937,10 +27949,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"coo" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/tankerbunks) "cop" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) @@ -28703,6 +28711,13 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) +"cDZ" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "cEg" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -32329,6 +32344,11 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"efL" = ( +/obj/effect/landmark/start/bridge, +/obj/effect/landmark/start/auxiliary_officer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/bridgebunks) "efU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -32461,7 +32481,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/lower_hull/l_f_p) +/area/almayer/living/tankerbunks) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -34417,10 +34437,6 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) -"eZX" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_f_p) "fau" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -35017,6 +35033,10 @@ icon_state = "emeraldcorner" }, /area/almayer/squads/charlie) +"foN" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "foP" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -38918,12 +38938,8 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "gZK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, /turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "ham" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -38977,6 +38993,15 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"hbu" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "hbx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -39782,11 +39807,6 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"hum" = ( -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/tankerbunks) "huK" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -40074,7 +40094,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/hull/lower_hull/l_f_s) "hzP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/power/apc/almayer{ @@ -40637,6 +40657,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"hPh" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "hPo" = ( /obj/structure/surface/rack, /obj/item/tool/wet_sign, @@ -41348,6 +41375,13 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"ifb" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "iff" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -41802,12 +41836,12 @@ "iqp" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_one_access = null; - req_one_access_txt = "19;27" + req_one_access_txt = "37" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "iqx" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -42430,6 +42464,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"iEg" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "iEr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43230,8 +43270,11 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "iYf" = ( /obj/structure/machinery/cm_vending/clothing/medical_crew{ density = 0; @@ -43741,7 +43784,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "jgu" = ( /obj/structure/sink{ dir = 4; @@ -45105,14 +45148,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"jPz" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_p) "jQt" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 8 @@ -45705,6 +45740,9 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/squads/bravo) +"kcp" = ( +/turf/closed/wall/almayer, +/area/almayer/living/auxiliary_officer_office) "kcH" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/synthcloset) @@ -47800,6 +47838,16 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) +"kZN" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "kZV" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -48964,7 +49012,6 @@ }, /area/almayer/squads/charlie) "lxo" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew, /obj/structure/sign/safety/hazard{ pixel_x = -17; pixel_y = -8 @@ -48976,20 +49023,15 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "lxW" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/structure/sign/prop2{ + pixel_y = 29 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "lyi" = ( /obj/structure/surface/table/almayer, /obj/item/trash/pistachios, @@ -49020,6 +49062,16 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) +"lyX" = ( +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + req_access = null; + req_access_txt = 37; + req_one_access = null + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "lzj" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -52436,7 +52488,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) @@ -52782,7 +52834,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "niY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -55232,7 +55284,6 @@ "onY" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, -/obj/item/attachable/bayonet, /obj/item/device/flashlight/lamp{ pixel_x = -8; pixel_y = 12 @@ -55240,7 +55291,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "oog" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -56370,20 +56421,16 @@ }, /area/almayer/squads/req) "oMi" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/microwave{ - pixel_y = 6 - }, /obj/structure/machinery/status_display{ pixel_y = 30 }, /obj/structure/sign/safety/rewire{ pixel_x = 32 }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "oMs" = ( /obj/structure/machinery/computer/cameras/almayer{ dir = 1 @@ -56554,10 +56601,25 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/tool/pen, +/obj/item/book/manual/marine_law{ + pixel_x = 15; + pixel_y = 5 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 16; + pixel_y = 9 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 8; + icon_state = "silver" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "oRj" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -57415,7 +57477,7 @@ dir = 5 }, /turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "pqc" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -59208,7 +59270,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "qdk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59462,6 +59524,16 @@ /obj/structure/sign/dartboard, /turf/closed/wall/almayer, /area/almayer/hallways/hangar) +"qih" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Tanker Quarters"; + req_one_access_txt = "19;27" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "qim" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -61664,8 +61736,21 @@ /obj/structure/pipes/vents/scrubber{ dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.5; + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/attachable/bayonet{ + pixel_x = -14; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/auxiliary_officer_office) "rgW" = ( /turf/open/floor/almayer{ icon_state = "emeraldcorner" @@ -61685,15 +61770,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"rix" = ( -/obj/structure/largecrate/supply/ammo/m41a/half, -/obj/structure/largecrate/supply/ammo/pistol/half{ - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_p) "riA" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -63023,6 +63099,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"rKA" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "rKO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65575,12 +65662,12 @@ /area/almayer/hallways/hangar) "sXE" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Tanker's Room" + name = "\improper Auxiliary Support Officer's Room" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "sXK" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66176,6 +66263,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"tjw" = ( +/obj/structure/machinery/cm_vending/clothing/vehicle_crew{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "tjU" = ( /obj/structure/bed/chair/wood/normal, /obj/item/bedsheet/brown, @@ -68860,13 +68954,10 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "utX" = ( /turf/closed/wall/almayer/research/containment/wall/connect_e2{ icon_state = "containment_wall_connect_e" @@ -73107,11 +73198,8 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, /turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "wdo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74170,12 +74258,6 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"wza" = ( -/obj/structure/machinery/cm_vending/clothing/vehicle_crew, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/tankerbunks) "wzg" = ( /obj/structure/bed/chair{ dir = 4 @@ -74474,8 +74556,9 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, +/obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "wHo" = ( /turf/open/floor/almayer{ icon_state = "emerald" @@ -75005,19 +75088,13 @@ /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell) "wTN" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/cups{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets, /obj/structure/machinery/power/apc/almayer{ dir = 1 }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/living/auxiliary_officer_office) "wUd" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -77253,6 +77330,21 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"xNz" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 7 + }, +/obj/item/storage/box/cups{ + pixel_x = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 19 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "xNB" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/security{ @@ -77676,6 +77768,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"xVT" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/closed/wall/almayer, +/area/almayer/living/tankerbunks) "xWd" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -91119,7 +91221,7 @@ uNL tVf mGL oxp -bSv +kcp bWJ nar alU @@ -91322,7 +91424,7 @@ mGL poR mGL pNp -bSv +kcp bTS bIA alU @@ -91521,13 +91623,13 @@ hJp oPI uNL hJp -bSv -bSv +kcp +kcp iqp -bSv -bSv +kcp +kcp jgl -bSv +kcp alU alU alU @@ -91724,13 +91826,13 @@ mGL dqd uNL hJp -bSv +kcp bBD bTS -wza +bTS lxo qcy -bSv +kcp bAg edM egq @@ -91748,11 +91850,11 @@ jjs jjs jjs jYd -bzy -fIH -nqU -vhq -nqU +bSv +bSv +bSv +bSv +bSv nqU vRz aag @@ -91927,13 +92029,13 @@ pzZ ijp uNL mGL -bSv +kcp bTR -bTH +iEg oQM -hum -bTH -bSv +aqI +aqI +kcp bzA bBB bBB @@ -91951,11 +92053,11 @@ afz afz afz iDd -bzy -rix -wlL -vhq -vhq +qih +bTH +foN +cDZ +bSv pch vRz aag @@ -92130,13 +92232,13 @@ uNL uNL uNL mGL -bSv +kcp lxW -bTH +hPh wGX bFr ppe -bSv +kcp bzA bKh bKh @@ -92154,11 +92256,11 @@ afz afz afz iDd -bzy -mzo -mzo -mzo -vhq +bSv +tjw +bTH +bTV +bSv nqU vRz aag @@ -92333,11 +92435,11 @@ qDv aLk uNL xCR -bSv +kcp wTN -bTH +kZN rgK -bTH +hbu iYe bJl bKa @@ -92357,11 +92459,11 @@ afC afz afz bRx -bzy -cEY -fIH -mzo -rpW +bSv +ifb +bTH +bSv +xVT kAs vRz aag @@ -92536,13 +92638,13 @@ kmM eqk uNL hJp -bSv +kcp oMi bAZ bTS bTS niR -bSv +kcp bzA bKh bKh @@ -92560,10 +92662,10 @@ afz afz afz iDd -bzy -cey -eZX -mzo +bSv +aIX +aIX +bSv ehZ eXo vRz @@ -92739,13 +92841,13 @@ hJp hJp uNL hJp -bSv -bSv -bSv +kcp +kcp +kcp sXE -bSv -bSv -bSv +kcp +kcp +kcp bzA bBB bBB @@ -92763,10 +92865,10 @@ afz afz afz iDd -bzy -vhq -wqE -mzo +bSv +cop +cop +bSv vhq nqU vRz @@ -92942,13 +93044,13 @@ aSY hJp uNL hJp -coo -bSv +dqd +kcp bTU gZK -aIX -aIX -bSv +bTS +lyX +kcp bAr bKh bBB @@ -92966,10 +93068,10 @@ eGg eGg eGg jYd -bzy -nqU -jPz -mzo +bSv +kBY +bTn +bSv vhq vhq vRz @@ -93145,13 +93247,13 @@ uNL lgY uNL mGL -cop -bSv +hJp +kcp onY wdf -cop -cop -bSv +bTS +kcp +kcp bzy bKh bBB @@ -93169,10 +93271,10 @@ hdh hdh hdh bRD -bzy -qOU -mzo -mzo +bSv +bSv +bSv +bSv mzo qOU vRz @@ -93349,12 +93451,12 @@ hJp qee mGL hzM -bSv -bTV +kcp +xNz utK -kBY -bTn -bSv +rKA +kcp +kcp bzy bXs bBB @@ -93551,13 +93653,13 @@ aQv aQv bcm bcm -bSv -bSv -bSv -bSv -bSv -bSv -bSv +kcp +kcp +kcp +kcp +kcp +kcp +kcp bzy bZL cat @@ -96723,7 +96825,7 @@ uiZ mKq qCy rpp -vCO +efL vCO vCO jxB