From b29c4c0b9f76c423cdb0e71b44fe8a37f6e1c914 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 1 Nov 2023 08:37:54 -0400 Subject: [PATCH 1/3] Initial --- code/__DEFINES/camera.dm | 2 + code/__DEFINES/shuttles.dm | 3 + code/game/area/Sulaco.dm | 12 +- code/game/machinery/camera/presets.dm | 7 + .../game/machinery/computer/camera_console.dm | 4 + .../machinery/computer/dropship_weapons.dm | 27 +- code/game/turfs/closed.dm | 8 + code/modules/cm_marines/dropship_equipment.dm | 3 +- .../dropships/attach_points/templates.dm | 53 ++ code/modules/shuttle/shuttles/dropship.dm | 19 + icons/turf/dropship.dmi | Bin 8052 -> 8170 bytes maps/map_files/golden_arrow/golden_arrow.dmm | 49 +- maps/shuttles/dropship_midway.dmm | 815 ++++++++++++++++++ 13 files changed, 961 insertions(+), 41 deletions(-) create mode 100644 maps/shuttles/dropship_midway.dmm diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm index 9d797b964d..a95112341a 100644 --- a/code/__DEFINES/camera.dm +++ b/code/__DEFINES/camera.dm @@ -1,10 +1,12 @@ // Networks #define CAMERA_NET_ALMAYER "Almayer" +#define CAMERA_NET_GOLDEN_ARROW "Golden Arrow" #define CAMERA_NET_CONTAINMENT "Containment" #define CAMERA_NET_CONTAINMENT_HIDDEN "Containment Hidden" #define CAMERA_NET_RESEARCH "Research" #define CAMERA_NET_ALAMO "Alamo" #define CAMERA_NET_NORMANDY "Normandy" +#define CAMERA_NET_MIDWAY "Midway" #define CAMERA_NET_COLONY "Colony" #define CAMERA_NET_ARES "ARES" diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index a3299184e4..a6e1e168c2 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -111,12 +111,15 @@ #define MOBILE_SHUTTLE_LIFEBOAT_STARBOARD "lifeboat-starboard" #define MOBILE_SHUTTLE_VEHICLE_ELEVATOR "vehicle_elevator" +#define DROPSHIP_MIDWAY "dropship_midway" #define DROPSHIP_ALAMO "dropship_alamo" #define DROPSHIP_NORMANDY "dropship_normandy" #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1" #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2" +#define GOLDEN_ARROW_LZ "golden arrow lz" + #define DROPSHIP_FLYBY_ID "special_flight" #define DROPSHIP_LZ1 "dropship-lz1" #define DROPSHIP_LZ2 "dropship-lz2" diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm index ae19753714..e2461ed30a 100644 --- a/code/game/area/Sulaco.dm +++ b/code/game/area/Sulaco.dm @@ -110,8 +110,18 @@ name = "\improper Normandy Landing Zone" icon_state = "away2" +/area/shuttle/midway + name = "\improper Dropship Midway" + icon_state = "shuttlered" + base_muffle = MUFFLE_HIGH + soundscape_interval = 30 + is_landing_zone = TRUE + ceiling = CEILING_REINFORCED_METAL - +/area/shuttle/midway/Enter(atom/movable/O, atom/oldloc) + if(istype(O, /obj/structure/barricade)) + return FALSE + return TRUE //DISTRESS SHUTTLES diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index a8735cbc06..b075808652 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -114,6 +114,13 @@ name = "ares core camera" network = list(CAMERA_NET_ALMAYER, CAMERA_NET_ARES) +/obj/structure/machinery/camera/autoname/golden_arrow + name = "military-grade camera" + network = list(CAMERA_NET_GOLDEN_ARROW) + +/obj/structure/machinery/camera/autoname/golden_arrow/midway + network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_MIDWAY) + //used by the landing camera dropship equipment. Do not place them right under where the dropship lands. //Should place them near each corner of your LZs. /obj/structure/machinery/camera/autoname/lz_camera diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index 281c548227..b5cfc856b0 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -377,4 +377,8 @@ name = "\improper 'Normandy' camera controls" network = list(CAMERA_NET_NORMANDY, CAMERA_NET_LASER_TARGETS) +/obj/structure/machinery/computer/cameras/dropship/midway + name = "\improper 'Midway' camera controls" + network = list(CAMERA_NET_MIDWAY, CAMERA_NET_LASER_TARGETS) + #undef DEFAULT_MAP_SIZE diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm index 6218bf0cde..370461cff7 100644 --- a/code/game/machinery/computer/dropship_weapons.dm +++ b/code/game/machinery/computer/dropship_weapons.dm @@ -9,6 +9,7 @@ unslashable = TRUE unacidable = TRUE exproof = TRUE + var/shuttle_tag // Used to know which shuttle we're linked to. var/obj/structure/dropship_equipment/selected_equipment //the currently selected equipment installed on the shuttle this console controls. var/list/shuttle_equipments = list() //list of the equipments on the shuttle this console controls @@ -28,6 +29,8 @@ /obj/structure/machinery/computer/dropship_weapons/Initialize() . = ..() simulation = new() + firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship() + req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT) /obj/structure/machinery/computer/dropship_weapons/New() ..() @@ -717,29 +720,23 @@ else firemission_envelope.change_current_loc(shootloc) +/obj/structure/machinery/computer/dropship_weapons/Destroy() + . = ..() + + QDEL_NULL(firemission_envelope) + +/obj/structure/machinery/computer/dropship_weapons/midway + name = "\improper 'Midway' weapons controls" + shuttle_tag = DROPSHIP_MIDWAY + /obj/structure/machinery/computer/dropship_weapons/dropship1 name = "\improper 'Alamo' weapons controls" - req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT) - firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship() - -/obj/structure/machinery/computer/dropship_weapons/dropship1/New() - ..() shuttle_tag = DROPSHIP_ALAMO /obj/structure/machinery/computer/dropship_weapons/dropship2 name = "\improper 'Normandy' weapons controls" - req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT) - firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship() - -/obj/structure/machinery/computer/dropship_weapons/dropship2/New() - ..() shuttle_tag = DROPSHIP_NORMANDY -/obj/structure/machinery/computer/dropship_weapons/Destroy() - . = ..() - - QDEL_NULL(firemission_envelope) - // CAS TGUI SHIT \\ /obj/structure/machinery/computer/dropship_weapons/tgui_interact(mob/user, datum/tgui/ui) diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index bf84bc04bf..312c351f47 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -259,6 +259,14 @@ /turf/closed/shuttle/dropship2/transparent opacity = FALSE +/turf/closed/shuttle/midway + name = "\improper Midway" + icon = 'icons/turf/dropship.dmi' + icon_state = "1" + +/turf/closed/shuttle/midway/transparent + opacity = FALSE + /turf/closed/shuttle/twe_dropship name = "\improper UD4-UK" icon = 'icons/turf/twedropship.dmi' diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index f12966b471..8503dc5981 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -261,7 +261,8 @@ deployed_turret.linked_cam.network = list(CAMERA_NET_ALAMO) else if (linked_shuttle.id == DROPSHIP_NORMANDY) deployed_turret.linked_cam.network = list(CAMERA_NET_NORMANDY) - + else if(linked_shuttle.id == DROPSHIP_MIDWAY) + deployed_turret.linked_cam.network = list(CAMERA_NET_MIDWAY) /obj/structure/dropship_equipment/sentry_holder/proc/undeploy_sentry() if(!deployed_turret) diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm index 51c870f04b..1d0fc53d8a 100644 --- a/code/modules/dropships/attach_points/templates.dm +++ b/code/modules/dropships/attach_points/templates.dm @@ -80,6 +80,47 @@ transverse = 3 long = 0 +/obj/effect/attach_point/weapon/midway + ship_tag = DROPSHIP_MIDWAY + +/obj/effect/attach_point/weapon/midway/left_wing + name = "port wing weapon attach point" + icon_state = "equip_base_l_wing" + attach_id = 1 + dir = WEST + firing_arc_min = -3 + firing_arc_max = 3 + transverse = -3 + long = 0 + +/obj/effect/attach_point/weapon/midway/left_fore + name = "port fore weapon attach point" + attach_id = 2 + dir = NORTH + firing_arc_min = -6 + firing_arc_max = 0 + transverse = 0 + long = 0 + +/obj/effect/attach_point/weapon/midway/right_fore + name = "starboard fore weapon attach point" + attach_id = 3 + dir = NORTH + firing_arc_min = 0 + firing_arc_max = 6 + transverse = 0 + long = 0 + +/obj/effect/attach_point/weapon/midway/right_wing + name = "starboard wing weapon attach point" + icon_state = "equip_base_r_wing"; + attach_id = 4 + dir = EAST + firing_arc_min = -3 + firing_arc_max = 3 + transverse = 3 + long = 0 + /obj/effect/attach_point/crew_weapon name = "crew compartment attach point" base_category = DROPSHIP_CREW_WEAPON @@ -90,6 +131,9 @@ /obj/effect/attach_point/crew_weapon/dropship2 ship_tag = DROPSHIP_NORMANDY +/obj/effect/attach_point/crew_weapon/midway + ship_tag = DROPSHIP_MIDWAY + /obj/effect/attach_point/electronics name = "electronic system attach point" base_category = DROPSHIP_ELECTRONICS @@ -102,6 +146,9 @@ /obj/effect/attach_point/electronics/dropship2 ship_tag = DROPSHIP_NORMANDY +/obj/effect/attach_point/electronics/midway + ship_tag = DROPSHIP_MIDWAY + /obj/effect/attach_point/fuel name = "engine system attach point" icon = 'icons/obj/structures/props/almayer_props64.dmi' @@ -114,6 +161,9 @@ /obj/effect/attach_point/fuel/dropship2 ship_tag = DROPSHIP_NORMANDY +/obj/effect/attach_point/fuel/midway + ship_tag = DROPSHIP_MIDWAY + /obj/effect/attach_point/computer base_category = DROPSHIP_COMPUTER @@ -122,3 +172,6 @@ /obj/effect/attach_point/computer/dropship2 ship_tag = DROPSHIP_NORMANDY + +/obj/effect/attach_point/computer/midway + ship_tag = DROPSHIP_MIDWAY diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 9d910882d1..0a69439011 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -104,6 +104,15 @@ set_security_level(SEC_LEVEL_RED) return +/obj/docking_port/mobile/marine_dropship/midway + name = "Midway" + id = DROPSHIP_MIDWAY + width = 9 + height = 18 + + dwidth = 4 + dheight = 8 + /obj/docking_port/mobile/marine_dropship/alamo name = "Alamo" id = DROPSHIP_ALAMO @@ -260,6 +269,12 @@ auto_open = TRUE roundstart_template = /datum/map_template/shuttle/normandy +/obj/docking_port/stationary/marine_dropship/golden_arrow_hangar + name = "Hangar Bay" + id = GOLDEN_ARROW_LZ + auto_open = TRUE + roundstart_template = /datum/map_template/shuttle/midway + /obj/docking_port/stationary/marine_dropship/crash_site auto_open = TRUE @@ -285,6 +300,10 @@ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) +/datum/map_template/shuttle/midway + name = "Midway" + shuttle_id = DROPSHIP_MIDWAY + /datum/map_template/shuttle/alamo name = "Alamo" shuttle_id = DROPSHIP_ALAMO diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi index b3cf56eb454991cc8fb37eacabd3cc6c79e468e7..88a220eb6f9f0271202d20aebaf6a125a57c2a9b 100644 GIT binary patch delta 7676 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 delta 7578 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 U(yx6c=YXTlP~S|iLWdCke`_&Mj{pDw diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index fbc55b0e38..bbcbe52131 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -173,7 +173,8 @@ "aT" = ( /obj/structure/machinery/computer/cameras/almayer/vehicle{ dir = 4; - pixel_x = -17 + pixel_x = -17; + network = list("Golden Arrow","Vehicle","Midway") }, /obj/structure/machinery/prop/almayer/CICmap{ dir = 4; @@ -250,7 +251,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -260,7 +261,7 @@ }, /area/golden_arrow/hangar) "bu" = ( -/obj/structure/machinery/camera/autoname/almayer, +/obj/structure/machinery/camera/autoname/golden_arrow, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 @@ -504,7 +505,7 @@ }, /area/golden_arrow/squad_two) "cB" = ( -/obj/structure/machinery/camera/autoname/almayer, +/obj/structure/machinery/camera/autoname/golden_arrow, /turf/open/floor/almayer, /area/golden_arrow/hangar) "cD" = ( @@ -1243,7 +1244,7 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) "hk" = ( -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; name = "ship-grade camera" }, @@ -1583,7 +1584,7 @@ icon_state = "E"; pixel_x = 1 }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -1832,7 +1833,7 @@ icon_state = "SE-out"; pixel_x = 1 }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -3225,7 +3226,7 @@ }, /area/golden_arrow/canteen) "ug" = ( -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; name = "ship-grade camera" }, @@ -3747,7 +3748,7 @@ /obj/structure/machinery/recharger{ pixel_y = 6 }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; name = "ship-grade camera" }, @@ -3833,7 +3834,7 @@ }, /area/golden_arrow/supply) "yj" = ( -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 1; name = "ship-grade camera" }, @@ -3985,7 +3986,7 @@ }, /area/golden_arrow/hangar) "za" = ( -/obj/structure/machinery/camera/autoname/almayer, +/obj/structure/machinery/camera/autoname/golden_arrow, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 @@ -4005,7 +4006,7 @@ /area/golden_arrow/squad_one) "zl" = ( /obj/structure/machinery/power/smes/buildable, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -4053,7 +4054,7 @@ }, /area/golden_arrow/hangar) "zG" = ( -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -4251,7 +4252,7 @@ /turf/open/floor/almayer, /area/golden_arrow/hangar) "AY" = ( -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; name = "ship-grade camera" }, @@ -4629,8 +4630,8 @@ "CZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - name = "Alamo Remote Control Console"; - shuttleId = "dropship_alamo" + name = "Midway Remote Control Console"; + shuttleId = "dropship_midway" }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) @@ -4888,7 +4889,7 @@ /area/golden_arrow/engineering) "EK" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -5580,7 +5581,7 @@ /area/golden_arrow/engineering) "IS" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; name = "ship-grade camera" }, @@ -5949,7 +5950,7 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/cryo_cells) "Lg" = ( -/obj/docking_port/stationary/marine_dropship/almayer_hangar_1, +/obj/docking_port/stationary/marine_dropship/golden_arrow_hangar, /turf/open/floor/plating, /area/golden_arrow/hangar) "Ll" = ( @@ -5998,7 +5999,7 @@ }, /area/golden_arrow/supply) "LE" = ( -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -6434,7 +6435,7 @@ }, /area/golden_arrow/briefing) "Oj" = ( -/obj/structure/machinery/camera/autoname/almayer, +/obj/structure/machinery/camera/autoname/golden_arrow, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -7109,7 +7110,7 @@ /obj/item/tool/wrench{ pixel_y = 7 }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, @@ -7342,7 +7343,7 @@ /area/golden_arrow/cryo_cells) "Sy" = ( /obj/structure/machinery/disposal, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; name = "ship-grade camera" }, @@ -7656,7 +7657,7 @@ "Ub" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8; name = "ship-grade camera" }, diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm new file mode 100644 index 0000000000..93ff9659d4 --- /dev/null +++ b/maps/shuttles/dropship_midway.dmm @@ -0,0 +1,815 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"af" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "34" + }, +/area/shuttle/midway) +"bm" = ( +/obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust, +/turf/template_noop, +/area/shuttle/midway) +"bs" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin6" + }, +/area/shuttle/midway) +"dr" = ( +/obj/structure/machinery/door_control{ + id = "dropship_midway"; + name = "Dropship Lockdown"; + normaldoorcontrol = 3; + pixel_y = -19; + req_one_access_txt = "3;22"; + throw_range = 15 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"dB" = ( +/obj/structure/shuttle/part/dropship1/left_inner_wing_connector, +/turf/open/space/basic, +/area/shuttle/midway) +"dD" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "22" + }, +/area/shuttle/midway) +"dE" = ( +/turf/closed/shuttle/midway{ + icon_state = "42" + }, +/area/shuttle/midway) +"eu" = ( +/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing, +/turf/template_noop, +/area/shuttle/midway) +"go" = ( +/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/shuttle/midway) +"gw" = ( +/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap, +/turf/template_noop, +/area/shuttle/midway) +"hl" = ( +/turf/closed/shuttle/midway{ + icon_state = "24" + }, +/area/shuttle/midway) +"hL" = ( +/obj/structure/machinery/light{ + dir = 8; + pixel_x = -14 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin2" + }, +/area/shuttle/midway) +"hO" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "86" + }, +/area/shuttle/midway) +"if" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "27" + }, +/area/shuttle/midway) +"im" = ( +/obj/structure/shuttle/part/dropship1/transparent/nose_top_left, +/obj/structure/shuttle/part/dropship1/transparent/nose_top_left, +/turf/template_noop, +/area/shuttle/midway) +"iv" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"je" = ( +/obj/structure/machinery/camera/autoname/golden_arrow/midway{ + dir = 4; + pixel_x = -23 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"jy" = ( +/obj/effect/attach_point/crew_weapon/midway, +/obj/structure/machinery/light{ + dir = 8; + pixel_x = -14 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"jW" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"kC" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/shuttle/dropship{ + icon_state = "floor8" + }, +/area/shuttle/midway) +"ls" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "35" + }, +/area/shuttle/midway) +"lC" = ( +/turf/closed/shuttle/midway{ + icon_state = "104" + }, +/area/shuttle/midway) +"mh" = ( +/obj/structure/shuttle/part/dropship1/right_inner_wing_connector, +/turf/open/space/basic, +/area/shuttle/midway) +"mE" = ( +/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing, +/turf/template_noop, +/area/shuttle/midway) +"mG" = ( +/obj/structure/shuttle/part/dropship1/transparent/upper_left_wing, +/turf/template_noop, +/area/shuttle/midway) +"mL" = ( +/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/shuttle/midway) +"mR" = ( +/obj/structure/shuttle/part/dropship1/nose_front_left, +/turf/template_noop, +/area/shuttle/midway) +"nH" = ( +/obj/structure/shuttle/part/dropship1/transparent/nose_center, +/turf/template_noop, +/area/shuttle/midway) +"od" = ( +/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing, +/turf/template_noop, +/area/shuttle/midway) +"ro" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "80" + }, +/area/shuttle/midway) +"rq" = ( +/turf/closed/shuttle/midway{ + icon_state = "77" + }, +/area/shuttle/midway) +"rr" = ( +/turf/closed/shuttle/midway{ + icon_state = "103" + }, +/area/shuttle/midway) +"rF" = ( +/obj/structure/shuttle/part/dropship1/lower_right_wall, +/turf/template_noop, +/area/shuttle/midway) +"rR" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "32" + }, +/area/shuttle/midway) +"sl" = ( +/turf/closed/shuttle/midway{ + 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 + }, +/turf/closed/shuttle/midway/transparent{ + icon_state = "78" + }, +/area/shuttle/midway) +"tG" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = 30 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"tP" = ( +/obj/structure/shuttle/part/dropship1/transparent/right_outer_bottom_wing, +/turf/template_noop, +/area/shuttle/midway) +"ul" = ( +/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap, +/turf/template_noop, +/area/shuttle/midway) +"ux" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin14" + }, +/area/shuttle/midway) +"vJ" = ( +/turf/closed/shuttle/midway{ + icon_state = "92" + }, +/area/shuttle/midway) +"vN" = ( +/obj/structure/shuttle/part/dropship1/transparent/middle_right_wing, +/turf/template_noop, +/area/shuttle/midway) +"wB" = ( +/turf/closed/shuttle/midway{ + icon_state = "83" + }, +/area/shuttle/midway) +"xp" = ( +/turf/closed/shuttle/midway{ + icon_state = "62" + }, +/area/shuttle/midway) +"xy" = ( +/obj/effect/attach_point/crew_weapon/midway, +/obj/structure/machinery/light{ + dir = 4; + pixel_x = 14 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"ym" = ( +/turf/closed/shuttle/midway{ + icon_state = "69" + }, +/area/shuttle/midway) +"yB" = ( +/turf/closed/shuttle/midway{ + icon_state = "54" + }, +/area/shuttle/midway) +"yN" = ( +/obj/structure/shuttle/part/dropship1/right_outer_wing_connector, +/turf/open/space/basic, +/area/shuttle/midway) +"yO" = ( +/turf/closed/shuttle/midway{ + icon_state = "94" + }, +/area/shuttle/midway) +"zm" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "23" + }, +/area/shuttle/midway) +"Aw" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "97" + }, +/area/shuttle/midway) +"Bn" = ( +/turf/closed/shuttle/midway{ + icon_state = "30" + }, +/area/shuttle/midway) +"BI" = ( +/turf/closed/shuttle/midway{ + icon_state = "47" + }, +/area/shuttle/midway) +"BS" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "38" + }, +/area/shuttle/midway) +"BU" = ( +/obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust, +/turf/template_noop, +/area/shuttle/midway) +"Cc" = ( +/obj/structure/machinery/camera/autoname/golden_arrow/midway{ + dir = 8; + pixel_x = 23 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"Cm" = ( +/obj/effect/attach_point/fuel/midway, +/turf/closed/shuttle/midway/transparent{ + icon_state = "28" + }, +/area/shuttle/midway) +"Cr" = ( +/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/shuttle/midway) +"Db" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "26" + }, +/area/shuttle/midway) +"Dg" = ( +/turf/open/shuttle/dropship, +/area/shuttle/midway) +"Ds" = ( +/obj/structure/stairs/perspective, +/obj/structure/platform{ + dir = 4; + layer = 2.7 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"DH" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "89" + }, +/area/shuttle/midway) +"Ed" = ( +/turf/closed/shuttle/midway{ + icon_state = "25" + }, +/area/shuttle/midway) +"EN" = ( +/obj/structure/shuttle/part/dropship1/nose_front_right, +/turf/template_noop, +/area/shuttle/midway) +"Fu" = ( +/obj/structure/shuttle/part/dropship1/transparent/lower_right_wing, +/obj/effect/attach_point/weapon/midway/right_wing, +/turf/template_noop, +/area/shuttle/midway) +"Gf" = ( +/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/shuttle/midway) +"Gh" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin7" + }, +/area/shuttle/midway) +"Go" = ( +/obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons, +/obj/effect/attach_point/weapon/midway/left_fore, +/turf/template_noop, +/area/shuttle/midway) +"Hj" = ( +/turf/closed/shuttle/midway{ + icon_state = "75" + }, +/area/shuttle/midway) +"Hz" = ( +/obj/structure/shuttle/part/dropship1/left_outer_wing_connector, +/turf/open/space/basic, +/area/shuttle/midway) +"HY" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{ + id = "aft_door" + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"Id" = ( +/obj/effect/attach_point/crew_weapon/midway, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"Ji" = ( +/turf/closed/shuttle/midway{ + icon_state = "64" + }, +/area/shuttle/midway) +"Jq" = ( +/turf/closed/shuttle/midway{ + icon_state = "72" + }, +/area/shuttle/midway) +"Ks" = ( +/obj/structure/shuttle/part/dropship1/transparent/lower_left_wing, +/obj/effect/attach_point/weapon/midway/left_wing, +/turf/template_noop, +/area/shuttle/midway) +"Kv" = ( +/obj/structure/machinery/light{ + dir = 4; + pixel_x = 14 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"Kw" = ( +/turf/template_noop, +/area/space) +"Lr" = ( +/turf/closed/shuttle/midway{ + icon_state = "48" + }, +/area/shuttle/midway) +"LY" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/computer/shuttle/dropship/flight, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"LZ" = ( +/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing, +/turf/template_noop, +/area/shuttle/midway) +"Mf" = ( +/obj/structure/machinery/door/airlock/dropship_hatch{ + id = "port_door" + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"Mz" = ( +/obj/structure/stairs/perspective, +/obj/structure/platform{ + dir = 8; + layer = 2.7 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"ME" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"OB" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "96" + }, +/area/shuttle/midway) +"Pc" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "98" + }, +/area/shuttle/midway) +"PP" = ( +/obj/structure/machinery/door/airlock/hatch/cockpit, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"Qk" = ( +/obj/docking_port/mobile/marine_dropship/midway, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"QI" = ( +/obj/structure/shuttle/part/dropship1/lower_left_wall, +/turf/template_noop, +/area/shuttle/midway) +"QK" = ( +/obj/structure/machinery/light{ + dir = 8; + pixel_x = -14 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/midway) +"Rm" = ( +/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/shuttle/midway) +"SS" = ( +/obj/structure/machinery/door/airlock/dropship_hatch{ + dir = 8; + id = "starboard_door" + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"SZ" = ( +/obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing, +/turf/template_noop, +/area/shuttle/midway) +"Tl" = ( +/obj/structure/shuttle/part/dropship1/transparent/nose_top_right, +/turf/template_noop, +/area/shuttle/midway) +"UI" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/midway) +"Vu" = ( +/turf/closed/shuttle/midway{ + icon_state = "67" + }, +/area/shuttle/midway) +"VU" = ( +/turf/closed/shuttle/midway{ + icon_state = "73" + }, +/area/shuttle/midway) +"WN" = ( +/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/shuttle/midway) +"XH" = ( +/obj/effect/attach_point/fuel/midway{ + pixel_x = -32 + }, +/turf/closed/shuttle/midway/transparent{ + icon_state = "33" + }, +/area/shuttle/midway) +"Yr" = ( +/turf/closed/shuttle/midway{ + icon_state = "81" + }, +/area/shuttle/midway) +"Zr" = ( +/obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons, +/obj/effect/attach_point/weapon/midway/right_fore, +/turf/template_noop, +/area/shuttle/midway) +"Zu" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "29" + }, +/area/shuttle/midway) +"ZZ" = ( +/turf/closed/shuttle/midway/transparent{ + icon_state = "39" + }, +/area/shuttle/midway) + +(1,1,1) = {" +Kw +Kw +Kw +Kw +Kw +mG +od +Ks +Kw +Kw +Kw +ul +af +Cm +dD +BU +Kw +mE +"} +(2,1,1) = {" +Kw +Kw +Kw +Go +Hj +Jq +Vu +xp +Mf +Mf +QI +gw +ls +Zu +zm +bm +Kw +eu +"} +(3,1,1) = {" +im +mR +vJ +hO +Yr +UI +iv +jy +ME +dr +BI +dE +dE +Bn +hl +rr +dB +Hz +"} +(4,1,1) = {" +nH +OB +Cr +hL +ti +ux +bs +jW +jW +jW +Ds +Rm +jW +je +QK +HY +Kw +Kw +"} +(5,1,1) = {" +nH +Aw +LY +tf +PP +jW +Dg +WN +ME +Qk +Id +kC +ME +ME +ME +ME +Kw +Kw +"} +(6,1,1) = {" +nH +Pc +go +Gf +ro +ux +Gh +jW +jW +jW +Mz +mL +tG +jW +Kv +ME +Kw +Kw +"} +(7,1,1) = {" +Tl +EN +yO +DH +rq +UI +Cc +xy +ME +dr +Lr +yB +yB +sl +Ed +lC +mh +yN +"} +(8,1,1) = {" +Kw +Kw +Kw +Zr +wB +VU +ym +Ji +SS +SS +rF +ul +BS +rR +Db +BU +Kw +SZ +"} +(9,1,1) = {" +Kw +Kw +Kw +Kw +Kw +LZ +vN +Fu +Kw +Kw +Kw +gw +ZZ +XH +if +bm +Kw +tP +"} From 96c740215d270560ceceab95ebd69d40afff9538 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 1 Nov 2023 11:17:46 -0400 Subject: [PATCH 2/3] throw_range ???? --- maps/shuttles/dropship_midway.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm index 93ff9659d4..9d9d49c18d 100644 --- a/maps/shuttles/dropship_midway.dmm +++ b/maps/shuttles/dropship_midway.dmm @@ -20,7 +20,7 @@ normaldoorcontrol = 3; pixel_y = -19; req_one_access_txt = "3;22"; - throw_range = 15 + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" From 99fb632335b40c43cc27e0fd032ba5e93b6c0066 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 1 Nov 2023 11:27:37 -0400 Subject: [PATCH 3/3] OK you caught me it was a direct edit --- maps/shuttles/dropship_midway.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm index 9d9d49c18d..4c41724f40 100644 --- a/maps/shuttles/dropship_midway.dmm +++ b/maps/shuttles/dropship_midway.dmm @@ -19,8 +19,7 @@ name = "Dropship Lockdown"; normaldoorcontrol = 3; pixel_y = -19; - req_one_access_txt = "3;22"; - + req_one_access_txt = "3;22" }, /turf/open/shuttle/dropship{ icon_state = "rasputin15"