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

Dropship sidedoors #4995

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Dropship sidedoors #4995

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dad009
initial
Doubleumc Nov 22, 2023
9de7f7b
Merge remote-tracking branch 'upstream/master' into dropship-sidedoors
Doubleumc Nov 22, 2023
5491b57
Typhoon doors, fixed hitbox dir
Doubleumc Nov 22, 2023
f97fd4d
Merge remote-tracking branch 'upstream/master' into dropship-sidedoors
Doubleumc Nov 22, 2023
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
11 changes: 11 additions & 0 deletions code/game/machinery/doors/multi_tile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,17 @@
name = "\improper Normandy cargo door"
icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'

/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside
width = 2

/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1
name = "\improper Alamo crew hatch"
icon = 'icons/obj/structures/doors/dropship1_side2.dmi'

/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2
name = "\improper Normandy crew hatch"
icon = 'icons/obj/structures/doors/dropship2_side2.dmi'

/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/blastdoor
name = "bulkhead blast door"
icon = 'icons/obj/structures/doors/almayerblastdoor.dmi'
Expand Down
Binary file added icons/obj/structures/doors/dropship1_side2.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/obj/structures/doors/dropship2_side2.dmi
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions maps/shuttles/dropship_alamo.dmm
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
},
/area/shuttle/drop1/sulaco)
"rS" = (
/obj/structure/machinery/door/airlock/dropship_hatch{
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
id = "port_door"
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -481,7 +481,7 @@
},
/area/shuttle/drop1/sulaco)
"Pf" = (
/obj/structure/machinery/door/airlock/dropship_hatch{
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
dir = 8;
id = "starboard_door"
},
Expand Down Expand Up @@ -675,7 +675,7 @@ hG
Et
iI
JP
rS
il
rS
mW
qn
Expand Down Expand Up @@ -859,7 +859,7 @@ zS
iv
zV
MP
Pf
il
Pf
nC
nE
Expand Down
8 changes: 4 additions & 4 deletions maps/shuttles/dropship_normandy.dmm
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
/turf/template_noop,
/area/shuttle/drop2/sulaco)
"En" = (
/obj/structure/machinery/door/airlock/dropship_hatch/two{
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{
dir = 8;
id = "starboard_door"
},
Expand Down Expand Up @@ -583,7 +583,7 @@
/turf/template_noop,
/area/shuttle/drop2/sulaco)
"SC" = (
/obj/structure/machinery/door/airlock/dropship_hatch/two{
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{
id = "port_door"
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -708,7 +708,7 @@ eu
OI
GE
lJ
SC
PJ
SC
jc
pU
Expand Down Expand Up @@ -892,7 +892,7 @@ wX
fI
fx
Tp
En
PJ
En
gG
RG
Expand Down
Loading