Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework shuttles and let the Alamo soar #16185

Closed
wants to merge 23 commits into from
Closed

Rework shuttles and let the Alamo soar #16185

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
58dc8db
Initial commit
XElectricX Jun 26, 2024
eec1006
Tons of code and mapping
XElectricX Jun 29, 2024
da8eefa
Merge remote-tracking branch 'upstream/master' into dropship
XElectricX Jun 29, 2024
ecfe523
Conflicts
XElectricX Jun 29, 2024
240e526
Bug fixes and turret improvements
XElectricX Jun 29, 2024
8e89b3c
Repairable shuttle walls and windows
XElectricX Jul 3, 2024
35cc416
Merge branch 'master' into dropship
XElectricX Jul 3, 2024
4fef9cb
New map error
XElectricX Jul 3, 2024
7bcf98b
Hijacking is spaghetti
XElectricX Jul 7, 2024
82bd5c5
Tweaks
XElectricX Jul 7, 2024
fd4c4d8
Merge remote-tracking branch 'upstream/master' into dropship
XElectricX Jul 7, 2024
2a0d5ef
Finish hijack code, unify LZ areas
XElectricX Jul 8, 2024
e8cfdd9
Polish
XElectricX Jul 8, 2024
ec3d898
Merge branch 'master' into dropship
XElectricX Jul 8, 2024
4de2ef6
Forgor job
XElectricX Jul 8, 2024
577a1cf
Fix areas
XElectricX Jul 8, 2024
94b83ad
Fix more areas
XElectricX Jul 8, 2024
148b115
Undo that xeno turret thing
XElectricX Jul 8, 2024
2151e15
Ok then
XElectricX Jul 8, 2024
1156960
Please pass the tests
XElectricX Jul 9, 2024
07daf2a
Forgor an area-less tile
XElectricX Jul 9, 2024
8c37b08
Screw you
XElectricX Jul 9, 2024
6904382
Rename shuttle picker consoles
XElectricX Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions _maps/map_files/Arachne/TGS_Arachne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
"anI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/docking_port/stationary/shuttle/crash_target,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical)
"aoJ" = (
Expand Down Expand Up @@ -3633,7 +3633,7 @@
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/medical_science)
"dfL" = (
/obj/docking_port/stationary/marine_dropship/minidropship,
/obj/docking_port/stationary/shuttle/minidropship,
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
"dfN" = (
Expand Down Expand Up @@ -4583,7 +4583,7 @@
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical)
"dSy" = (
/obj/machinery/computer/dropship_picker,
/obj/machinery/computer/shuttle_picker/mini,
/turf/open/floor/mainship/orange{
dir = 10
},
Expand Down Expand Up @@ -6792,7 +6792,7 @@
/obj/machinery/door/firedoor{
dir = 1
},
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/docking_port/stationary/shuttle/crash_target,
/turf/open/floor/mainship/floor,
/area/mainship/squads/general)
"fMs" = (
Expand Down Expand Up @@ -8952,7 +8952,7 @@
dir = 8;
on = 1
},
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/docking_port/stationary/shuttle/crash_target,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical)
"hyU" = (
Expand Down Expand Up @@ -16327,7 +16327,7 @@
/turf/open/floor/wood,
/area/mainship/hallways/starboard_hallway)
"nwb" = (
/obj/docking_port/stationary/marine_dropship/cas,
/obj/docking_port/stationary/shuttle/cas,
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
"nwd" = (
Expand Down Expand Up @@ -22764,7 +22764,7 @@
},
/area/mainship/command/self_destruct)
"sPf" = (
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/docking_port/stationary/shuttle/crash_target,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical)
"sPi" = (
Expand Down Expand Up @@ -27696,7 +27696,7 @@
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
"xaX" = (
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/docking_port/stationary/shuttle/crash_target,
/obj/structure/disposalpipe/segment{
dir = 1
},
Expand Down Expand Up @@ -27967,8 +27967,8 @@
/turf/open/floor/mainship/tcomms,
/area/mainship/shipboard/weapon_room)
"xnz" = (
/obj/docking_port/stationary/marine_dropship/hangar/one,
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/docking_port/stationary/shuttle/dropship,
/obj/docking_port/stationary/shuttle/crash_target,
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
"xnM" = (
Expand Down
14 changes: 3 additions & 11 deletions _maps/map_files/BigRed_v2/BigRed_v2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8313,11 +8313,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/filtration_plant)
"dzw" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/shuttle/shuttle_control/dropship/two,
/turf/open/floor/plating/ground/mars/random/dirt,
/area/lv624/lazarus/console)
"dzA" = (
/obj/structure/prop/mainship/telecomms/bus,
/turf/open/floor/podhatch/floor,
Expand Down Expand Up @@ -10056,7 +10051,6 @@
/turf/open/floor/freezer,
/area/bigredv2/outside/dorms)
"hse" = (
/obj/machinery/computer/shuttle/shuttle_control/dropship,
/obj/structure/table,
/turf/open/floor/tile/dark,
/area/lv624/lazarus/console)
Expand Down Expand Up @@ -14847,8 +14841,6 @@
/obj/machinery/light{
dir = 1
},
/obj/structure/table/reinforced,
/obj/machinery/computer/shuttle/shuttle_control/dropship,
/turf/open/floor/asteroidfloor,
/area/bigredv2/outside/space_port)
"shc" = (
Expand Down Expand Up @@ -15230,7 +15222,7 @@
/turf/open/floor/tile/dark,
/area/bigredv2/outside/space_port)
"tej" = (
/obj/docking_port/stationary/marine_dropship/lz2,
/obj/docking_port/stationary/shuttle/lz2,
/turf/open/floor/plating,
/area/shuttle/drop2/lz2)
"teq" = (
Expand Down Expand Up @@ -17217,7 +17209,7 @@
},
/area/bigredv2/outside/s)
"xvj" = (
/obj/docking_port/stationary/marine_dropship/lz1,
/obj/docking_port/stationary/shuttle/lz1,
/turf/open/floor/plating,
/area/shuttle/drop1/lz1)
"xvL" = (
Expand Down Expand Up @@ -26706,7 +26698,7 @@ eKH
eKH
eKH
cfV
dzw
eKH
iet
nyy
evZ
Expand Down
Loading