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

Fixes wrong dropship attachment planes #5495

Merged
merged 1 commit into from
Jan 20, 2024
Merged

Fixes wrong dropship attachment planes #5495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/modules/dropships/attach_points/attach_point.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
unacidable = TRUE
anchored = TRUE
layer = ABOVE_TURF_LAYER
plane = FLOOR_PLANE
plane = GAME_PLANE
/// The currently installed equipment, if any
var/obj/structure/dropship_equipment/installed_equipment
/// What kind of equipment this base accepts
Expand Down
6 changes: 6 additions & 0 deletions code/modules/dropships/attach_points/templates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,15 @@
/obj/effect/attach_point/crew_weapon/dropship1
ship_tag = DROPSHIP_ALAMO

/obj/effect/attach_point/crew_weapon/dropship1/floor
plane = FLOOR_PLANE

/obj/effect/attach_point/crew_weapon/dropship2
ship_tag = DROPSHIP_NORMANDY

/obj/effect/attach_point/crew_weapon/dropship2/floor
plane = FLOOR_PLANE

/obj/effect/attach_point/electronics
name = "electronic system attach point"
base_category = DROPSHIP_ELECTRONICS
Expand Down
6 changes: 3 additions & 3 deletions maps/shuttles/dropship_alamo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
},
/area/shuttle/drop1/sulaco)
"Kk" = (
/obj/effect/attach_point/crew_weapon/dropship1{
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 7
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -450,7 +450,7 @@
},
/area/shuttle/drop1/sulaco)
"Nv" = (
/obj/effect/attach_point/crew_weapon/dropship1{
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 8
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -507,7 +507,7 @@
},
/area/shuttle/drop1/sulaco)
"PV" = (
/obj/effect/attach_point/crew_weapon/dropship1{
/obj/effect/attach_point/crew_weapon/dropship1/floor{
attach_id = 9
},
/turf/open/shuttle/dropship{
Expand Down
6 changes: 3 additions & 3 deletions maps/shuttles/dropship_normandy.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
},
/area/shuttle/drop2/sulaco)
"hn" = (
/obj/effect/attach_point/crew_weapon/dropship2{
/obj/effect/attach_point/crew_weapon/dropship2/floor{
attach_id = 8
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -326,7 +326,7 @@
},
/area/shuttle/drop2/sulaco)
"Bg" = (
/obj/effect/attach_point/crew_weapon/dropship2{
/obj/effect/attach_point/crew_weapon/dropship2/floor{
attach_id = 7
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -478,7 +478,7 @@
/turf/template_noop,
/area/shuttle/drop2/sulaco)
"MA" = (
/obj/effect/attach_point/crew_weapon/dropship2{
/obj/effect/attach_point/crew_weapon/dropship2/floor{
attach_id = 9
},
/turf/open/shuttle/dropship{
Expand Down
Loading