diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 2c37c3c390..0947ec5e8a 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -108,11 +108,17 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_UPP_FLIGHT 235 #define ACCESS_UPP_RESEARCH 236 +#define ACCESS_UPP_SQUAD_ONE 237 +#define ACCESS_UPP_SQUAD_TWO 238 + #define ACCESS_UPP_COMMANDO 239 #define ACCESS_UPP_LEADERSHIP 240 ///Senior leadership, the highest ranks #define ACCESS_UPP_SENIOR_LEAD 241 +#define ACCESS_UPP_MEDPREP 242 +#define ACCESS_UPP_MACHINEGUN 243 +#define ACCESS_UPP_TLPREP 244 //================================================= //Colonial Liberation Front access levels (260-289) @@ -196,6 +202,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu ///All access levels associated with UPP #define ACCESS_LIST_UPP_ALL "UPP (ALL)" +#define ACCESS_LIST_UPP_PLATOON "UPP (Platoon)" ///Generic/basic access to CLF stuff #define ACCESS_LIST_CLF_BASE "CLF (Basic)" diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index c2ebdbb779..9ab037abc0 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -63,6 +63,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_SQUAD_FOXTROT "#fe7b2e" #define MINIMAP_SQUAD_SOF "#400000" #define MINIMAP_SQUAD_INTEL "#053818" +#define MINIMAP_SQUAD_UPP "#B22222" #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820" #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f" diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 0d10b06d5f..eb4ffb2f55 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -286,6 +286,19 @@ ACCESS_UPP_SENIOR_LEAD, ) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + if(ACCESS_LIST_UPP_PLATOON) + return list( + ACCESS_UPP_GENERAL, + ACCESS_UPP_MEDICAL, + ACCESS_UPP_FLIGHT, + ACCESS_UPP_LEADERSHIP, + ACCESS_UPP_SENIOR_LEAD, + ACCESS_UPP_MEDPREP, + ACCESS_UPP_TLPREP, + ACCESS_UPP_MACHINEGUN + ) + + /proc/get_region_accesses(code) switch(code) if(0)//Everything diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index d45c0a0195..5ff9639cdb 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -112,6 +112,8 @@ ///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman var/prepend_squad_name_to_assignment = TRUE + var/squad_one_access = ACCESS_SQUAD_ONE + var/squad_two_access = ACCESS_SQUAD_TWO /datum/squad/marine name = "Root" @@ -133,12 +135,14 @@ name = SQUAD_UPP equipment_color = "#8B0000" chat_color = "#B22222" - access = list(ACCESS_MARINE_ALPHA) + access = list(ACCESS_UPP_GENERAL) radio_freq = UPP_FREQ - minimap_color = MINIMAP_SQUAD_ALPHA + minimap_color = MINIMAP_SQUAD_UPP use_stripe_overlay = FALSE usable = TRUE faction = FACTION_UPP + squad_one_access = ACCESS_UPP_SQUAD_ONE + squad_two_access = ACCESS_UPP_SQUAD_TWO /datum/squad/marine/upp/New() . = ..() @@ -764,9 +768,9 @@ // I'm not fixing how cursed these strings are, god save us all if someone (or me (https://i.imgur.com/nSy81Bn.png)) has to change these again if(H.wear_id) if(fireteam == "SQ1") - H.wear_id.access += ACCESS_SQUAD_ONE + H.wear_id.access += squad_one_access if(fireteam == "SQ2") - H.wear_id.access += ACCESS_SQUAD_TWO + H.wear_id.access += squad_two_access for(var/obj/item/device/radio/headset/cycled_headset in H) if(!("Squad Sergeant" in cycled_headset.tracking_options)) @@ -789,7 +793,7 @@ H.hud_set_squad() if(H.wear_id) - H.wear_id.access.Remove(ACCESS_SQUAD_ONE, ACCESS_SQUAD_TWO) + H.wear_id.access.Remove(squad_one_access, squad_two_access) for(var/obj/item/device/radio/headset/cycled_headset in H) if(!("Platoon Sergeant" in cycled_headset.tracking_options)) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index c659cc0e3e..a75e532440 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -273,7 +273,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list( name = "\improper UnTech Squad Medical Equipment Rack" desc = "An automated rack hooked up to a colossal storage of hospital corpsman standard-issue equipment." icon_state = "upp_gear" - req_access = list(ACCESS_MARINE_MEDPREP) + req_access = list(ACCESS_UPP_MEDPREP) vendor_role = list(JOB_SQUAD_MEDIC) vendor_theme = VENDOR_THEME_UPP diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 9e8996451b..cc89de1b8d 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -153,7 +153,7 @@ name = "\improper UnTech Surplus Uniform Vendor" desc = "An automated supply rack hooked up to a small storage of standard UPP uniforms." icon_state = "upp_gear" - req_access = list(ACCESS_MARINE_PREP) + req_access = list(ACCESS_UPP_GENERAL) req_one_access = list() listed_products = list() hackable = TRUE @@ -381,7 +381,7 @@ name = "\improper UnTech Automated Utilities Squad Vendor" desc = "An automated supply rack hooked up to a small storage of various utilities and tools. Can be accessed by any UPP Rifleman." req_access = list() - req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SPECPREP, ACCESS_MARINE_RO, ACCESS_MARINE_PREP) + req_one_access = list(ACCESS_UPP_GENERAL) hackable = TRUE vend_x_offset = 2 diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 2d727a185d..70231319ab 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -62,6 +62,8 @@ can_be_near_defense = TRUE + var/start_up_message = "Default systems initiated." + /// Delay sending no ammo messages COOLDOWN_DECLARE(no_ammo_message_cooldown) @@ -237,7 +239,7 @@ set_light(luminosity_strength) visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] hums to life and emits several beeps.")]") - visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] buzzes in a monotone voice: 'Default systems initiated'")]") + visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] buzzes in a monotone voice: '[start_up_message]'")]") start_processing() setup_target_acquisition() @@ -767,7 +769,7 @@ selected_categories = list( SENTRY_CATEGORY_IFF = FACTION_UPP, ) - + start_up_message = "Sentry mounted and loaded. Glory to the UPP." #undef SENTRY_FIREANGLE #undef SENTRY_RANGE diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 2c0c3b1326..111171117a 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -97,6 +97,7 @@ /datum/equipment_preset/uscm/pfc/upp name = "UPP Squad Rifleman" paygrade = "UE1" + access = list(ACCESS_UPP_GENERAL) assignment = JOB_SQUAD_MARINE_UPP languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) faction_group = list(FACTION_UPP) @@ -147,6 +148,7 @@ /datum/equipment_preset/uscm/sg/upp name = "UPP Squad Machinegunner" + access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MACHINEGUN) assignment = JOB_SQUAD_SMARTGUN_UPP paygrade = "UE3" role_comm_title = "MG" @@ -335,6 +337,7 @@ /datum/equipment_preset/uscm/medic/upp name = "UPP Sanitar" paygrade = "UE3" + access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MEDPREP, ACCESS_UPP_MEDICAL) assignment = JOB_SQUAD_MEDIC_UPP languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) faction_group = list(FACTION_UPP) @@ -382,6 +385,7 @@ /datum/equipment_preset/uscm/tl/upp name = "UPP Squad Sergeant" paygrade = "UE4" + access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_TLPREP) assignment = JOB_SQUAD_TEAM_LEADER_UPP languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) faction_group = list(FACTION_UPP) @@ -462,6 +466,7 @@ /datum/equipment_preset/uscm/leader/upp name = "UPP Platoon Sergeant" assignment = JOB_SQUAD_LEADER_UPP + access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_LEADERSHIP, ACCESS_UPP_FLIGHT) languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) paygrade = "UE6" faction_group = list(FACTION_UPP) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 33fb12da9c..f9315083e5 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -547,10 +547,11 @@ skills = /datum/skills/SO minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER) minimap_background = MINIMAP_ICON_BACKGROUND_CIC + var/access_list = ACCESS_LIST_MARINE_MAIN /datum/equipment_preset/uscm_ship/so/New() . = ..() - access = get_access(ACCESS_LIST_MARINE_MAIN) + access = get_access(access_list) /datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -586,6 +587,7 @@ paygrade = "UO2" faction_group = list(FACTION_UPP) faction = FACTION_UPP + access_list = ACCESS_LIST_UPP_PLATOON /datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index 6d12149992..3ff110ba44 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index 9f0e15209f..cf714461d6 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 75671cb7c1..4d193ff70a 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -9,17 +9,6 @@ icon_state = "cyan1" }, /area/golden_arrow/medical) -"ac" = ( -/turf/closed/shuttle/midway{ - icon_state = "47" - }, -/area/space) -"ad" = ( -/obj/structure/shuttle/part/dropship1/left_outer_wing_connector{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "ae" = ( /obj/structure/machinery/power/smes/buildable, /turf/open/floor/almayer{ @@ -48,12 +37,6 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"al" = ( -/obj/structure/shuttle/part/dropship1/transparent/nose_top_right{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "an" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4 @@ -70,12 +53,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"ay" = ( -/obj/structure/shuttle/part/dropship1/lower_left_wall{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "az" = ( /obj/structure/machinery/cryopod{ dir = 1 @@ -222,7 +199,7 @@ /area/golden_arrow/dorms) "bw" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "14;40"; + req_access_txt = "243;238"; name = "machinegunner locker" }, /obj/item/ammo_magazine/pkp, @@ -270,11 +247,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/prep_hallway) -"bM" = ( -/turf/closed/shuttle/midway{ - icon_state = "64" - }, -/area/space) "bN" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply, @@ -417,43 +389,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"dg" = ( -/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) -"dh" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "96" - }, -/area/space) -"di" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "29" - }, -/area/space) -"dj" = ( -/obj/structure/machinery/light{ - dir = 8; - pixel_x = -14 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin2" - }, -/area/space) -"dk" = ( -/obj/structure/shuttle/part/dropship1/transparent/lower_right_wing{ - name = "\improper Midway" - }, -/obj/effect/attach_point/weapon/midway/right_wing, -/turf/open/space/basic, -/area/space) -"dm" = ( -/turf/open/shuttle/dropship{ - icon_state = "rasputin6" - }, -/area/space) "dr" = ( /obj/structure/machinery/body_scanconsole{ pixel_y = 6; @@ -548,14 +483,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"dQ" = ( -/obj/effect/attach_point/fuel/midway{ - pixel_x = -32 - }, -/turf/closed/shuttle/midway/transparent{ - icon_state = "33" - }, -/area/space) "dS" = ( /obj/structure/closet, /obj/item/clothing/head/uppcap, @@ -631,11 +558,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"ec" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "26" - }, -/area/space) "ei" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/squad_one) @@ -679,11 +601,6 @@ icon_state = "floor2" }, /area/golden_arrow/squad_one) -"ep" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "23" - }, -/area/space) "es" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -719,11 +636,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) -"eI" = ( -/turf/closed/shuttle/midway{ - icon_state = "42" - }, -/area/space) "eL" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/upp, /turf/open/floor/strata{ @@ -744,11 +656,6 @@ icon_state = "floor3" }, /area/golden_arrow/supply) -"eU" = ( -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "fc" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -799,12 +706,6 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"gk" = ( -/obj/structure/shuttle/part/dropship1/right_outer_wing_connector{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "gm" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -818,7 +719,7 @@ /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Platoon Commander's Office"; req_access = list(); - req_one_access_txt = "19;12" + req_one_access_txt = "241" }, /turf/open/floor/strata{ dir = 4; @@ -877,11 +778,6 @@ icon_state = "floor2" }, /area/golden_arrow/briefing) -"gV" = ( -/turf/closed/shuttle/midway{ - icon_state = "92" - }, -/area/space) "gZ" = ( /obj/structure/machinery/floodlight/landing/floor, /obj/structure/machinery/camera/autoname/golden_arrow{ @@ -969,11 +865,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) -"ij" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "86" - }, -/area/space) "io" = ( /obj/structure/toilet{ dir = 4 @@ -1053,19 +944,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"iI" = ( -/obj/structure/bed/chair/dropship/pilot{ - dir = 1 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) -"iJ" = ( -/turf/closed/shuttle/midway{ - icon_state = "77" - }, -/area/space) "iK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -1081,19 +959,6 @@ "iO" = ( /turf/closed/wall/strata_outpost/reinforced, /area/golden_arrow/cryo_cells) -"iS" = ( -/obj/structure/extinguisher_cabinet/lifeboat{ - pixel_x = 12 - }, -/turf/closed/shuttle/midway/transparent{ - icon_state = "78" - }, -/area/space) -"iV" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "34" - }, -/area/space) "iW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -1122,20 +987,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"ju" = ( -/obj/structure/phone_base/rotary{ - name = "Midway Telephone"; - phone_category = "Dropship"; - phone_id = "Midway"; - pixel_x = 11; - pixel_y = 16 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/machinery/computer/dropship_weapons/midway, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "jF" = ( /obj/structure/bed/bedroll{ pixel_y = 21; @@ -1166,17 +1017,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/platoon_commander_rooms) -"jL" = ( -/obj/structure/prop/ice_colony/hula_girl{ - pixel_x = -10; - pixel_y = 16 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/machinery/computer/cameras/dropship/midway, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "jS" = ( /obj/effect/landmark/start/marine/upp, /obj/effect/landmark/late_join/upp, @@ -1215,15 +1055,6 @@ icon_state = "floor2" }, /area/golden_arrow/briefing) -"ki" = ( -/obj/structure/machinery/camera/autoname/golden_arrow/midway{ - dir = 4; - pixel_x = -23 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) "kj" = ( /obj/item/clothing/shoes/slippers_worn{ pixel_y = 16 @@ -1301,11 +1132,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"kV" = ( -/turf/closed/shuttle/midway{ - icon_state = "72" - }, -/area/space) "kW" = ( /obj/item/stool, /obj/structure/pipes/vents/pump{ @@ -1316,12 +1142,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"le" = ( -/obj/structure/shuttle/part/dropship1/transparent/right_outer_bottom_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "lo" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -1329,12 +1149,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/golden_arrow/canteen) -"ls" = ( -/obj/structure/shuttle/part/dropship1/transparent/middle_right_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "lE" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata{ @@ -1361,12 +1175,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"lS" = ( -/obj/structure/shuttle/part/dropship1/transparent/upper_left_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "me" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/upp, /turf/open/floor/strata{ @@ -1453,15 +1261,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"mZ" = ( -/obj/structure/machinery/camera/autoname/golden_arrow/midway{ - dir = 8; - pixel_x = 23 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "nb" = ( /obj/structure/machinery/conveyor, /obj/structure/pipes/standard/cap/hidden/supply{ @@ -1530,16 +1329,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"nw" = ( -/obj/structure/stairs/perspective, -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) "nD" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ req_one_access = list() @@ -1632,16 +1421,6 @@ "os" = ( /turf/closed/wall/strata_outpost/reinforced, /area/golden_arrow/platoon_commander_rooms) -"ot" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "35" - }, -/area/space) -"oA" = ( -/turf/closed/shuttle/midway{ - icon_state = "48" - }, -/area/space) "oB" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/hangar) @@ -1666,13 +1445,13 @@ /turf/open/floor/plating, /area/golden_arrow/cryo_cells) "oZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Private Briefing Room"; req_one_access = null; - req_one_access_txt = "12;19;32" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 + req_one_access_txt = "240;244;241" }, /turf/open/floor/strata{ dir = 4; @@ -1734,7 +1513,7 @@ "py" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ req_one_access = null; - req_one_access_txt = "8;12;39"; + req_one_access_txt = "231;240;237"; name = "\improper Squad One Armoury" }, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -1871,7 +1650,7 @@ dir = 1; name = "\improper Platoon Commander's Office"; req_access = list(); - req_one_access_txt = "19;12" + req_one_access_txt = "240;241" }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ @@ -1976,12 +1755,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"rq" = ( -/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "ru" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -2041,11 +1814,6 @@ icon_state = "cyan1" }, /area/golden_arrow/medical) -"sk" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "97" - }, -/area/space) "so" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -2071,12 +1839,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/cryo_cells) -"st" = ( -/obj/docking_port/mobile/marine_dropship/midway, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "su" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata{ @@ -2236,13 +1998,13 @@ }, /area/golden_arrow/dorms) "tL" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Platoon Sergeant's Bunk"; req_one_access = null; - req_one_access_txt = "12"; + req_one_access_txt = "240"; dir = 2 }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" @@ -2320,13 +2082,6 @@ icon_state = "floor2" }, /area/golden_arrow/platoon_commander_rooms) -"uo" = ( -/obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons{ - name = "\improper Midway" - }, -/obj/effect/attach_point/weapon/midway/left_fore, -/turf/open/space/basic, -/area/space) "uq" = ( /obj/structure/machinery/conveyor{ dir = 8 @@ -2374,12 +2129,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"uF" = ( -/obj/structure/shuttle/part/dropship1/lower_right_wall{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "uQ" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -2387,7 +2136,7 @@ /area/golden_arrow/platoon_commander_rooms) "uS" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "32;39"; + req_access_txt = "244;237"; name = "squad sergeant locker" }, /obj/item/clothing/accessory/armband, @@ -2436,11 +2185,6 @@ icon_state = "floor2" }, /area/golden_arrow/hangar) -"vl" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "32" - }, -/area/space) "vq" = ( /obj/structure/largecrate, /obj/structure/largecrate{ @@ -2483,12 +2227,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"wb" = ( -/obj/structure/shuttle/part/dropship1/transparent/nose_top_left{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "wc" = ( /obj/item/stack/sheet/metal{ amount = 50 @@ -2505,15 +2243,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) -"wf" = ( -/obj/structure/machinery/light{ - dir = 8; - pixel_x = -14 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) "wq" = ( /turf/open/floor/plating, /area/golden_arrow/hangar) @@ -2617,15 +2346,6 @@ "wV" = ( /turf/closed/wall/strata_outpost/reinforced, /area/golden_arrow/synthcloset) -"wY" = ( -/obj/structure/machinery/light{ - dir = 4; - pixel_x = 14 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) "xe" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/landmark/late_join/alpha, @@ -2649,12 +2369,6 @@ icon_state = "floor2" }, /area/golden_arrow/hangar) -"xt" = ( -/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "xz" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/upp, /turf/open/floor/strata{ @@ -2679,11 +2393,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"xF" = ( -/turf/closed/shuttle/midway{ - icon_state = "62" - }, -/area/space) "xK" = ( /obj/structure/foamed_metal, /obj/structure/foamed_metal, @@ -2707,26 +2416,11 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) -"xP" = ( -/obj/effect/attach_point/crew_weapon/midway, -/obj/structure/machinery/light{ - dir = 4; - pixel_x = 14 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) -"xT" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "80" - }, -/area/space) "xU" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Sergeants Room"; req_one_access = null; - req_one_access_txt = "12;32" + req_one_access_txt = "240;244" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -2736,11 +2430,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"xW" = ( -/turf/closed/shuttle/midway{ - icon_state = "24" - }, -/area/space) "xX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -2770,15 +2459,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/engineering) -"yo" = ( -/obj/structure/shuttle/part/dropship1/nose_front_right{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) -"yq" = ( -/turf/open/shuttle/dropship, -/area/space) "ys" = ( /obj/item/tool/mop{ pixel_x = 17; @@ -2807,28 +2487,6 @@ icon_state = "floor2" }, /area/golden_arrow/squad_one) -"yv" = ( -/turf/closed/shuttle/midway{ - icon_state = "73" - }, -/area/space) -"yz" = ( -/obj/item/clothing/head/helmet/marine/veteran/van_bandolier, -/turf/open/space/basic, -/area/space) -"yG" = ( -/obj/structure/machinery/camera/autoname/golden_arrow/midway{ - pixel_x = -6; - pixel_y = -16 - }, -/obj/structure/machinery/light{ - dir = 4; - pixel_x = 14 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin2" - }, -/area/space) "yH" = ( /turf/closed/wall/strata_outpost/reinforced, /area/golden_arrow/hangar) @@ -2849,26 +2507,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"zc" = ( -/obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons{ - name = "\improper Midway" - }, -/obj/effect/attach_point/weapon/midway/right_fore, -/turf/open/space/basic, -/area/space) -"zi" = ( -/obj/structure/shuttle/part/dropship1/transparent/nose_center{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) -"zl" = ( -/obj/structure/shuttle/part/dropship1/transparent/lower_left_wing{ - name = "\improper Midway" - }, -/obj/effect/attach_point/weapon/midway/left_wing, -/turf/open/space/basic, -/area/space) "zq" = ( /obj/structure/machinery/light{ dir = 4; @@ -2898,24 +2536,6 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) -"zF" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "38" - }, -/area/space) -"zO" = ( -/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" - }, -/area/space) "zR" = ( /obj/structure/machinery/cryopod, /obj/structure/machinery/light{ @@ -2941,11 +2561,6 @@ "zX" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/cryo_cells) -"Ab" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "98" - }, -/area/space) "Ac" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/prop/invuln/overhead_pipe{ @@ -3028,11 +2643,6 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) -"AJ" = ( -/turf/closed/shuttle/midway{ - icon_state = "94" - }, -/area/space) "AS" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/machinery/shower{ @@ -3104,7 +2714,7 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Platoon Sergeant's Bunk"; req_one_access = null; - req_one_access_txt = "12" + req_one_access_txt = "240" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3122,11 +2732,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/platoon_commander_rooms) -"By" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "39" - }, -/area/space) "BD" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -3134,18 +2739,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/engineering) -"BK" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin6" - }, -/area/space) "BQ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/prop/almayer/CICmap{ @@ -3226,14 +2819,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"Cw" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "Cx" = ( /turf/open/floor/strata{ dir = 6; @@ -3348,12 +2933,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) -"CY" = ( -/obj/structure/shuttle/part/dropship1/left_inner_wing_connector{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "CZ" = ( /obj/structure/toilet{ dir = 4 @@ -3393,12 +2972,6 @@ icon_state = "floor2" }, /area/golden_arrow/platoon_commander_rooms) -"DB" = ( -/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "DE" = ( /obj/structure/machinery/light{ dir = 8; @@ -3544,17 +3117,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"EV" = ( -/obj/structure/bed/chair/vehicle{ - pixel_x = -8 - }, -/obj/structure/bed/chair/vehicle{ - pixel_x = 8 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "EW" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -3563,11 +3125,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"EY" = ( -/turf/closed/shuttle/midway{ - icon_state = "104" - }, -/area/space) "Fb" = ( /obj/structure/machinery/light{ dir = 8; @@ -3628,12 +3185,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/cryo_cells) -"Fu" = ( -/obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "FB" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -3754,21 +3305,10 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"Gy" = ( -/obj/structure/shuttle/part/dropship1/nose_front_left{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) -"Gz" = ( -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) "GB" = ( /obj/structure/closet/secure_closet{ name = "platoon sergeant locker"; - req_one_access = list(12) + req_one_access = list(240) }, /obj/item/device/whistle, /obj/item/device/binoculars/range/designator, @@ -3790,29 +3330,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) -"GI" = ( -/turf/closed/shuttle/midway{ - icon_state = "69" - }, -/area/space) -"GN" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = 30 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) -"GO" = ( -/obj/effect/attach_point/crew_weapon/midway, -/obj/structure/machinery/light{ - dir = 8; - pixel_x = -14 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "GS" = ( /obj/structure/machinery/light{ dir = 4 @@ -3911,11 +3428,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"Hv" = ( -/turf/closed/shuttle/midway{ - icon_state = "67" - }, -/area/space) "HA" = ( /obj/structure/machinery/light/small, /turf/open/floor/strata{ @@ -3943,17 +3455,6 @@ icon_state = "floor3" }, /area/golden_arrow/supply) -"HR" = ( -/obj/structure/machinery/prop/almayer/CICmap{ - density = 0; - icon_state = "shuttle"; - layer = 2.97; - name = "Tactical Map Display"; - pixel_x = 7; - faction = "UPP" - }, -/turf/open/space/basic, -/area/space) "HX" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ name = "ship-grade camera"; @@ -4002,19 +3503,12 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"IR" = ( -/obj/structure/machinery/door/airlock/hatch/cockpit, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "IS" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/dorms) "IW" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "14;39"; + req_access_txt = "243;237"; name = "machinegunner locker" }, /obj/item/ammo_magazine/pkp, @@ -4029,11 +3523,6 @@ icon_state = "floor2" }, /area/golden_arrow/squad_one) -"IZ" = ( -/turf/closed/shuttle/midway{ - icon_state = "103" - }, -/area/space) "Jc" = ( /obj/effect/landmark/start/bridge/upp, /turf/open/floor/strata{ @@ -4115,11 +3604,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) -"JJ" = ( -/turf/closed/shuttle/midway{ - icon_state = "25" - }, -/area/space) "JN" = ( /obj/structure/machinery/conveyor{ dir = 6 @@ -4194,11 +3678,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/prep_hallway) -"Ko" = ( -/turf/closed/shuttle/midway{ - icon_state = "31" - }, -/area/space) "Ku" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -4208,11 +3687,6 @@ icon_state = "floor3" }, /area/golden_arrow/dorms) -"Kz" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "22" - }, -/area/space) "KB" = ( /turf/open/floor/strata{ icon_state = "floor2" @@ -4320,7 +3794,7 @@ /area/golden_arrow/briefing) "Lm" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "32;40"; + req_access_txt = "244;238"; name = "squad sergeant locker" }, /obj/item/clothing/accessory/armband, @@ -4354,14 +3828,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/cryo_cells) -"LK" = ( -/obj/structure/machinery/door/airlock/dropship_hatch{ - id = "port_door" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "LL" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/sniper/svd/pve, @@ -4390,14 +3856,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/golden_arrow/briefing) -"Me" = ( -/obj/structure/machinery/m56d_hmg/mg_turret/dropship{ - dir = 4 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "Mm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4413,11 +3871,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_commander_rooms) -"My" = ( -/turf/closed/shuttle/midway{ - icon_state = "83" - }, -/area/space) "MC" = ( /obj/structure/foamed_metal, /obj/structure/foamed_metal, @@ -4451,18 +3904,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/squad_one) -"MI" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin7" - }, -/area/space) "ML" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, @@ -4505,11 +3946,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"Nf" = ( -/turf/closed/shuttle/midway{ - icon_state = "81" - }, -/area/space) "Nz" = ( /obj/structure/machinery/light{ dir = 8 @@ -4573,7 +4009,8 @@ /area/golden_arrow/engineering) "Os" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ - name = "\improper Platoon Commander's Quarters" + name = "\improper Platoon Commander's Quarters"; + req_access = list(241) }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -4623,11 +4060,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"OW" = ( -/turf/open/shuttle/dropship{ - icon_state = "rasputin7" - }, -/area/space) "OX" = ( /turf/open/floor/strata{ icon_state = "floor2" @@ -4637,7 +4069,7 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Squad Two Armoury"; req_one_access = null; - req_one_access_txt = "8;12;40" + req_one_access_txt = "231;240;238" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -4736,11 +4168,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) -"Qk" = ( -/turf/closed/shuttle/midway{ - icon_state = "54" - }, -/area/space) "Qr" = ( /obj/structure/bed/chair{ dir = 1 @@ -4804,12 +4231,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) -"Rd" = ( -/obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust{ - name = "\improper Midway" - }, -/turf/template_noop, -/area/space) "Re" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/strata_decals/catwalk/prison, @@ -4825,11 +4246,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"Ro" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "89" - }, -/area/space) "Ru" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ammo_magazine/pistol/np92, @@ -4862,7 +4278,7 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Platoon Medic Office"; req_one_access = null; - req_one_access_txt = "8" + req_one_access_txt = "231" }, /turf/open/floor/strata{ dir = 4; @@ -4918,16 +4334,6 @@ }, /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/platoon_sergeant) -"Su" = ( -/obj/structure/stairs/perspective, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/space) "Sx" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -4935,18 +4341,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/prep_hallway) -"SB" = ( -/obj/structure/machinery/door_control{ - id = "dropship_midway"; - name = "Dropship Lockdown"; - normaldoorcontrol = 3; - pixel_y = -19; - req_one_access_txt = "3;22" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "SF" = ( /obj/structure/machinery/computer/station_alert{ dir = 8; @@ -5101,12 +4495,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"TU" = ( -/obj/effect/attach_point/crew_weapon/midway, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "Ua" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 4; @@ -5119,14 +4507,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/prep_hallway) -"Ue" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{ - id = "aft_door" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "Ug" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5176,12 +4556,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"UC" = ( -/obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust{ - name = "\improper Midway" - }, -/turf/template_noop, -/area/space) "UM" = ( /obj/item/trash/ceramic_plate{ pixel_x = -6; @@ -5331,11 +4705,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"VY" = ( -/turf/closed/shuttle/midway{ - icon_state = "75" - }, -/area/space) "VZ" = ( /obj/structure/machinery/power/smes/buildable, /obj/structure/machinery/camera/autoname/golden_arrow{ @@ -5352,24 +4721,18 @@ /turf/open/floor/plating, /area/golden_arrow/briefing) "Wg" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Platoon Medic Office"; req_one_access = null; - req_one_access_txt = "8"; + req_one_access_txt = "231"; dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" }, /area/golden_arrow/medical) -"Wo" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "Wp" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/beetsoup, @@ -5382,11 +4745,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"Wr" = ( -/turf/closed/shuttle/midway/transparent{ - icon_state = "27" - }, -/area/space) "Wt" = ( /obj/vehicle/powerloader/jd{ name = "\improper CosmosStal 12 Bogatyr Power Loader" @@ -5402,30 +4760,12 @@ icon_state = "multi_tiles" }, /area/golden_arrow/cryo_cells) -"Wy" = ( -/turf/closed/shuttle/midway{ - icon_state = "30" - }, -/area/space) -"WC" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/machinery/computer/shuttle/dropship/flight, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/space) "WI" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/cleanable/blood/oil, /obj/structure/prop/invuln/overhead_pipe, /turf/open/floor/plating, /area/golden_arrow/engineering) -"WJ" = ( -/obj/structure/shuttle/part/dropship1/right_inner_wing_connector{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "WM" = ( /obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ pixel_y = 20; @@ -5611,12 +4951,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"XT" = ( -/obj/effect/attach_point/fuel/midway, -/turf/closed/shuttle/midway/transparent{ - icon_state = "28" - }, -/area/space) "Yo" = ( /obj/structure/closet, /obj/item/clothing/head/uppcap/civi{ @@ -5627,17 +4961,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"Yq" = ( -/obj/structure/bed/chair/vehicle{ - pixel_x = -8 - }, -/obj/structure/bed/chair/vehicle{ - pixel_x = 8 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin14" - }, -/area/space) "YA" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -5741,12 +5064,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"ZI" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{ - name = "\improper Midway" - }, -/turf/open/space/basic, -/area/space) "ZN" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 5" @@ -5756,18 +5073,6 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"ZO" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/shuttle/dropship{ - icon_state = "floor8" - }, -/area/space) "ZU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11333,7 +10638,7 @@ mV mV mV mV -yz +mV mV mV mV @@ -12865,7 +12170,7 @@ mV mV mV mV -HR +mV mV mV mV @@ -23205,19 +22510,19 @@ mV mV mV mV -lS -DB -zl mV mV mV -ZI -iV -XT -Kz -UC mV -dg +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -23355,21 +22660,21 @@ mV mV mV mV -uo -VY -kV -Hv -xF -LK -LK -ay -Wo -ot -di -ep -Rd mV -xt +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -23504,24 +22809,24 @@ mV mV mV mV -wb -Gy -gV -ij -Nf -EV -Cw -GO -eU -SB -ac -eI -eI -Wy -xW -IZ -CY -ad +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -23656,22 +22961,22 @@ mV mV mV mV -zi -dh -jL -dj -iS -Yq -dm -Gz -Gz -Gz -Su -BK -Gz -ki -wf -Ue +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -23808,22 +23113,22 @@ mV mV mV mV -zi -sk -WC -iI -IR -Gz -yq -zO -eU -st -TU -ZO -eU -eU -eU -eU +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -23960,22 +23265,22 @@ mV mV mV mV -zi -Ab -ju -yG -xT -Yq -OW -Gz -Gz -Gz -nw -MI -GN -Gz -wY -eU +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -24112,24 +23417,24 @@ mV mV mV mV -al -yo -AJ -Ro -iJ -EV -mZ -xP -eU -SB -oA -Qk -Qk -Ko -JJ -EY -WJ -gk +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -24267,21 +23572,21 @@ mV mV mV mV -zc -My -yv -GI -bM -Me -eU -uF -ZI -zF -vl -ec -UC mV -Fu +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV @@ -24421,19 +23726,19 @@ mV mV mV mV -rq -ls -dk mV mV mV -Wo -By -dQ -Wr -Rd mV -le +mV +mV +mV +mV +mV +mV +mV +mV +mV mV mV mV