diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 949f9385e8..87e53a3d80 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -14,7 +14,7 @@ // Job name defines #define JOB_SQUAD_MARINE "Rifleman" -#define JOB_SQUAD_LEADER "Platoon Sergeant" +#define JOB_SQUAD_LEADER "Section Sergeant" #define JOB_SQUAD_ENGI "Combat Technician" #define JOB_SQUAD_MEDIC "Platoon Corpsman" #define JOB_SQUAD_SPECIALIST "Weapons Specialist" diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 3a3a2473ec..42b7144059 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -138,7 +138,7 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE) -var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE) +var/global/list/ROLES_AI = list(JOB_SO, JOB_SYNTH, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE) var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER) //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc. #define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\ diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm index fd97ea4ae3..a35d5c81ff 100644 --- a/code/datums/factions/uscm.dm +++ b/code/datums/factions/uscm.dm @@ -31,7 +31,7 @@ if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd" if(squad.squad_leader == current_human) switch(squad.squad_type) - if("Platoon") marine_rk = "leader_a" + if("Section") marine_rk = "leader_a" if("Team") marine_rk = "soctl_a" current_human.langchat_styles = "langchat_bolded" // bold text for bold leaders diff --git a/code/game/area/golden_arrow.dm b/code/game/area/golden_arrow.dm index 11656d7da4..8970a103d9 100644 --- a/code/game/area/golden_arrow.dm +++ b/code/game/area/golden_arrow.dm @@ -51,7 +51,7 @@ icon_state = "port" /area/golden_arrow/platoon_sergeant - name = "\improper Platoon Sergeant Office" + name = "\improper Section Sergeant Office" icon_state = "alpha" /area/golden_arrow/squad_one diff --git a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm index 8d41f5282b..297ca11db2 100644 --- a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm +++ b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm @@ -17,6 +17,9 @@ role_mappings = list( /datum/job/command/bridge/ai = JOB_SO, + /datum/job/civilians/support/synthetic/ai = JOB_SYNTH, + /datum/job/command/auxiliary/pilot/ai = JOB_PILOT, + /datum/job/command/auxiliary/crew_chief/ai = JOB_DROPSHIP_CREW_CHIEF, /datum/job/marine/leader/ai = JOB_SQUAD_LEADER, /datum/job/marine/medic/ai = JOB_SQUAD_MEDIC, /datum/job/marine/tl/ai = JOB_SQUAD_TEAM_LEADER, diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm index 3e02385bc9..8125fac799 100644 --- a/code/game/jobs/job/civilians/support/synthetic.dm +++ b/code/game/jobs/job/civilians/support/synthetic.dm @@ -50,3 +50,7 @@ name = JOB_SYNTH icon_state = "syn_spawn" job = /datum/job/civilian/synthetic + +/datum/job/civilians/support/synthetic/ai + total_positions = 1 + spawn_positions = 1 diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index c8dfe2a8eb..967a275488 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -3,7 +3,7 @@ total_positions = 2 spawn_positions = 2 allow_additional = TRUE - scaled = TRUE + scaled = FALSE supervisors = "the pilot officers" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/dcc @@ -17,3 +17,7 @@ AddTimelock(/datum/job/command/crew_chief, list( name = JOB_DROPSHIP_CREW_CHIEF icon_state = "dcc_spawn" job = /datum/job/command/crew_chief + +/datum/job/command/auxiliary/crew_chief/ai + total_positions = 1 + spawn_positions = 1 diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index a75846f929..cb64305466 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -3,7 +3,7 @@ total_positions = 2 spawn_positions = 2 allow_additional = TRUE - scaled = TRUE + scaled = FALSE supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/po @@ -18,3 +18,7 @@ AddTimelock(/datum/job/command/pilot, list( name = JOB_PILOT icon_state = "po_spawn" job = /datum/job/command/pilot + +/datum/job/command/auxiliary/pilot/ai + total_positions = 1 + spawn_positions = 1 diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index 869336c561..ae3a0bc140 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -9,7 +9,7 @@ supervisors = "the acting commanding officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/leader - entry_message_body = "You are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way." + entry_message_body = "You are responsible for the men and women of your section. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way." job_options = list(GYSGT_VARIANT = "GYSGT", SSGT_VARIANT = "SSGT") diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 23db6c1e8d..6c17f91ed0 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -11,8 +11,8 @@ var/sub_leader /datum/squad_type/marine_squad - name = "Platoon" - lead_name = "Platoon Sergeant" + name = "Section" + lead_name = "Section Sergeant" lead_icon = "leader" sub_squad = "Squad" sub_leader = "Squad Sergeant" @@ -70,7 +70,7 @@ var/faction = FACTION_MARINE /// What will the assistant squad leader be called - var/squad_type = "Platoon" //Referenced for aSL details. Squad/Team/Cell etc. + var/squad_type = "Section" //Referenced for aSL details. Squad/Team/Cell etc. /// Squad leaders icon var/lead_icon //Referenced for SL's 'L' icon. If nulled, won't override icon for aSLs. diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 1f7c20a648..ad2e333b2b 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -20,7 +20,7 @@ maxf = 1489 var/list/inbuilt_tracking_options = list( - "Platoon Sergeant" = TRACKER_SL, + "Section Sergeant" = TRACKER_SL, "Squad Sergeant" = TRACKER_FTL, "Landing Zone" = TRACKER_LZ ) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index ab37fb091b..5bbeccb7fb 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -76,8 +76,8 @@ new /obj/item/clothing/shoes/black(src) /obj/structure/closet/secure_closet/platoon_sergeant - name = "platoon sergeant locker" - desc = "A secure storage unit for the platoon sergeant." + name = "section sergeant locker" + desc = "A secure storage unit for the section sergeant." req_one_access = list(ACCESS_MARINE_LEADER) /obj/structure/closet/secure_closet/platoon_sergeant/Initialize() diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index eda8bb1737..f829e08052 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -388,9 +388,9 @@ return TRUE current_squad.send_message(input, 1) //message, adds username - current_squad.send_maptext(input, "Platoon Message:") - visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to all Marines of platoon '[current_squad]'.")]") - log_overwatch("[key_name(user)] sent '[input]' to platoon [current_squad].") + current_squad.send_maptext(input, "Section Message:") + visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to all Marines of section '[current_squad]'.")]") + log_overwatch("[key_name(user)] sent '[input]' to section [current_squad].") var/comm_paygrade = user.get_paygrade() @@ -405,20 +405,20 @@ if(!current_squad) return TRUE - var/input = tgui_input_text(user, "Please write a message to announce to the Platoon leader:", "SL Message") + var/input = tgui_input_text(user, "Please write a message to announce to the Section leader:", "SL Message") if(!input) return TRUE current_squad.send_message(input, 1, 1) //message, adds username, only to leader - current_squad.send_maptext(input, "Platoon Sergeant Message:", 1) - visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to Platoon Sergeant [current_squad.squad_leader] of platoon '[current_squad]'.")]") - log_overwatch("[key_name(user)] sent '[input]' to Platoon Sergeant [current_squad.squad_leader] of squad [current_squad].") + current_squad.send_maptext(input, "Section Sergeant Message:", 1) + visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to Section Sergeant [current_squad.squad_leader] of section '[current_squad]'.")]") + log_overwatch("[key_name(user)] sent '[input]' to Section Sergeant [current_squad.squad_leader] of section [current_squad].") var/comm_paygrade = user.get_paygrade() for(var/mob/dead/observer/cycled_observer in GLOB.player_list) if(cycled_observer.client && cycled_observer.client.prefs && (cycled_observer.client.prefs.toggles_chat & CHAT_GHOSTRADIO)) - var/ghost_message = "[comm_paygrade][user] (F) messaged platoon leader of '[current_squad]': \"[input]\"" + var/ghost_message = "[comm_paygrade][user] (F) messaged section leader of '[current_squad]': \"[input]\"" cycled_observer.show_message(ghost_message) return TRUE diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index bd7718f247..60c9f4e512 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -359,14 +359,14 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/leader - name = "USCM Platoon Sergeant" + name = "USCM Section Sergeant" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER paygrade = "ME7" - role_comm_title = "PltSgt" + role_comm_title = "SctSgt" minimum_age = 27 skills = /datum/skills/SL @@ -380,7 +380,7 @@ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/leader/cryo - name = "USCM Cryo Platoon Sergeant" + name = "USCM Cryo Section Sergeant" auto_squad_name = SQUAD_MARINE_CRYO /datum/equipment_preset/uscm/leader/cryo/load_gear(mob/living/carbon/human/new_human) @@ -442,7 +442,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/leader_equipped - name = "USCM Platoon Sergeant (Equipped)" + name = "USCM Section Sergeant (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human) @@ -452,7 +452,7 @@ assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER paygrade = "ME7" - role_comm_title = "PltSgt" + role_comm_title = "SctSgt" minimum_age = 27 skills = /datum/skills/SL @@ -478,7 +478,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/leader_equipped/cryo - name = "USCM Cryo Platoon Sergeant (Equipped)" + name = "USCM Cryo Section Sergeant (Equipped)" auto_squad_name = SQUAD_MARINE_CRYO //*****************************************************************************************************/ diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 2dbe1caedd..00c693f3ea 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -737,6 +737,13 @@ "dJ" = ( /turf/open/floor/plating, /area/golden_arrow/hangar) +"dN" = ( +/obj/effect/landmark/start/synthetic, +/obj/effect/landmark/late_join, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) "dO" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -791,10 +798,6 @@ req_one_access = list(36); name = "\improper Synthetic Preperations" }, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - indestructible = 1 - }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -833,6 +836,15 @@ icon_state = "cargo" }, /area/golden_arrow/cryo_cells) +"eQ" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/hangar) "eR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -970,6 +982,12 @@ icon_state = "plating" }, /area/golden_arrow/engineering) +"fw" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "fx" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -1140,7 +1158,7 @@ }, /area/golden_arrow/engineering) "gz" = ( -/obj/structure/ship_ammo/rocket/widowmaker, +/obj/structure/dropship_equipment/fuel/cooling_system, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -2056,9 +2074,9 @@ }, /area/golden_arrow/briefing) "ml" = ( -/obj/structure/ship_ammo/minirocket, +/obj/structure/machinery/part_fabricator/dropship, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/golden_arrow/hangar) "mm" = ( @@ -2110,6 +2128,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/squad_two) +"mV" = ( +/obj/structure/machinery/cm_vending/clothing/pilot_officer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "mW" = ( /obj/structure/machinery/landinglight/ds1, /turf/open/floor/almayer{ @@ -2975,6 +2999,12 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"sd" = ( +/obj/structure/machinery/shower, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/hangar) "sf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3192,7 +3222,7 @@ }, /area/golden_arrow/briefing) "tV" = ( -/obj/structure/ship_ammo/rocket/keeper, +/obj/structure/dropship_equipment/fuel/fuel_enhancer, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -3352,6 +3382,14 @@ icon_state = "plating" }, /area/golden_arrow/engineering) +"uR" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "uS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -4033,6 +4071,13 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) +"zw" = ( +/obj/effect/landmark/start/pilot, +/obj/effect/landmark/late_join, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) "zy" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -4588,6 +4633,10 @@ icon_state = "dark_sterile" }, /area/golden_arrow/canteen) +"CH" = ( +/obj/effect/landmark/late_join, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/cryo_cells) "CK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -4665,6 +4714,20 @@ icon_state = "plate" }, /area/golden_arrow/platoon_sergeant) +"Di" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Dl" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -4966,6 +5029,14 @@ icon_state = "test_floor4" }, /area/golden_arrow/canteen) +"Fb" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Fe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -5074,6 +5145,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) +"FQ" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "FR" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -5476,6 +5554,16 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) +"HU" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/machinery/door/window/eastleft, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/hangar) "HV" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 @@ -5950,15 +6038,25 @@ /turf/open/floor/plating, /area/golden_arrow/hangar) "Ll" = ( -/obj/structure/ship_ammo/minirocket/incendiary, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/golden_arrow/hangar) "Ln" = ( -/obj/structure/ship_ammo/rocket/banshee, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/golden_arrow/hangar) "Lo" = ( @@ -5994,6 +6092,12 @@ icon_state = "test_floor5" }, /area/golden_arrow/supply) +"LD" = ( +/obj/structure/dropship_equipment/rappel_system, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "LE" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; @@ -6221,6 +6325,11 @@ icon_state = "plating" }, /area/golden_arrow/engineering) +"MY" = ( +/obj/effect/landmark/start/crew_chief, +/obj/effect/landmark/late_join, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/cryo_cells) "MZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -6760,6 +6869,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) +"Qa" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Qc" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/overwatch/almayer{ @@ -6818,6 +6933,15 @@ icon_state = "plate" }, /area/golden_arrow/prep_hallway) +"Qm" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper Pilot's Room" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Qq" = ( /obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ req_one_access = list(); @@ -7122,6 +7246,17 @@ icon_state = "plate" }, /area/golden_arrow/squad_one) +"RB" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + dir = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "RD" = ( /obj/effect/landmark/late_join, /obj/effect/landmark/start/marine/alpha, @@ -15174,13 +15309,13 @@ Cr Cr Cr Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +ca +ca +ca +ca +ca +ca +ca Cr Cr Cr @@ -15326,13 +15461,13 @@ Cr Cr Cr Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +ca +FQ +ZL +ZL +Qm +eQ +ca Cr Cr Cr @@ -15479,12 +15614,12 @@ ca ca ca ca -Cr -Cr -Cr -Cr -Cr -SC +yZ +ZL +uR +Yj +HU +ca SC SC sC @@ -15615,28 +15750,28 @@ Cr Cr Cr ca -Ln +Xd wz -gz +Xd wK -gz +Xd Pt -tV +Xd ca ml -wz -Ll +lg +pD wK -Ll +Xd wz -ml +tV +ca +FQ +ZL +fw +Yj +sd ca -Cr -Cr -Cr -Cr -Cr -SC Xz Xz sC @@ -15775,20 +15910,20 @@ Xd wz Xd ca -ml -wz -Ll +ZL +lg +pD wz -Ll +Xd wz -ml +Xd +ca +Yj +Qm +Yj +Yj +Yj ca -Cr -Cr -Cr -Cr -Cr -SC Xz Xz sC @@ -15927,20 +16062,20 @@ JZ fe wz ca -Pt -jl -JZ +Ll +Ln +Di SR SR wx Pt ca -Cr -Cr -Cr -Cr -Cr -SC +fw +ZL +Fb +Xd +mV +ca Xz Xz sC @@ -16071,28 +16206,28 @@ Yw Yw Yw ca -Ln +Xd So KO KO Rr Kx -tV +Xd ca -ml +Xd So KO KO KO Kx -ml +gz +ca +fw +ZL +ZL +Xd +Qa ca -Cr -Cr -Cr -Cr -Cr -SC Xz Xz sC @@ -16231,20 +16366,20 @@ KO Kx Xd ca -ml +Xd UX Rr Ea KO kV -ml +LD +ca +fw +ZL +ZL +Xd +mV ca -Cr -Cr -Cr -Cr -Cr -SC Xz Xz sC @@ -16377,23 +16512,23 @@ wz ca ca ca -Yw -Yw -Yw +qi +qi +qi ca ca ca ca ca -Yw -Yw -Yw -ca -ca +qi +qi +qi ca ca ca ca +qi +RB ca ca ca @@ -16543,10 +16678,10 @@ ZL wz wz wz -wz +wK ZL wz -wz +wK ca ca ZL @@ -20532,8 +20667,8 @@ ti To BY BY -cr -BY +zw +MY BY sI Cr @@ -20684,8 +20819,8 @@ Sq To ZI ZI -cr -BY +dN +CH BY sI Cr @@ -21442,7 +21577,7 @@ IC IC Bi To -BY +LL YX cr BY diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm index 4c41724f40..b0e838a38c 100644 --- a/maps/shuttles/dropship_midway.dmm +++ b/maps/shuttles/dropship_midway.dmm @@ -71,6 +71,9 @@ dir = 8; pixel_x = -14 }, +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, /turf/open/shuttle/dropship{ icon_state = "rasputin2" }, @@ -94,6 +97,14 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = -30 }, +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = 8 + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, @@ -209,14 +220,6 @@ icon_state = "31" }, /area/shuttle/midway) -"tf" = ( -/obj/structure/bed/chair/dropship/pilot{ - dir = 1 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/midway) "ti" = ( /obj/structure/extinguisher_cabinet/lifeboat{ pixel_x = 12 @@ -334,6 +337,14 @@ dir = 8; pixel_x = 23 }, +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = 8 + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, @@ -401,6 +412,9 @@ dir = 4; pixel_x = 14 }, +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, /turf/open/shuttle/dropship{ icon_state = "rasputin2" }, @@ -716,7 +730,7 @@ Kw nH Aw LY -tf +ME PP jW Dg