Skip to content

Commit

Permalink
Dropship sidedoors (#4995)
Browse files Browse the repository at this point in the history
# About the pull request

Replaces the pairs of 1-wide sidedoors on dropships with a 2-wide
sidedoor. Icons are identical to the 1-wide sidedoors with the door part
widened.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

Two less moving parts that might accidentally get opened just as a
lockdown or launch is initiated thus locking it open at the worst
possible time. Also, I think it looks cleaner.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Before

![image](https://github.com/cmss13-devs/cmss13/assets/14267245/b92ea440-b33a-422e-8fe5-7fb3ee2a832c)

![image](https://github.com/cmss13-devs/cmss13/assets/14267245/a251ff6d-3a4e-44c4-9b31-a4edd13f1144)

After

![image](https://github.com/cmss13-devs/cmss13/assets/14267245/fcac7e07-1924-4d77-8625-ce6ce0a0fc94)

![image](https://github.com/cmss13-devs/cmss13/assets/14267245/ba1745dc-c696-4148-8b13-c0e5af97b8fb)

</details>


# Changelog
:cl:
imageadd: 2-wide dropship side doors
maptweak: changed dropship side doors to a lone doublewide door
/:cl:
  • Loading branch information
Doubleumc committed Nov 24, 2023
1 parent 221d270 commit 0d05880
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 17 deletions.
11 changes: 11 additions & 0 deletions code/game/machinery/doors/multi_tile.dm
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
Binary file not shown.
Binary file added icons/obj/structures/doors/dropship2_side2.dmi
Binary file not shown.
22 changes: 17 additions & 5 deletions maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -42329,8 +42329,10 @@
/turf/open/floor/wood,
/area/lv522/indoors/a_block/fitness/glass)
"qzp" = (
/obj/structure/machinery/door/airlock/dropship_hatch/two{
dir = 8
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{
id = "sh_dropship2";
dir = 2;
name = "\improper Typhoon crew hatch"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
Expand Down Expand Up @@ -47136,6 +47138,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/lv522/indoors/lone_buildings/storage_blocks)
"shh" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{
dir = 1;
id = "sh_dropship2";
name = "\improper Typhoon crew hatch"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
},
/area/lv522/landing_zone_forecon/UD6_Typhoon)
"shm" = (
/obj/structure/machinery/vending/cola,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -66448,7 +66460,7 @@ pRK
qmM
qGQ
qTh
qzp
rjP
qzp
nfq
fDg
Expand Down Expand Up @@ -67810,8 +67822,8 @@ pUc
qst
qLz
qVl
qzp
qzp
rjP
shh
rFp
sdE
sIx
Expand Down
13 changes: 7 additions & 6 deletions maps/shuttles/dropship_alamo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,9 @@
},
/area/shuttle/drop1/sulaco)
"rS" = (
/obj/structure/machinery/door/airlock/dropship_hatch{
id = "port_door"
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
id = "port_door";
dir = 2
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -481,8 +482,8 @@
},
/area/shuttle/drop1/sulaco)
"Pf" = (
/obj/structure/machinery/door/airlock/dropship_hatch{
dir = 8;
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
dir = 1;
id = "starboard_door"
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -675,7 +676,7 @@ hG
Et
iI
JP
rS
il
rS
mW
qn
Expand Down Expand Up @@ -859,7 +860,7 @@ zS
iv
zV
MP
Pf
il
Pf
nC
nE
Expand Down
13 changes: 7 additions & 6 deletions maps/shuttles/dropship_normandy.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@
/turf/template_noop,
/area/shuttle/drop2/sulaco)
"En" = (
/obj/structure/machinery/door/airlock/dropship_hatch/two{
dir = 8;
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{
dir = 1;
id = "starboard_door"
},
/turf/open/shuttle/dropship{
Expand Down Expand Up @@ -583,8 +583,9 @@
/turf/template_noop,
/area/shuttle/drop2/sulaco)
"SC" = (
/obj/structure/machinery/door/airlock/dropship_hatch/two{
id = "port_door"
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{
id = "port_door";
dir = 2
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -708,7 +709,7 @@ eu
OI
GE
lJ
SC
PJ
SC
jc
pU
Expand Down Expand Up @@ -892,7 +893,7 @@ wX
fI
fx
Tp
En
PJ
En
gG
RG
Expand Down

0 comments on commit 0d05880

Please sign in to comment.