Skip to content

Commit

Permalink
PvE shuttle mapping fix
Browse files Browse the repository at this point in the history
some backend changes to normandy/alamo weren't added to PvE shuttles
  • Loading branch information
Doubleumc committed Aug 1, 2024
1 parent b677889 commit 62c9ff4
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 33 deletions.
46 changes: 28 additions & 18 deletions maps/shuttles/dropship_cyclone.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/obj/structure/shuttle/part/dropship2/transparent/outer_left_weapons{
name = "\improper Cyclone"
},
/obj/effect/attach_point/weapon/midway/right_fore{
/obj/effect/attach_point/weapon/midway/left_fore{
ship_tag = "dropship_cyclone"
},
/turf/template_noop,
Expand Down Expand Up @@ -87,7 +87,8 @@
"fy" = (
/obj/docking_port/mobile/marine_dropship/cyclone,
/obj/effect/attach_point/crew_weapon/midway{
ship_tag = "dropship_cyclone"
ship_tag = "dropship_cyclone";
attach_id = 7
},
/turf/open/shuttle/dropship{
icon_state = "rasputin14"
Expand All @@ -104,14 +105,19 @@
},
/area/shuttle/cyclone)
"ha" = (
/obj/effect/attach_point/fuel/midway{
attach_id = 11;
ship_tag = "dropship_cyclone"
},
/turf/closed/shuttle/cyclone/transparent{
icon_state = "32"
},
/area/shuttle/cyclone)
"hd" = (
/obj/effect/attach_point/fuel/dropship2{
pixel_x = -32;
ship_tag = "dropship_cyclone"
ship_tag = "dropship_cyclone";
attach_id = 11
},
/turf/closed/shuttle/cyclone/transparent{
icon_state = "33"
Expand Down Expand Up @@ -152,7 +158,8 @@
"jr" = (
/obj/effect/attach_point/crew_weapon/midway{
ship_tag = "dropship_cyclone";
dir = 8
dir = 8;
attach_id = 8
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -264,7 +271,8 @@
"rk" = (
/obj/effect/attach_point/crew_weapon/midway{
ship_tag = "dropship_cyclone";
dir = 4
dir = 4;
attach_id = 9
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -327,7 +335,7 @@
/area/shuttle/cyclone)
"wk" = (
/turf/template_noop,
/area/space)
/area/template_noop)
"wA" = (
/turf/closed/shuttle/cyclone/transparent{
icon_state = "35"
Expand Down Expand Up @@ -392,9 +400,9 @@
/area/shuttle/cyclone)
"Ax" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/machinery/computer/cameras/dropship/two{
name = "\improper 'Cyclone' camera controls";
network = list("Cyclone","Laser Targets")
/obj/structure/machinery/computer/cameras/dropship/midway{
network = list("Cyclone","Laser Targets");
name = "\improper 'Cyclone' camera controls"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -467,8 +475,9 @@
},
/area/shuttle/cyclone)
"Fz" = (
/obj/effect/attach_point/fuel/dropship2{
ship_tag = "dropship_cyclone"
/obj/effect/attach_point/fuel/midway{
ship_tag = "dropship_cyclone";
attach_id = 10
},
/turf/closed/shuttle/cyclone/transparent{
icon_state = "28"
Expand Down Expand Up @@ -514,7 +523,6 @@
},
/area/shuttle/cyclone)
"IP" = (
/obj/effect/attach_point/weapon/dropship2/left_wing,
/obj/structure/shuttle/part/dropship2/transparent/lower_left_wing{
name = "\improper Cyclone"
},
Expand Down Expand Up @@ -569,9 +577,6 @@
},
/area/shuttle/cyclone)
"MU" = (
/obj/structure/machinery/computer/dropship_weapons/dropship2{
name = "\improper 'Cyclone' weapons controls"
},
/obj/structure/phone_base/rotary{
name = "Cyclone Telephone";
phone_category = "Dropship";
Expand All @@ -580,6 +585,10 @@
pixel_y = 16
},
/obj/structure/blocker/invisible_wall,
/obj/structure/machinery/computer/dropship_weapons/midway{
name = "\improper 'Cyclone' weapons controls";
shuttle_tag = "dropship_cyclone"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
Expand Down Expand Up @@ -677,11 +686,12 @@
},
/area/shuttle/cyclone)
"Zd" = (
/obj/structure/shuttle/part/dropship2/transparent/outer_right_weapons,
/obj/effect/attach_point/weapon/midway/left_fore{
ship_tag = "dropship_cyclone";
/obj/structure/shuttle/part/dropship2/transparent/outer_right_weapons{
name = "\improper Cyclone"
},
/obj/effect/attach_point/weapon/midway/right_fore{
ship_tag = "dropship_cyclone"
},
/turf/template_noop,
/area/shuttle/cyclone)
"ZG" = (
Expand Down
37 changes: 29 additions & 8 deletions maps/shuttles/dropship_midway.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@
},
/area/shuttle/midway)
"jy" = (
/obj/effect/attach_point/crew_weapon/midway,
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 8
},
/obj/structure/machinery/light{
dir = 8;
pixel_x = -14
Expand Down Expand Up @@ -206,7 +208,9 @@
name = "\improper Midway";
icon_state = "105"
},
/obj/effect/attach_point/electronics/midway,
/obj/effect/attach_point/electronics/midway{
attach_id = 5
},
/turf/template_noop,
/area/shuttle/midway)
"ro" = (
Expand Down Expand Up @@ -309,7 +313,9 @@
},
/area/shuttle/midway)
"xy" = (
/obj/effect/attach_point/crew_weapon/midway,
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 9
},
/obj/structure/machinery/light{
dir = 4;
pixel_x = 14
Expand Down Expand Up @@ -380,7 +386,9 @@
},
/area/shuttle/midway)
"Cm" = (
/obj/effect/attach_point/fuel/midway,
/obj/effect/attach_point/fuel/midway{
attach_id = 10
},
/turf/closed/shuttle/midway/transparent{
icon_state = "28"
},
Expand Down Expand Up @@ -483,7 +491,9 @@
},
/area/shuttle/midway)
"Id" = (
/obj/effect/attach_point/crew_weapon/midway,
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 7
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
Expand Down Expand Up @@ -525,7 +535,7 @@
/area/shuttle/midway)
"Kw" = (
/turf/template_noop,
/area/space)
/area/template_noop)
"Lr" = (
/turf/closed/shuttle/midway{
icon_state = "48"
Expand All @@ -544,6 +554,16 @@
},
/turf/template_noop,
/area/shuttle/midway)
"Mw" = (
/obj/structure/shuttle/part/dropship1/transparent/nose_center{
name = "\improper Midway";
icon_state = "105"
},
/obj/effect/attach_point/electronics/midway{
attach_id = 6
},
/turf/template_noop,
/area/shuttle/midway)
"Mz" = (
/obj/structure/stairs/perspective,
/obj/structure/platform{
Expand Down Expand Up @@ -666,7 +686,8 @@
/area/shuttle/midway)
"XH" = (
/obj/effect/attach_point/fuel/midway{
pixel_x = -32
pixel_x = -32;
attach_id = 11
},
/turf/closed/shuttle/midway/transparent{
icon_state = "33"
Expand Down Expand Up @@ -796,7 +817,7 @@ Kw
Kw
"}
(6,1,1) = {"
ok
Mw
Pc
go
Gf
Expand Down
38 changes: 31 additions & 7 deletions maps/shuttles/dropship_upp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,10 @@
},
/area/shuttle/ds_upp)
"xZ" = (
/obj/effect/attach_point/crew_weapon/midway,
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 7;
ship_tag = "dropship_upp"
},
/turf/open/floor/strata{
dir = 4;
icon_state = "floor3"
Expand Down Expand Up @@ -402,10 +405,10 @@
ship_tag = "dropship_upp"
},
/turf/template_noop,
/area/space)
/area/template_noop)
"Jy" = (
/turf/template_noop,
/area/space)
/area/template_noop)
"JD" = (
/obj/effect/decal/strata_decals/catwalk/prison,
/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
Expand Down Expand Up @@ -440,6 +443,16 @@
icon_state = "uppwall"
},
/area/shuttle/ds_upp)
"OB" = (
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 9;
ship_tag = "dropship_upp"
},
/turf/open/floor/strata{
dir = 4;
icon_state = "floor3"
},
/area/shuttle/ds_upp)
"PQ" = (
/obj/effect/attach_point/weapon/midway/right_wing{
ship_tag = "dropship_upp"
Expand Down Expand Up @@ -512,7 +525,8 @@
/obj/structure/machinery/computer/dropship_weapons/midway{
name = "\improper 'Akademia Nauk' weapons controls";
shuttle_tag = "dropship_upp";
faction = "UPP"
faction = "UPP";
req_one_access = list(235,240)
},
/obj/structure/blocker/invisible_wall,
/turf/open/floor/strata{
Expand All @@ -531,12 +545,22 @@
ship_tag = "dropship_upp"
},
/turf/template_noop,
/area/space)
/area/template_noop)
"Xo" = (
/turf/closed/shuttle/ert{
icon_state = "T151"
},
/area/shuttle/ds_upp)
"XO" = (
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 8;
ship_tag = "dropship_upp"
},
/turf/open/floor/strata{
dir = 4;
icon_state = "floor3"
},
/area/shuttle/ds_upp)
"Zm" = (
/turf/closed/shuttle/ert{
icon_state = "upp8"
Expand Down Expand Up @@ -600,7 +624,7 @@ xE
xE
AK
he
xZ
XO
nA
HV
ex
Expand Down Expand Up @@ -680,7 +704,7 @@ Sx
Sx
AK
he
xZ
OB
nA
HV
yy
Expand Down

0 comments on commit 62c9ff4

Please sign in to comment.